From 03f9c70ae781b4f6cae562f6c78dbda52dfededb Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 18 May 2022 14:34:00 +0100
Subject: [PATCH 01/10] Copy updates, referral and tutorial buttons

---
 app/_locales/en/messages.json                 |  21 ++--
 .../connect-hardware/index.scss               |  27 ++++
 .../connect-hardware/select-hardware.js       | 119 ++++++++++++------
 3 files changed, 121 insertions(+), 46 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b63775632c56..b3d7222e3447 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -36,14 +36,17 @@
     "message": "Scan QR Code"
   },
   "QRHardwareWalletSteps1Description": {
-    "message": "Connect an airgapped hardware wallet that communicates through QR-codes. Officially supported airgapped hardware wallets include:"
+    "message": "You can choose from a list of official QR-code supporting partners below."
   },
   "QRHardwareWalletSteps1Title": {
-    "message": "QR-based HW Wallet"
+    "message": "Connect your QR hardware wallet"
   },
   "QRHardwareWalletSteps2Description": {
     "message": "Ngrave (Coming Soon)"
   },
+  "QRHardwareWalletSteps3Description": {
+    "message": "CoolWallet (Coming Soon)"
+  },
   "about": {
     "message": "About"
   },
@@ -1400,7 +1403,7 @@
     "message": "GWEI"
   },
   "happyToSeeYou": {
-    "message": "We’re happy to see you."
+    "message": "We’re happy to see you.."
   },
   "hardware": {
     "message": "Hardware"
@@ -3051,10 +3054,10 @@
     "message": "Not connected"
   },
   "step1LatticeWallet": {
-    "message": "Make sure your Lattice1 is ready to connect"
+    "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. For more on using hardware wallets, $1",
+    "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": {
@@ -3065,17 +3068,17 @@
     "description": "$1 represents the `ledgerLiveApp` localization value"
   },
   "step1TrezorWallet": {
-    "message": "Plug in Trezor wallet"
+    "message": "Connect your Trezor"
   },
   "step1TrezorWalletMsg": {
-    "message": "Connect your wallet directly to your computer. For more on using your hardware wallet device, $1",
+    "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": "Plug in Ledger wallet"
+    "message": "Connect your Ledger"
   },
   "step2LedgerWalletMsg": {
-    "message": "Connect your wallet directly to your computer.  Unlock your Ledger and open the Ethereum app. For more on using your hardware wallet device, $1.",
+    "message": "Plug your Ledger directly into your computer, then  unlock it and open the Ethereum app.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
   "storePhrase": {
diff --git a/ui/pages/create-account/connect-hardware/index.scss b/ui/pages/create-account/connect-hardware/index.scss
index 86517efe4a1c..4521e4a48be0 100644
--- a/ui/pages/create-account/connect-hardware/index.scss
+++ b/ui/pages/create-account/connect-hardware/index.scss
@@ -25,6 +25,13 @@
     }
   }
 
+  &__QR-subtitle {
+    @include H5;
+
+    margin-top: 10px;
+    color: var(--color-text-default);
+  }
+
   &__btn-wrapper {
     flex: 1;
     flex-direction: row;
@@ -41,6 +48,26 @@
     opacity: 0.5;
   }
 
+  &__external-btn-first {
+    @include H7;
+
+    padding: 5px 10px;
+    width: auto;
+    display: inline;
+    margin-top: 10px;
+    
+    margin-right: 20px;
+  }
+
+  &__external-btn {
+    @include H7;
+
+    padding: 5px 10px;
+    width: auto;
+    display: inline;
+    margin-top: 10px;
+  }
+
   &__btn {
     background: var(--color-background-alternative);
     border: 1px solid var(--color-border-muted);
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index fc058ae45093..27243c4cb7d3 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -194,7 +194,7 @@ export default class SelectHardware extends Component {
     steps.push({
       asset: 'plug-in-wallet',
       dimensions: { width: '225px', height: '75px' },
-      title: this.context.t('step2LedgerWallet'),
+      title: this.context.t('step2LedgerWallet'), 
       message: this.context.t('step2LedgerWalletMsg', [
         <a
           className="hw-connect__msg-link"
@@ -213,6 +213,22 @@ export default class SelectHardware extends Component {
         {steps.map((step, index) => (
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://shop.ledger.com/?r=17c4991a03fa", "_blank")
+            }
+          >
+           Buy Now
+          </Button>
+          <Button
+            className="hw-connect__external-btn"
+            type="secondary"
+            onClick={() => window.open("https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true", "_blank")
+            }
+          >
+           Tutorial
+          </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -253,6 +269,22 @@ export default class SelectHardware extends Component {
         {steps.map((step, index) => (
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://gridplus.io/?afmc=7p", "_blank")
+            }
+          >
+           Buy Now
+          </Button>
+          <Button
+            className="hw-connect__external-btn"
+            type="secondary"
+            onClick={() => window.open("https://docs.gridplus.io/setup/metamask", "_blank")
+            }
+          >
+           Tutorial
+          </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -293,6 +325,22 @@ export default class SelectHardware extends Component {
         {steps.map((step, index) => (
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009", "_blank")
+            }
+          >
+           Buy Now
+          </Button>
+          <Button
+            className="hw-connect__external-btn"
+            type="secondary"
+            onClick={() => window.open("https://wiki.trezor.io/Apps:MetaMask", "_blank")
+            }
+          >
+           Tutorial
+          </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -318,54 +366,51 @@ export default class SelectHardware extends Component {
       {
         message: (
           <>
-            <a
-              className="hw-connect__msg-link"
-              href="https://keyst.one"
-              rel="noopener noreferrer"
-              target="_blank"
-              key="keystone-support-link"
-            >
-              {this.context.t('keystone')}
-            </a>
-            <a
-              className="hw-connect__msg-link"
-              href="https://keyst.one/mm"
-              rel="noopener noreferrer"
-              target="_blank"
-              key="keystone-tutorial-link"
-            >
-              {this.context.t('keystoneTutorial')}
-            </a>
+            <p className="hw-connect__QR-subtitle">Keystone</p>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9", "_blank")
+            }>
+              Buy Now
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => window.open("https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone", "_blank")
+              }>
+              Tutorial
+            </Button>
           </>
         ),
       },
       {
         message: (
           <>
-            <a
-              className="hw-connect__msg-link"
-              href="https://airgap.it/metamask"
-              rel="noopener noreferrer"
-              target="_blank"
-              key="airgap-vault-support-link"
-            >
-              {this.context.t('airgapVault')}
-            </a>
-            <a
-              className="hw-connect__msg-link"
-              href="https://support.airgap.it/guides/metamask"
-              rel="noopener noreferrer"
-              target="_blank"
-              key="airgap-vault-tutorial-link"
-            >
-              {this.context.t('airgapVaultTutorial')}
-            </a>
+            <p className="hw-connect__QR-subtitle">AirGap Vault</p>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://airgap.it/", "_blank")
+            }>
+              Download Now
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => window.open("https://support.airgap.it/guides/metamask/", "_blank")
+              }>
+              Tutorial
+            </Button>
           </>
         ),
       },
       {
         message: this.context.t('QRHardwareWalletSteps2Description'),
       },
+      {
+        message: this.context.t('QRHardwareWalletSteps3Description'),
+      },
       {
         asset: 'qrcode-wallet-demo',
         dimensions: { width: '225px', height: '75px' },

From edf7269cb3b4165242e99a5ee19401ce345de041 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 18 May 2022 14:53:55 +0100
Subject: [PATCH 02/10] Update messages.json

---
 app/_locales/en/messages.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b3d7222e3447..612e590dce2c 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1403,7 +1403,7 @@
     "message": "GWEI"
   },
   "happyToSeeYou": {
-    "message": "We’re happy to see you.."
+    "message": "We’re happy to see you."
   },
   "hardware": {
     "message": "Hardware"

From 201df5f21b23a5db942f79345c3e1e97af44e9be Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Mon, 25 Jul 2022 17:35:41 +0100
Subject: [PATCH 03/10] New QR hardware wallets

---
 .../connect-hardware/select-hardware.js       | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 27243c4cb7d3..8eb52d3ce20b 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -11,6 +11,7 @@ import {
   DEVICE_NAMES,
   LEDGER_TRANSPORT_TYPES,
 } from '../../../../shared/constants/hardware-wallets';
+import { message } from '@truffle/codec/dist/lib/format/utils/exception';
 
 export default class SelectHardware extends Component {
   static contextTypes = {
@@ -406,10 +407,49 @@ export default class SelectHardware extends Component {
         ),
       },
       {
-        message: this.context.t('QRHardwareWalletSteps2Description'),
+        message: (
+          <>
+            <p className="hw-connect__QR-subtitle">CoolWallet</p>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://www.coolwallet.io/", "_blank")
+            }>
+              Buy Now
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => window.open("https://www.coolwallet.io/metamask-step-by-step-guides/", "_blank")
+              }>
+              Tutorial
+            </Button>
+          </>
+        ),
       },
       {
-        message: this.context.t('QRHardwareWalletSteps3Description'),
+        message: (
+          <>
+            <p className="hw-connect__QR-subtitle">D'Cent</p>
+            <Button
+            className="hw-connect__external-btn-first"
+            type="secondary"
+            onClick={() => window.open("https://dcentwallet.com/", "_blank")
+            }>
+              Buy Now
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
+              }>
+              + {t('addContact')}
+            </Button>
+          </>
+        ),
+      },
+      {
+        message: this.context.t('QRHardwareWalletSteps2Description'),
       },
       {
         asset: 'qrcode-wallet-demo',

From 00a15b0807b62564a4ecce8b57e3e1bb51d1dd90 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Mon, 25 Jul 2022 17:40:51 +0100
Subject: [PATCH 04/10] Update select-hardware.js

---
 ui/pages/create-account/connect-hardware/select-hardware.js | 2 +-
 1 file changed, 1 insertion(+), 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 8eb52d3ce20b..6b7248a8b4ea 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -443,7 +443,7 @@ export default class SelectHardware extends Component {
               type="secondary"
               onClick={() => window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
               }>
-              + {t('addContact')}
+              Tutorial 
             </Button>
           </>
         ),

From d511ae1833ab305d6952c65673d939fcd1990554 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 27 Jul 2022 13:56:42 +0100
Subject: [PATCH 05/10] Internationalisation

---
 app/_locales/en/messages.json                 |  9 ++++++
 .../connect-hardware/select-hardware.js       | 28 +++++++++----------
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 612e590dce2c..a34af875bb96 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -429,6 +429,9 @@
     "message": "Transak supports credit & debit cards, Apple Pay, MobiKwik, and bank transfers (depending on location) in 100+ countries. $1 deposits directly into your MetaMask account.",
     "description": "$1 represents the crypto symbol to be purchased"
   },
+  "buyNow": {
+    "message": "Buy Now"
+  },
   "buyWithWyre": {
     "message": "Buy ETH with Wyre"
   },
@@ -870,6 +873,9 @@
   "downloadGoogleChrome": {
     "message": "Download Google Chrome"
   },
+  "downloadNow": {
+    "message": "Download Now"
+  },
   "downloadSecretBackup": {
     "message": "Download this Secret Recovery Phrase and keep it stored safely on an external encrypted hard drive or storage medium."
   },
@@ -3783,6 +3789,9 @@
   "tryAgain": {
     "message": "Try again"
   },
+  "tutorial": {
+    "message": "Tutorial"
+  },
   "turnOnTokenDetection": {
     "message": "Turn on enhanced token detection"
   },
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 6b7248a8b4ea..1e9f611fea84 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -220,7 +220,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://shop.ledger.com/?r=17c4991a03fa", "_blank")
             }
           >
-           Buy Now
+           {this.context.t('buyNow')}
           </Button>
           <Button
             className="hw-connect__external-btn"
@@ -228,7 +228,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true", "_blank")
             }
           >
-           Tutorial
+           {this.context.t('tutorial')}
           </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
@@ -276,7 +276,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://gridplus.io/?afmc=7p", "_blank")
             }
           >
-           Buy Now
+          {this.context.t('buyNow')}
           </Button>
           <Button
             className="hw-connect__external-btn"
@@ -284,7 +284,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://docs.gridplus.io/setup/metamask", "_blank")
             }
           >
-           Tutorial
+           {this.context.t('tutorial')}
           </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
@@ -332,7 +332,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009", "_blank")
             }
           >
-           Buy Now
+           {this.context.t('buyNow')}
           </Button>
           <Button
             className="hw-connect__external-btn"
@@ -340,7 +340,7 @@ export default class SelectHardware extends Component {
             onClick={() => window.open("https://wiki.trezor.io/Apps:MetaMask", "_blank")
             }
           >
-           Tutorial
+           {this.context.t('tutorial')}
           </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
@@ -373,14 +373,14 @@ export default class SelectHardware extends Component {
             type="secondary"
             onClick={() => window.open("https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9", "_blank")
             }>
-              Buy Now
+              {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => window.open("https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone", "_blank")
               }>
-              Tutorial
+              {this.context.t('tutorial')}
             </Button>
           </>
         ),
@@ -394,14 +394,14 @@ export default class SelectHardware extends Component {
             type="secondary"
             onClick={() => window.open("https://airgap.it/", "_blank")
             }>
-              Download Now
+              {this.context.t('downloadNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => window.open("https://support.airgap.it/guides/metamask/", "_blank")
               }>
-              Tutorial
+              {this.context.t('tutorial')}
             </Button>
           </>
         ),
@@ -415,14 +415,14 @@ export default class SelectHardware extends Component {
             type="secondary"
             onClick={() => window.open("https://www.coolwallet.io/", "_blank")
             }>
-              Buy Now
+              {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => window.open("https://www.coolwallet.io/metamask-step-by-step-guides/", "_blank")
               }>
-              Tutorial
+              {this.context.t('tutorial')}
             </Button>
           </>
         ),
@@ -436,14 +436,14 @@ export default class SelectHardware extends Component {
             type="secondary"
             onClick={() => window.open("https://dcentwallet.com/", "_blank")
             }>
-              Buy Now
+              {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
               }>
-              Tutorial 
+                {this.context.t('tutorial')}
             </Button>
           </>
         ),

From 72c9e1e0b218166eda250fb38d08a17c7e9f8bd9 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 27 Jul 2022 18:15:58 +0100
Subject: [PATCH 06/10] First metric

---
 .../connect-hardware/select-hardware.js              | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 1e9f611fea84..0ddd457c2faf 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -411,9 +411,15 @@ export default class SelectHardware extends Component {
           <>
             <p className="hw-connect__QR-subtitle">CoolWallet</p>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => window.open("https://www.coolwallet.io/", "_blank")
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Buy CoolWallet',
+                })
+                window.open("https://www.coolwallet.io/", "_blank")
+              }
             }>
               {this.context.t('buyNow')}
             </Button>

From 597a9088f9f4d44c58c12242a3ea2258e7562b59 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 27 Jul 2022 22:44:40 +0100
Subject: [PATCH 07/10] Revert "Merge branch
 'hardware-wallets-referral-and-tutorial-links' of
 https://github.com/MetaMask/metamask-extension into
 hardware-wallets-referral-and-tutorial-links"

This reverts commit 416abd75b15e0998cdfa073f436e475982d3679e, reversing
changes made to d511ae1833ab305d6952c65673d939fcd1990554.
---
 .circleci/config.yml                          |   78 +-
 .circleci/scripts/bundle-stats-commit.sh      |   70 -
 .circleci/scripts/chrome-install.sh           |    4 +-
 .circleci/scripts/firefox-install.sh          |    2 +-
 .depcheckrc.yml                               |    1 -
 .eslintrc.js                                  |    1 -
 .github/PULL_REQUEST_TEMPLATE.md              |    7 +-
 .iyarc                                        |    3 +-
 .metamaskrc.dist                              |    3 -
 .nvmrc                                        |    2 +-
 .storybook/1.INTRODUCTION.stories.mdx         |    2 +-
 .storybook/3.COLORS.stories.mdx               |   39 +-
 .storybook/4.BREAKPOINTS.stories.mdx          |  125 -
 .storybook/initial-states/transactions.js     | 1921 ------
 .storybook/preview.js                         |    2 +-
 .storybook/test-data.js                       |  394 +-
 CHANGELOG.md                                  |  192 +-
 README.md                                     |    8 +-
 app/_locales/am/messages.json                 |    4 +-
 app/_locales/ar/messages.json                 |    2 +-
 app/_locales/bg/messages.json                 |    4 +-
 app/_locales/bn/messages.json                 |    4 +-
 app/_locales/ca/messages.json                 |    4 +-
 app/_locales/da/messages.json                 |    4 +-
 app/_locales/de/messages.json                 |  142 +-
 app/_locales/el/messages.json                 |  140 +-
 app/_locales/en/messages.json                 |  186 +-
 app/_locales/es/messages.json                 |  142 +-
 app/_locales/es_419/messages.json             |   12 +-
 app/_locales/et/messages.json                 |    4 +-
 app/_locales/fa/messages.json                 |    4 +-
 app/_locales/fi/messages.json                 |    4 +-
 app/_locales/fil/messages.json                |    4 +-
 app/_locales/fr/messages.json                 |  146 +-
 app/_locales/he/messages.json                 |    2 +-
 app/_locales/hi/messages.json                 |  138 +-
 app/_locales/hr/messages.json                 |    4 +-
 app/_locales/hu/messages.json                 |    2 +-
 app/_locales/id/messages.json                 |  138 +-
 app/_locales/it/messages.json                 |    4 +-
 app/_locales/ja/messages.json                 |  140 +-
 app/_locales/kn/messages.json                 |    4 +-
 app/_locales/ko/messages.json                 |  138 +-
 app/_locales/lt/messages.json                 |    4 +-
 app/_locales/lv/messages.json                 |    4 +-
 app/_locales/ms/messages.json                 |    4 +-
 app/_locales/no/messages.json                 |    4 +-
 app/_locales/ph/messages.json                 |   12 +-
 app/_locales/pl/messages.json                 |    4 +-
 app/_locales/pt/messages.json                 |  140 +-
 app/_locales/pt_BR/messages.json              |   12 +-
 app/_locales/ro/messages.json                 |    4 +-
 app/_locales/ru/messages.json                 |  140 +-
 app/_locales/sk/messages.json                 |    4 +-
 app/_locales/sl/messages.json                 |    4 +-
 app/_locales/sr/messages.json                 |    4 +-
 app/_locales/sv/messages.json                 |    4 +-
 app/_locales/sw/messages.json                 |    4 +-
 app/_locales/tl/messages.json                 |  142 +-
 app/_locales/tr/messages.json                 |  140 +-
 app/_locales/uk/messages.json                 |    4 +-
 app/_locales/vi/messages.json                 |  140 +-
 app/_locales/zh/messages.json                 |  146 +-
 app/_locales/zh_CN/messages.json              |   14 +-
 app/_locales/zh_TW/messages.json              |    4 +-
 app/home.html                                 |    5 +-
 app/images/fantom-opera.svg                   |    1 -
 app/images/harmony-one.svg                    |    1 -
 app/images/info-fox.svg                       |    1 -
 .../recovery-onboarding/subtitles/de.vtt      |   68 +-
 .../recovery-onboarding/subtitles/el.vtt      |   98 -
 .../recovery-onboarding/subtitles/es.vtt      |    3 +-
 .../recovery-onboarding/subtitles/fr.vtt      |   98 -
 .../recovery-onboarding/subtitles/hi.vtt      |   69 +-
 .../recovery-onboarding/subtitles/id.vtt      |   63 +-
 .../recovery-onboarding/subtitles/ja.vtt      |   67 +-
 .../recovery-onboarding/subtitles/ko.vtt      |   69 +-
 .../recovery-onboarding/subtitles/pt.vtt      |   79 +-
 .../recovery-onboarding/subtitles/ru.vtt      |   63 +-
 .../recovery-onboarding/subtitles/tl.vtt      |    3 +-
 .../recovery-onboarding/subtitles/tr.vtt      |  116 -
 .../recovery-onboarding/subtitles/vi.vtt      |   84 +-
 .../recovery-onboarding/subtitles/zh.vtt      |   98 -
 app/manifest/{v2 => }/_base.json              |    4 +-
 app/manifest/{v2 => }/brave.json              |    0
 app/manifest/{v2 => }/chrome.json             |    0
 app/manifest/{v2 => }/firefox.json            |    0
 app/manifest/{v2 => }/opera.json              |    0
 app/manifest/v3/_base.json                    |   76 -
 app/manifest/v3/brave.json                    |    1 -
 app/manifest/v3/chrome.json                   |    7 -
 app/manifest/v3/firefox.json                  |   26 -
 app/manifest/v3/opera.json                    |    9 -
 app/phishing.html                             |  150 +
 app/popup.html                                |    5 +-
 app/scripts/app-init.js                       |  124 -
 app/scripts/background.js                     |  168 +-
 app/scripts/constants/contracts.js            |   14 -
 app/scripts/constants/on-ramp.js              |    1 -
 app/scripts/contentscript.js                  |   82 +-
 app/scripts/controllers/detect-tokens.js      |    6 +-
 app/scripts/controllers/detect-tokens.test.js |   28 +-
 app/scripts/controllers/ens/ens.js            |   17 +-
 app/scripts/controllers/ens/index.test.js     |    2 +-
 .../controllers/incoming-transactions.js      |    3 +-
 app/scripts/controllers/metametrics.js        |   17 +-
 app/scripts/controllers/metametrics.test.js   |   10 +-
 app/scripts/controllers/network/network.js    |    8 +-
 .../permissions/flask/snap-permissions.js     |    2 +-
 app/scripts/controllers/preferences.js        |   12 -
 app/scripts/controllers/transactions/index.js |  131 +-
 .../controllers/transactions/index.test.js    |  145 +-
 .../transactions/pending-tx-tracker.js        |    3 +-
 .../transactions/tx-state-manager.js          |   23 +-
 .../transactions/tx-state-manager.test.js     |  109 +-
 app/scripts/init-globals.js                   |   18 -
 .../lib/ComposableObservableStore.test.js     |    4 +-
 app/scripts/lib/account-tracker.js            |   74 +-
 app/scripts/lib/buy-url.js                    |   49 +-
 .../lib/createRPCMethodTrackingMiddleware.js  |  228 +-
 .../createRPCMethodTrackingMiddleware.test.js |  217 -
 app/scripts/lib/ens-ipfs/setup.js             |    3 +-
 app/scripts/lib/metaRPCClientFactory.js       |   29 +-
 app/scripts/lib/metaRPCClientFactory.test.js  |   17 -
 app/scripts/lib/network-store.js              |    3 +-
 .../handlers/add-ethereum-chain.js            |   74 +-
 app/scripts/lib/setupSentry.js                |   12 +-
 app/scripts/lib/util.js                       |    2 +-
 app/scripts/lib/util.test.js                  |    7 +
 app/scripts/metamask-controller.js            |  457 +-
 app/scripts/metamask-controller.test.js       |   55 -
 app/scripts/migrations/072.js                 |   30 -
 app/scripts/migrations/072.test.js            |  427 --
 app/scripts/migrations/index.js               |    2 -
 app/scripts/phishing-detect.js                |   40 +
 app/scripts/ui.js                             |   43 +-
 development/README.md                         |   21 -
 development/build/README.md                   |   36 +-
 development/build/constants.js                |   48 -
 development/build/etc.js                      |   12 +-
 development/build/index.js                    |  157 +-
 development/build/manifest.js                 |   18 +-
 development/build/scripts.js                  |  228 +-
 development/build/static.js                   |   13 +-
 development/build/styles.js                   |    7 +-
 development/build/transforms/utils.test.js    |    2 +-
 .../charts/flamegraph/chart/index.html        |  170 -
 .../flamegraph/lib/d3-flamegraph-tooltip.js   | 3117 ---------
 .../charts/flamegraph/lib/d3-flamegraph.css   |   46 -
 .../charts/flamegraph/lib/d3-flamegraph.js    | 5719 -----------------
 development/charts/table/index.html           |   67 -
 development/charts/table/jquery.min.js        |   18 -
 development/metamaskbot-build-announce.js     |   12 -
 development/sourcemap-validator.js            |    1 +
 docs/trezor-emulator.md                       |    2 +-
 jest.config.js                                |   12 +-
 lavamoat/browserify/beta/policy.json          |  500 +-
 lavamoat/browserify/flask/policy.json         |  500 +-
 lavamoat/browserify/main/policy.json          |  500 +-
 lavamoat/browserify/policy-override.json      |    7 -
 lavamoat/build-system/policy-override.json    |   30 -
 lavamoat/build-system/policy.json             |  305 +-
 package.json                                  |   42 +-
 patches/@lavamoat+lavapack+3.1.0.patch        |   15 -
 patches/abort-controller+3.0.0.patch          |    5 +-
 patches/bip39+2.5.0.patch                     |   99 +
 patches/eth-hd-keyring+3.6.0.patch            |   43 +
 patches/eth-keyring-controller+6.2.1.patch    |   37 +
 patches/yargs+17.4.1.patch                    |   11 -
 shared/constants/app.js                       |    5 -
 shared/constants/gas.js                       |   17 +-
 shared/constants/metametrics.js               |   21 -
 shared/constants/network.js                   |  135 +-
 shared/constants/permissions.js               |    1 -
 shared/constants/permissions.test.js          |    2 +-
 shared/constants/phishing.js                  |    4 -
 shared/constants/swaps.js                     |    5 -
 shared/constants/tokens.js                    |   13 -
 shared/constants/transaction.js               |   95 +-
 shared/modules/fetch-with-timeout.js          |    3 +-
 shared/modules/fetch-with-timeout.test.js     |    8 +-
 shared/modules/mv3.utils.js                   |    4 -
 shared/modules/object.utils.js                |   22 -
 shared/modules/rpc.utils.js                   |    3 +-
 shared/modules/transaction.utils.js           |   48 +-
 shared/modules/transaction.utils.test.js      |   89 +-
 shared/notifications/index.js                 |   15 +-
 test/data/mock-state.json                     |   16 -
 test/e2e/benchmark.js                         |   35 +-
 test/e2e/fixtures/address-entry/state.json    |    3 -
 test/e2e/fixtures/connected-state/state.json  |    3 -
 test/e2e/fixtures/custom-rpc/state.json       |    3 -
 test/e2e/fixtures/custom-token/state.json     |    3 -
 test/e2e/fixtures/eip-1559-v2-dapp/state.json |    3 -
 test/e2e/fixtures/eip-1559-v2/state.json      |    3 -
 test/e2e/fixtures/import-ui/state.json        |    3 -
 test/e2e/fixtures/imported-account/state.json |    3 -
 test/e2e/fixtures/localization/state.json     |    3 -
 test/e2e/fixtures/metrics-enabled/state.json  |    3 -
 .../fixtures/navigate-transactions/state.json |    3 -
 test/e2e/fixtures/onboarding/state.json       |    3 -
 test/e2e/fixtures/send-edit-v2/state.json     |    3 -
 test/e2e/fixtures/send-edit/state.json        |    3 -
 test/e2e/fixtures/special-settings/state.json |  149 -
 test/e2e/fixtures/threebox-enabled/state.json |    3 -
 test/e2e/helpers.js                           |   34 +-
 test/e2e/lavamoat-stats.js                    |  140 -
 test/e2e/metamask-ui.spec.js                  |    8 +-
 test/e2e/mock-e2e.js                          |   51 -
 .../index.html                                |   20 -
 test/e2e/mock-page-with-iframe/index.html     |   11 -
 test/e2e/mv3-perf-stats/bundle-size.js        |  119 -
 test/e2e/mv3-perf-stats/index.js              |    2 -
 test/e2e/mv3-perf-stats/init-load-stats.js    |  111 -
 test/e2e/mv3-stats.js                         |  111 -
 test/e2e/phishing-warning-page-server.js      |   58 -
 test/e2e/run-e2e-test.js                      |    3 -
 .../ganache-contract-address-registry.js      |   28 -
 test/e2e/seeder/ganache-seeder.js             |   88 -
 test/e2e/seeder/smart-contracts.js            |   43 -
 test/e2e/snaps/enums.js                       |    3 -
 test/e2e/snaps/test-snap-bip-44.spec.js       |   28 +-
 test/e2e/snaps/test-snap-confirm.spec.js      |   20 +-
 test/e2e/snaps/test-snap-error.spec.js        |   16 +-
 test/e2e/snaps/test-snap-managestate.spec.js  |   72 +-
 test/e2e/snaps/test-snap-notification.spec.js |  109 -
 test/e2e/tests/add-hide-token.spec.js         |    8 +-
 test/e2e/tests/address-book.spec.js           |    1 +
 test/e2e/tests/chain-interactions.spec.js     |   56 +-
 test/e2e/tests/contract-interactions.spec.js  |    2 +-
 test/e2e/tests/custom-rpc-history.spec.js     |   12 +-
 .../tests/custom-token-add-approve.spec.js    |  358 --
 test/e2e/tests/dapp-interactions.spec.js      |    8 +-
 test/e2e/tests/from-import-ui.spec.js         |    5 +-
 test/e2e/tests/incremental-security.spec.js   |    6 +-
 test/e2e/tests/metamask-responsive-ui.spec.js |    8 +-
 test/e2e/tests/navigate-transactions.spec.js  |    4 +
 test/e2e/tests/phishing-detection.spec.js     |  123 +-
 test/e2e/tests/provider-api.spec.js           |    4 +-
 test/e2e/tests/send-eth.spec.js               |   48 -
 test/e2e/tests/send-hex-address.spec.js       |  329 -
 test/e2e/tests/send-to-contract.spec.js       |   83 -
 test/e2e/tests/settings-search.spec.js        |    9 +
 test/e2e/tests/state-logs.spec.js             |   65 -
 test/e2e/tests/swap-eth.spec.js               |    4 +-
 test/e2e/webdriver/chrome.js                  |   12 +-
 test/e2e/webdriver/driver.js                  |   26 +-
 test/e2e/webdriver/firefox.js                 |   19 +-
 test/e2e/webdriver/index.js                   |    6 +-
 test/helpers/file.js                          |   37 -
 test/jest/mock-store.js                       |  146 +-
 test/jest/mocks.js                            |   44 -
 .../account-menu/account-menu.component.js    |   66 +-
 .../account-menu/account-menu.container.js    |   10 +-
 ui/components/app/account-menu/index.scss     |   44 +-
 ui/components/app/add-network/add-network.js  |  385 +-
 .../app/add-network/add-network.test.js       |   60 -
 ui/components/app/add-network/index.scss      |   54 +-
 .../advanced-gas-controls.component.js        |    6 +-
 .../app/advanced-gas-controls/index.scss      |    2 +-
 .../advanced-gas-fee-defaults.js              |    4 +-
 .../advanced-gas-fee-gas-limit.js             |   11 +-
 .../advanced-gas-fee-input-subtext.js         |    2 +-
 .../base-fee-input/base-fee-input.js          |    2 +-
 .../priority-fee-input/priority-fee-input.js  |    7 +-
 .../advanced-gas-fee-save.js                  |    5 +-
 ui/components/app/app-components.scss         |    1 -
 .../app/app-header/app-header.component.js    |   19 +-
 .../app/app-header/app-header.container.js    |   10 -
 ui/components/app/app-header/index.scss       |   21 -
 .../app/asset-list-item/asset-list-item.js    |    4 +-
 ui/components/app/asset-list/asset-list.js    |   10 +-
 .../cancel-speedup-popover.js                 |   17 +-
 .../collectible-default-image.js              |   41 -
 .../collectible-default-image.stories.js      |   42 -
 .../app/collectible-default-image/index.js    |    1 -
 .../app/collectible-default-image/index.scss  |   22 -
 .../collectible-details.js                    |   17 +-
 .../collectible-details.stories.js            |   36 +-
 .../collectibles-detection-notice.js          |    5 +-
 .../collectibles-items/collectibles-items.js  |   77 +-
 .../app/collectibles-items/index.scss         |   30 +-
 .../collectibles-tab/collectibles-tab.test.js |    6 +-
 .../confirm-detail-row.stories.js             |   47 -
 .../confirm-detail-row/index.scss             |    4 +-
 ...onfirm-page-container-summary.component.js |    9 +-
 .../enableEIP1559V2-notice.js                 |    4 +-
 .../connected-accounts-list.stories.js        |   38 -
 .../connected-sites-list.component.js         |    8 +-
 .../app/connected-sites-list/index.scss       |    4 +
 .../app/currency-input/currency-input.js      |   40 +-
 .../app/currency-input/currency-input.test.js |   21 +-
 .../detected-token-address.js                 |    3 +-
 .../detected-token-ignored-popover.js         |    5 +-
 .../app/detected-token/detected-token.js      |   20 +-
 .../app/detected-token/detected-token.test.js |    6 +-
 ui/components/app/dropdowns/dropdown.js       |    2 +-
 .../app/dropdowns/network-dropdown.js         |   13 +-
 .../app/dropdowns/network-dropdown.test.js    |    5 +-
 .../edit-gas-display.component.js             |    6 +-
 .../edit-gas-display.stories.js               |   14 +-
 ui/components/app/edit-gas-display/index.scss |    4 +-
 .../edit-gas-fee-button.js                    |   23 +-
 .../app/edit-gas-fee-button/index.scss        |    7 -
 .../edit-gas-fee-popover.js                   |   32 +-
 .../edit-gas-item/edit-gas-item.js            |    3 +-
 .../edit-gas-item/index.scss                  |    2 +-
 .../edit-gas-tooltip/index.scss               |    2 +-
 .../network-statistics/network-statistics.js  |    3 +-
 .../status-slider/index.scss                  |    2 +-
 .../status-slider/status-slider.js            |    5 +-
 .../network-statistics/tooltips.js            |    2 +-
 .../flask/snaps-authorship-pill/index.scss    |   23 +-
 .../snaps-authorship-pill.js                  |   50 +-
 .../snaps-authorship-pill.stories.js          |    8 +-
 .../advanced-gas-inputs/index.scss            |    4 +-
 .../gas-price-button-group.stories.js         |   47 -
 .../gas-price-button-group/index.scss         |    2 +-
 .../gas-slider/gas-slider.stories.js          |   34 -
 .../gas-customization/gas-slider/index.scss   |    1 +
 .../gas-details-item-title.js                 |    7 +-
 .../app/gas-details-item/gas-details-item.js  |    9 +-
 ui/components/app/gas-details-item/index.scss |    2 +-
 ui/components/app/gas-timing/index.scss       |    2 +-
 .../hold-to-reveal-button.js                  |    2 +-
 .../app/home-notification/index.scss          |    2 +-
 .../metamask-template-renderer.js             |    3 -
 .../safe-component-list.js                    |    5 -
 .../account-details-modal.test.js             |   14 +-
 .../convert-token-to-nft-modal.js             |    9 +-
 .../deposit-ether-modal.component.js          |   35 +-
 .../deposit-ether-modal.container.js          |   11 +-
 .../hide-token-confirmation-modal.js          |    6 +-
 .../hide-token-confirmation.stories.js        |   11 -
 .../hide-token-confirmation-modal/index.scss  |    2 +-
 ui/components/app/modals/modal.js             |   14 +-
 .../app/modals/new-account-modal/index.scss   |    2 +-
 .../new-account-modal.stories.js              |   11 -
 .../nickname-popovers.component.js            |    2 +-
 .../modals/qr-scanner/qr-scanner.component.js |    2 +-
 .../app/network-display/network-display.js    |    4 +-
 .../app/permissions-connect-header/index.scss |    2 +-
 .../permissions-connect-header.component.js   |   62 +-
 .../index.scss                                |    2 +-
 .../qr-hardware-popover/enhanced-reader.js    |    2 +-
 .../qr-hardware-sign-request/player.js        |    7 +-
 .../recovery-phrase-reminder.js               |    9 +-
 .../selected-account.component.js             |    2 +-
 .../app/signature-request-original/README.mdx |   15 -
 .../app/signature-request-original/index.scss |    8 +-
 .../signature-request-original.component.js   |   44 +-
 .../signature-request-original.container.js   |   28 +-
 .../signature-request-original.stories.js     |  132 -
 .../app/signature-request/index.scss          |   10 +-
 .../signature-request-footer.component.js     |    4 +-
 .../signature-request-message/index.scss      |    2 +-
 .../signature-request-message.component.js    |    2 +-
 .../signature-request.component.js            |    6 +-
 .../signature-request.component.test.js       |    4 +-
 .../signature-request.container.test.js       |    1 -
 .../signature-request.stories.js              |   32 +-
 ui/components/app/srp-input/srp-input.js      |   15 +-
 ui/components/app/srp-input/srp-input.scss    |   25 +-
 .../app/step-progress-bar/index.scss          |   32 +-
 .../step-progress-bar/step-progress-bar.js    |   10 +-
 ui/components/app/tab-bar/index.scss          |    2 +-
 ui/components/app/token-cell/token-cell.js    |    2 +-
 .../transaction-activity-log-icon.stories.js  |    3 -
 .../transaction-decoding.component.js         |    6 +-
 .../app/transaction-detail-item/index.scss    |    2 +-
 .../transaction-detail-item.component.js      |    4 +-
 .../app/transaction-icon/transaction-icon.js  |   18 +-
 ...transaction-list-item-details.component.js |    5 +-
 ...action-list-item-details.component.test.js |    5 -
 ...transaction-list-item-details.container.js |    5 +-
 .../app/transaction-list-item/index.scss      |    6 +
 .../smart-transaction-list-item.component.js  |    9 +-
 .../transaction-list-item.component.js        |   18 +-
 .../transaction-list-item.stories.js          |  210 -
 .../app/transaction-status/index.scss         |    2 +-
 ...erenced-currency-display.component.test.js |    2 +-
 .../app/wallet-overview/eth-overview.js       |   44 +-
 ui/components/app/wallet-overview/index.scss  |    2 +-
 .../app/wallet-overview/token-overview.js     |    4 +-
 .../app/wallet-overview/wallet-overview.js    |    5 +-
 .../app/whats-new-popup/whats-new-popup.js    |    8 +-
 ui/components/ui/alert/README.mdx             |   15 -
 ui/components/ui/alert/alert.stories.js       |   32 -
 ui/components/ui/alert/index.js               |   71 +-
 ui/components/ui/alert/index.test.js          |   24 +
 ui/components/ui/box/README.mdx               |  207 +-
 ui/components/ui/box/box.js                   |  358 +-
 ui/components/ui/box/box.scss                 |  253 +-
 ui/components/ui/box/box.stories.js           |  139 +-
 ui/components/ui/box/box.test.js              |  732 ---
 ui/components/ui/box/index.js                 |    7 +-
 ui/components/ui/breadcrumbs/README.mdx       |   16 -
 .../ui/breadcrumbs/breadcrumbs.stories.js     |   33 -
 ui/components/ui/button-group/index.scss      |    2 +-
 ui/components/ui/button/buttons.scss          |   28 +-
 ui/components/ui/callout/callout.scss         |    2 +-
 ui/components/ui/callout/callout.stories.js   |    6 +-
 ui/components/ui/chip/chip.js                 |   19 +-
 ui/components/ui/chip/chip.scss               |    8 -
 .../ui/color-indicator/color-indicator.js     |    2 +-
 ui/components/ui/confusable/README.mdx        |   25 -
 .../ui/confusable/confusable.stories.js       |   37 -
 .../ui/definition-list/definition-list.js     |    2 -
 .../definition-list.stories.js                |  100 +-
 ui/components/ui/dialog/README.mdx            |   15 -
 ui/components/ui/dialog/dialog.stories.js     |   30 -
 ui/components/ui/dropdown/dropdown.scss       |    1 -
 .../error-message/error-message.component.js  |    8 -
 .../ui/export-text-container/README.mdx       |   15 -
 .../export-text.stories.js                    |   29 -
 .../ui/form-field/form-field.stories.js       |    2 +-
 ui/components/ui/form-field/index.scss        |    4 +-
 ui/components/ui/hex-to-decimal/README.mdx    |   15 -
 .../hex-to-decimal/hex-to-decimal.stories.js  |   32 -
 .../ui/i18n-value/i18n-value.component.js     |   15 +
 ui/components/ui/i18n-value/index.js          |    1 +
 .../icon-with-fallback.scss                   |    2 +-
 ui/components/ui/icon/icon.stories.js         |    5 +-
 ui/components/ui/icon/search-icon.js          |   42 -
 ui/components/ui/info-tooltip/index.scss      |   54 +-
 ui/components/ui/info-tooltip/info-tooltip.js |    9 +-
 .../ui/info-tooltip/info-tooltip.stories.js   |    1 +
 .../ui/jazzicon/jazzicon.component.js         |   10 +-
 ui/components/ui/loading-screen/index.scss    |    4 +-
 .../loading-screen.component.js               |    2 +-
 ui/components/ui/logo/logo-coinbasepay.js     |   58 -
 ui/components/ui/logo/logo-coinbasepay.scss   |    3 -
 ui/components/ui/logo/logo-wyre.js            |   48 +-
 ui/components/ui/logo/logo.stories.js         |    2 -
 ui/components/ui/menu/menu.scss               |    4 +-
 .../ui/metafox-logo/horizontal-logo.js        |    2 +-
 .../nickname-popover.stories.js               |   45 +-
 ui/components/ui/page-container/index.scss    |    2 +-
 .../page-container.component.js               |    4 +-
 .../page-container/page-container.stories.js  |   66 -
 ui/components/ui/popover/index.scss           |    4 +-
 ui/components/ui/search-icon/index.js         |    1 +
 .../ui/search-icon/search-icon.component.js   |   20 +
 .../ui/sender-to-recipient/index.scss         |    4 +-
 ui/components/ui/site-icon/site-icon.test.js  |    3 +-
 ui/components/ui/site-origin/index.scss       |    8 +-
 ui/components/ui/site-origin/site-origin.js   |   52 +-
 .../ui/site-origin/site-origin.stories.js     |    8 -
 ui/components/ui/slider/slider.component.js   |    6 +-
 ui/components/ui/spinner/spinner.stories.js   |   26 -
 ui/components/ui/tabs/index.scss              |    2 +-
 ui/components/ui/tabs/tabs.stories.js         |   47 +-
 ui/components/ui/text-field/index.scss        |    6 -
 ui/components/ui/textarea/textarea.js         |    2 +-
 .../ui/token-input/token-input.component.js   |    9 +-
 .../token-input/token-input.component.test.js |   90 -
 .../ui/token-input/token-input.container.js   |    3 +-
 ui/components/ui/tooltip/index.scss           |   62 +-
 ui/components/ui/tooltip/tooltip.js           |    2 +-
 ui/components/ui/tooltip/tooltip.stories.js   |   92 -
 ui/components/ui/typography/typography.js     |   28 +-
 ui/components/ui/ui-components.scss           |    1 -
 .../ui/update-nickname-popover/index.scss     |    2 +-
 .../update-nickname-popover.js                |   10 +-
 ui/components/ui/url-icon/index.scss          |    2 +-
 ui/css/base-styles.scss                       |    1 +
 ui/css/design-system/attributes.scss          |    4 +-
 ui/css/design-system/breakpoints.scss         |   69 +-
 ui/css/errors.scss                            |   44 -
 ui/css/index.scss                             |    2 -
 ui/css/itcss/components/newui-sections.scss   |    6 +-
 ui/css/itcss/components/send.scss             |   32 +-
 ui/css/loading.scss                           |   13 -
 ui/css/utilities/colors.scss                  |    4 +-
 ui/ducks/app/app.js                           |   10 -
 ui/ducks/ens.js                               |   23 +-
 ui/ducks/send/helpers.js                      |  294 -
 ui/ducks/send/helpers.test.js                 |  163 -
 ui/ducks/send/send.js                         | 3062 ++++-----
 ui/ducks/send/send.test.js                    | 2060 +++---
 ui/ducks/swaps/swaps.js                       |   71 +-
 ui/helpers/constants/common.js                |   14 +-
 ui/helpers/constants/critical-error.js        |    1 -
 ui/helpers/constants/design-system.js         |    5 -
 ui/helpers/constants/notifications.js         |    6 -
 ui/helpers/constants/routes.js                |   10 -
 ui/helpers/constants/settings.js              |    7 -
 ui/helpers/constants/transactions.js          |    1 -
 ui/helpers/utils/error-utils.js               |   55 -
 ui/helpers/utils/error-utils.test.js          |   49 -
 ui/helpers/utils/i18n-helper.js               |    3 +-
 ui/helpers/utils/icon-factory.js              |   41 +-
 ui/helpers/utils/permission.js                |    5 -
 ui/helpers/utils/settings-search.test.js      |    2 +-
 ui/helpers/utils/token-util.js                |   97 +-
 ui/helpers/utils/transactions.util.js         |   32 +-
 ui/helpers/utils/transactions.util.test.js    |   46 -
 ui/hooks/useAssetDetails.js                   |   80 +-
 ui/hooks/useAssetDetails.test.js              |  193 -
 ui/hooks/useTransactionDisplayData.js         |   92 +-
 ui/hooks/useTransactionDisplayData.test.js    |    2 +-
 ui/index.js                                   |   56 +-
 ui/index.test.js                              |   70 -
 ui/pages/add-collectible/add-collectible.js   |   19 +-
 .../add-collectible/add-collectible.test.js   |   79 -
 ui/pages/asset/asset.scss                     |    2 +-
 ui/pages/asset/components/asset-options.js    |   31 +-
 .../confirm-add-suggested-token.js            |    6 +-
 .../confirm-approve-content.component.js      |  170 +-
 .../confirm-approve-content.component.test.js |    2 +-
 .../confirm-approve-content.stories.js        |    2 +-
 .../confirm-approve-content/index.scss        |    4 -
 ui/pages/confirm-approve/confirm-approve.js   |   21 +-
 .../confirm-decrypt-message.scss              |    2 +-
 .../confirm-deploy-contract.stories.js        |   60 +-
 ...confirm-encryption-public-key.component.js |    5 +-
 .../confirm-encryption-public-key.scss        |    3 +-
 .../confirm-import-token.js                   |    6 +-
 .../confirm-send-ether.container.js           |    6 +-
 .../confirm-send-ether.stories.js             |   64 +-
 .../confirm-send-token.component.js           |    9 +-
 .../confirm-send-token.container.js           |   17 +-
 .../confirm-send-token/confirm-send-token.js  |   29 +-
 .../confirm-token-transaction-base.js         |    9 +-
 .../confirm-transaction-base.component.js     |   13 +-
 .../confirm-transaction-base.container.js     |   10 +-
 .../transaction-alerts/transaction-alerts.js  |   51 +-
 .../confirm-transaction-switch.component.js   |    5 -
 .../confirm-token-transaction-switch.js       |   25 -
 .../confirmation-network-switch/index.scss    |    1 +
 ui/pages/confirmation/confirmation.js         |   57 +-
 .../templates/add-ethereum-chain.js           |  203 +-
 .../connect-hardware/index.scss               |    2 +-
 ui/pages/create-account/index.scss            |    2 +-
 .../metametrics-opt-in/index.scss             |    4 +
 .../metametrics-opt-in.component.js           |   29 +-
 .../metametrics-opt-in.container.js           |    2 +
 .../confirm-seed-phrase/index.scss            |    2 +-
 .../seed-phrase-intro.component.js            |    5 -
 .../select-action/select-action.component.js  |    9 +-
 .../welcome/welcome.component.js              |   21 +-
 .../welcome/welcome.container.js              |    7 +-
 .../first-time-flow/welcome/welcome.test.js   |    8 +-
 ui/pages/home/home.component.js               |   76 +-
 ui/pages/home/home.container.js               |   16 +-
 ui/pages/home/index.scss                      |   18 +-
 .../import-token/import-token.component.js    |    2 +-
 ui/pages/import-token/token-list/index.scss   |    2 +-
 .../token-list/token-list.component.js        |   11 +-
 .../token-search/token-search.component.js    |    6 +-
 ui/pages/keychains/restore-vault.js           |    8 +-
 ui/pages/notifications/index.js               |    1 -
 ui/pages/notifications/index.scss             |  114 -
 ui/pages/notifications/notification.test.js   |  100 -
 ui/pages/notifications/notifications.js       |  141 -
 .../create-password/create-password.js        |   23 +-
 .../create-password/index.scss                |   11 +-
 .../creation-successful.js                    |   11 +-
 .../creation-successful/index.scss            |    8 +-
 .../onboarding-flow/import-srp/import-srp.js  |    7 +-
 .../onboarding-flow/import-srp/index.scss     |   31 +-
 ui/pages/onboarding-flow/index.scss           |   18 +-
 .../onboarding-flow/metametrics/index.scss    |   23 +-
 .../metametrics/metametrics.js                |   14 +-
 .../onboarding-app-header/index.scss          |    2 +-
 .../onboarding-flow/pin-extension/index.scss  |    4 +-
 .../privacy-settings/index.scss               |   13 -
 .../privacy-settings/setting.js               |    2 +-
 .../confirm-recovery-phrase.js                |   12 +-
 .../recovery-phrase/index.scss                |   75 +-
 .../recovery-phrase/review-recovery-phrase.js |    7 +-
 .../secure-your-wallet/index.scss             |   30 +-
 .../secure-your-wallet/secure-your-wallet.js  |   16 +-
 ui/pages/onboarding-flow/welcome/index.scss   |    8 +-
 ui/pages/onboarding-flow/welcome/welcome.js   |    2 +-
 ui/pages/pages.scss                           |    1 -
 .../flask/snap-install/index.scss             |    4 +
 .../flask/snap-install/snap-install.js        |    9 +-
 ui/pages/permissions-connect/index.scss       |    4 +-
 .../permissions-connect/redirect/index.scss   |    1 +
 ui/pages/routes/routes.component.js           |   11 -
 .../add-recipient/add-recipient.component.js  |   14 +-
 .../add-recipient/ens-input.component.js      |    5 +-
 .../amount-max-button.test.js                 |   21 +-
 .../send-asset-row.component.js               |    8 +-
 .../send-content/send-content.component.js    |   49 +-
 .../send-content.component.test.js            |   28 +-
 .../send-content/send-content.container.js    |   17 +-
 .../send/send-content/send-content.stories.js |   86 +-
 .../send/send-header/send-header.component.js |   10 +-
 .../send-header/send-header.component.test.js |   38 +-
 ui/pages/send/send.constants.js               |    3 +-
 ui/pages/send/send.js                         |   42 +-
 ui/pages/send/send.scss                       |   11 +-
 ui/pages/send/send.test.js                    |   88 +-
 ui/pages/send/send.utils.js                   |    6 +-
 ui/pages/send/send.utils.test.js              |    2 +-
 .../advanced-tab.component.test.js            |    6 -
 ui/pages/settings/alerts-tab/alerts-tab.js    |    2 +-
 ui/pages/settings/alerts-tab/alerts-tab.scss  |    4 -
 ui/pages/settings/contact-list-tab/index.scss |    1 -
 .../experimental-tab.component.js             |   46 +-
 .../experimental-tab.container.js             |    5 -
 .../settings/flask/view-snap/view-snap.js     |    6 +-
 ui/pages/settings/index.scss                  |    6 +-
 .../custom-content-search.js                  |    4 +-
 ui/pages/settings/networks-tab/index.scss     |  244 +-
 .../networks-form/networks-form.js            |   64 +-
 .../networks-list-item/networks-list-item.js  |   12 +-
 .../networks-list/networks-list.js            |    4 +-
 .../networks-tab-subheader.js                 |   21 +-
 .../networks-tab-subheader.test.js            |    5 +-
 .../settings/networks-tab/networks-tab.js     |   31 +-
 .../settings-search/settings-search.js        |    2 +-
 .../settings-tab/settings-tab.component.js    |    8 +-
 ui/pages/settings/settings.component.js       |   14 +-
 ui/pages/settings/settings.container.js       |    7 -
 ui/pages/swaps/awaiting-swap/awaiting-swap.js |   53 +-
 .../swaps/awaiting-swap/awaiting-swap.test.js |    3 +-
 ui/pages/swaps/awaiting-swap/index.scss       |   19 +
 .../view-on-ether-scan-link.test.js.snap      |   21 +
 .../view-on-ether-scan-link/index.js          |    1 +
 .../view-on-ether-scan-link.js                |   50 +
 .../view-on-ether-scan-link.test.js           |   39 +
 .../__snapshots__/build-quote.test.js.snap    |    8 +-
 ui/pages/swaps/build-quote/build-quote.js     |    9 +-
 .../swaps/build-quote/build-quote.stories.js  |  213 +-
 .../swaps/build-quote/build-quote.test.js     |    2 +-
 ui/pages/swaps/build-quote/index.scss         |    2 +-
 .../swaps/create-new-swap/create-new-swap.js  |   47 -
 .../create-new-swap/create-new-swap.test.js   |   27 -
 ui/pages/swaps/create-new-swap/index.js       |    1 -
 ui/pages/swaps/create-new-swap/index.scss     |    8 -
 .../dropdown-search-list.js                   |   35 +-
 .../swaps/dropdown-search-list/index.scss     |    4 +-
 .../exchange-rate-display.test.js.snap        |    2 +-
 .../exchange-rate-display.js                  |    2 +-
 .../__snapshots__/fee-card.test.js.snap       |    2 +
 ui/pages/swaps/fee-card/fee-card.js           |   93 +-
 ui/pages/swaps/fee-card/fee-card.test.js      |   62 +-
 ui/pages/swaps/import-token/import-token.js   |    4 +-
 ui/pages/swaps/index.js                       |   38 +-
 ui/pages/swaps/index.scss                     |    4 +-
 ui/pages/swaps/main-quote-summary/README.mdx  |   14 -
 .../main-quote-summary/main-quote-summary.js  |   34 +-
 .../main-quote-summary.stories.js             |   57 +-
 .../searchable-item-list.test.js.snap         |   14 +-
 .../item-list/item-list.component.js          |   57 +-
 .../list-item-search.component.js             |    6 +-
 .../searchable-item-list.js                   |   11 +-
 .../swaps/select-quote-popover/index.scss     |    4 +-
 .../select-quote-popover.test.js              |    1 -
 .../sort-list/sort-list.test.js               |    1 -
 .../slippage-buttons.test.js.snap             |   16 +-
 .../slippage-buttons/slippage-buttons.js      |   26 +-
 .../slippage-buttons/slippage-buttons.test.js |    2 +-
 .../smart-transaction-status.js               |   79 +-
 .../smart-transaction-status.test.js          |    2 +-
 ui/pages/swaps/swaps.util.js                  |   17 +-
 ui/pages/swaps/swaps.util.test.js             |  104 -
 .../view-on-block-explorer.test.js.snap       |   13 -
 .../swaps/view-on-block-explorer/index.js     |    1 -
 .../swaps/view-on-block-explorer/index.scss   |    8 -
 .../view-on-block-explorer.js                 |   47 -
 .../view-on-block-explorer.test.js            |   23 -
 .../view-quote/view-quote-price-difference.js |    6 +-
 ui/pages/swaps/view-quote/view-quote.js       |  333 +-
 ui/pages/swaps/view-quote/view-quote.test.js  |    3 +-
 ui/pages/token-details/token-details-page.js  |   41 +-
 ui/pages/unlock-page/index.scss               |    4 +-
 ui/selectors/confirm-transaction.js           |   23 -
 ui/selectors/custom-gas.js                    |    5 +-
 ui/selectors/custom-gas.test.js               |   49 +-
 ui/selectors/selectors.js                     |   95 +-
 ui/selectors/selectors.test.js                |   23 -
 ui/store/actionConstants.js                   |    1 -
 ui/store/actions.js                           |  258 +-
 ui/store/actions.test.js                      |   76 +-
 yarn.lock                                     | 2645 ++++----
 679 files changed, 10091 insertions(+), 34038 deletions(-)
 delete mode 100755 .circleci/scripts/bundle-stats-commit.sh
 delete mode 100644 .storybook/4.BREAKPOINTS.stories.mdx
 delete mode 100644 .storybook/initial-states/transactions.js
 delete mode 100644 app/images/fantom-opera.svg
 delete mode 100644 app/images/harmony-one.svg
 delete mode 100644 app/images/info-fox.svg
 delete mode 100644 app/images/videos/recovery-onboarding/subtitles/el.vtt
 delete mode 100644 app/images/videos/recovery-onboarding/subtitles/fr.vtt
 delete mode 100644 app/images/videos/recovery-onboarding/subtitles/tr.vtt
 delete mode 100644 app/images/videos/recovery-onboarding/subtitles/zh.vtt
 rename app/manifest/{v2 => }/_base.json (95%)
 rename app/manifest/{v2 => }/brave.json (100%)
 rename app/manifest/{v2 => }/chrome.json (100%)
 rename app/manifest/{v2 => }/firefox.json (100%)
 rename app/manifest/{v2 => }/opera.json (100%)
 delete mode 100644 app/manifest/v3/_base.json
 delete mode 100644 app/manifest/v3/brave.json
 delete mode 100644 app/manifest/v3/chrome.json
 delete mode 100644 app/manifest/v3/firefox.json
 delete mode 100644 app/manifest/v3/opera.json
 create mode 100644 app/phishing.html
 delete mode 100644 app/scripts/app-init.js
 delete mode 100644 app/scripts/init-globals.js
 delete mode 100644 app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
 delete mode 100644 app/scripts/migrations/072.js
 delete mode 100644 app/scripts/migrations/072.test.js
 create mode 100644 app/scripts/phishing-detect.js
 delete mode 100644 development/build/constants.js
 delete mode 100644 development/charts/flamegraph/chart/index.html
 delete mode 100644 development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
 delete mode 100644 development/charts/flamegraph/lib/d3-flamegraph.css
 delete mode 100644 development/charts/flamegraph/lib/d3-flamegraph.js
 delete mode 100644 development/charts/table/index.html
 delete mode 100644 development/charts/table/jquery.min.js
 delete mode 100644 patches/@lavamoat+lavapack+3.1.0.patch
 create mode 100644 patches/bip39+2.5.0.patch
 create mode 100644 patches/eth-hd-keyring+3.6.0.patch
 create mode 100644 patches/eth-keyring-controller+6.2.1.patch
 delete mode 100644 patches/yargs+17.4.1.patch
 delete mode 100644 shared/constants/phishing.js
 delete mode 100644 shared/modules/mv3.utils.js
 delete mode 100644 shared/modules/object.utils.js
 delete mode 100644 test/e2e/fixtures/special-settings/state.json
 delete mode 100644 test/e2e/lavamoat-stats.js
 delete mode 100644 test/e2e/mock-page-with-disallowed-iframe/index.html
 delete mode 100644 test/e2e/mock-page-with-iframe/index.html
 delete mode 100644 test/e2e/mv3-perf-stats/bundle-size.js
 delete mode 100644 test/e2e/mv3-perf-stats/index.js
 delete mode 100644 test/e2e/mv3-perf-stats/init-load-stats.js
 delete mode 100644 test/e2e/mv3-stats.js
 delete mode 100644 test/e2e/phishing-warning-page-server.js
 delete mode 100644 test/e2e/seeder/ganache-contract-address-registry.js
 delete mode 100644 test/e2e/seeder/ganache-seeder.js
 delete mode 100644 test/e2e/seeder/smart-contracts.js
 delete mode 100644 test/e2e/snaps/enums.js
 delete mode 100644 test/e2e/snaps/test-snap-notification.spec.js
 delete mode 100644 test/e2e/tests/custom-token-add-approve.spec.js
 delete mode 100644 test/e2e/tests/send-hex-address.spec.js
 delete mode 100644 test/e2e/tests/send-to-contract.spec.js
 delete mode 100644 test/e2e/tests/state-logs.spec.js
 delete mode 100644 test/helpers/file.js
 delete mode 100644 ui/components/app/add-network/add-network.test.js
 delete mode 100644 ui/components/app/collectible-default-image/collectible-default-image.js
 delete mode 100644 ui/components/app/collectible-default-image/collectible-default-image.stories.js
 delete mode 100644 ui/components/app/collectible-default-image/index.js
 delete mode 100644 ui/components/app/collectible-default-image/index.scss
 delete mode 100644 ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
 delete mode 100644 ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
 delete mode 100644 ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
 delete mode 100644 ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
 delete mode 100644 ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
 delete mode 100644 ui/components/app/modals/new-account-modal/new-account-modal.stories.js
 delete mode 100644 ui/components/app/signature-request-original/README.mdx
 delete mode 100644 ui/components/app/signature-request-original/signature-request-original.stories.js
 delete mode 100644 ui/components/app/transaction-list-item/transaction-list-item.stories.js
 delete mode 100644 ui/components/ui/alert/README.mdx
 delete mode 100644 ui/components/ui/alert/alert.stories.js
 delete mode 100644 ui/components/ui/box/box.test.js
 delete mode 100644 ui/components/ui/breadcrumbs/README.mdx
 delete mode 100644 ui/components/ui/breadcrumbs/breadcrumbs.stories.js
 delete mode 100644 ui/components/ui/confusable/README.mdx
 delete mode 100644 ui/components/ui/confusable/confusable.stories.js
 delete mode 100644 ui/components/ui/dialog/README.mdx
 delete mode 100644 ui/components/ui/dialog/dialog.stories.js
 delete mode 100644 ui/components/ui/export-text-container/README.mdx
 delete mode 100644 ui/components/ui/export-text-container/export-text.stories.js
 delete mode 100644 ui/components/ui/hex-to-decimal/README.mdx
 delete mode 100644 ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
 create mode 100644 ui/components/ui/i18n-value/i18n-value.component.js
 create mode 100644 ui/components/ui/i18n-value/index.js
 delete mode 100644 ui/components/ui/icon/search-icon.js
 delete mode 100644 ui/components/ui/logo/logo-coinbasepay.js
 delete mode 100644 ui/components/ui/logo/logo-coinbasepay.scss
 delete mode 100644 ui/components/ui/page-container/page-container.stories.js
 create mode 100644 ui/components/ui/search-icon/index.js
 create mode 100644 ui/components/ui/search-icon/search-icon.component.js
 delete mode 100644 ui/components/ui/spinner/spinner.stories.js
 delete mode 100644 ui/components/ui/tooltip/tooltip.stories.js
 delete mode 100644 ui/css/errors.scss
 delete mode 100644 ui/css/loading.scss
 delete mode 100644 ui/ducks/send/helpers.js
 delete mode 100644 ui/ducks/send/helpers.test.js
 delete mode 100644 ui/helpers/constants/critical-error.js
 delete mode 100644 ui/helpers/constants/notifications.js
 delete mode 100644 ui/helpers/utils/error-utils.js
 delete mode 100644 ui/helpers/utils/error-utils.test.js
 delete mode 100644 ui/hooks/useAssetDetails.test.js
 delete mode 100644 ui/index.test.js
 delete mode 100644 ui/pages/add-collectible/add-collectible.test.js
 delete mode 100644 ui/pages/notifications/index.js
 delete mode 100644 ui/pages/notifications/index.scss
 delete mode 100644 ui/pages/notifications/notification.test.js
 delete mode 100644 ui/pages/notifications/notifications.js
 create mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
 create mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
 create mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
 create mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
 delete mode 100644 ui/pages/swaps/create-new-swap/create-new-swap.js
 delete mode 100644 ui/pages/swaps/create-new-swap/create-new-swap.test.js
 delete mode 100644 ui/pages/swaps/create-new-swap/index.js
 delete mode 100644 ui/pages/swaps/create-new-swap/index.scss
 delete mode 100644 ui/pages/swaps/main-quote-summary/README.mdx
 delete mode 100644 ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
 delete mode 100644 ui/pages/swaps/view-on-block-explorer/index.js
 delete mode 100644 ui/pages/swaps/view-on-block-explorer/index.scss
 delete mode 100644 ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
 delete mode 100644 ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8bc591a91df9..749402c7fe6d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,10 +3,10 @@ version: 2.1
 executors:
   node-browsers:
     docker:
-      - image: circleci/node:16-browsers
+      - image: circleci/node:14-browsers
   node-browsers-medium-plus:
     docker:
-      - image: circleci/node:16-browsers
+      - image: circleci/node:14-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
@@ -53,9 +53,6 @@ workflows:
       - prep-build-test:
           requires:
             - prep-deps
-      - prep-build-test-mv3:
-          requires:
-            - prep-deps
       - prep-build-test-flask:
           requires:
             - prep-deps
@@ -136,9 +133,6 @@ workflows:
       - benchmark:
           requires:
             - prep-build-test
-      - stats-module-load-init:
-          requires:
-            - prep-build-test-mv3
       - job-publish-prerelease:
           requires:
             - prep-deps
@@ -146,9 +140,7 @@ workflows:
             - prep-build-beta
             - prep-build-flask
             - prep-build-storybook
-            - prep-build-test-mv3
             - benchmark
-            - stats-module-load-init
             - all-tests-pass
       - job-publish-release:
           filters:
@@ -208,8 +200,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-            - node_modules
-            - build-artifacts
+          - node_modules
+          - build-artifacts
 
   validate-lavamoat-config:
     executor: node-browsers-medium-plus
@@ -313,26 +305,6 @@ jobs:
             - dist-test-flask
             - builds-test-flask
 
-  prep-build-test-mv3:
-    executor: node-browsers-medium-plus
-    steps:
-      - checkout
-      - attach_workspace:
-          at: .
-      - run:
-          name: Build extension in mv3 for testing
-          command: yarn build:test:mv3
-      - run:
-          name: Move test build to 'dist-test' to avoid conflict with production build
-          command: mv ./dist ./dist-test-mv3
-      - run:
-          name: Move test zips to 'builds-test' to avoid conflict with production build
-          command: mv ./builds ./builds-test-mv3
-      - persist_to_workspace:
-          root: .
-          paths:
-            - dist-test-mv3
-            - builds-test-mv3
 
   prep-build-test:
     executor: node-browsers-medium-plus
@@ -447,6 +419,7 @@ jobs:
                 name: Validate release candidate changelog
                 command: yarn lint:changelog:rc
 
+
   test-deps-audit:
     executor: node-browsers
     steps:
@@ -601,43 +574,6 @@ jobs:
           paths:
             - test-artifacts
 
-  stats-module-load-init:
-    executor: node-browsers-medium-plus
-    steps:
-      - checkout
-      - run:
-          name: Re-Install Chrome
-          command: ./.circleci/scripts/chrome-install.sh
-      - attach_workspace:
-          at: .
-      - run:
-          name: Move test build to dist
-          command: mv ./dist-test-mv3 ./dist
-      - run:
-          name: Move test zips to builds
-          command: mv ./builds-test-mv3 ./builds
-      - run:
-          name: Run page load benchmark
-          command: |
-            mkdir -p test-artifacts/chrome/mv3
-            cp -R development/charts/flamegraph test-artifacts/chrome/mv3/initialisation
-            cp -R development/charts/flamegraph/chart test-artifacts/chrome/mv3/initialisation/background
-            cp -R development/charts/flamegraph/chart test-artifacts/chrome/mv3/initialisation/ui
-            cp -R development/charts/table test-artifacts/chrome/mv3/load_time
-      - run:
-          name: Run page load benchmark
-          command: yarn mv3:stats:chrome --out test-artifacts/chrome/mv3
-      - run:
-          name: Record bundle size at commit
-          command: ./.circleci/scripts/bundle-stats-commit.sh
-      - store_artifacts:
-          path: test-artifacts
-          destination: test-artifacts
-      - persist_to_workspace:
-          root: .
-          paths:
-            - test-artifacts
-
   job-publish-prerelease:
     executor: node-browsers
     steps:
@@ -712,7 +648,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - '3d:49:29:f4:b2:e8:ea:af:d1:32:eb:2a:fc:15:85:d8'
+            - "3d:49:29:f4:b2:e8:ea:af:d1:32:eb:2a:fc:15:85:d8"
       - checkout
       - attach_workspace:
           at: .
@@ -734,7 +670,7 @@ jobs:
       - run:
           name: test:coverage:jest
           command: yarn test:coverage:jest
-      - run:
+      - run: 
           name: Validate coverage thresholds
           command: |
             if ! git diff --exit-code jest.config.js development/jest.config.js; then
diff --git a/.circleci/scripts/bundle-stats-commit.sh b/.circleci/scripts/bundle-stats-commit.sh
deleted file mode 100755
index 7c0894430386..000000000000
--- a/.circleci/scripts/bundle-stats-commit.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-set -u
-set -o pipefail
-
-if [[ "${CI:-}" != 'true' ]]
-then
-    printf '%s\n' 'CI environment variable must be set to true'
-    exit 1
-fi
-
-if [[ "${CIRCLECI:-}" != 'true' ]]
-then
-    printf '%s\n' 'CIRCLECI environment variable must be set to true'
-    exit 1
-fi
-
-if [[ -z "${GITHUB_TOKEN:-}" ]]
-then
-    printf '%s\n' 'GITHUB_TOKEN environment variable must be set'
-    exit 1
-elif [[ -z "${GITHUB_TOKEN_USER:-}" ]]
-then
-    printf '%s\n' 'GITHUB_TOKEN_USER environment variable must be set'
-    exit 1
-fi
-
-printf '%s\n' 'Commit the manifest version and changelog if the manifest has changed'
-
-if [[ "${CIRCLE_BRANCH}" != "develop" ]]
-then
-    printf 'This is not develop branch'
-    exit 0
-fi
-
-mkdir temp
-
-git config --global user.email "metamaskbot@users.noreply.github.com"
-
-git config --global user.name "MetaMask Bot"
-
-git clone git@github.com:MetaMask/extension_bundlesize_stats.git temp
-
-if [[ -f "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json" ]]
-then
-    printf 'Bundle size of the commit is already recorded'
-    cd ..
-    rm -rf temp
-    exit 0
-fi
-
-cp -R test-artifacts/chrome/mv3/bundle_size.json temp/stats
-
-echo " bundle_size_stats-${CIRCLE_SHA1}.json" >> temp/stats/fileList.txt
-
-mv temp/stats/bundle_size.json "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json"
-
-cd temp
-
-git add .
-
-git commit --message "Bundle size at commit: ${CIRCLE_SHA1}"
-
-repo_slug="$CIRCLE_PROJECT_USERNAME/extension_bundlesize_stats"
-git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" main
-
-cd ..
-
-rm -rf temp
diff --git a/.circleci/scripts/chrome-install.sh b/.circleci/scripts/chrome-install.sh
index dcd122fb8399..441e61124f92 100755
--- a/.circleci/scripts/chrome-install.sh
+++ b/.circleci/scripts/chrome-install.sh
@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
-CHROME_VERSION='103.0.5060.53-1'
+CHROME_VERSION='101.0.4951.54-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='36f4e79f46cb71c1431dccf1489f5f8e89d35204a717a4618c7f6f638123ddc2b37bd5cbd00498be8f84c7713149f2faa447cb6da3518be1cb9703e99d110e1a'
+CHROME_BINARY_SHA512SUM='46ebc53c806f179a5f9ab570c1097c2d35fc437dd4f5bd3fb34e758dc4f306771ceb05f8df7d450584355abf35bae34c0e70903e4f0312e2d3caa34491c8f622'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 
diff --git a/.circleci/scripts/firefox-install.sh b/.circleci/scripts/firefox-install.sh
index f2f9f284d1d0..0c3512114796 100755
--- a/.circleci/scripts/firefox-install.sh
+++ b/.circleci/scripts/firefox-install.sh
@@ -4,7 +4,7 @@ set -e
 set -u
 set -o pipefail
 
-FIREFOX_VERSION='102.0'
+FIREFOX_VERSION='83.0'
 FIREFOX_BINARY="firefox-${FIREFOX_VERSION}.tar.bz2"
 FIREFOX_BINARY_URL="https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/${FIREFOX_BINARY}"
 FIREFOX_PATH='/opt/firefox'
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 2652ffb2b097..50c309973fe3 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -17,7 +17,6 @@ ignores:
   # used in testing + ci
   - '@metamask/auto-changelog' # invoked as `auto-changelog`
   - '@metamask/forwarder'
-  - '@metamask/phishing-warning' # statically hosted as part of some e2e tests
   - '@metamask/test-dapp'
   - '@metamask/design-tokens' # Only imported in index.css
   - '@tsconfig/node14' # required dynamically by TS, used in tsconfig.json
diff --git a/.eslintrc.js b/.eslintrc.js
index 16c28cf7dc2b..2001994f4915 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,7 +8,6 @@ module.exports = {
     'app/vendor/**',
     'builds/**/*',
     'development/chromereload.js',
-    'development/charts/**',
     'dist/**/*',
     'node_modules/**/*',
   ],
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 6df4c6e65ac4..f15418ea6d08 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -49,11 +49,8 @@ How should reviewers and QA manually test your changes? For instance:
 ## Pre-Merge Checklist
 
 - [ ] PR template is filled out
+- [ ] Manual testing complete & passed
 - [ ] **IF** this PR fixes a bug, a test that _would have_ caught the bug has been added
 - [ ] PR is linked to the appropriate GitHub issue
+- [ ] **IF** QA attention is required, "QA Board" label has been applied
 - [ ] PR has been added to the appropriate release Milestone
-
-### + If there are functional changes:
-
-- [ ] Manual testing complete & passed
-- [ ] "Extension QA Board" label has been applied
diff --git a/.iyarc b/.iyarc
index bbd5d06c106d..583324582de8 100644
--- a/.iyarc
+++ b/.iyarc
@@ -1,5 +1,4 @@
 # improved-yarn-audit advisory exclusions
 GHSA-93q8-gq69-wqmw
 GHSA-257v-vj4p-3w2h
-GHSA-wm7h-9275-46v2
-GHSA-pfrx-2q88-qq97
+GHSA-fwr7-v2mv-hh25
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index d3bff3b467b9..29dbcb2f791f 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -6,6 +6,3 @@ ONBOARDING_V2=
 SWAPS_USE_DEV_APIS=
 COLLECTIBLES_V1=
 TOKEN_DETECTION_V2=
-
-; Set this to test changes to the phishing warning page.
-PHISHING_WARNING_PAGE_URL=
diff --git a/.nvmrc b/.nvmrc
index 6f7f377bf514..958b5a36e1fa 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v16
+v14
diff --git a/.storybook/1.INTRODUCTION.stories.mdx b/.storybook/1.INTRODUCTION.stories.mdx
index 2633d11aedb3..23ba7e8f7fb7 100644
--- a/.storybook/1.INTRODUCTION.stories.mdx
+++ b/.storybook/1.INTRODUCTION.stories.mdx
@@ -8,7 +8,7 @@ Welcome to the MetaMask Browser Extension Storybook.
 
 ## Building locally and Contributing
 
-This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of MetaMask up and running or contribute to the extension codebase please read the MetaMask [README.md](https://github.com/MetaMask/metamask-extension)
+This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of Metamask up and running or contribute to the extension codebase please read the Metamask [README.md](https://github.com/MetaMask/metamask-extension)
 
 ## Documentation Guidelines
 
diff --git a/.storybook/3.COLORS.stories.mdx b/.storybook/3.COLORS.stories.mdx
index fce6ef662839..b694a721ad84 100644
--- a/.storybook/3.COLORS.stories.mdx
+++ b/.storybook/3.COLORS.stories.mdx
@@ -1,12 +1,20 @@
 import { Meta } from '@storybook/addon-docs';
+import ActionaleMessage from '../ui/components/ui/actionable-message';
 import designTokenDiagramImage from './images/design.token.graphic.svg';
 
-<Meta title="Foundations / Color" />
+<Meta title="Design Tokens / Color" />
 
 # Color
 
 Color is used to express style and communicate meaning.
 
+<ActionaleMessage
+  type="warning"
+  message="We are in the process of consolidating all of our colors, making them accessible and enabling theming. Many of the colors used throughout the codebase are deprecated please follow the guide below to ensure you are using the correct colors when building MetaMask UI"
+/>
+
+<br />
+
 ## Design tokens
 
 We are importing design tokens as CSS variables from [@metamask/design-tokens](https://github.com/MetaMask/design-tokens) repo to help consolidate colors and enable theming across all MetaMask products.
@@ -59,7 +67,6 @@ var(--color-text-muted)
 
 /** Icons */
 var(--color-icon-default)
-var(--color-icon-alternative)
 var(--color-icon-muted)
 
 /** Borders */
@@ -68,20 +75,20 @@ var(--color-border-muted)
 
 /** Overlays */
 var(--color-overlay-default)
-var(--color-overlay-inverse) [DEPRECATED]
+var(--color-overlay-inverse)
 
 /** User Actions */
 var(--color-primary-default)
 var(--color-primary-alternative)
 var(--color-primary-muted)
 var(--color-primary-inverse)
-var(--color-primary-disabled) [DEPRECATED]
+var(--color-primary-disabled)
 
-var(--color-secondary-default) [DEPRECATED]
-var(--color-secondary-alternative) [DEPRECATED]
-var(--color-secondary-muted) [DEPRECATED]
-var(--color-secondary-inverse) [DEPRECATED]
-var(--color-secondary-disabled) [DEPRECATED]
+var(--color-secondary-default)
+var(--color-secondary-alternative)
+var(--color-secondary-muted)
+var(--color-secondary-inverse)
+var(--color-secondary-disabled)
 
 /** States */
 /** Error */
@@ -89,28 +96,28 @@ var(--color-error-default)
 var(--color-error-alternative)
 var(--color-error-muted)
 var(--color-error-inverse)
-var(--color-error-disabled) [DEPRECATED]
+var(--color-error-disabled)
 
 /** Warning */
 var(--color-warning-default)
-var(--color-warning-alternative) [DEPRECATED]
+var(--color-warning-alternative)
 var(--color-warning-muted)
 var(--color-warning-inverse)
-var(--color-warning-disabled) [DEPRECATED]
+var(--color-warning-disabled)
 
 /** Success */
 var(--color-success-default)
-var(--color-success-alternative) [DEPRECATED]
+var(--color-success-alternative)
 var(--color-success-muted)
 var(--color-success-inverse)
-var(--color-success-disabled) [DEPRECATED]
+var(--color-success-disabled)
 
 /** Info */
 var(--color-info-default)
-var(--color-info-alternative) [DEPRECATED]
+var(--color-info-alternative)
 var(--color-info-muted)
 var(--color-info-inverse)
-var(--color-info-disabled) [DEPRECATED]
+var(--color-info-disabled)
 ```
 
 ### **Component colors** (tier 3)
diff --git a/.storybook/4.BREAKPOINTS.stories.mdx b/.storybook/4.BREAKPOINTS.stories.mdx
deleted file mode 100644
index 1ddd2c42087d..000000000000
--- a/.storybook/4.BREAKPOINTS.stories.mdx
+++ /dev/null
@@ -1,125 +0,0 @@
-import { Meta } from '@storybook/addon-docs';
-
-<Meta title="Foundations / Breakpoints" />
-
-# Breakpoints
-
-Breakpoints are used for responsive layout
-
-## Screen Sizes
-
-There are 4 screen sizes that make up the breakpoints for the MetaMask extension
-
-- base: `0px`
-- sm: `576px`
-- md: `768px`
-- lg: `1280px`
-
-### SCSS
-
-There are Sass variables and mixins available for use for both min and max screens sizes
-
-### Variables
-
-```css
-$screen-sm-max /* 575px */
-$screen-md-max /* 767px */
-$screen-lg-max /* 1279px */
-
-$screen-sm-min /* 576px */
-$screen-md-min /* 768px */
-$screen-lg-min /* 1280px */
-```
-
-### Mixins
-
-```css
-/* Max screen size */
-@include screen-sm-max {
-  /* equivalent css @media screen and (max-width: 575px) */
-}
-@include screen-md-max {
-  /* equivalent css @media screen and (max-width: 767px) */
-}
-@include screen-lg-max {
-  /* equivalent css @media screen and (max-width: 1279px) */
-}
-
-/* Min screen size */
-@include screen-sm-min {
-  /* equivalent css @media screen and (min-width: 576px) */
-}
-@include screen-md-min {
-  /* equivalent css @media screen and (min-width: 768px) */
-}
-@include screen-lg-min {
-  /* equivalent css @media screen and (min-width: 1280px) */
-}
-```
-
-Migrating from the old sass variables to the new mixins looks like this
-
-```css
-/* Max width */
-/* Instead of the media query and sass variable */
-@media screen and (max-width: $break-small) {
-  right: 16px;
-}
-
-/* Use the sass mixin */
-@include screen-sm-max {
-  right: 16px;
-}
-
-/* Min width */
-/* Instead of the media query and sass variable */
-@media screen and (min-width: $break-large) {
-  left: 16px;
-}
-
-/* Use the sass mixin */
-@include screen-sm-min {
-  left: 16px;
-}
-```
-
-## Takeaways
-
-- Try to avoid using static media queries in your code.
-- Try to use the provided SCSS mixins
-
-### ❌ Don't do this
-
-Don't use static media queries in your code.
-
-```css
-/**
-* Don't do this
-* Static media queries create inconsistency and could break the UI if we want to update them in future
-**/
-.account-menu {
-  @media screen and (min-width: 769px) {
-    right: calc((100vw - 80vw) / 2);
-  }
-
-  @media screen and (min-width: 1281px) {
-    right: calc((100vw - 65vw) / 2);
-  }
-}
-```
-
-### ✅ Do this
-
-Do use the provided Sass mixins
-
-```css
-.account-menu {
-  @include screen-md-min {
-    right: calc((100vw - 80vw) / 2);
-  }
-
-  @include screen-lg-min {
-    right: calc((100vw - 65vw) / 2);
-  }
-}
-```
diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js
deleted file mode 100644
index 34b848712231..000000000000
--- a/.storybook/initial-states/transactions.js
+++ /dev/null
@@ -1,1921 +0,0 @@
-const MOCK_TX_TYPE = {
-  CANCEL: 'cancel',
-  CONTRACT_INTERACTION: 'contractInteraction',
-  DEPLOY_CONTRACT: 'contractDeployment',
-  ETH_DECRYPT: 'eth_decrypt',
-  ETH_GET_ENCRYPTION_PUBLIC_KEY: 'eth_getEncryptionPublicKey',
-  INCOMING: 'incoming',
-  PERSONAL_SIGN: 'personal_sign',
-  RETRY: 'retry',
-  SIGN: 'eth_sign',
-  SIGN_TYPED_DATA: 'eth_signTypedData',
-  SIMPLE_SEND: 'simpleSend',
-  SMART: 'smart',
-  SWAP: 'swap',
-  SWAP_APPROVAL: 'swapApproval',
-  TOKEN_METHOD_APPROVE: 'approve',
-  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
-  TOKEN_METHOD_TRANSFER: 'transfer',
-  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
-};
-
-export const MOCK_TRANSACTION_BY_TYPE = {
-  [MOCK_TX_TYPE.CANCEL]: {
-    id: 643368596521636,
-    time: 1653527035634,
-    status: 'submitted',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '5208',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: null,
-    sendFlowHistory: [],
-    txParams: {
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      to: '0xefge7847fd3661a9b7c86aaf1daea08d9da5750e',
-      nonce: '0x51',
-      value: '0x0',
-      gas: '0x5208',
-      gasPrice: '0x59682f0e',
-      estimateSuggested: 'medium',
-      estimateUsed: 'custom',
-    },
-    previousGasParams: {
-      gasPrice: '0x3b9aca00',
-    },
-    type: 'cancel',
-    history: [
-      {
-        id: 643368596521636,
-        time: 1653527035634,
-        status: 'approved',
-        metamaskNetworkId: '4',
-        originalGasEstimate: '5208',
-        userEditedGasLimit: false,
-        chainId: '0x4',
-        loadingDefaults: false,
-        dappSuggestedGasFees: null,
-        sendFlowHistory: [],
-        txParams: {
-          from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-          to: '0xefge7847fd3661a9b7c86aaf1daea08d9da5750e',
-          nonce: '0x51',
-          value: '0x0',
-          gas: '0x5208',
-          gasPrice: '0x59682f0e',
-          estimateSuggested: 'medium',
-          estimateUsed: 'custom',
-        },
-        previousGasParams: {
-          gasPrice: '0x3b9aca00',
-        },
-        type: 'cancel',
-      },
-      [
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 81,
-              highestSuggested: 81,
-              nextNetworkNonce: 81,
-            },
-            local: {
-              name: 'local',
-              nonce: 83,
-              details: {
-                startPoint: 81,
-                highest: 83,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 81,
-              details: {
-                blockNumber: '0xa3e3ac',
-                baseCount: 81,
-              },
-            },
-          },
-          note: 'transactions#approveTransaction',
-          timestamp: 1653527035723,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/r',
-          value:
-            '0xb66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347',
-          note: 'transactions#signTransaction: add r, s, v values',
-          timestamp: 1653527035817,
-        },
-        {
-          op: 'add',
-          path: '/s',
-          value:
-            '0x3a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
-        },
-        {
-          op: 'add',
-          path: '/v',
-          value: '0x2b',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'signed',
-          note: 'txStateManager: setting status to signed',
-          timestamp: 1653527035818,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/rawTx',
-          value:
-            '0xf863518459682f0e82520894e56e7847fd3661a9b7c86aaf1daea08d9da5750e80802ba0b66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347a03a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
-          note: 'transactions#publishTransaction',
-          timestamp: 1653527035819,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/hash',
-          value:
-            '0xb7628b82716108edcfe84dfd6ed49b219bc019e3fc6e96cf95548c32a67c1cbc',
-          note: 'transactions#setTxHash',
-          timestamp: 1653527035923,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/submittedTime',
-          value: 1653527035924,
-          note: 'txStateManager - add submitted time stamp',
-          timestamp: 1653527035924,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'submitted',
-          note: 'txStateManager: setting status to submitted',
-          timestamp: 1653527035925,
-        },
-      ],
-    ],
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 81,
-        highestSuggested: 81,
-        nextNetworkNonce: 81,
-      },
-      local: {
-        name: 'local',
-        nonce: 83,
-        details: {
-          startPoint: 81,
-          highest: 83,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 81,
-        details: {
-          blockNumber: '0xa3e3ac',
-          baseCount: 81,
-        },
-      },
-    },
-    r: '0xb66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347',
-    s: '0x3a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
-    v: '0x2b',
-    rawTx:
-      '0xf863518459682f0e82520894e56e7847fd3661a9b7c86aaf1daea08d9da5750e80802ba0b66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347a03a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
-    hash: '0xb7628b82716108edcfe84dfd6ed49b219bc019e3fc6e96cf95548c32a67c1cbc',
-    submittedTime: 1653527035924,
-  },
-  [MOCK_TX_TYPE.CONTRACT_INTERACTION]: {
-    chainId: '0x4',
-    dappSuggestedGasFees: {
-      gas: '0x118f4',
-      maxFeePerGas: '0x9502f91a',
-      maxPriorityFeePerGas: '0x9502F900',
-    },
-    id: 7694052085150913,
-    loadingDefaults: true,
-    metamaskNetworkId: '4',
-    origin: 'https://remix.ethereum.org',
-    originalGasEstimate: '0x118f4',
-    sendFlowHistory: [],
-    status: 'unapproved',
-    time: 1653417884003,
-    txParams: {
-      data:
-        '0xa1448194000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e0000000000000000000000000000000000000000000000000000000000000004',
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      gas: '0x118f4',
-      maxFeePerGas: '0x9502f91a',
-      maxPriorityFeePerGas: '0x9502F900',
-      to: '0xefg6c980a3fcd3100503d8f80537eefcee516d67',
-      type: '0x2',
-      value: '0x0',
-    },
-    type: 'contractInteraction',
-    userEditedGasLimit: false,
-  },
-  [MOCK_TX_TYPE.DEPLOY_CONTRACT]: {
-    blockNumber: '6195527',
-    id: 4243712234858468,
-    metamaskNetworkId: '4',
-    status: 'confirmed',
-    time: 1585088013000,
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
-    type: 'contractDeployment',
-    origin: 'https://metamask.github.io',
-  },
-  [MOCK_TX_TYPE.ETH_DECRYPT]: {
-    id: 5177046356058652,
-    msgParams: {
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      data:
-        '0x7b2276657273696f6e223a227832353531392d7873616c736132302d706f6c7931333035222c226e6f6e6365223a22415a7a535971376139725531396e3835753174494f5765367a486e32775a6166222c22657068656d5075626c69634b6579223a2251336d346650474a6b6a32396d44766f7133536a77616733686b3651366571744236397671795258517a673d222c2263697068657274657874223a223943556d614c327a69635a5838584c4d5a75646b58392f6531544770384d61513135776276774c6d442b4235772b4f706655694c586c586d55355536645339675638584c61445557446e656735546b3d227d',
-      origin: 'https://metamask.github.io',
-    },
-    time: 1653450860396,
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    status: 'unapproved',
-    type: 'eth_decrypt',
-  },
-  [MOCK_TX_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]: {
-    id: 5177046356058645,
-    msgParams: '0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e',
-    time: 1653450802102,
-    status: 'unapproved',
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    type: 'eth_getEncryptionPublicKey',
-    origin: 'https://metamask.github.io',
-  },
-  [MOCK_TX_TYPE.INCOMING]: {
-    blockNumber: '6477257',
-    id: 4243712234858505,
-    metamaskNetworkId: '4',
-    status: 'confirmed',
-    time: 1589314295000,
-    txParams: {
-      from: '0xabc98d14007bdee637298086988a0bbd31184523',
-      gas: '0x5208',
-      gasPrice: '0x3b9aca00',
-      nonce: '0x56540',
-      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
-      value: '0x1043561a882930000',
-    },
-    hash: '0x5ca26d1cdcabef1ac2ad5b2b38604c9ced65d143efc7525f848c46f28e0e4116',
-    type: 'incoming',
-  },
-  [MOCK_TX_TYPE.PERSONAL_SIGN]: {
-    id: 5177046356058671,
-    msgParams: {
-      0: 'E',
-      1: 'x',
-      2: 'a',
-      3: 'm',
-      4: 'p',
-      5: 'l',
-      6: 'e',
-      7: ' ',
-      8: 'p',
-      9: 'a',
-      10: 's',
-      11: 's',
-      12: 'w',
-      13: 'o',
-      14: 'r',
-      15: 'd',
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      data: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
-      origin: 'https://metamask.github.io',
-    },
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    time: 1653451036121,
-    status: 'unapproved',
-    type: 'personal_sign',
-  },
-  [MOCK_TX_TYPE.RETRY]: {
-    id: 3938342322880462,
-    time: 1653459456297,
-    status: 'failed',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '14609',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: null,
-    sendFlowHistory: [],
-    txParams: {
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      nonce: '0x7',
-      value: '0x0',
-      data:
-        '0x6080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032',
-      gas: '0x14609',
-      maxFeePerGas: '0x3b9aca0d',
-      maxPriorityFeePerGas: '0x3b9aca00',
-      estimateSuggested: 'medium',
-      estimateUsed: 'low',
-    },
-    previousGasParams: {
-      maxFeePerGas: '0x3b9aca0b',
-      maxPriorityFeePerGas: '0xbebc200',
-    },
-    type: 'retry',
-    estimatedBaseFee: 'd',
-    history: [
-      {
-        id: 3938342322880462,
-        time: 1653459456297,
-        status: 'approved',
-        metamaskNetworkId: '4',
-        originalGasEstimate: '14609',
-        userEditedGasLimit: false,
-        chainId: '0x4',
-        loadingDefaults: false,
-        dappSuggestedGasFees: null,
-        sendFlowHistory: [],
-        txParams: {
-          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-          nonce: '0x7',
-          value: '0x0',
-          data:
-            '0x6080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032',
-          gas: '0x14609',
-          maxFeePerGas: '0x3b9aca0d',
-          maxPriorityFeePerGas: '0x3b9aca00',
-          estimateSuggested: 'medium',
-          estimateUsed: 'low',
-        },
-        previousGasParams: {
-          maxFeePerGas: '0x3b9aca0b',
-          maxPriorityFeePerGas: '0xbebc200',
-        },
-        type: 'retry',
-        estimatedBaseFee: 'd',
-      },
-      [
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 7,
-              highestSuggested: 7,
-              nextNetworkNonce: 7,
-            },
-            local: {
-              name: 'local',
-              nonce: 10,
-              details: {
-                startPoint: 7,
-                highest: 10,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 7,
-              details: {
-                blockNumber: '0xa3d235',
-                baseCount: 7,
-              },
-            },
-          },
-          note: 'transactions#approveTransaction',
-          timestamp: 1653459456415,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/r',
-          value:
-            '0xde2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26',
-          note: 'transactions#signTransaction: add r, s, v values',
-          timestamp: 1653459456512,
-        },
-        {
-          op: 'add',
-          path: '/s',
-          value:
-            '0x64ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
-        },
-        {
-          op: 'add',
-          path: '/v',
-          value: '0x00',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'signed',
-          note: 'txStateManager: setting status to signed',
-          timestamp: 1653459456512,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/rawTx',
-          value:
-            '0x02f901010407843b9aca00843b9aca0d830146098080b8a96080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032c080a0de2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26a064ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
-          note: 'transactions#publishTransaction',
-          timestamp: 1653459456514,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/err',
-          value: {
-            message:
-              '[ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'',
-            stack:
-              'Error: [ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'\n  at chrome-extension://hbljfohiafgaaaabejngpgolnboohpaf/common-5.js:14346:29',
-          },
-          note: 'transactions:tx-state-manager#fail - add error',
-          timestamp: 1653459456632,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'failed',
-          note: 'txStateManager: setting status to failed',
-          timestamp: 1653459456633,
-        },
-      ],
-    ],
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 7,
-        highestSuggested: 7,
-        nextNetworkNonce: 7,
-      },
-      local: {
-        name: 'local',
-        nonce: 10,
-        details: {
-          startPoint: 7,
-          highest: 10,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 7,
-        details: {
-          blockNumber: '0xa3d235',
-          baseCount: 7,
-        },
-      },
-    },
-    r: '0xde2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26',
-    s: '0x64ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
-    v: '0x00',
-    rawTx:
-      '0x02f901010407843b9aca00843b9aca0d830146098080b8a96080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032c080a0de2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26a064ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
-    err: {
-      message:
-        '[ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'',
-      stack:
-        'Error: [ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'\n  at chrome-extension://hbljfohiafgaaaabejngpgolnboohpaf/common-5.js:14346:29',
-    },
-  },
-  [MOCK_TX_TYPE.SIGN]: {
-    id: 5177046356058675,
-    msgParams: {
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      data:
-        '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0',
-      origin: 'https://metamask.github.io',
-    },
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    time: 1653451051909,
-    status: 'unapproved',
-    type: 'eth_sign',
-  },
-  [MOCK_TX_TYPE.SIGN_TYPED_DATA]: {
-    id: 5177046356058598,
-    msgParams: {
-      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
-      data: [
-        {
-          type: 'string',
-          name: 'Message',
-          value: 'Hi, Alice!',
-        },
-        {
-          type: 'uint32',
-          name: 'A number',
-          value: '1337',
-        },
-      ],
-      version: 'V1',
-      origin: 'https://metamask.github.io',
-    },
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    time: 1653450005954,
-    status: 'unapproved',
-    type: 'eth_signTypedData',
-  },
-  [MOCK_TX_TYPE.SIMPLE_SEND]: {
-    id: 4243712234858512,
-    time: 1589314601567,
-    status: 'confirmed',
-    metamaskNetworkId: '4',
-    loadingDefaults: false,
-    txParams: {
-      from: '0xabca64466f257793eaa52fcfff5066894b76a149',
-      to: '0xefg5bc4e8f1f969934d773fa67da095d2e491a97',
-      nonce: '0xc',
-      value: '0xde0b6b3a7640000',
-      gas: '0x5208',
-      gasPrice: '0x2540be400',
-    },
-    origin: 'metamask',
-    type: 'simpleSend',
-  },
-  [MOCK_TX_TYPE.SMART]: {
-    blockNumber: '6195527',
-    id: 4243712234858468,
-    metamaskNetworkId: '4',
-    status: 'confirmed',
-    time: 1585088013000,
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      value: '0x00',
-      data:
-        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
-    },
-    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
-    transactionType: 'smart',
-    type: 'contractDeployment',
-    origin: 'https://metamask.github.io',
-  },
-  [MOCK_TX_TYPE.SWAP]: {
-    blockNumber: '6195527',
-    id: 4243712234858467,
-    metamaskNetworkId: '4',
-    status: 'confirmed',
-    time: 1585088013000,
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
-      value: '0xde0b6b3a7640000',
-    },
-    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
-    destinationTokenSymbol: 'ABC',
-    sourceTokenSymbol: 'ETH',
-    type: 'swap',
-  },
-  [MOCK_TX_TYPE.SWAP_APPROVAL]: {
-    blockNumber: '6195527',
-    id: 4243712234858467,
-    metamaskNetworkId: '4',
-    status: 'confirmed',
-    time: 1585088013000,
-    txParams: {
-      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
-      gas: '0x5208',
-      gasPrice: '0x77359400',
-      nonce: '0x3',
-      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
-      value: '0xde0b6b3a7640000',
-    },
-    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
-    destinationTokenSymbol: 'ABC',
-    type: 'swapApproval',
-    sourceTokenSymbol: 'XBN',
-  },
-  [MOCK_TX_TYPE.TOKEN_METHOD_APPROVE]: {
-    id: 5177046356058729,
-    time: 1653457101080,
-    status: 'submitted',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '0xb427',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: {
-      gasPrice: '0x4a817c800',
-      gas: '0xb427',
-    },
-    sendFlowHistory: [],
-    txParams: {
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-      nonce: '0x5',
-      value: '0x0',
-      data:
-        '0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170',
-      gas: '0xb427',
-      maxFeePerGas: '0x4a817c800',
-      maxPriorityFeePerGas: '0x4a817c800',
-    },
-    origin: 'https://metamask.github.io',
-    type: 'approve',
-    history: [
-      {
-        id: 5177046356058729,
-        time: 1653457101080,
-        status: 'unapproved',
-        metamaskNetworkId: '4',
-        originalGasEstimate: '0xb427',
-        userEditedGasLimit: false,
-        chainId: '0x4',
-        loadingDefaults: true,
-        dappSuggestedGasFees: {
-          gasPrice: '0x4a817c800',
-          gas: '0xb427',
-        },
-        sendFlowHistory: [],
-        txParams: {
-          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-          to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-          value: '0x0',
-          data:
-            '0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170',
-          gas: '0xb427',
-          gasPrice: '0x4a817c800',
-        },
-        origin: 'https://metamask.github.io',
-        type: 'approve',
-      },
-      [
-        {
-          op: 'remove',
-          path: '/txParams/gasPrice',
-          note: 'Added new unapproved transaction.',
-          timestamp: 1653457101715,
-        },
-        {
-          op: 'add',
-          path: '/txParams/maxFeePerGas',
-          value: '0x4a817c800',
-        },
-        {
-          op: 'add',
-          path: '/txParams/maxPriorityFeePerGas',
-          value: '0x4a817c800',
-        },
-        {
-          op: 'replace',
-          path: '/loadingDefaults',
-          value: false,
-        },
-        {
-          op: 'add',
-          path: '/userFeeLevel',
-          value: 'custom',
-        },
-        {
-          op: 'add',
-          path: '/defaultGasEstimates',
-          value: {
-            estimateType: 'custom',
-            gas: '0xb427',
-            maxFeePerGas: '0x4a817c800',
-            maxPriorityFeePerGas: '0x4a817c800',
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/estimatedBaseFee',
-          value: '14',
-          note: 'confTx: user approved transaction',
-          timestamp: 1653457117006,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'approved',
-          note: 'txStateManager: setting status to approved',
-          timestamp: 1653457117008,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/txParams/nonce',
-          value: '0x5',
-          note: 'transactions#approveTransaction',
-          timestamp: 1653457117294,
-        },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 5,
-              highestSuggested: 5,
-              nextNetworkNonce: 5,
-            },
-            local: {
-              name: 'local',
-              nonce: 5,
-              details: {
-                startPoint: 5,
-                highest: 5,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 5,
-              details: {
-                blockNumber: '0xa3d19b',
-                baseCount: 5,
-              },
-            },
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/r',
-          value:
-            '0xfdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0',
-          note: 'transactions#signTransaction: add r, s, v values',
-          timestamp: 1653457117407,
-        },
-        {
-          op: 'add',
-          path: '/s',
-          value:
-            '0x54c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
-        },
-        {
-          op: 'add',
-          path: '/v',
-          value: '0x00',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'signed',
-          note: 'txStateManager: setting status to signed',
-          timestamp: 1653457117408,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/rawTx',
-          value:
-            '0x02f8b104058504a817c8008504a817c80082b427949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170c080a0fdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0a054c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
-          note: 'transactions#publishTransaction',
-          timestamp: 1653457117410,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/hash',
-          value:
-            '0x75b35f5b9a95c8e4b1a242be5b163c7a1b18822191b0b1de6985a8b9d3abfe26',
-          note: 'transactions#setTxHash',
-          timestamp: 1653457118158,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/submittedTime',
-          value: 1653457118159,
-          note: 'txStateManager - add submitted time stamp',
-          timestamp: 1653457118160,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'submitted',
-          note: 'txStateManager: setting status to submitted',
-          timestamp: 1653457118161,
-        },
-      ],
-    ],
-    userFeeLevel: 'custom',
-    defaultGasEstimates: {
-      estimateType: 'custom',
-      gas: '0xb427',
-      maxFeePerGas: '0x4a817c800',
-      maxPriorityFeePerGas: '0x4a817c800',
-    },
-    estimatedBaseFee: '14',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 5,
-        highestSuggested: 5,
-        nextNetworkNonce: 5,
-      },
-      local: {
-        name: 'local',
-        nonce: 5,
-        details: {
-          startPoint: 5,
-          highest: 5,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 5,
-        details: {
-          blockNumber: '0xa3d19b',
-          baseCount: 5,
-        },
-      },
-    },
-    r: '0xfdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0',
-    s: '0x54c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
-    v: '0x00',
-    rawTx:
-      '0x02f8b104058504a817c8008504a817c80082b427949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170c080a0fdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0a054c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
-    hash: '0x75b35f5b9a95c8e4b1a242be5b163c7a1b18822191b0b1de6985a8b9d3abfe26',
-    submittedTime: 1653457118159,
-  },
-  [MOCK_TX_TYPE.TOKEN_METHOD_SAFE_TRANSFER_FROM]: {
-    id: 1441203963845330,
-    time: 1652206763566,
-    status: 'confirmed',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '0x118e0',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: {
-      maxPriorityFeePerGas: '0x3B9ACA00',
-      maxFeePerGas: '0x7be830aec',
-    },
-    sendFlowHistory: [],
-    txParams: {
-      from: '0xabc627172af48bd5b0765d3449a7def80d6576ff',
-      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-      nonce: '0x57',
-      value: '0x0',
-      data:
-        '0x42842e0e000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98000000000000000000000000000000000000000000000000000000000009a7cc',
-      gas: '0x118e0',
-      maxFeePerGas: '0x7be830aec',
-      maxPriorityFeePerGas: '0x3B9ACA00',
-    },
-    origin: 'https://rinkeby.etherscan.io',
-    type: 'safetransferfrom',
-    userFeeLevel: 'dappSuggested',
-    defaultGasEstimates: {
-      estimateType: 'dappSuggested',
-      gas: '0x118e0',
-      maxFeePerGas: '0x7be830aec',
-      maxPriorityFeePerGas: '0x3B9ACA00',
-    },
-    estimatedBaseFee: '3ba182755',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 87,
-        highestSuggested: 87,
-        nextNetworkNonce: 87,
-      },
-      local: {
-        name: 'local',
-        nonce: 87,
-        details: {
-          startPoint: 87,
-          highest: 87,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 87,
-        details: {
-          blockNumber: '0xa28e38',
-          baseCount: 87,
-        },
-      },
-    },
-    r: '0xd13310569a8d5876e37788183034bfe4bc3b49c0663c5fd9b2bf13adf9b4791c',
-    s: '0x7a83d8840e7edcdf4fdedfd2bc1ce19775e54fd17f29ede5165591a1cf3febea',
-    v: '0x00',
-    rawTx:
-      '0x02f8d10457843b9aca008507be830aec830118e094f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86442842e0e000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98000000000000000000000000000000000000000000000000000000000009a7ccc080a0d13310569a8d5876e37788183034bfe4bc3b49c0663c5fd9b2bf13adf9b4791ca07a83d8840e7edcdf4fdedfd2bc1ce19775e54fd17f29ede5165591a1cf3febea',
-    hash: '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
-    submittedTime: 1652206777046,
-    txReceipt: {
-      blockHash:
-        '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
-      blockNumber: 'a28e39',
-      contractAddress: null,
-      cumulativeGasUsed: 'fd5dee',
-      effectiveGasPrice: '0x4028dcaf1',
-      from: '0xabc627172af48bd5b0765d3449a7def80d6576ff',
-      gasUsed: 'bb40',
-      logs: [
-        {
-          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-          blockHash:
-            '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
-          blockNumber: 'a28e39',
-          data: '0x',
-          logIndex: '45',
-          removed: false,
-          topics: [
-            '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
-            '0x000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x000000000000000000000000000000000000000000000000000000000009a7cc',
-          ],
-          transactionHash:
-            '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
-          transactionIndex: '23',
-        },
-        {
-          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-          blockHash:
-            '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
-          blockNumber: 'a28e39',
-          data: '0x',
-          logIndex: '46',
-          removed: false,
-          topics: [
-            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-            '0x000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff',
-            '0x000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98',
-            '0x000000000000000000000000000000000000000000000000000000000009a7cc',
-          ],
-          transactionHash:
-            '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
-          transactionIndex: '23',
-        },
-      ],
-      logsBloom:
-        '0x00000000000000001000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020800000000000000000800000000000000000000000010000000000000000000000000000080000010000000000000000000000000000000000000020000000000000000000001000000000000000000000000000000000000000000000202000000000000000000000800000000000000000000000000000020000010000000000002008000000000000000000000000000000000000000000000',
-      status: '0x1',
-      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-      transactionHash:
-        '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
-      transactionIndex: '23',
-      type: '0x2',
-    },
-    baseFeePerGas: '0x3c6f300f1',
-    blockTimestamp: '627aacc2',
-  },
-  [MOCK_TX_TYPE.TOKEN_METHOD_TRANSFER]: {
-    id: 5177046356058725,
-    time: 1653457077370,
-    status: 'confirmed',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '0xea60',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: {
-      gasPrice: '0x4a817c800',
-      gas: '0xea60',
-    },
-    sendFlowHistory: [],
-    txParams: {
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-      nonce: '0x4',
-      value: '0x0',
-      data:
-        '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98',
-      gas: '0xea60',
-      maxFeePerGas: '0x4a817c800',
-      maxPriorityFeePerGas: '0x4a817c800',
-    },
-    origin: 'https://metamask.github.io',
-    type: 'transfer',
-    history: [
-      {
-        id: 5177046356058725,
-        time: 1653457077370,
-        status: 'unapproved',
-        metamaskNetworkId: '4',
-        originalGasEstimate: '0xea60',
-        userEditedGasLimit: false,
-        chainId: '0x4',
-        loadingDefaults: true,
-        dappSuggestedGasFees: {
-          gasPrice: '0x4a817c800',
-          gas: '0xea60',
-        },
-        sendFlowHistory: [],
-        txParams: {
-          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-          to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-          value: '0x0',
-          data:
-            '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98',
-          gas: '0xea60',
-          gasPrice: '0x4a817c800',
-        },
-        origin: 'https://metamask.github.io',
-        type: 'transfer',
-      },
-      [
-        {
-          op: 'remove',
-          path: '/txParams/gasPrice',
-          note: 'Added new unapproved transaction.',
-          timestamp: 1653457077808,
-        },
-        {
-          op: 'add',
-          path: '/txParams/maxFeePerGas',
-          value: '0x4a817c800',
-        },
-        {
-          op: 'add',
-          path: '/txParams/maxPriorityFeePerGas',
-          value: '0x4a817c800',
-        },
-        {
-          op: 'replace',
-          path: '/loadingDefaults',
-          value: false,
-        },
-        {
-          op: 'add',
-          path: '/userFeeLevel',
-          value: 'custom',
-        },
-        {
-          op: 'add',
-          path: '/defaultGasEstimates',
-          value: {
-            estimateType: 'custom',
-            gas: '0xea60',
-            maxFeePerGas: '0x4a817c800',
-            maxPriorityFeePerGas: '0x4a817c800',
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/estimatedBaseFee',
-          value: '16',
-          note: 'confTx: user approved transaction',
-          timestamp: 1653457091914,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'approved',
-          note: 'txStateManager: setting status to approved',
-          timestamp: 1653457091915,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/txParams/nonce',
-          value: '0x4',
-          note: 'transactions#approveTransaction',
-          timestamp: 1653457091939,
-        },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 4,
-              highestSuggested: 4,
-              nextNetworkNonce: 4,
-            },
-            local: {
-              name: 'local',
-              nonce: 4,
-              details: {
-                startPoint: 4,
-                highest: 4,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 4,
-              details: {
-                blockNumber: '0xa3d198',
-                baseCount: 4,
-              },
-            },
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/r',
-          value:
-            '0xb0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bce',
-          note: 'transactions#signTransaction: add r, s, v values',
-          timestamp: 1653457092053,
-        },
-        {
-          op: 'add',
-          path: '/s',
-          value:
-            '0x08e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
-        },
-        {
-          op: 'add',
-          path: '/v',
-          value: '0x01',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'signed',
-          note: 'txStateManager: setting status to signed',
-          timestamp: 1653457092054,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/rawTx',
-          value:
-            '0x02f8b104048504a817c8008504a817c80082ea60949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844a9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98c001a0b0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bcea008e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
-          note: 'transactions#publishTransaction',
-          timestamp: 1653457092056,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/hash',
-          value:
-            '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-          note: 'transactions#setTxHash',
-          timestamp: 1653457092526,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/submittedTime',
-          value: 1653457092527,
-          note: 'txStateManager - add submitted time stamp',
-          timestamp: 1653457092527,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'submitted',
-          note: 'txStateManager: setting status to submitted',
-          timestamp: 1653457092529,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/firstRetryBlockNumber',
-          value: '0xa3d199',
-          note: 'transactions/pending-tx-tracker#event: tx:block-update',
-          timestamp: 1653457094748,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'confirmed',
-          note: 'txStateManager: setting status to confirmed',
-          timestamp: 1653457115712,
-        },
-        {
-          op: 'add',
-          path: '/txReceipt',
-          value: {
-            blockHash:
-              '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
-            blockNumber: 'a3d19a',
-            contractAddress: null,
-            cumulativeGasUsed: 'ca21',
-            effectiveGasPrice: '0x4a817c800',
-            from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-            gasUsed: 'ca21',
-            logs: [
-              {
-                address: '0x9ba60bbf4ba1de43f3b4983a539feebfbd5fd976',
-                blockHash:
-                  '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
-                blockNumber: 'a3d19a',
-                data:
-                  '0x0000000000000000000000000000000000000000000000000000000000003a98',
-                logIndex: '0',
-                removed: false,
-                topics: [
-                  '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-                  '0x0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c970',
-                ],
-                transactionHash:
-                  '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-                transactionIndex: '0',
-              },
-            ],
-            logsBloom:
-              '0x00000000000000000000000000000000000000000000001000000100000100000000000000000000000000000000000000000000000000000000000000000000000000000020000000000008000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000100000000000000000000000000000000000000000000000000000000000000000000000800000004000000000000001000000000000000',
-            status: '0x1',
-            to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-            transactionHash:
-              '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-            transactionIndex: '0',
-            type: '0x2',
-          },
-        },
-        {
-          op: 'add',
-          path: '/baseFeePerGas',
-          value: '0x14',
-        },
-        {
-          op: 'add',
-          path: '/blockTimestamp',
-          value: '628dc0c8',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/blockTimestamp',
-          value: '628dc0c8',
-          note: 'transactions#confirmTransaction - add txReceipt',
-          timestamp: 1653457115870,
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/transactionIndex',
-          value: '0',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/transactionIndex',
-          value: '0',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/logIndex',
-          value: '0',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/blockNumber',
-          value: 'a3d19a',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/cumulativeGasUsed',
-          value: 'ca21',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/blockNumber',
-          value: 'a3d19a',
-        },
-      ],
-    ],
-    userFeeLevel: 'custom',
-    defaultGasEstimates: {
-      estimateType: 'custom',
-      gas: '0xea60',
-      maxFeePerGas: '0x4a817c800',
-      maxPriorityFeePerGas: '0x4a817c800',
-    },
-    estimatedBaseFee: '16',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 4,
-        highestSuggested: 4,
-        nextNetworkNonce: 4,
-      },
-      local: {
-        name: 'local',
-        nonce: 4,
-        details: {
-          startPoint: 4,
-          highest: 4,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 4,
-        details: {
-          blockNumber: '0xa3d198',
-          baseCount: 4,
-        },
-      },
-    },
-    r: '0xb0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bce',
-    s: '0x08e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
-    v: '0x01',
-    rawTx:
-      '0x02f8b104048504a817c8008504a817c80082ea60949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844a9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98c001a0b0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bcea008e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
-    hash: '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-    submittedTime: 1653457092527,
-    firstRetryBlockNumber: '0xa3d199',
-    txReceipt: {
-      blockHash:
-        '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
-      blockNumber: 'a3d19a',
-      contractAddress: null,
-      cumulativeGasUsed: 'ca21',
-      effectiveGasPrice: '0x4a817c800',
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      gasUsed: 'ca21',
-      logs: [
-        {
-          address: '0x9ba60bbf4ba1de43f3b4983a539feebfbd5fd976',
-          blockHash:
-            '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
-          blockNumber: 'a3d19a',
-          data:
-            '0x0000000000000000000000000000000000000000000000000000000000003a98',
-          logIndex: '0',
-          removed: false,
-          topics: [
-            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-            '0x0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c970',
-          ],
-          transactionHash:
-            '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-          transactionIndex: '0',
-        },
-      ],
-      logsBloom:
-        '0x00000000000000000000000000000000000000000000001000000100000100000000000000000000000000000000000000000000000000000000000000000000000000000020000000000008000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000100000000000000000000000000000000000000000000000000000000000000000000000800000004000000000000001000000000000000',
-      status: '0x1',
-      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
-      transactionHash:
-        '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
-      transactionIndex: '0',
-      type: '0x2',
-    },
-    baseFeePerGas: '0x14',
-    blockTimestamp: '628dc0c8',
-  },
-  [MOCK_TX_TYPE.TOKEN_METHOD_TRANSFER_FROM]: {
-    id: 5177046356058754,
-    time: 1653457323504,
-    status: 'confirmed',
-    metamaskNetworkId: '4',
-    originalGasEstimate: '0x10896',
-    userEditedGasLimit: false,
-    chainId: '0x4',
-    loadingDefaults: false,
-    dappSuggestedGasFees: null,
-    sendFlowHistory: [
-      {
-        entry: 'sendFlow - user set asset type to COLLECTIBLE',
-        timestamp: 1653457317999,
-      },
-      {
-        entry: 'sendFlow - user set asset symbol to undefined',
-        timestamp: 1653457318000,
-      },
-      {
-        entry:
-          'sendFlow - user set asset address to 0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
-        timestamp: 1653457318000,
-      },
-      {
-        entry:
-          'sendFlow - user selected transfer to my accounts on recipient screen',
-        timestamp: 1653457319474,
-      },
-      {
-        entry:
-          'sendFlow - User clicked recipient from my accounts. address: 0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e, nickname Account 1',
-        timestamp: 1653457320321,
-      },
-    ],
-    txParams: {
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-      nonce: '0x6',
-      value: '0x0',
-      data:
-        '0x23b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8',
-      gas: '0x10896',
-      maxFeePerGas: '0x59682f12',
-      maxPriorityFeePerGas: '0x59682f00',
-      type: '0x2',
-    },
-    origin: 'metamask',
-    type: 'transferfrom',
-    history: [
-      {
-        id: 5177046356058754,
-        time: 1653457323504,
-        status: 'unapproved',
-        metamaskNetworkId: '4',
-        originalGasEstimate: '0x10896',
-        userEditedGasLimit: false,
-        chainId: '0x4',
-        loadingDefaults: true,
-        dappSuggestedGasFees: null,
-        sendFlowHistory: [
-          {
-            entry: 'sendFlow - user set asset type to COLLECTIBLE',
-            timestamp: 1653457317999,
-          },
-          {
-            entry: 'sendFlow - user set asset symbol to undefined',
-            timestamp: 1653457318000,
-          },
-          {
-            entry:
-              'sendFlow - user set asset address to 0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
-            timestamp: 1653457318000,
-          },
-          {
-            entry:
-              'sendFlow - user selected transfer to my accounts on recipient screen',
-            timestamp: 1653457319474,
-          },
-          {
-            entry:
-              'sendFlow - User clicked recipient from my accounts. address: 0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e, nickname Account 1',
-            timestamp: 1653457320321,
-          },
-        ],
-        txParams: {
-          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-          to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-          value: '0x0',
-          data:
-            '0x23b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8',
-          gas: '0x10896',
-          maxFeePerGas: '0x59682f12',
-          maxPriorityFeePerGas: '0x59682f00',
-          type: '0x2',
-        },
-        origin: 'metamask',
-        type: 'transferfrom',
-      },
-      [
-        {
-          op: 'replace',
-          path: '/loadingDefaults',
-          value: false,
-          note: 'Added new unapproved transaction.',
-          timestamp: 1653457323593,
-        },
-        {
-          op: 'add',
-          path: '/userFeeLevel',
-          value: 'medium',
-        },
-        {
-          op: 'add',
-          path: '/defaultGasEstimates',
-          value: {
-            estimateType: 'medium',
-            gas: '0x10896',
-            maxFeePerGas: '0x59682f12',
-            maxPriorityFeePerGas: '0x59682f00',
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/estimatedBaseFee',
-          value: 'd',
-          note: 'confTx: user approved transaction',
-          timestamp: 1653457330346,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'approved',
-          note: 'txStateManager: setting status to approved',
-          timestamp: 1653457330347,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/txParams/nonce',
-          value: '0x6',
-          note: 'transactions#approveTransaction',
-          timestamp: 1653457330354,
-        },
-        {
-          op: 'add',
-          path: '/nonceDetails',
-          value: {
-            params: {
-              highestLocallyConfirmed: 6,
-              highestSuggested: 6,
-              nextNetworkNonce: 6,
-            },
-            local: {
-              name: 'local',
-              nonce: 6,
-              details: {
-                startPoint: 6,
-                highest: 6,
-              },
-            },
-            network: {
-              name: 'network',
-              nonce: 6,
-              details: {
-                blockNumber: '0xa3d1a8',
-                baseCount: 6,
-              },
-            },
-          },
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/r',
-          value:
-            '0x58294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdc',
-          note: 'transactions#signTransaction: add r, s, v values',
-          timestamp: 1653457330496,
-        },
-        {
-          op: 'add',
-          path: '/s',
-          value:
-            '0x3993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
-        },
-        {
-          op: 'add',
-          path: '/v',
-          value: '0x01',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'signed',
-          note: 'txStateManager: setting status to signed',
-          timestamp: 1653457330497,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/rawTx',
-          value:
-            '0x02f8d004068459682f008459682f128301089694f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86423b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8c001a058294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdca03993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
-          note: 'transactions#publishTransaction',
-          timestamp: 1653457330498,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/hash',
-          value:
-            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-          note: 'transactions#setTxHash',
-          timestamp: 1653457330596,
-        },
-      ],
-      [
-        {
-          op: 'add',
-          path: '/submittedTime',
-          value: 1653457330597,
-          note: 'txStateManager - add submitted time stamp',
-          timestamp: 1653457330597,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'submitted',
-          note: 'txStateManager: setting status to submitted',
-          timestamp: 1653457330598,
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/status',
-          value: 'confirmed',
-          note: 'txStateManager: setting status to confirmed',
-          timestamp: 1653457338358,
-        },
-        {
-          op: 'add',
-          path: '/txReceipt',
-          value: {
-            blockHash:
-              '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-            blockNumber: 'a3d1aa',
-            contractAddress: null,
-            cumulativeGasUsed: '3c0267',
-            effectiveGasPrice: '0x59682f0d',
-            from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-            gasUsed: '9da4',
-            logs: [
-              {
-                address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-                blockHash:
-                  '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-                blockNumber: 'a3d1aa',
-                data: '0x',
-                logIndex: '21',
-                removed: false,
-                topics: [
-                  '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
-                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-                  '0x0000000000000000000000000000000000000000000000000000000000000000',
-                  '0x000000000000000000000000000000000000000000000000000000000009a7b8',
-                ],
-                transactionHash:
-                  '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-                transactionIndex: '11',
-              },
-              {
-                address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-                blockHash:
-                  '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-                blockNumber: 'a3d1aa',
-                data: '0x',
-                logIndex: '22',
-                removed: false,
-                topics: [
-                  '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-                  '0x000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e',
-                  '0x000000000000000000000000000000000000000000000000000000000009a7b8',
-                ],
-                transactionHash:
-                  '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-                transactionIndex: '11',
-              },
-            ],
-            logsBloom:
-              '0x00000000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020000000000000000000800000000000000000000000010000000000000000000000000000000000010000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000002504000000100000000000020000000000000000000000000000020000010000000000000000000000400000000000000000000001000000000000000',
-            status: '0x1',
-            to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-            transactionHash:
-              '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-            transactionIndex: '11',
-            type: '0x2',
-          },
-        },
-        {
-          op: 'add',
-          path: '/baseFeePerGas',
-          value: '0xd',
-        },
-        {
-          op: 'add',
-          path: '/blockTimestamp',
-          value: '628dc1b8',
-        },
-      ],
-      [
-        {
-          op: 'replace',
-          path: '/blockTimestamp',
-          value: '628dc1b8',
-          note: 'transactions#confirmTransaction - add txReceipt',
-          timestamp: 1653457338377,
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/transactionIndex',
-          value: '11',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/1/transactionIndex',
-          value: '11',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/1/logIndex',
-          value: '22',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/1/blockNumber',
-          value: 'a3d1aa',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/transactionIndex',
-          value: '11',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/logIndex',
-          value: '21',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/logs/0/blockNumber',
-          value: 'a3d1aa',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/cumulativeGasUsed',
-          value: '3c0267',
-        },
-        {
-          op: 'replace',
-          path: '/txReceipt/blockNumber',
-          value: 'a3d1aa',
-        },
-      ],
-    ],
-    userFeeLevel: 'medium',
-    defaultGasEstimates: {
-      estimateType: 'medium',
-      gas: '0x10896',
-      maxFeePerGas: '0x59682f12',
-      maxPriorityFeePerGas: '0x59682f00',
-    },
-    estimatedBaseFee: 'd',
-    nonceDetails: {
-      params: {
-        highestLocallyConfirmed: 6,
-        highestSuggested: 6,
-        nextNetworkNonce: 6,
-      },
-      local: {
-        name: 'local',
-        nonce: 6,
-        details: {
-          startPoint: 6,
-          highest: 6,
-        },
-      },
-      network: {
-        name: 'network',
-        nonce: 6,
-        details: {
-          blockNumber: '0xa3d1a8',
-          baseCount: 6,
-        },
-      },
-    },
-    r: '0x58294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdc',
-    s: '0x3993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
-    v: '0x01',
-    rawTx:
-      '0x02f8d004068459682f008459682f128301089694f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86423b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8c001a058294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdca03993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
-    hash: '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-    submittedTime: 1653457330597,
-    txReceipt: {
-      blockHash:
-        '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-      blockNumber: 'a3d1aa',
-      contractAddress: null,
-      cumulativeGasUsed: '3c0267',
-      effectiveGasPrice: '0x59682f0d',
-      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
-      gasUsed: '9da4',
-      logs: [
-        {
-          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-          blockHash:
-            '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-          blockNumber: 'a3d1aa',
-          data: '0x',
-          logIndex: '21',
-          removed: false,
-          topics: [
-            '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
-            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-            '0x0000000000000000000000000000000000000000000000000000000000000000',
-            '0x000000000000000000000000000000000000000000000000000000000009a7b8',
-          ],
-          transactionHash:
-            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-          transactionIndex: '11',
-        },
-        {
-          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
-          blockHash:
-            '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
-          blockNumber: 'a3d1aa',
-          data: '0x',
-          logIndex: '22',
-          removed: false,
-          topics: [
-            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
-            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
-            '0x000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e',
-            '0x000000000000000000000000000000000000000000000000000000000009a7b8',
-          ],
-          transactionHash:
-            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-          transactionIndex: '11',
-        },
-      ],
-      logsBloom:
-        '0x00000000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020000000000000000000800000000000000000000000010000000000000000000000000000000000010000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000002504000000100000000000020000000000000000000000000000020000010000000000000000000000400000000000000000000001000000000000000',
-      status: '0x1',
-      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
-      transactionHash:
-        '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
-      transactionIndex: '11',
-      type: '0x2',
-    },
-    baseFeePerGas: '0xd',
-    blockTimestamp: '628dc1b8',
-  },
-};
diff --git a/.storybook/preview.js b/.storybook/preview.js
index 2e7bc26bc9da..517e7820ad40 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -30,7 +30,7 @@ addParameters({
     storySort: {
       order: [
         'Getting Started',
-        'Foundations',
+        'Design Tokens',
         'Components',
         ['UI', 'App'],
         'Pages',
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index 44aca95a649d..44038239df48 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1,4 +1,3 @@
-import { draftTransactionInitialState } from '../ui/ducks/send';
 const state = {
   invalidCustomNetwork: {
     state: 'CLOSED',
@@ -16,99 +15,99 @@ const state = {
   },
   networkList: [
     {
-      blockExplorerUrl: 'https://etherscan.io',
-      chainId: '0x1',
+      blockExplorerUrl: "https://etherscan.io",
+      chainId: "0x1",
       iconColor: 'var(--mainnet)',
       isATestNetwork: false,
-      labelKey: 'mainnet',
-      providerType: 'mainnet',
-      rpcUrl: 'https://mainnet.infura.io/v3/',
-      ticker: 'ETH',
+      labelKey: "mainnet",
+      providerType: "mainnet",
+      rpcUrl: "https://mainnet.infura.io/v3/",
+      ticker: "ETH",
       viewOnly: true,
     },
     {
-      blockExplorerUrl: 'https://ropsten.etherscan.io',
-      chainId: '0x3',
+      blockExplorerUrl: "https://ropsten.etherscan.io",
+      chainId: "0x3",
       iconColor: 'var(--ropsten)',
       isATestNetwork: true,
-      labelKey: 'ropsten',
-      providerType: 'ropsten',
-      rpcUrl: 'https://ropsten.infura.io/v3/',
-      ticker: 'ETH',
+      labelKey: "ropsten",
+      providerType: "ropsten",
+      rpcUrl: "https://ropsten.infura.io/v3/",
+      ticker: "ETH",
       viewOnly: true,
     },
     {
-      blockExplorerUrl: 'https://rinkeby.etherscan.io',
-      chainId: '0x4',
+      blockExplorerUrl: "https://rinkeby.etherscan.io",
+      chainId: "0x4",
       iconColor: 'var(--rinkeby)',
       isATestNetwork: true,
-      labelKey: 'rinkeby',
-      providerType: 'rinkeby',
-      rpcUrl: 'https://rinkeby.infura.io/v3/',
-      ticker: 'ETH',
+      labelKey: "rinkeby",
+      providerType: "rinkeby",
+      rpcUrl: "https://rinkeby.infura.io/v3/",
+      ticker: "ETH",
       viewOnly: true,
     },
     {
-      blockExplorerUrl: 'https://goerli.etherscan.io',
-      chainId: '0x5',
+      blockExplorerUrl: "https://goerli.etherscan.io",
+      chainId: "0x5",
       iconColor: 'var(--goerli)',
       isATestNetwork: true,
-      labelKey: 'goerli',
-      providerType: 'goerli',
-      rpcUrl: 'https://goerli.infura.io/v3/',
-      ticker: 'ETH',
+      labelKey: "goerli",
+      providerType: "goerli",
+      rpcUrl: "https://goerli.infura.io/v3/",
+      ticker: "ETH",
       viewOnly: true,
     },
     {
-      blockExplorerUrl: 'https://kovan.etherscan.io',
-      chainId: '0x2a',
+      blockExplorerUrl: "https://kovan.etherscan.io",
+      chainId: "0x2a",
       iconColor: 'var(--kovan)',
       isATestNetwork: true,
-      labelKey: 'kovan',
-      providerType: 'kovan',
-      rpcUrl: 'https://kovan.infura.io/v3/',
-      ticker: 'ETH',
+      labelKey: "kovan",
+      providerType: "kovan",
+      rpcUrl: "https://kovan.infura.io/v3/",
+      ticker: "ETH",
       viewOnly: true,
     },
     {
-      blockExplorerUrl: '',
-      chainId: '0x539',
+      blockExplorerUrl: "",
+      chainId: "0x539",
       iconColor: 'var(--localhost)',
       isATestNetwork: true,
-      label: 'Localhost 8545',
-      providerType: 'rpc',
-      rpcUrl: 'http://localhost:8545',
-      ticker: 'ETH',
+      label: "Localhost 8545",
+      providerType: "rpc",
+      rpcUrl: "http://localhost:8545",
+      ticker: "ETH",
     },
     {
-      blockExplorerUrl: 'https://bscscan.com',
-      chainId: '0x38',
+      blockExplorerUrl: "https://bscscan.com",
+      chainId: "0x38",
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: 'Binance Smart Chain',
-      providerType: 'rpc',
-      rpcUrl: 'https://bsc-dataseed.binance.org/',
-      ticker: 'BNB',
+      label: "Binance Smart Chain",
+      providerType: "rpc",
+      rpcUrl: "https://bsc-dataseed.binance.org/",
+      ticker: "BNB",
     },
     {
-      blockExplorerUrl: 'https://cchain.explorer.avax.network/',
-      chainId: '0xa86a',
+      blockExplorerUrl: "https://cchain.explorer.avax.network/",
+      chainId: "0xa86a",
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: 'Avalanche',
-      providerType: 'rpc',
-      rpcUrl: 'https://api.avax.network/ext/bc/C/rpc',
-      ticker: 'AVAX',
+      label: "Avalanche",
+      providerType: "rpc",
+      rpcUrl: "https://api.avax.network/ext/bc/C/rpc",
+      ticker: "AVAX",
     },
     {
-      blockExplorerUrl: 'https://polygonscan.com',
-      chainId: '0x89',
+      blockExplorerUrl: "https://polygonscan.com",
+      chainId: "0x89",
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: 'Polygon',
-      providerType: 'rpc',
-      rpcUrl: 'https://polygon-rpc.com',
-      ticker: 'MATIC',
+      label: "Polygon",
+      providerType: "rpc",
+      rpcUrl: "https://polygon-rpc.com",
+      ticker: "MATIC",
     },
   ],
   metamask: {
@@ -133,7 +132,7 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false,
+        unlisted: false
       },
       '0xc00e94cb662c3520282e6f5717214004a7f26888': {
         address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
@@ -154,18 +153,23 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false,
+        unlisted: false
       },
       '0xfffffffff15abf397da76f1dcc1a1604f45126db': {
         address: '0xfffffffff15abf397da76f1dcc1a1604f45126db',
         symbol: 'FSW',
         decimals: 18,
         name: 'Falconswap',
-        iconUrl:
-          'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
-        aggregators: ['CoinGecko', '1inch', 'Paraswap', 'Zapper', 'Zerion'],
+        iconUrl: 'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
+        aggregators: [
+          'CoinGecko',
+          '1inch',
+          'Paraswap',
+          'Zapper',
+          'Zerion',
+        ],
         occurrences: 12,
-        unlisted: false,
+        unlisted: false
       },
       '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f': {
         address: '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
@@ -188,70 +192,70 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false,
+        unlisted: false
       },
       '0x6b175474e89094c44da98b954eedeac495271d0f': {
         address: '0x6b175474e89094c44da98b954eedeac495271d0f',
         symbol: 'META',
         decimals: 18,
         image: 'metamark.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0xB8c77482e45F1F44dE1745F52C74426C631bDD52': {
         address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
         symbol: '0X',
         decimals: 18,
         image: '0x.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
         address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
         symbol: 'AST',
         decimals: 18,
         image: 'ast.png',
-        unlisted: false,
+        unlisted: false
       },
       '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2': {
         address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
         symbol: 'BAT',
         decimals: 18,
         image: 'BAT_icon.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1': {
         address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
         symbol: 'CVL',
         decimals: 18,
         image: 'CVL_token.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e': {
         address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
         symbol: 'GLA',
         decimals: 18,
         image: 'gladius.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0x467Bccd9d29f223BcE8043b84E8C8B282827790F': {
         address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
         symbol: 'GNO',
         decimals: 18,
         image: 'gnosis.svg',
-        unlisted: false,
+        unlisted: false
       },
       '0xff20817765cb7f73d4bde2e66e067e58d11095c2': {
         address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
         symbol: 'OMG',
         decimals: 18,
         image: 'omg.jpg',
-        unlisted: false,
+        unlisted: false
       },
       '0x8e870d67f660d95d5be530380d0ec0bd388289e1': {
         address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
         symbol: 'WED',
         decimals: 18,
         image: 'wed.png',
-        unlisted: false,
+        unlisted: false
       },
     },
     networkDetails: {
@@ -277,84 +281,83 @@ const state = {
       swapsFeatureIsLive: false,
       swapsQuoteRefreshTime: 60000,
     },
-    snapStates: {},
-    snaps: {
-      'local:http://localhost:8080/': {
-        enabled: true,
-        id: 'local:http://localhost:8080/',
-        initialPermissions: {
-          snap_confirm: {},
+    "snapStates": {},
+    "snaps": {
+      "local:http://localhost:8080/": {
+        "enabled": true,
+        "id": "local:http://localhost:8080/",
+        "initialPermissions": {
+          "snap_confirm": {}
         },
-        manifest: {
-          description: 'An example MetaMask Snap.',
-          initialPermissions: {
-            snap_confirm: {},
+        "manifest": {
+          "description": "An example MetaMask Snap.",
+          "initialPermissions": {
+            "snap_confirm": {}
           },
-          manifestVersion: '0.1',
-          proposedName: 'MetaMask Example Snap',
-          repository: {
-            type: 'git',
-            url: 'https://github.com/MetaMask/snaps-skunkworks.git',
+          "manifestVersion": "0.1",
+          "proposedName": "MetaMask Example Snap",
+          "repository": {
+            "type": "git",
+            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
           },
-          source: {
-            location: {
-              npm: {
-                filePath: 'dist/bundle.js',
-                iconPath: 'images/icon.svg',
-                packageName: '@metamask/example-snap',
-                registry: 'https://registry.npmjs.org/',
-              },
+          "source": {
+            "location": {
+              "npm": {
+                "filePath": "dist/bundle.js",
+                "iconPath": "images/icon.svg",
+                "packageName": "@metamask/example-snap",
+                "registry": "https://registry.npmjs.org/"
+              }
             },
-            shasum: '3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE=',
+            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
           },
-          version: '0.6.0',
+          "version": "0.6.0"
         },
-        permissionName: 'wallet_snap_local:http://localhost:8080/',
-        sourceCode: '(...)',
-        status: 'stopped',
-        svgIcon: '<svg>...</svg>',
-        version: '0.6.0',
-      },
-      'Filecoin Snap': {
-        enabled: true,
-        id: 'npm:http://localhost:8080/',
-        initialPermissions: {
-          snap_confirm: {},
-          eth_accounts: {},
-          snap_manageState: {},
+        "permissionName": "wallet_snap_local:http://localhost:8080/",
+        "sourceCode": "(...)",
+        "status": "stopped",
+        "svgIcon": "<svg>...</svg>",
+        "version": "0.6.0"
+      },
+      "Filecoin Snap": {
+        "enabled": true,
+        "id": "npm:http://localhost:8080/",
+        "initialPermissions": {
+          "snap_confirm": {},
+          "eth_accounts": {},
+          "snap_manageState": {},
         },
-        manifest: {
-          description:
-            'This swap provides developers everywhere access to an entirely new data storage paradigm, even letting your programs store data autonomously. Learn more.',
-          initialPermissions: {
-            snap_confirm: {},
-            eth_accounts: {},
-            snap_manageState: {},
+        "manifest": {
+          "description": "This swap provides developers everywhere access to an entirely new data storage paradigm, even letting your programs store data autonomously. Learn more.",
+          "initialPermissions": {
+            "snap_confirm": {},
+            "eth_accounts": {},
+            "snap_manageState": {},
           },
-          manifestVersion: '0.1',
-          proposedName: 'Filecoin Snap',
-          repository: {
-            type: 'git',
-            url: 'https://github.com/MetaMask/snaps-skunkworks.git',
+          "manifestVersion": "0.1",
+          "proposedName": "Filecoin Snap",
+          "repository": {
+            "type": "git",
+            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
           },
-          source: {
-            location: {
-              npm: {
-                filePath: 'dist/bundle.js',
-                iconPath: 'images/icon.svg',
-                packageName: '@metamask/example-snap',
-                registry: 'https://registry.npmjs.org/',
-              },
+          "source": {
+            "location": {
+              "npm": {
+                "filePath": "dist/bundle.js",
+                "iconPath": "images/icon.svg",
+                "packageName": "@metamask/example-snap",
+                "registry": "https://registry.npmjs.org/"
+              }
             },
-            shasum: '3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE=',
+            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
           },
-          version: '0.6.0',
+          "version": "0.6.0"
         },
-        permissionName: 'wallet_snap_npm:http://localhost:8080/',
-        sourceCode: '(...)',
-        status: 'stopped',
-        svgIcon: '<svg>...</svg>',
-        version: '0.6.0',
+        "permissionName": "wallet_snap_npm:http://localhost:8080/",
+        "sourceCode": "(...)",
+        "status": "stopped",
+        "svgIcon": "<svg>...</svg>",
+        "version": "0.6.0"
       },
     },
     accountArray: [
@@ -483,46 +486,32 @@ const state = {
     ],
     detectedTokens: [
       {
-        address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+        address: "0x514910771AF9Ca656af840dff83E8264EcF986CA",
         decimals: 18,
-        symbol: 'LINK',
-        image: 'https://crypto.com/price/coin-data/icon/LINK/color_icon.png',
-        aggregators: ['coinGecko', 'oneInch', 'paraswap', 'zapper', 'zerion'],
+        symbol: "LINK",
+        image: "https://crypto.com/price/coin-data/icon/LINK/color_icon.png",
+        aggregators:[
+          "coinGecko","oneInch","paraswap","zapper","zerion"
+        ]
       },
       {
-        address: '0xc00e94Cb662C3520282E6f5717214004A7f26888',
+        address: "0xc00e94Cb662C3520282E6f5717214004A7f26888",
         decimals: 18,
-        symbol: 'COMP',
-        image: 'https://crypto.com/price/coin-data/icon/COMP/color_icon.png',
-        aggregators: [
-          'bancor',
-          'cmc',
-          'cryptocom',
-          'coinGecko',
-          'oneInch',
-          'paraswap',
-          'pmm',
-          'zapper',
-          'zerion',
-          'zeroEx',
-        ],
+        symbol: "COMP",
+        image: "https://crypto.com/price/coin-data/icon/COMP/color_icon.png",
+        aggregators:[
+          "bancor","cmc","cryptocom","coinGecko","oneInch","paraswap","pmm","zapper","zerion","zeroEx"
+        ]
       },
       {
-        address: '0xfffffffFf15AbF397dA76f1dcc1A1604F45126DB',
+        address: "0xfffffffFf15AbF397dA76f1dcc1A1604F45126DB",
         decimals: 18,
-        symbol: 'FSW',
-        image:
-          'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
-        aggregators: [
-          'aave',
-          'cmc',
-          'coinGecko',
-          'oneInch',
-          'paraswap',
-          'zapper',
-          'zerion',
-        ],
-      },
+        symbol: "FSW",
+        image: "https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184",
+        aggregators:[
+          "aave", "cmc","coinGecko","oneInch","paraswap","zapper","zerion"
+        ]
+      }
     ],
     pendingTokens: {},
     customNonceValue: '',
@@ -570,18 +559,18 @@ const state = {
     swapsWelcomeMessageHasBeenShown: true,
     defaultHomeActiveTabName: 'Assets',
     provider: {
-      type: 'rinkeby',
+      type: 'ropsten',
       ticker: 'ETH',
       nickname: '',
       rpcUrl: '',
-      chainId: '0x4',
+      chainId: '0x3',
     },
     previousProviderStore: {
-      type: 'rinkeby',
+      type: 'ropsten',
       ticker: 'ETH',
       nickname: '',
       rpcUrl: '',
-      chainId: '0x4',
+      chainId: '0x3',
     },
     network: '3',
     accounts: {
@@ -1315,7 +1304,7 @@ const state = {
     subjects: {
       'https://app.uniswap.org': {
         permissions: {
-          eth_accounts: {
+          'eth_accounts': {
             invoker: 'https://app.uniswap.org',
             parentCapability: 'eth_accounts',
             id: 'a7342e4b-beae-4525-a36c-c0635fd03359',
@@ -1329,14 +1318,14 @@ const state = {
           },
         },
       },
-      'local:http://localhost:8080/': {
+      "local:http://localhost:8080/": {
         permissions: {
-          snap_confirm: {
-            invoker: 'local:http://localhost:8080/',
+          'snap_confirm': {
+            invoker: "local:http://localhost:8080/",
             parentCapability: 'snap_confirm',
             id: 'a7342F4b-beae-4525-a36c-c0635fd03359',
             date: 1620710693178,
-            caveats: [],
+            caveats: []
           },
         },
       },
@@ -1434,30 +1423,30 @@ const state = {
     pendingApprovals: {},
     pendingApprovalCount: 0,
     subjectMetadata: {
-      'http://localhost:8080': {
+      "http://localhost:8080": {
         extensionId: null,
         iconUrl: null,
-        name: 'Hello, Snaps!',
-        origin: 'http://localhost:8080',
-        subjectType: 'website',
+        name: "Hello, Snaps!",
+        origin: "http://localhost:8080",
+        subjectType: "website"
       },
-      'https://metamask.github.io': {
+      "https://metamask.github.io": {
         extensionId: null,
         iconUrl: null,
-        name: 'Snaps Iframe Execution Environment',
-        origin: 'https://metamask.github.io',
-        subjectType: 'website',
+        name: "Snaps Iframe Execution Environment",
+        origin: "https://metamask.github.io",
+        subjectType: "website"
       },
-      'local:http://localhost:8080/': {
+      "local:http://localhost:8080/": {
         extensionId: null,
         iconUrl: null,
-        name: 'MetaMask Example Snap',
-        origin: 'local:http://localhost:8080/',
-        subjectType: 'snap',
-        svgIcon: '<svg>...</svg>',
-        version: '0.6.0',
-      },
-    },
+        name: "MetaMask Example Snap",
+        origin: "local:http://localhost:8080/",
+        subjectType: "snap",
+        svgIcon: "<svg>...</svg>",
+        version: "0.6.0"
+      }
+    }
   },
   appState: {
     shouldClose: false,
@@ -1466,14 +1455,7 @@ const state = {
       open: false,
       modalState: {
         name: null,
-        props: {
-          token: {
-            address: '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
-            symbol: 'DAI',
-            decimals: 18,
-          },
-          history: {},
-        },
+        props: {},
       },
       previousModalState: {
         name: null,
@@ -1525,12 +1507,6 @@ const state = {
     amount: {
       error: 'amount',
     },
-    currentTransactionUUID: 'test-uuid',
-    draftTransactions: {
-      'test-uuid': {
-        ...draftTransactionInitialState,
-      },
-    },
   },
   confirmTransaction: {
     txData: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06e058fbfbe4..d271b47a3b86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,182 +6,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [10.18.0]
-### Added
-- Add setApprovalForAll confirmation view so granted permissions are displayed in a digested manner, instead of a simple contract interaction([#15010](https://github.com/MetaMask/metamask-extension/pull/15010)) 
-- Add warning when performing a Send directly to a token contract([#13588](https://github.com/MetaMask/metamask-extension/pull/13588))
-
-### Changed
-- Update Optimism ChainID from Kovan to Goerli ([#15119](https://github.com/MetaMask/metamask-extension/pull/15119))
-
-### Fixed
-- Fix one of the possible causes for "Sending to a random cached address", by removing the global transaction state from the Send flow ([#14777](https://github.com/MetaMask/metamask-extension/pull/14777))
-- Fix Chinese translation for the message of Importing repeated tokens ([#14994](https://github.com/MetaMask/metamask-extension/pull/14994))
-- Fix Japanese translation for the word Sign ([#15078](https://github.com/MetaMask/metamask-extension/pull/15078))
-- Fix partially the error "Seedphrase is invalid" by disabling Seedphrase Import button after switching the Seedphrase length ([#15139](https://github.com/MetaMask/metamask-extension/pull/15139))
-- Fix Edit Transaction flow by ensuring that changing a tx from a Transfer to a Send resets data and updates tx type ([#15248](https://github.com/MetaMask/metamask-extension/pull/15248))
-- Fix UI on Import Seedphrase page by disabling Import button, if any of the characters of the Seedphrase is in uppercase ([#15186](https://github.com/MetaMask/metamask-extension/pull/15186))
-
-## [10.17.0]
-### Added
-- Add cost estimation for canceling a Smart Transaction on Awaiting Swap page ([#15011](https://github.com/MetaMask/metamask-extension/pull/15011))
-- Add missing subtitles for Secret Recovery Phrase video, including French, Greek, Turkish, Chinese
- ([#14943](https://github.com/MetaMask/metamask-extension/pull/14943))
-
-### Changed
-- Consolidate all Error Messages in one style component ([#14945](https://github.com/MetaMask/metamask-extension/pull/14945))
-- Improve accessibility by allowing keyboard navigation on Accounts menu ([#14936](https://github.com/MetaMask/metamask-extension/pull/14936))
-- Allow using locally hosted RPCs and Block Explorer Urls when adding an Ethereum Chain programmatically ([#14272](https://github.com/MetaMask/metamask-extension/pull/14272))
-- **[FLASK] BREAKING:** Snaps [are now required](https://github.com/MetaMask/snaps-skunkworks/discussions/590) to export `onRpcRequest` to receive RPC requests ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
-  - All existing snaps will have to be updated to conform to this new standard.
-- **[FLASK] BREAKING:** Snap state [is now encrypted](https://github.com/MetaMask/snaps-skunkworks/discussions/590) by default ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
-  - Breaks existing installed snaps that use `snap_manageState`. All such Snaps must be reinstalled.
-
-### Fixed
-- Fix German translation for `statusConnected` ([#14997](https://github.com/MetaMask/metamask-extension/pull/14997))
-- Fix Account Search functionality returning inconsistent results ([#14914](https://github.com/MetaMask/metamask-extension/pull/14914))
-- Fix Notifications icon color on the Account menu ([#14941](https://github.com/MetaMask/metamask-extension/pull/14941))
-- Fix broken UI for Network Settings page on small browser sizes ([#14857](https://github.com/MetaMask/metamask-extension/pull/14857))
-- Fix scanner for animated QR codes on dark mode, by removing bottom black line from the QR ([#14900](https://github.com/MetaMask/metamask-extension/pull/14900))
-- Fix displaying wrong balance on the first seconds after switching network ([#14354](https://github.com/MetaMask/metamask-extension/pull/14354))
-- Fix Contact name display on Edit tx page ([#14613](https://github.com/MetaMask/metamask-extension/pull/14613))
-- Fix infinite loading when transferring non-standard ERC721 (without name and/or symbol) ([#14756](https://github.com/MetaMask/metamask-extension/pull/14756))
-- **[FLASK]:** Fix multiple bugs related to snap installation ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
-
-## [10.16.2]
-### Changed
-- This release restores the changes from v10.16.0, which was temporarily reverted in v10.16.1.
-
-## [10.16.1]
-### Changed
-- This release is a patch for v10.15.2, so all changes in v10.16.0 have been temporarily reverted. They will be restored in a future v16 release. ([#15063](https://github.com/MetaMask/metamask-extension/pull/15063))
-
-### Fixed
-- Fix bug that could cause an incorrect recipient address after pasting an address, without a 0x prefix, in the send flow while sending a token ([#15064](https://github.com/MetaMask/metamask-extension/pull/15064)
-
-## [10.16.0]
-### Added
-- Add friendly error handling screen, when UI fails to connect to background ([#14461](https://github.com/MetaMask/metamask-extension/pull/14461))
-- Add fiat onboarding for AVAX and MATIC through Wyre ([#14683](https://github.com/MetaMask/metamask-extension/pull/14683))
-- Add Coinbase Pay as fiat onramp option ([#14648](https://github.com/MetaMask/metamask-extension/pull/14648))
-- Add search information for Theme dropdown ([#14476](https://github.com/MetaMask/metamask-extension/pull/14476))
-- **[FLASK]** Add in-app notifications for snaps ([#14605](https://github.com/MetaMask/metamask-extension/pull/14605))
-- **[FLASK]** Add `long-running` snap permission ([#14700](https://github.com/MetaMask/metamask-extension/pull/14700))
-
-### Changed
-- Update caret icon color on Home Page for darkmode, from black to white ([#14835](https://github.com/MetaMask/metamask-extension/pull/14835))
-- Update the color of the ledger alert text to adhere to design system guidelines ([#14674](https://github.com/MetaMask/metamask-extension/pull/14674))
-- Standardize display of connected site's origin data on all confirmation screens ([#14720](https://github.com/MetaMask/metamask-extension/pull/14720))
-- Improved app loading performance
-  - Improve loading performance by patching the "secp256k1" package ([#14677](https://github.com/MetaMask/metamask-extension/pull/14677))
-  - Patch gridplus-sdk module for improving performance ([#14582](https://github.com/MetaMask/metamask-extension/pull/14582))
-- Swaps: ensure that native currency swap amounts are properly displayed on all networks, avoiding a bug where swap received amounts could equal gas costs ([#14821](https://github.com/MetaMask/metamask-extension/pull/14821))
-- Swaps: reduce the default slippage from 3% to 2% ([#14863](https://github.com/MetaMask/metamask-extension/pull/14863))
-- Swaps: update STX status content page ([#14805](https://github.com/MetaMask/metamask-extension/pull/14805))
-  - Make STX status timer behaviour dependent on API values
-  - Change "Swap complete in < X:XX" to "Swap will complete in < X:XX"
-  - Change "Privately submitting the Swap..." to "Privately submitting your Swap..."
-- Swaps: disable STX if a regular tx is in progress ([#14554](https://github.com/MetaMask/metamask-extension/pull/14554))
-- Swaps: remove gas editing ([#14673](https://github.com/MetaMask/metamask-extension/pull/14673))
-- **[FLASK]** Improve snap install screen ([#14803](https://github.com/MetaMask/metamask-extension/pull/14803), ([#14752](https://github.com/MetaMask/metamask-extension/pull/14752)))
-- **[FLASK] BREAKING** Bump `@metamask/key-tree` used by snaps to `4.0.0` ([#14700](https://github.com/MetaMask/metamask-extension/pull/14700))
-- **[FLASK]** Stopped showing confirmations for terminated snaps ([#14566](https://github.com/MetaMask/metamask-extension/pull/14566))
-
-### Fixed
-- Fix line-wrapping in Edit Nickname screen by decreasing the padding ([#14842](https://github.com/MetaMask/metamask-extension/pull/14842))
-- Fix 'Currency Symbol' detection in network settings when using Firefox ([#14810](https://github.com/MetaMask/metamask-extension/pull/14810))
-- Fix switching between ETH and USD in the amount field on the send screen ([#13827](https://github.com/MetaMask/metamask-extension/pull/13827))
-- Fix addition of 'add recipient' events to the send flow change logs so that 'contact' and 'recent' recipient are correctly distinguished ([#14771](https://github.com/MetaMask/metamask-extension/pull/14771))
-- Fix lock button sizing for text exceeding button boundaries ([#14335](https://github.com/MetaMask/metamask-extension/pull/14335))
-- Fix all "MetaMask" instances wrongly written as "Metamask" 
-  - ([#14851](https://github.com/MetaMask/metamask-extension/pull/14851))
-  - ([#14848](https://github.com/MetaMask/metamask-extension/pull/14848))
-- Fix design break on the Settings navbar for certain locales ([#14012](https://github.com/MetaMask/metamask-extension/pull/14012))
-- Fix missing white spacing for keystone transaction qrcode in darkmode ([#14798](https://github.com/MetaMask/metamask-extension/pull/14798))
-- Fix rare bug that could cause unexpected accounts to be generated from Ledger and connected to MetaMask ([#14799](https://github.com/MetaMask/metamask-extension/pull/14799))
-- Fix bug that could cause the incorrect token to be selected after editing the token via the send edit flow ([#14721](https://github.com/MetaMask/metamask-extension/pull/14721))
-- Fix chain ID field to use the same color pattern as the currency symbol field warning message ([#14627](https://github.com/MetaMask/metamask-extension/pull/14627))
-- Fix currency conversion rate on the Edit tx screen ([#14713](https://github.com/MetaMask/metamask-extension/pull/14713))
-- Fix sign button so it is enabled after scrolling all the way to the bottom on the sign type data confirmation screen ([#14745](https://github.com/MetaMask/metamask-extension/pull/14745))
-- Fix wrong tx type text for `Safe Transaction From` ([#14769](https://github.com/MetaMask/metamask-extension/pull/14769))
-- Fix "Site Suggested" tooltip in `EditGasFeeBtn` to only display the origin of dapp suggested gas fee if the origin is provided ([#14734](https://github.com/MetaMask/metamask-extension/pull/14734))
-- Fix incorrect line breaks on footer buttons from NetworksTab ([#14733](https://github.com/MetaMask/metamask-extension/pull/14733))
-- Fix incorrect currency symbol in the send flow history state logs ([#14726](https://github.com/MetaMask/metamask-extension/pull/14726))
-- Fix batch cancel/reject for signature requests ([#13786](https://github.com/MetaMask/metamask-extension/pull/13786))
-- Fix "Learn more" dialog broken link from Eth Sign ([#14667](https://github.com/MetaMask/metamask-extension/pull/14667))
-- Fix mixed text for Speed up/Cancel information ([#14551](https://github.com/MetaMask/metamask-extension/pull/14551))
-- Fix SRP paste duplication ([#14625](https://github.com/MetaMask/metamask-extension/pull/14625))
-- Fix onboarding functionality so that users of dapps using our onboarding library are redirected to the dapp after completing onboarding ([#14550](https://github.com/MetaMask/metamask-extension/pull/14550))
-- Fix error handling for signature methods so that proper errors are returned to dapps when there is a permissions error ([#14126](https://github.com/MetaMask/metamask-extension/pull/14126))
-- Fix `Speed Up` and `Cancel` button styles from `TransactionListItem` consolidating them with `TransactionListItemDetails` buttons ([#14659](https://github.com/MetaMask/metamask-extension/pull/14659))
-- Fix to prevent display of misleading or malicious contract method names ([#14937](https://github.com/MetaMask/metamask-extension/pull/14937))
-- Swaps: fix wrong colour for the high price impact notification ([#14697](https://github.com/MetaMask/metamask-extension/pull/14697))
-- Swaps: fix edge case when missing top assets ([#14688](https://github.com/MetaMask/metamask-extension/pull/14688))
-- **[FLASK]** Fix issues with the snap startup process and usage of `WebAssembly` ([#14772](https://github.com/MetaMask/metamask-extension/pull/14772))
-- **[FLASK]** Fix issues with snap id encoding ([#14693](https://github.com/MetaMask/metamask-extension/pull/14693))
-- **[FLASK]** Fix multiple smaller bugs with snaps ([#14670](https://github.com/MetaMask/metamask-extension/pull/14670))
-
-## [10.15.1]
-### Fixed
-- Fix Ledger connection failures that can occur after remove all hardware wallet accounts and reconnecting  ([#14993](https://github.com/MetaMask/metamask-extension/pull/14993))
-- Fix bug that could cause MetaMask to crash in some cases when interacting with tokens or NFTs ([#14962](https://github.com/MetaMask/metamask-extension/pull/14962))
-
-## [10.15.0]
-### Added
-- Add warning when multiple instances of MetaMask are running ([#13836](https://github.com/MetaMask/metamask-extension/pull/13836))
-- Add "What's New" announcement text for Dark Mode ([#14346](https://github.com/MetaMask/metamask-extension/pull/14346))
-- Theme: Add OS option in theme selection dropdown ([#14379](https://github.com/MetaMask/metamask-extension/pull/14379))
-
-### Changed
-- Use testname as the base currency prefix for preloaded test networks ([#14454](https://github.com/MetaMask/metamask-extension/pull/14454))
-- Update UI of "Add Network" page ([#13866](https://github.com/MetaMask/metamask-extension/pull/13866))
-- Update UI of network switch permissions prompt ([#13450](https://github.com/MetaMask/metamask-extension/pull/13450))
-- Show token approval details on approval screens by default ([#14523](https://github.com/MetaMask/metamask-extension/pull/14523))
-- Ensure theme selection dropdown is discoverable via settings search([#14379](https://github.com/MetaMask/metamask-extension/pull/14379))
-- Stop using the 4bytes registry to name contract deployment transactions in the activity list, preventing false method names from being shown for deployments ([#14598](https://github.com/MetaMask/metamask-extension/pull/14598))
-- Save send flow user action history in transaction state logs ([#14510](https://github.com/MetaMask/metamask-extension/pull/14510))
-- Update GridPlus to use https://github.com/GridPlus/gridplus-sdk/compare/v1.1.6...v1.2.4 ([#14467](https://github.com/MetaMask/metamask-extension/pull/14467))
-
-
-### Fixed
-- Fix `wallet_watchAsset method` ([#14545](https://github.com/MetaMask/metamask-extension/pull/14545))
-- Do not show failed off-chain transactions details when grouped with another valid transaction of same nonce ([#14497](https://github.com/MetaMask/metamask-extension/pull/14497))
-- Fix bug that could have caused some ledger transactions to fail after connecting Ledger then locking and unlocking ([#14563](https://github.com/MetaMask/metamask-extension/pull/14563))
-- Fix bug that could cause MetaMask to crash in some cases when attempting to send a transaction ([#14608](https://github.com/MetaMask/metamask-extension/pull/14608))
-
-## [10.14.7]
-### Changed
-- Make JavaScript bundles more reproducible between environments.
-  - The bundles no longer include absolute paths to each module included.
-
-## [10.14.6]
-### Changed
-- Move phishing warning page to external site.
-  - The page shown when a site is blocked has been extracted from the extension and moved to an external site. This site is eagerly cached with a service worker upon extension startup, so it should continue to work even while offline.
-- Make build .zip files reproducible (#14623)
-  - The ordering of files within each .zip file was non-deterministic before this change. We fixed this to comply with Firefox store policies.
-
-## [10.14.5]
-### Fixed
-- This release was deployed to fix a configuration issue.
-
-## [10.14.4]
-### Fixed
-- This release was deployed to fix a configuration issue.
-
-## [10.14.3]
-### Fixed
-- This release was deployed to fix a configuration issue.
-
-## [10.14.2]
-### Fixed
-- Make build deterministic (#14610)
-    - The ordering of modules within each bundle was non-deterministic before this change. We fixed this to comply with Firefox store policies.
-
-## [10.14.1]
-### Changed
-- This version was used to rollback from v10.14.0 to v10.13.0.
-
 ## [10.14.0]
 ### Added
 - **[FLASK]** Add snap version to details page ([#14110](https://github.com/MetaMask/metamask-extension/pull/14110))
@@ -3084,21 +2908,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.18.0...HEAD
-[10.18.0]: https://github.com/MetaMask/metamask-extension/compare/v10.17.0...v10.18.0
-[10.17.0]: https://github.com/MetaMask/metamask-extension/compare/v10.16.2...v10.17.0
-[10.16.2]: https://github.com/MetaMask/metamask-extension/compare/v10.16.1...v10.16.2
-[10.16.1]: https://github.com/MetaMask/metamask-extension/compare/v10.16.0...v10.16.1
-[10.16.0]: https://github.com/MetaMask/metamask-extension/compare/v10.15.1...v10.16.0
-[10.15.1]: https://github.com/MetaMask/metamask-extension/compare/v10.15.0...v10.15.1
-[10.15.0]: https://github.com/MetaMask/metamask-extension/compare/v10.14.7...v10.15.0
-[10.14.7]: https://github.com/MetaMask/metamask-extension/compare/v10.14.6...v10.14.7
-[10.14.6]: https://github.com/MetaMask/metamask-extension/compare/v10.14.5...v10.14.6
-[10.14.5]: https://github.com/MetaMask/metamask-extension/compare/v10.14.4...v10.14.5
-[10.14.4]: https://github.com/MetaMask/metamask-extension/compare/v10.14.3...v10.14.4
-[10.14.3]: https://github.com/MetaMask/metamask-extension/compare/v10.14.2...v10.14.3
-[10.14.2]: https://github.com/MetaMask/metamask-extension/compare/v10.14.1...v10.14.2
-[10.14.1]: https://github.com/MetaMask/metamask-extension/compare/v10.14.0...v10.14.1
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.14.0...HEAD
 [10.14.0]: https://github.com/MetaMask/metamask-extension/compare/v10.13.0...v10.14.0
 [10.13.0]: https://github.com/MetaMask/metamask-extension/compare/v10.12.4...v10.13.0
 [10.12.4]: https://github.com/MetaMask/metamask-extension/compare/v10.12.3...v10.12.4
diff --git a/README.md b/README.md
index 1174ddced850..1a4e7ca7011d 100644
--- a/README.md
+++ b/README.md
@@ -14,17 +14,14 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
 
 ## Building locally
 
-- Install [Node.js](https://nodejs.org) version 16
+- Install [Node.js](https://nodejs.org) version 14
     - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Install [Yarn](https://yarnpkg.com/en/docs/install)
 - Install dependencies: `yarn setup` (not the usual install command)
 - Copy the `.metamaskrc.dist` file to `.metamaskrc`
     - Replace the `INFURA_PROJECT_ID` value with your own personal [Infura Project ID](https://infura.io/docs).
-    - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask - Segment](./development/README.md#segment).
-    - If debugging unhandled exceptions, you'll need to add a value for `SENTRY_DSN` [Sentry Dsn](https://docs.sentry.io/product/sentry-basics/dsn-explainer/), see [Developing on MetaMask - Sentry](./development/README.md#sentry).
-    - Optionally, replace the `PASSWORD` value with your development wallet password to avoid entering it each time you open the app.
+    - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask](./development/README.md).
 - Build the project to the `./dist/` folder with `yarn dist`.
-    - Optionally, you may run `yarn start` to run dev mode.
 
 Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
 
@@ -118,4 +115,3 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
 - [How to generate a visualization of this repository's development](./development/gource-viz.sh)
 
 [1]: http://www.nomnoml.com/#view/%5B%3Cactor%3Euser%5D%0A%0A%5Bmetamask-ui%7C%0A%20%20%20%5Btools%7C%0A%20%20%20%20%20react%0A%20%20%20%20%20redux%0A%20%20%20%20%20thunk%0A%20%20%20%20%20ethUtils%0A%20%20%20%20%20jazzicon%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20account-detail%0A%20%20%20%20%20accounts%0A%20%20%20%20%20locked-screen%0A%20%20%20%20%20restore-vault%0A%20%20%20%20%20identicon%0A%20%20%20%20%20config%0A%20%20%20%20%20info%0A%20%20%20%5D%0A%20%20%20%5Breducers%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20metamask%0A%20%20%20%20%20identities%0A%20%20%20%5D%0A%20%20%20%5Bactions%7C%0A%20%20%20%20%20%5BbackgroundConnection%5D%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%5D%3A-%3E%5Bactions%5D%0A%20%20%20%5Bactions%5D%3A-%3E%5Breducers%5D%0A%20%20%20%5Breducers%5D%3A-%3E%5Bcomponents%5D%0A%5D%0A%0A%5Bweb%20dapp%7C%0A%20%20%5Bui%20code%5D%0A%20%20%5Bweb3%5D%0A%20%20%5Bmetamask-inpage%5D%0A%20%20%0A%20%20%5B%3Cactor%3Eui%20developer%5D%0A%20%20%5Bui%20developer%5D-%3E%5Bui%20code%5D%0A%20%20%5Bui%20code%5D%3C-%3E%5Bweb3%5D%0A%20%20%5Bweb3%5D%3C-%3E%5Bmetamask-inpage%5D%0A%5D%0A%0A%5Bmetamask-background%7C%0A%20%20%5Bprovider-engine%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bid%20store%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%3E%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%3C-%3E%5Bid%20store%5D%0A%20%20%5Bconfig%20manager%7C%0A%20%20%20%20%5Brpc%20configuration%5D%0A%20%20%20%20%5Bencrypted%20keys%5D%0A%20%20%20%20%5Bwallet%20nicknames%5D%0A%20%20%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%5Bconfig%20manager%5D%0A%20%20%5Bid%20store%5D%3C-%3E%5Bconfig%20manager%5D%0A%5D%0A%0A%5Buser%5D%3C-%3E%5Bmetamask-ui%5D%0A%0A%5Buser%5D%3C%3A--%3A%3E%5Bweb%20dapp%5D%0A%0A%5Bmetamask-contentscript%7C%0A%20%20%5Bplugin%20restart%20detector%5D%0A%20%20%5Brpc%20passthrough%5D%0A%5D%0A%0A%5Brpc%20%7C%0A%20%20%5Bethereum%20blockchain%20%7C%0A%20%20%20%20%5Bcontracts%5D%0A%20%20%20%20%5Baccounts%5D%0A%20%20%5D%0A%5D%0A%0A%5Bweb%20dapp%5D%3C%3A--%3A%3E%5Bmetamask-contentscript%5D%0A%5Bmetamask-contentscript%5D%3C-%3E%5Bmetamask-background%5D%0A%5Bmetamask-background%5D%3C-%3E%5Bmetamask-ui%5D%0A%5Bmetamask-background%5D%3C-%3E%5Brpc%5D%0A
-
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index 6a3d69bc2d0f..bfbbac952138 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -131,10 +131,10 @@
     "message": "ማሰሺያዎት አልተደገፈም..."
   },
   "buyWithWyre": {
-    "message": "$1 በ Wyre ይግዙ"
+    "message": "ETH በ Wyre ይግዙ"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ክሬዲት ካርድ ተጠቅመው $1 በቀጥታ በ MetaMask መለያዎ ላይ እንዲያስቀምጡ ያስችልዎታል።"
+    "message": "Wyre ክሬዲት ካርድ ተጠቅመው ETH በቀጥታ በ MetaMask መለያዎ ላይ እንዲያስቀምጡ ያስችልዎታል።"
   },
   "bytes": {
     "message": "ባይት"
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index 6d99fc54b78a..e87624ee26cb 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -148,7 +148,7 @@
     "message": "قم بشراء عملة إيثير بواسطة Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "يتيح لك Wyre استخدام بطاقة ائتمان لإيداع 1$ مباشرة في حساب MetaMask الخاص بك."
+    "message": "يتيح لك Wyre استخدام بطاقة ائتمان لإيداع ETH مباشرة في حساب MetaMask الخاص بك."
   },
   "bytes": {
     "message": "بايتات"
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 49b76836583e..9d4534adbe72 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -137,10 +137,10 @@
     "message": "Браузърът ви не се поддържа ..."
   },
   "buyWithWyre": {
-    "message": "Купете $1 с Wyre"
+    "message": "Купете ETH с Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ви позволява да използвате кредитна карта, за да депозирате $1 право във вашата MetaMask сметка."
+    "message": "Wyre ви позволява да използвате кредитна карта, за да депозирате ETH право във вашата MetaMask сметка."
   },
   "bytes": {
     "message": "Байта"
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 88fedac63b1f..7dd74c5ebeab 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -137,10 +137,10 @@
     "message": "আপনার ব্রাউজার সমর্থিত নয়..."
   },
   "buyWithWyre": {
-    "message": "Wyre দিয়ে $1 ক্রয় করুন"
+    "message": "Wyre দিয়ে ETH ক্রয় করুন"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre আপনার MetaMask অ্যাকাউন্টে সরাসরি $1 জমা করতে আপনাকে একটি ক্রেডিট কার্ড ব্যবহার করতে দেয়।"
+    "message": "Wyre আপনার MetaMask অ্যাকাউন্টে সরাসরি ETH জমা করতে আপনাকে একটি ক্রেডিট কার্ড ব্যবহার করতে দেয়।"
   },
   "bytes": {
     "message": "বাইটস"
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 3bdaf93ba630..34abb31dc6ae 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -137,10 +137,10 @@
     "message": "El teu navegador no és suportat..."
   },
   "buyWithWyre": {
-    "message": "Compra $1 amb Wyre"
+    "message": "Compra ETH amb Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre et permet utilitzar una targeta de crèdit per dipositar $1 directe al teu compte MetaMask."
+    "message": "Wyre et permet utilitzar una targeta de crèdit per dipositar ETH directe al teu compte MetaMask."
   },
   "cancel": {
     "message": "Cancel·la"
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 4b642ef37499..248404f43e82 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -137,10 +137,10 @@
     "message": "Din browser er ikke understøttet..."
   },
   "buyWithWyre": {
-    "message": "Køb $1 med Wyre"
+    "message": "Køb ETH med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre lader dig bruge et kreditkort til at indbetale $1 på din MetaMask-konto."
+    "message": "Wyre lader dig bruge et kreditkort til at indbetale ETH på din MetaMask-konto."
   },
   "bytes": {
     "message": "Byte"
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 7951a4640983..ed85a38cf280 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 kann auf dieses Asset zugreifen und es ausgeben",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Greifen Sie mit Ihrer geheimen Wiederherstellungsphrase auf Ihr Wallet zu"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask kann Ihr Passwort nicht wiederherstellen. Wir verwenden Ihre geheime Wiederherstellungsphrase, um Ihr Eigentum zu bestätigen, Ihr Wallet wiederherzustellen und ein neues Passwort festzulegen. Geben Sie zunächst die geheime Wiederherstellungsphrase ein, die Sie erhalten haben, als Sie Ihr Wallet erstellt haben. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Zugriff auf Ihre Kamera …"
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Netzwerk hinzufügen"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Diese Netzwerkverbindung ist von Dritten abhängig. Diese Verbindung könnte unzuverlässiger sein oder Dritten erlauben, Ihre Aktivitäten zu verfolgen. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Vorgeschlagene Token hinzufügen"
   },
@@ -411,14 +400,6 @@
     "message": "$1 kaufen",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "1 $ mit Coinbase Pay kaufen",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Sie können mit Ihrem Coinbase-Konto bequem Kryptowährungen kaufen oder überweisen.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "$1 mit MoonPay kaufen",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "$1 mit Wyre kaufen"
+    "message": "ETH mit Wyre kaufen"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ermöglicht Ihnen die Verwendung einer Kreditkarte zum direkten Einzahlen von $1 auf Ihr MetaMask-Konto."
+    "message": "Wyre ermöglicht Ihnen die Verwendung einer Kreditkarte zum direkten Einzahlen von ETH auf Ihr MetaMask-Konto."
   },
   "bytes": {
     "message": "Bytes"
@@ -466,6 +447,9 @@
     "message": "Für eine Transaktion im Wert von $1 muss die Gasgebühr um mindestens 10 % erhöht werden, damit sie vom Netz erkannt wird.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Swap abbrechen"
+  },
   "cancellationGasFee": {
     "message": "Stornierungs-Gasgebühr"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Weiter"
   },
-  "continueToCoinbasePay": {
-    "message": "Weiter zu Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Weiter zu MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Vertragsinteraktion"
   },
   "convertTokenToNFTDescription": {
-    "message": "Wir haben festgestellt, dass dieses Asset eine NFT ist. MetaMask hat jetzt volle native Unterstützung für NFTs. Möchten Sie es aus Ihrer Tokenliste entfernen und als NFT hinzufügen?"
+    "message": "Wir haben festgestellt, dass dieses Asset eine NFT ist. Metamask hat jetzt volle native Unterstützung für NFTs. Möchten Sie es aus Ihrer Tokenliste entfernen und als NFT hinzufügen?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Wir haben festgestellt, dass dieses Asset als NFT hinzugefügt wurde. Möchten Sie es aus Ihrer Token-Liste entfernen?"
@@ -1244,10 +1225,6 @@
     "message": "Alle Flask-APIs sind experimentell. Sie können ohne Vorankündigung geändert oder entfernt werden oder sie können auf unbestimmte Zeit in Flask bleiben, ohne jemals in die stabile MetaMask migriert zu werden. Die Verwendung erfolgt auf eigene Gefahr.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Stellen Sie sicher, dass Sie Ihre normale MetaMask-Erweiterung deaktivieren, wenn Sie Flask verwenden.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Ich akzeptiere die Risiken",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Ausblenden"
   },
-  "hideFullTransactionDetails": {
-    "message": "Vollständige Transaktionsdetails ausblenden"
-  },
   "hideSeedPhrase": {
     "message": "Seed-Phrase ausblenden"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Verlauf"
   },
-  "ignoreAll": {
-    "message": "Alle ignorieren"
-  },
-  "ignoreTokenWarning": {
-    "message": "Wenn Sie Token ignorieren, werden Sie nicht in Ihrem Wallet angezeigt. Sie können sie jedoch weiterhin hinzufügen, indem Sie nach ihnen suchen."
-  },
   "import": {
     "message": "Importieren",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Wallet importieren"
   },
-  "importWithCount": {
-    "message": "$1 importieren",
-    "description": "$1 will the number of detected tokens that are selected for importing, if all of them are selected then $1 will be all"
-  },
   "importYourExisting": {
     "message": "Ihre bestehende Wallet mit einer Geheime Wiederherstellungsphrase importieren"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "Richtungspfeil"
   },
-  "lightTheme": {
-    "message": "Leicht"
-  },
   "likeToImportTokens": {
     "message": "Möchtest du diese Token hinzufügen?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "6M+ Benutzern beitreten um MetaMask zu verbessern"
   },
+  "mismatchedChain": {
+    "message": "Die Netzwerkdetails für diese Ketten-ID stimmen nicht mit unseren Aufzeichnungen überein. Wir empfehlen Ihnen $1, bevor Sie fortfahren.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "die Netzwerkdetails überprüfen",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Neu bei MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Sie haben $1 erfolgreich importiert.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Token importiert"
-  },
   "newTotal": {
     "message": "Neue Summe"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Nicht genügend Gas"
   },
-  "notifications": {
-    "message": "Benachrichtigungen"
-  },
   "notifications10ActionText": {
     "message": "Einstellungen ansehen",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Wir machen Transaktionen leichter lesbar."
   },
-  "notificationsEmptyText": {
-    "message": "Hier gibt es nichts zu sehen."
-  },
-  "notificationsHeader": {
-    "message": "Benachrichtigungen"
-  },
-  "notificationsInfos": {
-    "message": "$1 von $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Alle als gelesen markieren"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 neue Tokens in diesem Konto gefunden\n",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Ursprung"
   },
-  "osTheme": {
-    "message": "System"
-  },
-  "padlock": {
-    "message": "Schloss"
-  },
   "parameters": {
     "message": "Parameter"
   },
@@ -2435,10 +2371,6 @@
     "message": "Siehe Adresse, Kontostand, Aktivität und Einleitung von Transaktionen",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Für unbestimmte Zeit ausführen.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Verwalten Sie Ihre „$1“-Konten und Vermögenswerte.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 mehr",
     "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": "Beliebte benutzerdefinierte Netzwerke"
-  },
   "preferredLedgerConnectionType": {
     "message": "Bevorzugter Ledger-Verbindungstyp",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Vergewissern Sie sich, dass Sie die richtige geheime Wiederherstellungsphrase verwenden, bevor Sie fortfahren. Sie können dies nicht mehr rückgängig machen."
   },
-  "restartMetamask": {
-    "message": "MetaMask neu starten"
-  },
   "restore": {
     "message": "Wiederherstellen"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Betrag senden"
   },
-  "sendBugReport": {
-    "message": "Übermitteln Sie uns einen Fehlerbericht."
-  },
   "sendSpecifiedTokens": {
     "message": "$1 senden",
     "description": "Symbol of the specified token"
@@ -3075,7 +2998,7 @@
     "message": "Status"
   },
   "statusConnected": {
-    "message": "Verbunden"
+    "message": "Verbinden"
   },
   "statusNotConnected": {
     "message": "Nicht verbunden"
@@ -3108,9 +3031,6 @@
     "message": "Verbinden Sie Ihre Wallet direkt mit Ihrem Computer.  Entsperren Sie Ihren Ledger und öffnen Sie die Ethereum-App. Für weitere Informationen zur Verwendung Ihres Hardware-Wallet-Geräts, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Erhalten Sie diese Meldung immer noch?"
-  },
   "storePhrase": {
     "message": "Speichern Sie diesen Schlüssel in einem Passwortmanager wie 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Sie können Ihre Token immer noch tauschen, selbst während intelligente Transaktionen nicht verfügbar sind."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Ihr Swap wird privat eingereicht ..."
+  "stxPendingFinalizing": {
+    "message": "Wird finalisiert ..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Ihr Swap wird öffentlich eingereicht ..."
+  "stxPendingOptimizingGas": {
+    "message": "Gas wird optimiert ..."
+  },
+  "stxPendingPrivatelySubmitting": {
+    "message": "Swap wird privat eingereicht ..."
   },
   "stxSubDescription": {
     "message": "* Intelligente Transaktionen versuchen mehrmals, Ihre Transaktion privat zu übermitteln. Wenn alle Versuche fehlschlagen, wird die Transaktion öffentlich übertragen, um sicherzustellen, dass Ihr Swap erfolgreich durchgeführt wird."
@@ -3179,10 +3102,6 @@
     "message": "Ihr $1 ist jetzt verfügbar.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Swap abgeschlossen in <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Simulieren Sie Transaktionen vor der Übermittlung, um die Transaktionskosten zu senken und Ausfälle zu vermeiden."
   },
@@ -3261,6 +3180,10 @@
     "message": "Keine Token verfügbar mit $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"
   },
+  "swapCompleteIn": {
+    "message": "Swap abgeschlossen in <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Mit Ihrer Hardware-Wallet bestätigen"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Slippage muss größer oder gleich Null sein"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Liquiditätsquelle"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Tokensymbol"
   },
-  "tokensFoundTitle": {
-    "message": "$1 neue Token gefunden",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Ich verstehe"
   },
@@ -3804,9 +3719,6 @@
     "message": "Wir hatten Probleme mit der Verbindung zu Ihrem $1, versuchen Sie, $2 zu überprüfen und versuchen es erneut.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "Beim Starten von MetaMask ist ein Problem aufgetreten. Dies könnte ein vorübergehendes Problem sein. Versuchen Sie daher, die Erweiterung neu zu starten."
-  },
   "troubleTokenBalances": {
     "message": "Wir haben Schwierigkeiten dein Tokenguthaben zu laden. Du kannst es hier anzeigen lassen",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Passwort eingeben"
   },
-  "typeYourSRP": {
-    "message": "Geben Sie Ihre geheime Wiederherstellungsphrase ein"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Dieses benutzerdefinierte Netzwerk ist nicht erkannt. Wir empfehlen, dass Sie $1 bevor Sie fortfahren",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "die Netzwerkdetails überprüfen",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Verwenden von Sammelbaren (ERC-721) Token wird derzeit nicht unterstützt",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Wallet-Erstellung erfolgreich"
   },
-  "warning": {
-    "message": "Warnung"
-  },
   "weak": {
     "message": "Schwach"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 649655d5e878..fec2fcdc217f 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -62,13 +62,6 @@
     "message": "Το $1 ίσως αποκτήσει πρόσβαση και δαπανήσει αυτό το περιουσιακό στοιχείο",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Αποκτήστε πρόσβαση στο πορτοφόλι σας με τη Μυστική σας Φράση Ανάκτησης"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "Το MetaMask δεν μπορεί να ανακτήσει τον κωδικό σας. Θα χρησιμοποιήσουμε τη Μυστική σας Φράση Ανάκτησης για να επιβεβαιώσουμε την κυριότητά σας, να ανακτήσουμε το πορτοφόλι σας και να ορίσουμε ένα νέο κωδικό. Πρώτα, εισάγετε τη Μυστική Φράση σας Ανάκτησης που σας δόθηκε όταν δημιουργήσατε το πορτοφόλι σας. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Πρόσβαση στην κάμερά σας..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Προσθήκη Δικτύου"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Αυτή η σύνδεση δικτύου βασίζεται σε τρίτους. H σύνδεση ενδέχεται να είναι λιγότερο αξιόπιστη ή να επιτρέπει σε τρίτους να παρακολουθούν τη δραστηριότητα. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Προσθέστε τα Προτεινόμενα Tokens"
   },
@@ -411,14 +400,6 @@
     "message": "Αγορά $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Αγορά $1 με Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Μπορείτε να αγοράσετε ή να μεταφέρετε εύκολα κρυπτονομίσματα με τον λογαριασμό σας στο Coinbase.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Αγορά $1 με MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Αγοράστε $1 με το Wyre"
+    "message": "Αγοράστε ETH με το Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Το Wyre σας επιτρέπει να χρησιμοποιήσετε μια πιστωτική κάρτα για να καταθέσετε $1 απευθείας στον λογαριασμό σας MetaTask."
+    "message": "Το Wyre σας επιτρέπει να χρησιμοποιήσετε μια πιστωτική κάρτα για να καταθέσετε ETH απευθείας στον λογαριασμό σας MetaTask."
   },
   "bytes": {
     "message": "Bytes"
@@ -466,6 +447,9 @@
     "message": "Για να $1 τη συναλλαγή, τα τέλη συναλλαγής πρέπει να αυξηθούν κατά τουλάχιστον 10% ώστε να αναγνωριστούν από το δίκτυο.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Ακύρωση ανταλλαγής"
+  },
   "cancellationGasFee": {
     "message": "Ακύρωση Χρέωσης Αερίου"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Συνέχεια"
   },
-  "continueToCoinbasePay": {
-    "message": "Συνέχεια στο Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Συνέχεια στη MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Αλληλεπίδραση Σύμβασης"
   },
   "convertTokenToNFTDescription": {
-    "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο είναι NFT. Το MetaMask υποστηρίζει πλέον εξ'ορισμού πλήρως τα NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας και να το προσθέσετε ως NFT;"
+    "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο είναι NFT. Το Metamask υποστηρίζει πλέον εξ'ορισμού πλήρως τα NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας και να το προσθέσετε ως NFT;"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο προστέθηκε ως NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας;"
@@ -1244,10 +1225,6 @@
     "message": "Όλα τα API του Flask είναι πειραματικά. Μπορεί να αλλάξουν ή να αφαιρεθούν χωρίς προειδοποίηση ή μπορεί να παραμείνουν στο Flask επ' αόριστον, χωρίς ποτέ να μεταφερθούν στο σταθερό MetaMask. Χρησιμοποιήστε τα με δική σας ευθύνη.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Βεβαιωθείτε ότι έχετε απενεργοποιήσει την κανονική σας επέκταση MetaMask όταν χρησιμοποιείτε το Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Αποδέχομαι τον κίνδυνο",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Απόκρυψη"
   },
-  "hideFullTransactionDetails": {
-    "message": "Απόκρυψη αναλυτικών στοιχείων συναλλαγών"
-  },
   "hideSeedPhrase": {
     "message": "Απόκρυψη φράσης ανάκτησης"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Ιστορικό"
   },
-  "ignoreAll": {
-    "message": "Αγνόηση όλων"
-  },
-  "ignoreTokenWarning": {
-    "message": "Εάν κάνετε απόκρυψη των token, δεν θα εμφανίζονται στο πορτοφόλι σας. Ωστόσο, μπορείτε ακόμα να τα προσθέσετε εάν κάνετε αναζήτηση για αυτά."
-  },
   "import": {
     "message": "Εισαγωγή",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Εισαγωγή Πορτοφολιού"
   },
-  "importWithCount": {
-    "message": "Εισαγωγή $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"
-  },
   "importYourExisting": {
     "message": "Εισαγωγή υπάρχοντος πορτοφολιού με Μυστική Φράση Ανάκτησης"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "βέλος αλλαγής επιπέδου"
   },
-  "lightTheme": {
-    "message": "Ανοιχτόχρωμο"
-  },
   "likeToImportTokens": {
     "message": "Θέλετε να προσθέσετε αυτά τα token;"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Συμμετάσχετε σε 6εκ+ χρήστες για να βελτιώσετε το MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Οι λεπτομέρειες δικτύου για αυτό το αναγνωριστικό αλυσίδας δεν ταιριάζουν με τις εγγραφές μας. Σας συνιστούμε να $1 πριν συνεχίσετε.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "επαληθεύστε τα στοιχεία δικτύου",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Καινούριος στο MetaMask;"
   },
-  "newTokensImportedMessage": {
-    "message": "Εισάγατε επιτυχώς το $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Τα token εισήχθησαν"
-  },
   "newTotal": {
     "message": "Νέο Σύνολο"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Δεν Υπάρχει Αρκετό Αέριο"
   },
-  "notifications": {
-    "message": "Ειδοποιήσεις"
-  },
   "notifications10ActionText": {
     "message": "Μετάβαση στις Ρυθμίσεις",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Κάνουμε τις συναλλαγές ευκολότερες στο διάβασμα."
   },
-  "notificationsEmptyText": {
-    "message": "Δεν υπάρχει κάτι να δείτε εδώ."
-  },
-  "notificationsHeader": {
-    "message": "Ειδοποιήσεις"
-  },
-  "notificationsInfos": {
-    "message": "$1 από $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Επισήμανση όλων ως αναγνωσμένων"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 νέα token βρέθηκαν σε αυτόν τον λογαριασμό",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Προέλευση"
   },
-  "osTheme": {
-    "message": "Σύστημα"
-  },
-  "padlock": {
-    "message": "Padlock"
-  },
   "parameters": {
     "message": "Παράμετροι"
   },
@@ -2435,10 +2371,6 @@
     "message": "Βλέπε διεύθυνση, υπόλοιπο λογαριασμού, δραστηριότητα και έναρξη συναλλαγών",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Εκτέλεση επ' αόριστον.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Ελέγξτε τους λογαριασμούς και τα περιουσιακά σας στοιχεία σας στο \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 ακόμη",
     "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": "Δημοφιλή προσαρμοσμένα δίκτυα"
-  },
   "preferredLedgerConnectionType": {
     "message": "Προτιμώμενος Τύπος Σύνδεσης Ledger",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Βεβαιωθείτε ότι χρησιμοποιείτε τη σωστή Μυστική Φράση Ανάκτησης πριν συνεχίσετε. Αυτή η ενέργεια είναι μη αναστρέψιμη."
   },
-  "restartMetamask": {
-    "message": "Επανεκκίνηση MetaMask"
-  },
   "restore": {
     "message": "Επαναφορά"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Αποστολή Ποσού"
   },
-  "sendBugReport": {
-    "message": "Στείλτε μας μια αναφορά σφάλματος."
-  },
   "sendSpecifiedTokens": {
     "message": "Αποστολή $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Συνδέστε το πορτοφόλι σας απευθείας στον υπολογιστή σας. Ξεκλειδώστε το Ledger και ανοίξτε την εφαρμογή Ethereum. Για περισσότερες πληροφορίες σχετικά με τη χρήση της συσκευής πορτοφολιού σας, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Λαμβάνετε ακόμα αυτό το μήνυμα;"
-  },
   "storePhrase": {
     "message": "Αποθηκεύστε αυτήν τη φράση σε έναν διαχειριστή κωδικών πρόσβασης όπως το 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Μπορείτε να ανταλλάξετε ακόμα τα token σας, ακόμα και αν οι Έξυπνες Συναλλαγές δεν είναι διαθέσιμες."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Ιδιωτική υποβολή της Ανταλλαγής σας..."
+  "stxPendingFinalizing": {
+    "message": "Ολοκλήρωση..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Δημόσια υποβολή της Ανταλλαγής σας..."
+  "stxPendingOptimizingGas": {
+    "message": "Βελτιστοποίηση τελών συναλλαγής..."
+  },
+  "stxPendingPrivatelySubmitting": {
+    "message": "Ιδιωτική υποβολή της Ανταλλαγής..."
   },
   "stxSubDescription": {
     "message": "* Οι Έξυπνες Συναλλαγές θα προσπαθήσουν να υποβάλουν τη συναλλαγή σας ιδιωτικά, πολλές φορές. Εάν όλες οι προσπάθειες αποτύχουν, η συναλλαγή θα μεταδοθεί δημόσια για να διασφαλιστεί η επιτυχής πραγματοποίηση της ανταλλαγής σας."
@@ -3179,10 +3102,6 @@
     "message": "Τα $1 σας είναι πλέον διαθέσιμα.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Η Ανταλλαγή θα ολοκληρωθεί σε <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Προσομοίωση συναλλαγών πριν από την υποβολή για μείωση του κόστους συναλλαγής και των αποτυχιών."
   },
@@ -3261,6 +3180,10 @@
     "message": "Δεν υπάρχουν διαθέσιμα tokens που να ταιριάζουν σε $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"
   },
+  "swapCompleteIn": {
+    "message": "Η ανταλλαγή θα ολοκληρωθεί σε <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Επιβεβαιώστε με το υλικό πορτοφόλι σας"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Η ολίσθηση πρέπει να είναι μεγαλύτερη ή ίση με το μηδέν"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Πηγή ρευστότητας"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Σύμβολο Token"
   },
-  "tokensFoundTitle": {
-    "message": "Βρέθηκαν $1 νέα tokens",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Καταλαβαίνω"
   },
@@ -3804,9 +3719,6 @@
     "message": "Είχαμε πρόβλημα να συνδεθούμε με το $1 σας, δοκιμάστε να ξαναδείτε το $2 και προσπαθήστε ξανά.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "Το MetaMask αντιμετώπισε πρόβλημα κατά την εκκίνηση. Αυτό το σφάλμα μπορεί να είναι τυχαίο, γι' αυτό προσπαθήστε να επανεκκινήσετε την επέκταση."
-  },
   "troubleTokenBalances": {
     "message": "Είχαμε πρόβλημα να φορτώσουμε τα υπόλοιπα του διακριτικού σας. Μπορείτε να τα δείτε ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Πληκτρολογήστε τον κωδικό πρόσβασής σας MetaMask"
   },
-  "typeYourSRP": {
-    "message": "Πληκτρολογήστε τη Μυστική σας Φράση Ανάκτησης"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Αυτό το προσαρμοσμένο δίκτυο δεν αναγνωρίζεται. Σας συνιστούμε να $1 πριν προχωρήσετε",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "επαληθεύστε τα στοιχεία δικτύου",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Η αποστολή συλλεκτικών (ERC-721) δεν υποστηρίζεται προς το παρόν",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Επιτυχής δημιουργία πορτοφολιού"
   },
-  "warning": {
-    "message": "Προειδοποίηση"
-  },
   "weak": {
     "message": "Αδύναμος"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index e425103f27d9..a34af875bb96 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -160,9 +160,6 @@
   "addMemo": {
     "message": "Add memo"
   },
-  "addMoreNetworks": {
-    "message": "add more networks manually"
-  },
   "addNetwork": {
     "message": "Add Network"
   },
@@ -233,10 +230,6 @@
   "alerts": {
     "message": "Alerts"
   },
-  "allOfYour": {
-    "message": "All of your $1",
-    "description": "$1 is the symbol or name of the token that the user is approving spending"
-  },
   "allowExternalExtensionTo": {
     "message": "Allow this external extension to:"
   },
@@ -273,10 +266,6 @@
   "approve": {
     "message": "Approve spend limit"
   },
-  "approveAllTokensTitle": {
-    "message": "Give permission to access all of your $1?",
-    "description": "$1 is the symbol of the token for which the user is granting approval"
-  },
   "approveAndInstall": {
     "message": "Approve & Install"
   },
@@ -425,14 +414,6 @@
     "message": "Buy $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Buy $1 with Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "You can easily buy or transfer crypto with your Coinbase account.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Buy $1 with MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -452,10 +433,10 @@
     "message": "Buy Now"
   },
   "buyWithWyre": {
-    "message": "Buy $1 with Wyre"
+    "message": "Buy ETH with Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Easy onboarding for purchases up to $ 1000. Fast interactive high limit purchase verification. Supports Debit/Credit Card, Apple Pay, Bank Transfers. Available in 100+ countries. Tokens deposit into your MetaMask Account"
+    "message": "Wyre lets you use a debit card to deposit ETH right in to your MetaMask account."
   },
   "bytes": {
     "message": "Bytes"
@@ -483,12 +464,8 @@
     "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'"
   },
-  "cancelSwapForFee": {
-    "message": "Cancel swap for ~$1",
-    "description": "$1 could be e.g. $2.98, it is a cost for cancelling a Smart Transaction"
-  },
-  "cancelSwapForFree": {
-    "message": "Cancel swap for free"
+  "cancelSwap": {
+    "message": "Cancel swap"
   },
   "cancellationGasFee": {
     "message": "Cancellation Gas Fee"
@@ -646,9 +623,6 @@
   "continue": {
     "message": "Continue"
   },
-  "continueToCoinbasePay": {
-    "message": "Continue to Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Continue to MoonPay"
   },
@@ -674,7 +648,7 @@
     "message": "Contract Interaction"
   },
   "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?"
+    "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?"
@@ -1304,9 +1278,6 @@
   "functionApprove": {
     "message": "Function: Approve"
   },
-  "functionSetApprovalForAll": {
-    "message": "Function: SetApprovalForAll"
-  },
   "functionType": {
     "message": "Function Type"
   },
@@ -1647,9 +1618,6 @@
   "invalidSeedPhrase": {
     "message": "Invalid Secret Recovery Phrase"
   },
-  "invalidSeedPhraseCaseSensitive": {
-    "message": "Invalid input! Secret Recovery Phrase is case sensitive."
-  },
   "ipfsGateway": {
     "message": "IPFS Gateway"
   },
@@ -1921,23 +1889,14 @@
   "metametricsTitle": {
     "message": "Join 6M+ users to improve MetaMask"
   },
+  "mismatchedChain": {
+    "message": "The network details for this chain ID do not match our records. We recommend that you $1 before proceeding.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "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."
-  },
-  "mismatchedRpcUrl": {
-    "message": "According to our records the submitted RPC URL value does not match a known provider for this chain ID."
-  },
   "missingNFT": {
     "message": "Don't see your NFT?"
   },
@@ -1989,9 +1948,6 @@
   "network": {
     "message": "Network:"
   },
-  "networkAddedSuccessfully": {
-    "message": "Network added successfully!"
-  },
   "networkDetails": {
     "message": "Network Details"
   },
@@ -2108,9 +2064,6 @@
     "message": "Nonce is higher than suggested nonce of $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
-  "nft": {
-    "message": "NFT"
-  },
   "nftTokenIdPlaceholder": {
     "message": "Enter the Token ID"
   },
@@ -2177,9 +2130,6 @@
   "notEnoughGas": {
     "message": "Not Enough Gas"
   },
-  "notifications": {
-    "message": "Notifications"
-  },
   "notifications10ActionText": {
     "message": "Visit in settings",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2211,16 +2161,6 @@
   "notifications12Title": {
     "message": "Wen dark mode? Now dark mode! 🕶️🦊"
   },
-  "notifications13ActionText": {
-    "message": "Show custom network list"
-  },
-  "notifications13Description": {
-    "message": "You can now add the following popular custom networks easily: Arbitrum, Avalanche, Binance Smart Chain, Fantom, Harmony, Optimism, Palm and Polygon! To enable this feature, go to Settings -> Experimental and turn \"Show custom network list\" on!",
-    "description": "Description of a notification in the 'See What's New' popup. Describes popular network feature."
-  },
-  "notifications13Title": {
-    "message": "Add Popular Networks"
-  },
   "notifications1Description": {
     "message": "MetaMask Mobile users can now swap tokens inside their mobile wallet. Scan the QR code to get the mobile app and start swapping.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."
@@ -2310,19 +2250,6 @@
   "notifications9Title": {
     "message": "👓 We are making transactions easier to read."
   },
-  "notificationsEmptyText": {
-    "message": "Nothing to see here."
-  },
-  "notificationsHeader": {
-    "message": "Notifications"
-  },
-  "notificationsInfos": {
-    "message": "$1 from $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Mark all as read"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 new tokens found in this account",
     "description": "$1 is the number of new tokens detected"
@@ -2497,10 +2424,6 @@
     "message": "See address, account balance, activity and suggest transactions to approve",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Run indefinitely.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Control your \"$1\" accounts and assets.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2707,9 +2630,6 @@
   "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"
   },
@@ -2738,14 +2658,6 @@
   "revealTheSeedPhrase": {
     "message": "Reveal seed phrase"
   },
-  "revokeAllTokensTitle": {
-    "message": "Revoke permission to access all of your $1?",
-    "description": "$1 is the symbol of the token for which the user is revoking approval"
-  },
-  "revokeApproveForAllDescription": {
-    "message": "By revoking permission, the following $1 will no longer be able to access your $2",
-    "description": "$1 is either key 'account' or 'contract', and $2 is either a string or link of a given token symbol or name"
-  },
   "rinkeby": {
     "message": "Rinkeby Test Network"
   },
@@ -2902,9 +2814,6 @@
   "sendAmount": {
     "message": "Send Amount"
   },
-  "sendBugReport": {
-    "message": "Send us a bug report."
-  },
   "sendSpecifiedTokens": {
     "message": "Send $1",
     "description": "Symbol of the specified token"
@@ -2922,23 +2831,12 @@
     "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"
-  },
   "setAdvancedPrivacySettings": {
     "message": "Set advanced privacy settings"
   },
   "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"
-  },
   "settings": {
     "message": "Settings"
   },
@@ -2958,12 +2856,6 @@
   "showAdvancedGasInlineDescription": {
     "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
   },
-  "showCustomNetworkList": {
-    "message": "Show Custom Network List"
-  },
-  "showCustomNetworkListDescription": {
-    "message": "Select this to show a list of networks with prefilled details when adding a new network."
-  },
   "showFiatConversionInTestnets": {
     "message": "Show Conversion on test networks"
   },
@@ -3073,9 +2965,6 @@
   "snapsToggle": {
     "message": "A snap will only run if it is enabled"
   },
-  "someNetworksMayPoseSecurity": {
-    "message": "Some networks may pose security and/or privacy risks. Understand the risks before adding & using a network."
-  },
   "somethingWentWrong": {
     "message": "Oops! Something went wrong."
   },
@@ -3198,9 +3087,6 @@
     "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?"
-  },
   "storePhrase": {
     "message": "Store this phrase in a password manager like 1Password."
   },
@@ -3226,7 +3112,7 @@
     "message": "Swap would have failed"
   },
   "stxCancelledDescription": {
-    "message": "Your transaction would have failed and was cancelled to protect you from paying unnecessary gas fees."
+    "message": "Your transaction would have failed and was canceled 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."
@@ -3253,11 +3139,14 @@
   "stxFallbackUnavailable": {
     "message": "You can still swap your tokens even while Smart Transactions are unavailable."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Privately submitting your Swap..."
+  "stxPendingFinalizing": {
+    "message": "Finalizing..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Optimizing gas..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Publicly submitting your Swap..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Privately submitting the Swap..."
   },
   "stxSubDescription": {
     "message": "* Smart Transactions will attempt to submit your transaction privately, multiple times. If all attempts fail, the transaction will be broadcast publicly to ensure your Swap successfully goes through."
@@ -3269,10 +3158,6 @@
     "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"
-  },
   "stxTooltip": {
     "message": "Simulate transactions before submitting to decrease transaction costs and reduce failures."
   },
@@ -3292,10 +3177,10 @@
     "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"
+    "message": "Swap canceled"
   },
   "stxUserCancelledDescription": {
-    "message": "Your transaction has been cancelled and you did not pay any unnecessary gas fees."
+    "message": "Your transaction has been canceled and you did not pay any unnecessary gas fees."
   },
   "stxYouCanOptOut": {
     "message": "You can opt-out in advanced settings any time."
@@ -3351,6 +3236,10 @@
     "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"
   },
+  "swapCompleteIn": {
+    "message": "Swap complete in <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Confirm with your hardware wallet"
   },
@@ -3532,10 +3421,6 @@
   "swapSlippageNegative": {
     "message": "Slippage must be greater or equal to zero"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Liquidity source"
   },
@@ -3638,10 +3523,6 @@
   "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"
   },
@@ -3898,9 +3779,6 @@
     "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."
-  },
   "troubleTokenBalances": {
     "message": "We had trouble loading your token balances. You can view them ",
     "description": "Followed by a link (here) to view token balances"
@@ -3948,9 +3826,6 @@
   "unknownCameraErrorTitle": {
     "message": "Ooops! Something went wrong...."
   },
-  "unknownCollection": {
-    "message": "Unnamed collection"
-  },
   "unknownNetwork": {
     "message": "Unknown Private Network"
   },
@@ -3967,9 +3842,13 @@
     "message": "The decentralized web awaits"
   },
   "unrecognizedChain": {
-    "message": "This custom network is not recognized",
+    "message": "This custom network is not recognized. We recommend that you $1 before proceeding",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "verify the network details",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Sending collectible (ERC-721) tokens is not currently supported",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -4062,7 +3941,7 @@
     "description": "$1 is the action type. e.g (Account, Transaction, Swap)"
   },
   "visitWebSite": {
-    "message": "Visit our website"
+    "message": "Visit our web site"
   },
   "walletConnectionGuide": {
     "message": "our hardware wallet connection guide"
@@ -4087,9 +3966,6 @@
   "walletCreationSuccessTitle": {
     "message": "Wallet creation successful"
   },
-  "wantToAddThisNetwork": {
-    "message": "Want to add this network?"
-  },
   "warning": {
     "message": "Warning"
   },
@@ -4152,10 +4028,6 @@
   "yesLetsTry": {
     "message": "Yes, let's try"
   },
-  "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."
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index ffe4d6aebee4..e31832da592f 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 puede acceder y gastar este activo",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Acceda a su billetera con la frase secreta de respaldo"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask no puede recuperar su contraseña. Usaremos su frase secreta de respaldo para validar su propiedad, restaurar su billetera y configurar una nueva contraseña. Primero, ingrese la frase secreta de respaldo que recibió cuando creó su billetera. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Accediendo a la cámara…"
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Agregar red"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Esta conexión de red depende de terceros. Y puede ser menos confiable o permite que terceros rastreen la actividad. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Agregar tokens sugeridos"
   },
@@ -411,14 +400,6 @@
     "message": "Comprar $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Comprar $1 con Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Puede comprar o transferir criptomonedas fácilmente por medio de su cuenta de Coinbase.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Comprar $1 con MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Comprar $1 con Wyre"
+    "message": "Comprar ETH con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Acceso fácil a transacciones de $ 1,000 o menos con verificación rápida y efectiva. Aceptamos tarjetas débito, crédito, Apple Pay y transferencias bancarias en más de 100 países. Tokens serán depósitados en su MetaMask."
+    "message": "Wyre le permite usar una tarjeta de débito para depositar ETH directamente en su cuenta de MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -466,6 +447,9 @@
     "message": "Para $1 una transacción, la tarifa de gas debe aumentar al menos un 10% para que sea reconocida por la red.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Cancelar swap"
+  },
   "cancellationGasFee": {
     "message": "Cuota de gas por cancelación"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Continuar"
   },
-  "continueToCoinbasePay": {
-    "message": "Continuar a Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Continuar a MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Interacción con el contrato"
   },
   "convertTokenToNFTDescription": {
-    "message": "Hemos detectado que este activo es un NFT. MetaMask ahora tiene soporte nativo completo para NFTs. ¿Quieres eliminarlo de tu lista de tokens y añadirlo como un NFT?"
+    "message": "Hemos detectado que este activo es un NFT. Metamask ahora tiene soporte nativo completo para NFTs. ¿Quieres eliminarlo de tu lista de tokens y añadirlo como un NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Hemos detectado que este recurso se ha agregado como NFT. ¿Quiere eliminarlo de su lista de tokens?"
@@ -1244,10 +1225,6 @@
     "message": "Todas las API de Flask son experimentales. Se pueden cambiar o eliminadar sin previo aviso o pueden permanecer en Flask indefinidamente sin ser migradas a MetaMask estable. Úselas bajo su propia responsabilidad.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Asegúrese de deshabilitar su extensión recurrente de MetaMask cuando use Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Acepto los riesgos",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Ocultar"
   },
-  "hideFullTransactionDetails": {
-    "message": "Esconder los detalles completos de la transacción"
-  },
   "hideSeedPhrase": {
     "message": "Ocultar frase inicial"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Historial"
   },
-  "ignoreAll": {
-    "message": "Ignorar todo"
-  },
-  "ignoreTokenWarning": {
-    "message": "Si oculta tokens, estos no se mostrarán en su billetera. Sin embargo, aún puede agregarlos buscándolos."
-  },
   "import": {
     "message": "Importar",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Importar cartera"
   },
-  "importWithCount": {
-    "message": "Importar $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"
-  },
   "importYourExisting": {
     "message": "Importar la cartera existente con una frase secreta de recuperación"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "flecha de nivel"
   },
-  "lightTheme": {
-    "message": "Claro"
-  },
   "likeToImportTokens": {
     "message": "¿Le gustaría agregar estos tokens?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Únase a más de 6 millones de usuarios para mejorar MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Los detalles de la red de este identificador de cadena no coinciden con nuestros registros. Antes de continuar, le recomendamos que $1.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "verifique los detalles de la red",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "¿Es nuevo en MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Ha importado $1 exitosamente.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Token importado"
-  },
   "newTotal": {
     "message": "Total nuevo"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "No hay gas suficiente"
   },
-  "notifications": {
-    "message": "Notificaciones"
-  },
   "notifications10ActionText": {
     "message": "Vaya a configuración",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2154,7 +2109,7 @@
     "message": "Habilitar modo oscuro"
   },
   "notifications12Description": {
-    "message": "¡El modo oscuro en Extension finalmente está aquí! Para encenderlo, vaya a Configuración -> Experimental y seleccione una de las opciones de visualización: Claro, Oscuro, Sistema."
+    "message": "Se habilitará el modo oscuro para los nuevos usuarios según las preferencias de su sistema. Para usuarios existentes, habilite el modo oscuro de forma manual en Configuración -> Experimental."
   },
   "notifications12Title": {
     "message": "¿Cuándo estará disponible el modo oscuro? ¡Ahora! 🕶️🦊"
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Estamos facilitando la lectura de las transacciones."
   },
-  "notificationsEmptyText": {
-    "message": "Nada que ver aquí."
-  },
-  "notificationsHeader": {
-    "message": "Notificaciones"
-  },
-  "notificationsInfos": {
-    "message": "$1 de $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Marcar todo como leído"
-  },
   "numberOfNewTokensDetected": {
     "message": "Se encontraron tokens nuevos de $1 en esta cuenta",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Origen"
   },
-  "osTheme": {
-    "message": "Sistema"
-  },
-  "padlock": {
-    "message": "Candado"
-  },
   "parameters": {
     "message": "Parámetros"
   },
@@ -2435,10 +2371,6 @@
     "message": "Ver las direcciones de las cuentas permitidas (requerido)",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Ejecutar indefinidamente.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Controle sus cuentas y activos \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 más",
     "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": "Redes populares personalizadas"
-  },
   "preferredLedgerConnectionType": {
     "message": "Tipo de conexión de Ledger preferida",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Asegúrese de usar la frase de recuperación secreta correcta antes de continuar. No podrá deshacer esto."
   },
-  "restartMetamask": {
-    "message": "Reiniciar MetaMask"
-  },
   "restore": {
     "message": "Restaurar"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Enviar monto"
   },
-  "sendBugReport": {
-    "message": "Envíenos un informe de error."
-  },
   "sendSpecifiedTokens": {
     "message": "Enviar $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Conecte la cartera directamente al equipo.  Desbloquee su Ledger y abra la aplicación de Ethereum. Para más información sobre el uso de su dispositivo de cartera de hardware, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "¿Sigue recibiendo este mensaje?"
-  },
   "storePhrase": {
     "message": "Guarde esta frase en un administrador de contraseñas como 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Todavía puede intercambiar sus tokens incluso cuando las transacciones inteligentes no están disponibles."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Enviando su swap de forma privada..."
+  "stxPendingFinalizing": {
+    "message": "Finalizando…"
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Optimizando gas..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Enviando su swap de forma pública..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Enviando el Swap de forma privada..."
   },
   "stxSubDescription": {
     "message": "* Transacciones inteligentes intentará enviar su transacción de forma privada varias veces. Si todos los intentos fallan, la transacción se transmitirá públicamente para garantizar que su swap se realice con éxito."
@@ -3179,10 +3102,6 @@
     "message": "Su $1 ya está disponible.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "El swap finalizará en <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Simule transacciones antes de enviarlas para disminuir los costos de transacción y reducir las fallas."
   },
@@ -3261,6 +3180,10 @@
     "message": "No hay tokens disponibles que coincidan con $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"
   },
+  "swapCompleteIn": {
+    "message": "Swap finalizado en <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Confirmar con la cartera de hardware"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "El desfase debe ser mayor o igual que cero"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Fuente de liquidez"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Símbolo del token"
   },
-  "tokensFoundTitle": {
-    "message": "$1 nuevos tokens encontrados",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Comprendo"
   },
@@ -3804,9 +3719,6 @@
     "message": "Tuvimos problemas al conectar su $1. Pruebe revisar $2 e inténtelo de nuevo.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask tuvo problemas para iniciar. Este error podría ser intermitente, así que intente reiniciar la extensión."
-  },
   "troubleTokenBalances": {
     "message": "Tuvimos problemas al cargar los saldos de token. Puede verlos ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Escriba su contraseña de MetaMask"
   },
-  "typeYourSRP": {
-    "message": "Escriba la frase secreta de respaldo"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "No se reconoce esta red personalizada. Antes de continuar, le recomendamos que $1",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "verifique los detalles de la red",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "El envío de tokens coleccionables (ERC-721) no se admite actualmente",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Creación exitosa de la cartera"
   },
-  "warning": {
-    "message": "Advertencia"
-  },
   "weak": {
     "message": "Débil"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index f92e60f3da65..25ff367a3649 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -363,10 +363,10 @@
     "message": "Comprar"
   },
   "buyWithWyre": {
-    "message": "Comprar $1 con Wyre"
+    "message": "Comprar ETH con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre le permite usar una tarjeta de débito para depositar $1 directamente en su cuenta de MetaMask."
+    "message": "Wyre le permite usar una tarjeta de débito para depositar ETH directamente en su cuenta de MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -1643,6 +1643,10 @@
   "metametricsTitle": {
     "message": "Únase a más de 6 millones de usuarios para mejorar MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Los detalles de la red de este ID de cadena no coinciden con nuestros registros. Antes de continuar, le recomendamos que $1.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "verifique los detalles de la red",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3211,6 +3215,10 @@
     "message": "No se reconoce esta red personalizada. Antes de continuar, le recomendamos que $1",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "verifique los detalles de la red",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "El envío de tokens coleccionables (ERC-721) no se admite actualmente",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 1b1a3872061c..bb5be3a52a86 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -137,10 +137,10 @@
     "message": "Teie lehitsejat ei toetata..."
   },
   "buyWithWyre": {
-    "message": "Ostke $1 -d Wyre'iga"
+    "message": "Ostke ETH-d Wyre'iga"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre võimaldab kasutada krediitkaarti, et teha $1 sissemakse otse MetaMaski kontole."
+    "message": "Wyre võimaldab kasutada krediitkaarti, et teha ETH sissemakse otse MetaMaski kontole."
   },
   "bytes": {
     "message": "Baidid"
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index ab74d3482c0d..2669d73217be 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -137,10 +137,10 @@
     "message": "مرورگر شما پشتیبانی نمیشود"
   },
   "buyWithWyre": {
-    "message": "$1 را توسط Wyre خریداری نمایید"
+    "message": "ETH را توسط Wyre خریداری نمایید"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre به شما اجازه میدهد تا یک کردیت کارت را جهت پرداخت 1$ مستقیمًا به حساب MetaMask تان استفاده نمایید."
+    "message": "Wyre به شما اجازه میدهد تا یک کردیت کارت را جهت پرداخت ETH مستقیمًا به حساب MetaMask تان استفاده نمایید."
   },
   "bytes": {
     "message": "بایت ها"
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 496475976a3b..08e7342378c1 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -137,10 +137,10 @@
     "message": "Selaintasi ei tueta..."
   },
   "buyWithWyre": {
-    "message": "Osta $1 :ta Wyrella"
+    "message": "Osta ETH:ta Wyrella"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre antaa sinun käyttää luottokorttia, jotta voit tallettaa $1 :ta suoraan MetaMask-tilillesi."
+    "message": "Wyre antaa sinun käyttää luottokorttia, jotta voit tallettaa ETH:ta suoraan MetaMask-tilillesi."
   },
   "bytes": {
     "message": "Tavua"
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 6ed19fecdfa0..54a59f2ad04a 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -122,10 +122,10 @@
     "message": "Hindi sinusuportahan ang iyong Browser..."
   },
   "buyWithWyre": {
-    "message": "Bumili ng $1 gamit ang Wyre"
+    "message": "Bumili ng ETH gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Binibigyang-daan ka ng Wyre na gumamit ng credit card para magdeposito ng $1 nang direkta sa iyong MetaMask account."
+    "message": "Binibigyang-daan ka ng Wyre na gumamit ng credit card para magdeposito ng ETH nang direkta sa iyong MetaMask account."
   },
   "cancel": {
     "message": "Kanselahin"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 9d2367dae7f7..ffed6ee1b854 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 peut accéder à cet actif et le dépenser",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Accédez à votre portefeuille en utilisant votre phrase secrète de récupération"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask ne peut pas récupérer votre mot de passe. Nous utiliserons votre phrase secrète de récupération pour vérifier votre identité, restaurer votre portefeuille et définir un nouveau mot de passe. Veuillez tout d’abord saisir la phrase secrète de récupération qui vous a été fournie lorsque vous avez créé votre portefeuille. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Accès à votre appareil photo..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Ajouter un réseau"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Cette connexion réseau repose sur des tiers. Elle peut être moins fiable ou permettre à des tiers de suivre l’activité des utilisateurs. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Ajouter les jetons suggérés"
   },
@@ -411,14 +400,6 @@
     "message": "Acheter $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Achetez des $1 avec Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Vous pouvez facilement acheter et transférer des cryptomonnaies en utilisant votre compte Coinbase.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Acheter $1 avec MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Acheter des $1 avec Wyre"
+    "message": "Acheter des ETH avec Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vous permet d’utiliser une carte de crédit pour déposer des $1 directement sur votre compte MetaMask."
+    "message": "Wyre vous permet d’utiliser une carte de crédit pour déposer des ETH directement sur votre compte MetaMask."
   },
   "bytes": {
     "message": "Octets"
@@ -466,6 +447,9 @@
     "message": "Pour $1 la transaction, les gas fees doivent être augmentés d’au moins 10 % pour être reconnus par le réseau.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Annuler le swap"
+  },
   "cancellationGasFee": {
     "message": "Frais d’annulation de carburant"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Continuer"
   },
-  "continueToCoinbasePay": {
-    "message": "Accéder à Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Continuer vers MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Interaction avec un contrat"
   },
   "convertTokenToNFTDescription": {
-    "message": "Nous avons détecté que cet actif est un NFT. MetaMask prend désormais nativement en charge les NFT. Voulez-vous le retirer de votre liste de tokens et l’ajouter comme un NFT ?"
+    "message": "Nous avons détecté que cet actif est un NFT. Metamask prend désormais nativement en charge les NFT. Voulez-vous le retirer de votre liste de tokens et l’ajouter comme un NFT ?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Nous avons détecté que cet actif a été ajouté en tant que NFT. Souhaitez-vous le retirer de votre liste de tokens ?"
@@ -879,7 +860,7 @@
     "message": "Téléchargez cette phrase de sauvegarde secrète et conservez-la en lieu sûr sur un disque dur ou un support de stockage externe chiffré."
   },
   "downloadStateLogs": {
-    "message": "Télécharger les Logs d’état"
+    "message": "Télécharger les Logs d'état"
   },
   "dropped": {
     "message": "Déconnecté"
@@ -1244,10 +1225,6 @@
     "message": "Toutes les API de Flask sont expérimentales. Elles peuvent être modifiées ou supprimées sans préavis. Elles peuvent aussi rester sur Flask indéfiniment sans jamais être migrées vers le MetaMask stable. Utilisez-les à vos risques et périls.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Assurez-vous de désactiver l’extension MetaMask que vous utilisez habituellement lorsque vous utilisez Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "J’accepte les risques",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1303,7 +1280,7 @@
     "message": "La limite de carburant est la quantité maximale d’unités d’essence que vous consentez à dépenser."
   },
   "gasLimitRecommended": {
-    "message": "La limite recommandée de gas est de $1. Si la limite de gas est inférieure à cette valeur, l’opération peut échouer."
+    "message": "La limite recommandée de gas est de $1. Si la limite de gas est inférieure à cette valeur, l'opération peut échouer."
   },
   "gasLimitTooLow": {
     "message": "La limite de carburant doit être d’au moins 21000"
@@ -1399,7 +1376,7 @@
     "message": "Réseau de test Goerli"
   },
   "gotIt": {
-    "message": "J’ai compris !"
+    "message": "J'ai compris !"
   },
   "grantedToWithColon": {
     "message": "Accordé à :"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Masquer"
   },
-  "hideFullTransactionDetails": {
-    "message": "Masquer tous les détails de la transaction"
-  },
   "hideSeedPhrase": {
     "message": "Masquer la phrase mnémonique"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Historique"
   },
-  "ignoreAll": {
-    "message": "Ignorer tout"
-  },
-  "ignoreTokenWarning": {
-    "message": "Si vous masquez des jetons, ils n’apparaîtront pas dans votre portefeuille. Cependant, vous pouvez toujours les ajouter en les recherchant."
-  },
   "import": {
     "message": "Importer",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Importer le portefeuille"
   },
-  "importWithCount": {
-    "message": "Importer $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"
-  },
   "importYourExisting": {
     "message": "Importez votre portefeuille existant à l’aide d’une phrase secrète de récupération"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "flèche de niveau"
   },
-  "lightTheme": {
-    "message": "Clair"
-  },
   "likeToImportTokens": {
     "message": "Souhaitez-vous ajouter ces jetons ?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Rejoignez plus de 6 M d’utilisateurs pour améliorer MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Les détails du réseau pour cet ID de chaîne ne correspondent pas à nos registres. Nous vous recommandons de $1 avant de poursuivre.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "vérifier les détails du réseau",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Nouveau sur MetaMask ?"
   },
-  "newTokensImportedMessage": {
-    "message": "Vous avez importé avec succès $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Jeton importé"
-  },
   "newTotal": {
     "message": "Nouveau total"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Pas assez de carburant"
   },
-  "notifications": {
-    "message": "Notifications"
-  },
   "notifications10ActionText": {
     "message": "Ouvrir les paramètres",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Nous simplifions la lisibilité des transactions."
   },
-  "notificationsEmptyText": {
-    "message": "Rien à voir ici."
-  },
-  "notificationsHeader": {
-    "message": "Notifications"
-  },
-  "notificationsInfos": {
-    "message": "Le $1 de $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Marquer tout comme lu"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 nouveaux jetons trouvés dans ce compte",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Origine"
   },
-  "osTheme": {
-    "message": "Système"
-  },
-  "padlock": {
-    "message": "Cadenas"
-  },
   "parameters": {
     "message": "Paramètres"
   },
@@ -2435,10 +2371,6 @@
     "message": "Consultez l’adresse, le solde du compte et l’activité, et lancez des transactions",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Fonctionner indéfiniment.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Contrôlez vos comptes et actifs « $1 ».",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 de plus",
     "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": "Réseaux personnalisés populaires"
-  },
   "preferredLedgerConnectionType": {
     "message": "Type de connexion Ledger préféré",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Vérifiez que vous avez saisi correctement la phrase de récupération secrète avant de continuer. Vous ne pourrez pas annuler cette action."
   },
-  "restartMetamask": {
-    "message": "Redémarrer MetaMask"
-  },
   "restore": {
     "message": "Restaurer"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Envoyer le montant"
   },
-  "sendBugReport": {
-    "message": "Envoyez-nous un rapport de bogue."
-  },
   "sendSpecifiedTokens": {
     "message": "Envoyer $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Connectez votre portefeuille directement à votre ordinateur. Déverrouillez votre Ledger et ouvrez l’application Ethereum. Pour en savoir plus sur l’utilisation de votre portefeuille matériel, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Vous recevez toujours ce message ?"
-  },
   "storePhrase": {
     "message": "Stockez cette phrase dans un gestionnaire de mots de passe comme 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Vous pouvez toujours faire un swap de tokens, même si les transactions intelligentes ne sont pas disponibles."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Soumission privée de votre Swap..."
+  "stxPendingFinalizing": {
+    "message": "Finalisation..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Optimisation des gas fees..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Soumission publique de votre Swap..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Soumission privée du swap..."
   },
   "stxSubDescription": {
     "message": "* Avec les transactions intelligentes, votre transaction sera soumise plusieurs fois en privé. Si toutes les tentatives échouent, la transaction sera diffusée publiquement pour s’assurer de la réussite de votre swap."
@@ -3179,10 +3102,6 @@
     "message": "Votre $1 est maintenant disponible.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Le Swap sera effectué dans <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Simulez les transactions avant de les soumettre pour réduire les coûts et les échecs de transaction."
   },
@@ -3261,6 +3180,10 @@
     "message": "Aucun jeton disponible correspondant à $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"
   },
+  "swapCompleteIn": {
+    "message": "Swap terminé dans <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Confirmez avec votre portefeuille matériel"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Le glissement doit être supérieur ou égal à zéro"
   },
-  "swapSlippagePercent": {
-    "message": "$1 %",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Source de liquidité"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Symbole du jeton"
   },
-  "tokensFoundTitle": {
-    "message": "$1 nouveaux jetons trouvés",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Je comprends"
   },
@@ -3804,9 +3719,6 @@
     "message": "Nous avons eu des difficultés à nous connecter à votre $1. Essayez de vérifier votre $2 et réessayez.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "Impossible de démarrer MetaMask. Cette erreur peut être occasionnelle, essayez donc de redémarrer lextension."
-  },
   "troubleTokenBalances": {
     "message": "Nous avons eu du mal à charger votre balance de jetons, vous pouvez la consulter ici :",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Entrez votre mot de passe"
   },
-  "typeYourSRP": {
-    "message": "Saisissez votre phrase secrète de récupération"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Ce réseau personnalisé n’est pas reconnu. Nous vous recommandons de $1 avant de continuer",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "vérifier les détails du réseau",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "L’envoi de jetons collectibles (ERC-721) n’est pas pris en charge actuellement",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Portefeuille créé avec succès"
   },
-  "warning": {
-    "message": "Avertissement"
-  },
   "weak": {
     "message": "Faible"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 9bfd09d99abe..1a9b8a265122 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -140,7 +140,7 @@
     "message": "רכישת את'ר עם Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre מאפשרת לך להשתמש בכרטיס אשראי כדי להפקיד $1 ישירות בחשבון ה-MetaMask שלך."
+    "message": "Wyre מאפשרת לך להשתמש בכרטיס אשראי כדי להפקיד ETH ישירות בחשבון ה-MetaMask שלך."
   },
   "bytes": {
     "message": "בייטים"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 2d643f1aa13b..1b55a7c66bf8 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 एक्सेस कर सकता है और इस एसेट को खर्च कर सकता है",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "अपने गुप्त रिकवरी वाक्यांश का इस्तेमाल कर अपने वॉलेट तक पहुंच प्राप्त करें"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "मेटामास्क आपका पासवर्ड रिकवर नहीं कर सकता। हम आपके स्वामित्व को मान्य करने, आपके वॉलेट को रीस्टोर करने और एक नया पासवर्ड सेट करने के लिए आपके गुप्त रिकवरी वाक्यांश का उपयोग करेंगे। सबसे पहले, अपना वह गुप्त रिकवरी वाक्यांश दर्ज करें जिसे आपको अपना बटुआ बनाते समय दिया गया था। $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "आपके कैमरे तक पहुँच रहा है..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "नेटवर्क जोड़ें"
   },
-  "addNetworkTooltipWarning": {
-    "message": "यह नेटवर्क कनेक्शन तृतीय पक्षों पर निर्भर करता है। यह कनेक्शन संभवतः कम विश्वसनीय है या तृतीय-पक्षों को एक्टिविटी को ट्रैक करने में सक्षम कर सकता है। $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "सुझाए गए टोकन जोड़ें"
   },
@@ -411,14 +400,6 @@
     "message": "$1 खरीदें",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "कॉइनबेस पे से $1 खरीदें",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "अपने कॉइनबेस अकाउंट के साथ आप क्रिप्टो को आसानी से खरीद या ट्रांसफर कर सकते हैं।",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay से $1 खरीदें",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre के जरिए $1 खरीदें"
+    "message": "Wyre के जरिए ETH खरीदें"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre आपको अपने MetaMask खाते में $1 जमा करने के लिए डेबिट कार्ड का उपयोग करने की सुविधा देता है।"
+    "message": "Wyre आपको अपने MetaMask खाते में ETH जमा करने के लिए डेबिट कार्ड का उपयोग करने की सुविधा देता है।"
   },
   "bytes": {
     "message": "बाइट"
@@ -466,6 +447,9 @@
     "message": "किसी लेनदेन को $1 करने के लिए गैस शुल्क में कम से कम 10% की वृद्धि की जानी चाहिए ताकि उसे नेटवर्क द्वारा मान्यता मिल सके।",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "स्वैप रद्द करें"
+  },
   "cancellationGasFee": {
     "message": "रद्दीकरण गैस शुल्क"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "जारी रखें"
   },
-  "continueToCoinbasePay": {
-    "message": "कॉइनबेस-पे पर जारी रहें"
-  },
   "continueToMoonPay": {
     "message": "MoonPay के लिए जारी रखें"
   },
@@ -1244,10 +1225,6 @@
     "message": "सभी Flask के API प्रयोगात्मक हैं। उन्हें बिना किसी सूचना के बदला या हटाया जा सकता है, या वो स्थायी MetaMask में माइग्रेट किए बिना अनिश्चित काल तक Flask पर रह सकते हैं। अपने जोखिम पर उनका उपयोग करें।",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Flask का उपयोग करते समय अपने नियमित MetaMask एक्सटेंशन को निष्क्रिय करना अवश्य सुनिश्चित करें।",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "जोख़िमों को मैं स्वीकर करता हूं।",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "छिपाएं"
   },
-  "hideFullTransactionDetails": {
-    "message": "लेन-देन की पूर्ण जानकारी छिपा कर रखें"
-  },
   "hideSeedPhrase": {
     "message": "सीड फ्रेज़ छुपा दें"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "इतिहास"
   },
-  "ignoreAll": {
-    "message": "सभी को अनदेखा करें"
-  },
-  "ignoreTokenWarning": {
-    "message": "यदि आप टोकन छिपाते हैं, तो वे आपके वॉलेट में नहीं दिखाए जाएंगे। हालांकि, आप अभी भी उन्हें खोज कर जोड़ सकते हैं।"
-  },
   "import": {
     "message": "आयात करें",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "वॉलेट आयात करें"
   },
-  "importWithCount": {
-    "message": "$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"
-  },
   "importYourExisting": {
     "message": "गुप्त रिकवरी फ्रेज का उपयोग करके अपने मौजूदा वॉलेट को आयात करें"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "लेवल ऐरो"
   },
-  "lightTheme": {
-    "message": "हल्की"
-  },
   "likeToImportTokens": {
     "message": "क्या आप इन टोकन को इंपोर्ट करना चाहते हैं?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "MetaMask को बेहतर बनाने के लिए 6M+ उपयोगकर्ताओं से जुड़ें"
   },
+  "mismatchedChain": {
+    "message": "इस चेन ID के लिए नेटवर्क विवरण हमारे रिकॉर्ड से मेल नहीं खाता। हम अनुशंसा करते हैं कि आप आगे बढ़ने से पहले $1।",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "नेटवर्क विवरण सत्यापित करें",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "MetaMask पर नए हैं?"
   },
-  "newTokensImportedMessage": {
-    "message": "आपने सफलतापूर्वक $1 इम्पोर्ट कर लिया है।",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "टोकन इम्पोर्ट हो गया"
-  },
   "newTotal": {
     "message": "नया कुलयोग"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "पर्याप्त गैस नहीं"
   },
-  "notifications": {
-    "message": "सूचनाएं"
-  },
   "notifications10ActionText": {
     "message": "सेटिंग्स में जाएं",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 हम लेन-देन को पढ़ना आसान बना रहे हैं।"
   },
-  "notificationsEmptyText": {
-    "message": "यहाँ देखने के लिए कुछ नहीं है।"
-  },
-  "notificationsHeader": {
-    "message": "सूचनाएं"
-  },
-  "notificationsInfos": {
-    "message": "$1 से $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "सभी को पढ़ा हुआ मार्क करें"
-  },
   "numberOfNewTokensDetected": {
     "message": "इस खाते में $1 के नए टोकन पाए गए",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "उत्पत्ति"
   },
-  "osTheme": {
-    "message": "सिस्टम"
-  },
-  "padlock": {
-    "message": "पैडलॉक"
-  },
   "parameters": {
     "message": "पैरामीटर"
   },
@@ -2435,10 +2371,6 @@
     "message": "पता, खाते की शेषराशि, गतिविधि देखें और लेन-देन शुरू करें",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "अनिश्चित काल तक चलाएं।",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "आपके \"$1\" अकाउंट्स और एसेट्स नियंत्रित करें।",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 अधिक",
     "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": "लोकप्रिय कस्टम नेटवर्क"
-  },
   "preferredLedgerConnectionType": {
     "message": "वरीयता वाले लेजर कनेक्शन के प्रकार",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "आगे बढ़ने से पहले ये सुनिश्चित करें कि आप सही सीक्रेट रिकवरी फ़्रेज़ का इस्तेमाल कर रहे हैं। इसे आप अनडू नहीं कर पाएंगे।"
   },
-  "restartMetamask": {
-    "message": "मेटामास्क को पुनरारंभ करें"
-  },
   "restore": {
     "message": "पुनर्स्थापित करें"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "राशि भेजें"
   },
-  "sendBugReport": {
-    "message": "हमें एक बग रिपोर्ट भेजें।"
-  },
   "sendSpecifiedTokens": {
     "message": "$1 भेजें",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "अपने वॉलेट को सीधे अपने कंप्यूटर से कनेक्ट करें। अपने Ledger को अनलॉक करें और Ethereum ऐप खोलें। अपने हार्डवेयर वॉलेट डिवाइस के उपयोग के बारे में अधिक जानकारी के लिए, $1।",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "अभी भी यह संदेश मिल रहा है?"
-  },
   "storePhrase": {
     "message": "इस फ्रेज को 1Password जैसे किसी पासवर्ड मैनेजर में संग्रहीत करें।"
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "स्मार्ट लेनदेन अनुपलब्ध होने पर भी आप अपने टोकनों को स्वैप कर सकते हैं।"
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "आपका स्वैप निजी रूप से भेजा जा रहा है..."
+  "stxPendingFinalizing": {
+    "message": "फ़ाइनलाइज़ कर रहा है..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "गैस ऑप्टिमाइज़ कर रहा है..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "आपका स्वैप सार्वजनिक रूप से भेजा जा रहा है..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "स्वैप को निजी तौर पर सबमिट कर रहा है..."
   },
   "stxSubDescription": {
     "message": "* स्मार्ट लेनदेन आपके लेनदेन को निजी तौर पर, अनेक बार जमा करने का प्रयास करेंगे। यदि सभी प्रयास विफल हो जाते हैं, तो लेनदेन को सार्वजनिक रूप से प्रसारित किया जाएगा ताकि यह सुनिश्चित हो सके कि आपका स्वैप सफलतापूर्वक पूरा हो।"
@@ -3179,10 +3102,6 @@
     "message": "आपका $1 अब उपलब्ध है।",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "स्वैप < में पूरा होगा",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "लेनदेन की लागतें घटाने और विफलताओं को कम करने के लिए सबमिट करने से पहले लेनदेन को सिम्युलेट करें।"
   },
@@ -3261,6 +3180,10 @@
     "message": "$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"
   },
+  "swapCompleteIn": {
+    "message": "स्वैप पूरा होगा <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "अपने हार्डवेयर वॉलेट से पुष्टि करें"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "स्लिपेज शून्य से अधिक या बराबर होना चाहिए"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "चलनिधि का स्रोत"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "टोकन का प्रतीक"
   },
-  "tokensFoundTitle": {
-    "message": "$1 नए टोकन मिले",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "मैं समझता हूं"
   },
@@ -3804,9 +3719,6 @@
     "message": "हमें आपके $1 से कनेक्ट करने में परेशानी हुई, $2 की समीक्षा करने का प्रयास करें और दोबारा कोशिश करें।",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "मेटामास्क को शुरू करने में दिक्कत हुई। यह त्रुटि रुक-रुक कर हो सकती है, इसलिए एक्सटेंशन को पुनरारंभ करने का प्रयास करें।"
-  },
   "troubleTokenBalances": {
     "message": "हमें आपके टोकन की शेषराशि लोड करने में परेशानी हुई। आप उन्हें देख सकते हैं ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "अपना MetaMask पासवर्ड टाइप करें"
   },
-  "typeYourSRP": {
-    "message": "अपना गुप्त रिकवरी वाक्यांश लिखें"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "यह कस्टम नेटवर्क पहचाना नहीं गया है। हम अनुशंसा करते हैं कि आप आगे बढ़ने से पहले $1",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "नेटवर्क विवरण सत्यापित करें",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "वर्तमान में संग्रहणीय (ERC-721) टोकन भेजना समर्थित नहीं है",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "वॉलेट का निर्माण सफल हुआ"
   },
-  "warning": {
-    "message": "चेतावनी"
-  },
   "weak": {
     "message": "कमज़ोर"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 551b1f15aa21..49c2704063f4 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš se preglednik ne podržava..."
   },
   "buyWithWyre": {
-    "message": "Kupi $1 Wyerom"
+    "message": "Kupi ETH Wyerom"
   },
   "buyWithWyreDescription": {
-    "message": "Wyreom vam se omogućava korištenje kreditnom karticom za polaganje $1 -a izravno na vaš račun za MetaMask."
+    "message": "Wyreom vam se omogućava korištenje kreditnom karticom za polaganje ETH-a izravno na vaš račun za MetaMask."
   },
   "bytes": {
     "message": "Bajtovi"
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 590b77f86e22..10f60bba47c6 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -137,7 +137,7 @@
     "message": "Az ön böngészője nem támogatott..."
   },
   "buyWithWyre": {
-    "message": "Vásároljon $1 -t a Wyre-rel"
+    "message": "Vásároljon ETH-t a Wyre-rel"
   },
   "buyWithWyreDescription": {
     "message": "A Wyre segítségével egyensen a MetaMaks fiókjában tehet letétbe ETH-t."
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 83c6ea82d6e2..f7109be0ddfb 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 dapat mengakses dan membelanjakan aset ini",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Akses dompet Anda dengan Frasa Pemulihan Rahasia"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask tidak dapat memulihkan kata sandi Anda. Kami akan menggunakan Frasa Pemulihan Rahasia untuk memvalidasi kepemilikan Anda, memulihkan dompet Anda, dan mengatur kata sandi baru. Pertama, masukkan Frasa Pemulihan Rahasia yang diberikan saat membuat dompet. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Mengakses kamera Anda..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Tambahkan Jaringan"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Koneksi jaringan ini mengandalkan pihak ketiga. Koneksi ini mungkin kurang bisa diandalkan atau memungkinkan pihak ketiga melacak aktivitas. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Tambahkan Token yang Disarankan"
   },
@@ -411,14 +400,6 @@
     "message": "Beli $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Beli $1 melalui Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Anda dapat dengan mudah membeli atau mentransfer kripto dengan akun Coinbase Anda.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Beli $1 melalui MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,7 +416,7 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Beli $1 dengan Wyre"
+    "message": "Beli ETH dengan Wyre"
   },
   "buyWithWyreDescription": {
     "message": "Wyre memungkinkan Anda menggunakan kartu debit untuk menyetorkan ETH langsung di akun MetaMask Anda."
@@ -466,6 +447,9 @@
     "message": "Untuk $1 suatu transaksi, biaya gas harus dinaikkan minimal 10% agar dapat dikenali oleh jaringan.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Batalkan pertukaran"
+  },
   "cancellationGasFee": {
     "message": "Biaya Pembatalan Gas"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Lanjutkan"
   },
-  "continueToCoinbasePay": {
-    "message": "Lanjutkan ke Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Lanjutkan ke MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Interaksi Kontrak"
   },
   "convertTokenToNFTDescription": {
-    "message": "Kami mendeteksi bahwa aset ini merupakan NFT. Kini MetaMask memiliki dukungan asli penuh untuk NFT. Anda ingin menghapusnya dari daftar token dan menambahkannya sebagai NFT?"
+    "message": "Kami mendeteksi bahwa aset ini merupakan NFT. Kini Metamask memiliki dukungan asli penuh untuk NFT. Anda ingin menghapusnya dari daftar token dan menambahkannya sebagai NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Kami mendeteksi bahwa aset ini telah ditambahkan sebagai NFT. Anda ingin menghapusnya dari daftar token?"
@@ -1244,10 +1225,6 @@
     "message": "Semua API Flask bersifat eksperimental. API dapat diubah atau dihapus tanpa pemberitahuan, atau tetap berada di Flask tanpa batas waktu dan tanpa pernah dimigrasikan ke MetaMask yang stabil. Gunakan API dengan risiko Anda sendiri.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Pastikan untuk menonaktifkan ekstensi MetaMask reguler Anda saat menggunakan Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Saya menerima risikonya",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Sembunyikan"
   },
-  "hideFullTransactionDetails": {
-    "message": "Sembunyikan detail transaksi lengkap"
-  },
   "hideSeedPhrase": {
     "message": "Sembunyikan frasa seed"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Riwayat"
   },
-  "ignoreAll": {
-    "message": "Abaikan semua"
-  },
-  "ignoreTokenWarning": {
-    "message": "Jika Anda menyembunyikan token, token tersebut tidak akan ditampilkan di dompet Anda. Namun, Anda masih dapat menambahkannya dengan mencarinya."
-  },
   "import": {
     "message": "Impor",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Impor dompet"
   },
-  "importWithCount": {
-    "message": "Impor $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"
-  },
   "importYourExisting": {
     "message": "Impor dompet Anda yang ada menggunakan Frasa Pemulihan Rahasia"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "panah tingkat"
   },
-  "lightTheme": {
-    "message": "Terang"
-  },
   "likeToImportTokens": {
     "message": "Apakah Anda ingin menambahkan token ini?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Bergabunglah bersama 6 Jt+ pengguna untuk meningkatkan MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Detail jaringan untuk ID rantai ini tidak cocok dengan catatan kami. Kami menyarankan agar Anda $1 sebelum melanjutkan.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "memverifikasi detail jaringan",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Baru menggunakan MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Anda berhasil mengimpor $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Token diimpor"
-  },
   "newTotal": {
     "message": "Total Baru"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Gas Tidak Cukup"
   },
-  "notifications": {
-    "message": "Notifikasi"
-  },
   "notifications10ActionText": {
     "message": "Lihat di pengaturan",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": ".👓 Kami membuat transaksi lebih mudah untuk dibaca."
   },
-  "notificationsEmptyText": {
-    "message": "Tak ada yang bisa dilihat di sini."
-  },
-  "notificationsHeader": {
-    "message": "Notifikasi"
-  },
-  "notificationsInfos": {
-    "message": "$1 dari $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Tandai semua telah dibaca"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 token baru ditemukan di akun ini",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Asal"
   },
-  "osTheme": {
-    "message": "Sistem"
-  },
-  "padlock": {
-    "message": "Gembok"
-  },
   "parameters": {
     "message": "Parameter"
   },
@@ -2435,10 +2371,6 @@
     "message": "Lihat alamat, saldo akun, aktivitas, dan mulai transaksi",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Operasikan sepanjang waktu.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Kontrol akun dan aset \"$1\" Anda.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 lagi",
     "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": "Jaringan khusus populer"
-  },
   "preferredLedgerConnectionType": {
     "message": "Jenis Koneksi Ledger Pilihan",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Pastikan Anda menggunakan Frasa Pemulihan Rahasia yang benar sebelum melanjutkan. Anda tidak dapat membatalkan tindakan ini."
   },
-  "restartMetamask": {
-    "message": "Mulai ulang MetaMask"
-  },
   "restore": {
     "message": "Pulihkan"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Kirim Jumlah"
   },
-  "sendBugReport": {
-    "message": "Kirimi kami laporan bug."
-  },
   "sendSpecifiedTokens": {
     "message": "Kirim $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Hubungkan dompet Anda langsung ke komputer.  Buka Ledger dan buka aplikasi Ethereum. Untuk selengkapnya seputar penggunaan perangkat dompet perangkat keras Anda, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Masih menerima pesan ini?"
-  },
   "storePhrase": {
     "message": "Simpan frasa ini dalam pengelola kata sandi seperti 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Anda masih bisa menukar token meskipun Transaksi Pintar tidak tersedia."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Kirimkan Swap Anda secara pribadi..."
+  "stxPendingFinalizing": {
+    "message": "Menyelesaikan..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Kirimkan Swap Anda secara publik..."
+  "stxPendingOptimizingGas": {
+    "message": "Mengoptimalkan gas..."
+  },
+  "stxPendingPrivatelySubmitting": {
+    "message": "Mengirimkan Pertukaran secara pribadi..."
   },
   "stxSubDescription": {
     "message": "* Transaksi Pintar akan mencoba mengirimkan transaksi Anda secara pribadi, beberapa kali. Jika semua upaya gagal, transaksi akan disiarkan secara publik untuk memastikan Pertukaran telah berhasil dilakukan."
@@ -3179,10 +3102,6 @@
     "message": "$1 kini telah tersedia.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Swap akan selesai dalam <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Simulasikan transaksi sebelum dikirim untuk mengurangi biaya transaksi dan mengurangi kegagalan."
   },
@@ -3261,6 +3180,10 @@
     "message": "Tidak ada token yang cocok yang tersedia $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"
   },
+  "swapCompleteIn": {
+    "message": "Pertukaran selesai di <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Konfirmasikan dengan dompet perangkat keras Anda"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Slippage harus lebih besar atau sama dengan nol"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Sumber likuiditas"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Simbol Token"
   },
-  "tokensFoundTitle": {
-    "message": "$1 token baru ditemukan",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Saya paham"
   },
@@ -3804,9 +3719,6 @@
     "message": "Kami mengalami masalah saat mencoba terhubung ke $1 Anda, tinjau kembali $2 dan coba lagi.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask mengalami masalah saat memulai. Kesalahan ini dapat terjadi berselang, coba mulai ulang ekstensi."
-  },
   "troubleTokenBalances": {
     "message": "Kami mengalami masalah saat memuat saldo token Anda. Anda dapat melihatnya ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Ketikkan kata sandi MetaMask Anda"
   },
-  "typeYourSRP": {
-    "message": "Ketik Frasa Pemulihan Rahasia"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Jaringan kustom ini tidak dikenali. Kami menyarankan agar Anda $1 sebelum melanjutkan",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "memverifikasi detail jaringan",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Tidak mendukung pengiriman token koleksi (ERC-721) untuk saat ini",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Dompet berhasil dibuat"
   },
-  "warning": {
-    "message": "Peringatan"
-  },
   "weak": {
     "message": "Lemah"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 9f6f93e56e23..faaa3079f5bf 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -189,10 +189,10 @@
     "message": "Compra"
   },
   "buyWithWyre": {
-    "message": "Compra $1 con Wyre"
+    "message": "Compra ETH con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ti consente di usare la carta di credito per depositare $1 direttamente nel tuo account MetaMask."
+    "message": "Wyre ti consente di usare la carta di credito per depositare ETH direttamente nel tuo account MetaMask."
   },
   "canToggleInSettings": {
     "message": "Puoi riabilitare questa notifica in Impostazioni -> Avvisi."
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index bf140ebfd67e..302b7f7c4f7d 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 はこのアセットにアクセスし、使用できます",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "秘密のリカバリーフレーズでウォレットにアクセス"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMaskはユーザーのパスワードを復元できません。代わりに秘密のリカバリーフレーズを使用して所有者を確認し、ウォレットを復元して新しいパスワードを設定します。まずはじめに、ウォレットの作成時に提供された秘密のリカバリーフレーズを入力してください。$1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "カメラにアクセス中..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "ネットワークを追加"
   },
-  "addNetworkTooltipWarning": {
-    "message": "このネットワーク接続はサードパーティに依存しているため、信頼性が低かったり、サードパーティによるアクティビティの追跡が可能になる可能性があります。$1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "推奨されたトークンを追加"
   },
@@ -411,14 +400,6 @@
     "message": "$1 を購入",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Coinbase Pay で $1 を購入",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Coinbase アカウントで簡単に仮想通貨を購入または送金できます。",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay で $1 を購入",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyreで $1 を購入"
+    "message": "WyreでETHを購入"
   },
   "buyWithWyreDescription": {
-    "message": "Wyreを使用すると、デビット カードを使用して、$1 をMetaMaskアカウントに直接デポジットできます。"
+    "message": "Wyreを使用すると、デビット カードを使用して、ETHをMetaMaskアカウントに直接デポジットできます。"
   },
   "bytes": {
     "message": "バイト"
@@ -466,6 +447,9 @@
     "message": "トランザクションを$1するには、ネットワークに認識されるようにガス代を 10% 以上増額する必要があります。",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "スワップをキャンセル"
+  },
   "cancellationGasFee": {
     "message": "キャンセルのガス代"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "続行"
   },
-  "continueToCoinbasePay": {
-    "message": "Coinbase Pay に進む"
-  },
   "continueToMoonPay": {
     "message": "MoonPay に進む"
   },
@@ -1244,10 +1225,6 @@
     "message": "Flask API はすべて実験的なものです。これらは通知なしに変更または削除される可能性があり、安定した MetaMask に移行することなく永久に Flask に残る可能性もあります。自己責任でご使用ください。",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Flask の使用中は、通常の MetaMask 拡張機能を無効にしてください。",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "リスクを受け入れる",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "非表示"
   },
-  "hideFullTransactionDetails": {
-    "message": "完全なトランザクション情報を非表示"
-  },
   "hideSeedPhrase": {
     "message": "シードフレーズを非表示"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "履歴"
   },
-  "ignoreAll": {
-    "message": "すべて無視"
-  },
-  "ignoreTokenWarning": {
-    "message": "トークンを非表示にするとウォレットに表示されなくなりますが、検索して追加することはできます。"
-  },
   "import": {
     "message": "インポート",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "ウォレットをインポート"
   },
-  "importWithCount": {
-    "message": "$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"
-  },
   "importYourExisting": {
     "message": "シークレットリカバリーフレーズを使用して既存のウォレットをインポート"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "水平矢印"
   },
-  "lightTheme": {
-    "message": "ライト"
-  },
   "likeToImportTokens": {
     "message": "これらのトークンを追加しますか?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "6百万人以上のユーザーと共に、MetaMaskの改善にご協力ください"
   },
+  "mismatchedChain": {
+    "message": "このチェーンIDのネットワーク詳細が、レコードと一致しません。続行する前に$1をお勧めします。",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "ネットワークの詳細の確認",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "MetaMaskを初めてご利用の場合"
   },
-  "newTokensImportedMessage": {
-    "message": "$1 をインポートしました。",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "トークンがインポートされました"
-  },
   "newTotal": {
     "message": "新しい総額"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "ガスが不足しています"
   },
-  "notifications": {
-    "message": "通知"
-  },
   "notifications10ActionText": {
     "message": "設定に移動",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 トランザクションが読みやすくなりました。"
   },
-  "notificationsEmptyText": {
-    "message": "ここに表示する内容はありません。"
-  },
-  "notificationsHeader": {
-    "message": "通知"
-  },
-  "notificationsInfos": {
-    "message": "$2 から $1 ",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "すべて既読にする"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 の新しいトークンがこのアカウントで見つかりました",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "起点"
   },
-  "osTheme": {
-    "message": "システム"
-  },
-  "padlock": {
-    "message": "南京錠"
-  },
   "parameters": {
     "message": "パラメーター"
   },
@@ -2435,10 +2371,6 @@
     "message": "アドレス、アカウント残高、アクティビティを表示してトランザクションを開始",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "無期限で実行。",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "「$1」アカウントとアセットをコントロールします。",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "他 + $1",
     "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": "人気のカスタムネットワーク"
-  },
   "preferredLedgerConnectionType": {
     "message": "優先Ledger接続タイプ",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "続行する前に、正しい秘密のリカバリーフレーズを使用していることを確認してください。これは元に戻せません。"
   },
-  "restartMetamask": {
-    "message": "MetaMask を再起動"
-  },
   "restore": {
     "message": "復元"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "送金額"
   },
-  "sendBugReport": {
-    "message": "バグレポートをお送りください。"
-  },
   "sendSpecifiedTokens": {
     "message": "$1を送金",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "コンピューターにウォレットを直接接続します。Ledgerのロックを解除し、イーサリアムアプリを開きます。ハードウェアウォレットデバイスの使い方の詳細については、$1",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "まだこのメッセージが表示されますか？"
-  },
   "storePhrase": {
     "message": "このフレーズを1Passwordのようなパスワードマネージャーに保存します。"
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "スマートトランザクションが利用できなくても、トークンのスワップは可能です。"
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "スワップを非公開で送信中..."
+  "stxPendingFinalizing": {
+    "message": "最終処理中..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "スワップを公開で送信中..."
+  "stxPendingOptimizingGas": {
+    "message": "ガス代を最適化中..."
+  },
+  "stxPendingPrivatelySubmitting": {
+    "message": "スワップを非公開で送信中..."
   },
   "stxSubDescription": {
     "message": "* スマートトランザクションは、非公開でトランザクションのの送信を数回試みます。すべての試みが失敗した場合、スワップが成功するようトランザクションが公開されます。"
@@ -3179,10 +3102,6 @@
     "message": "$1 が利用可能になりました。",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "スワップ完了まで残り <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "送信前にトランザクションのシミュレーションを行い、トランザクションのコストと失敗率を減らします。"
   },
@@ -3261,6 +3180,10 @@
     "message": "$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"
   },
+  "swapCompleteIn": {
+    "message": "スワップ完了まで <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "ハードウェアウォレットで確定"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "スリッページは0以上でなければなりません。"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "流動性ソース"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "トークンシンボル"
   },
-  "tokensFoundTitle": {
-    "message": "$1 種類の新しいトークンが見つかりました",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "理解しました"
   },
@@ -3804,9 +3719,6 @@
     "message": "$1に接続できませんでした。$2を確認してから、もう一度実行してください。",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask がうまく起動しませんでした。このエラーは断続的に発生する可能性があるため、拡張機能を再起動してみてください。"
-  },
   "troubleTokenBalances": {
     "message": "トークンバランスのロードに問題があります。トークンバランスを表示できます",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "MetaMaskパスワードを入力してください"
   },
-  "typeYourSRP": {
-    "message": "秘密のリカバリーフレーズを入力してください"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "このカスタムネットワークは認識されません。続行する前に$1をお勧めします",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "ネットワークの詳細の確認",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "コレクティブル (ERC-721) トークンの送信は現在サポートされていません",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "ウォレットが作成されました"
   },
-  "warning": {
-    "message": "警告"
-  },
   "weak": {
     "message": "弱"
   },
@@ -4053,7 +3963,7 @@
     "message": "この機能を使用するには、カメラへのアクセスを許可する必要があります。"
   },
   "youSign": {
-    "message": "署名しています"
+    "message": "著名しています"
   },
   "yourPrivateSeedPhrase": {
     "message": "秘密のシークレットリカバリーフレーズ"
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 762b250c7ff6..1edff554cc06 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -137,10 +137,10 @@
     "message": "ನಿಮ್ಮ ಬ್ರೌಸರ್ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ..."
   },
   "buyWithWyre": {
-    "message": "Wyre ನೊಂದಿಗೆ $1 ಖರೀದಿಸಿ"
+    "message": "Wyre ನೊಂದಿಗೆ ETH ಖರೀದಿಸಿ"
   },
   "buyWithWyreDescription": {
-    "message": "ನಿಮ್ಮ MetaMask ಖಾತೆಗೆ $1 ಅನ್ನು ಜಮಾ ಮಾಡಲು ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಬಳಸಲು Wyre ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."
+    "message": "ನಿಮ್ಮ MetaMask ಖಾತೆಗೆ ETH ಅನ್ನು ಜಮಾ ಮಾಡಲು ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಬಳಸಲು Wyre ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."
   },
   "bytes": {
     "message": "ಬೈಟ್‌ಗಳು"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 8a5ba0a7b0c1..6325712eeae6 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -62,13 +62,6 @@
     "message": "$1(은)는 이 자산에 접근하여 사용할 수 있습니다",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "비밀 복구 구문으로 지갑에 액세스하세요"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask는 사용자의 비밀번호를 복구할 수 없습니다. 사용자의 비밀 복구 구문을 이용하여 사용자의 소유권을 확인한 후, 지갑을 복구하고 새 비밀번호를 설정해 드립니다. 먼저 지갑을 생성할 때 받은 비밀 복구 구문을 입력하세요. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "카메라에 접근 중..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "네트워크 추가"
   },
-  "addNetworkTooltipWarning": {
-    "message": "이 네트워크 연결은 타사 서비스를 이용합니다. 연결의 보안이 취약하거나 타사에 연결 내용이 노출될 수 있습니다. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "추천 토큰 추가"
   },
@@ -411,14 +400,6 @@
     "message": "$1 구매",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Coinbase Pay로 $1 구매",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Coinbase 계정으로 손쉽게 암호화폐를 구매하거나 전송할 수 있습니다.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "문페이(MoonPay)로 $1 구매",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre로 $1 구매"
+    "message": "Wyre로 ETH 구매"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre를 사용하면 체크카드를 이용하여 $1 를 MetaMask 계정에 바로 예치할 수 있습니다."
+    "message": "Wyre를 사용하면 체크카드를 이용하여 ETH를 MetaMask 계정에 바로 예치할 수 있습니다."
   },
   "bytes": {
     "message": "바이트"
@@ -466,6 +447,9 @@
     "message": "거래를 $1하려면 가스비를 최소 10%를 인상해야 네트워크에서 인식될 수 있습니다.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "스왑 취소"
+  },
   "cancellationGasFee": {
     "message": "가스 수수료 취소"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "계속"
   },
-  "continueToCoinbasePay": {
-    "message": "Coinbase Pay로 계속하기"
-  },
   "continueToMoonPay": {
     "message": "문페이로 계속하기"
   },
@@ -1244,10 +1225,6 @@
     "message": "모든 플라스크의 API는 실험 단계입니다. 따라서 예고 없이 변경, 제거되거나 안정적인 MetaMask로 마이그레이션되지 않고 플라스크에 무기한 남아 있을 수 있습니다. 사용 시 위험은 자기 책임입니다.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Flask를 사용할 때는 정규 MetaMask 익스텐션을 비활성화하세요.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "본인은 위험을 감수합니다",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "숨기기"
   },
-  "hideFullTransactionDetails": {
-    "message": "전체 거래 세부정보 숨기기"
-  },
   "hideSeedPhrase": {
     "message": "시드 구문 숨기기"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "기록"
   },
-  "ignoreAll": {
-    "message": "모두 무시"
-  },
-  "ignoreTokenWarning": {
-    "message": "토큰을 숨기면 지갑에 표시되지 않습니다. 하지만 이를 검색하여 추가할 수 있습니다."
-  },
   "import": {
     "message": "가져오기",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "지갑 가져오기"
   },
-  "importWithCount": {
-    "message": "$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"
-  },
   "importYourExisting": {
     "message": "비밀 복구 구문을 사용하여 기존 지갑 가져오기"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "수평 화살표"
   },
-  "lightTheme": {
-    "message": "라이트"
-  },
   "likeToImportTokens": {
     "message": "이 토큰을 추가할까요?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "6백만 명 이상의 사용자와 함께 MetaMask 기능 향상에 동참하세요."
   },
+  "mismatchedChain": {
+    "message": "이 체인 ID의 네트워크 세부 정보가 기록과 일치하지 않습니다. 진행하기 전에 $1을(를) 권장합니다.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "네트워크 세부 정보 검증",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "MetaMask가 처음이세요?"
   },
-  "newTokensImportedMessage": {
-    "message": "$1 토큰을 성공적으로 불러왔습니다.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "불러온 토큰"
-  },
   "newTotal": {
     "message": "새 합계"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "가스 부족"
   },
-  "notifications": {
-    "message": "알림"
-  },
   "notifications10ActionText": {
     "message": "설정으로 이동하기",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 사용자가 거래를 이해하기 쉽게 도와드립니다."
   },
-  "notificationsEmptyText": {
-    "message": "표시할 항목이 없습니다."
-  },
-  "notificationsHeader": {
-    "message": "알림"
-  },
-  "notificationsInfos": {
-    "message": "$1($2)",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "모두 읽음으로 표시"
-  },
   "numberOfNewTokensDetected": {
     "message": "계정에서 $1개의 새로운 토큰이 발견됨",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "원본"
   },
-  "osTheme": {
-    "message": "시스템"
-  },
-  "padlock": {
-    "message": "패드락"
-  },
   "parameters": {
     "message": "매개변수"
   },
@@ -2435,10 +2371,6 @@
     "message": "허용되는 계정의 주소 보기(필수)",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "무기한 운용됩니다.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "'$1' 계정과 자산을 통제합니다.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ 그 외 $1개",
     "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": "인기 사용자 정의 네트워크"
-  },
   "preferredLedgerConnectionType": {
     "message": "선호하는 Ledger 연결 유형",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "계속하기 전에 비밀 복구 구문이 정확한지 확인하세요. 이 작업은 취소할 수 없습니다."
   },
-  "restartMetamask": {
-    "message": "MetaMask 재시작"
-  },
   "restore": {
     "message": "복구"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "송금"
   },
-  "sendBugReport": {
-    "message": "버그 리포트 전송"
-  },
   "sendSpecifiedTokens": {
     "message": "$1 보내기",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "지갑을 컴퓨터에 바로 연결합니다.  Ledger를 잠금 해제하고 이더리움 앱을 엽니다. 하드웨어 지갑 장치를 사용하는 방법에 관한 자세한 내용은 $1 링크를 참조하세요.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "아직 이 메시지가 표시되시나요?"
-  },
   "storePhrase": {
     "message": "이 구문을 1Password 같은 비밀번호 관리자에 저장하세요."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "스마트 거래를 사용할 수 없을 때도 토큰 스왑은 가능합니다."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "스왑을 비공개로 제출하는 중..."
+  "stxPendingFinalizing": {
+    "message": "마무리 중..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "가스비 최적화 중..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "스왑을 공개로 제출하는 중..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "스왑을 비공개로 제출하는 중..."
   },
   "stxSubDescription": {
     "message": "*스마트 거래는 비공개로 거래를 제출하기 위해 여러 번 시도할 것입니다. 모든 시도가 실패하면 성공적인 스왑을 위해 거래는 공개적으로 브로드캐스트될 것입니다."
@@ -3179,10 +3102,6 @@
     "message": "현재 $1(을)를 사용할 수 있습니다.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "스왑 완료까지 남은 시간:",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "제출하기 전에 거래를 시뮬레이션하면 거래 비용을 줄이고 실패율을 낮출 수 있습니다."
   },
@@ -3261,6 +3180,10 @@
     "message": "$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"
   },
+  "swapCompleteIn": {
+    "message": "스왑 완료까지 남은 시간:",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "하드웨어 지갑으로 확인합니다."
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "슬리패지는 0보다 크거나 같아야 합니다."
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "유동성 소스"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "토큰 기호"
   },
-  "tokensFoundTitle": {
-    "message": "$1개의 새 토큰을 찾았습니다",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "이해했습니다"
   },
@@ -3804,9 +3719,6 @@
     "message": "$1 연결 도중 문제가 발생했습니다. $2을(를) 검토하고 다시 시도해 보세요.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask 실행 중 오류가 발생했습니다. 일시적인 오류일 수 있으니 확장 프로그램을 재시작해 보세요."
-  },
   "troubleTokenBalances": {
     "message": "토큰 잔액을 로드하는 도중 문제가 발생했습니다. 다음에서 잔액을 확인하세요. ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "MetaMask 비밀번호를 입력하세요"
   },
-  "typeYourSRP": {
-    "message": "비밀 복구 구문을 입력하세요"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "이 맞춤형 네트워크는 인식되지 않습니다. 진행하기 전에 $1을(를) 권장합니다.",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "네트워크 세부 정보 검증",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "수집 가능한(ERC-721) 토큰 전송은 현재 지원되지 않습니다.",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "지갑 생성 성공"
   },
-  "warning": {
-    "message": "경고"
-  },
   "weak": {
     "message": "약함"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 68dd08edc238..f2866345ce83 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -137,10 +137,10 @@
     "message": "Jūsų naršyklė neatpažįstama..."
   },
   "buyWithWyre": {
-    "message": "Pirkti $1 su „Wyre“"
+    "message": "Pirkti ETH su „Wyre“"
   },
   "buyWithWyreDescription": {
-    "message": "„Wyre“ leidžia naudotis kreditine kortele norint įnešti $1 tiesiai į jūsų „MetaMask“ paskyrą."
+    "message": "„Wyre“ leidžia naudotis kreditine kortele norint įnešti ETH tiesiai į jūsų „MetaMask“ paskyrą."
   },
   "bytes": {
     "message": "Baitai"
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 30e65fd68b1e..13233a066c4b 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -137,10 +137,10 @@
     "message": "Jūsu pārlūkprogramma netiek atbalstīta..."
   },
   "buyWithWyre": {
-    "message": "Pirkt $1 ar Wyre"
+    "message": "Pirkt ETH ar Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ļauj noguldīt $1 tieši jūsu MetaMask kontā, izmantojot kredītkarti."
+    "message": "Wyre ļauj noguldīt ETH tieši jūsu MetaMask kontā, izmantojot kredītkarti."
   },
   "bytes": {
     "message": "Baiti"
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 8923fb8bfcb9..bc42b1bc2c7b 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -137,10 +137,10 @@
     "message": "Pelayar anda tidak disokong..."
   },
   "buyWithWyre": {
-    "message": "Beli $1 dengan Wyre"
+    "message": "Beli ETH dengan Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre membolehkan anda menggunakan kad kredit untuk mendeposit $1 secara terus ke dalam akaun MetaMask anda."
+    "message": "Wyre membolehkan anda menggunakan kad kredit untuk mendeposit ETH secara terus ke dalam akaun MetaMask anda."
   },
   "bytes": {
     "message": "Bait"
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 8d1cc1eab29e..ceb83e98285b 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -137,10 +137,10 @@
     "message": "Nettleseren din støttes ikke ..."
   },
   "buyWithWyre": {
-    "message": "Kjøp $1 med Wyre"
+    "message": "Kjøp ETH med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre lar deg bruke et kredittkort for å sette inn $1 rett på MetaMask-kontoen din."
+    "message": "Wyre lar deg bruke et kredittkort for å sette inn ETH rett på MetaMask-kontoen din."
   },
   "cancel": {
     "message": "Avbryt"
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 9d64198d3b0e..9855e4452367 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -228,10 +228,10 @@
     "message": "Bumili"
   },
   "buyWithWyre": {
-    "message": "Bumili ng $1 gamit ang Wyre"
+    "message": "Bumili ng ETH gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Binibigyang-daan ka ng Wyre na gumamit ng debit card para mag-deposit ng $1 sa mismong MetaMask account mo."
+    "message": "Binibigyang-daan ka ng Wyre na gumamit ng debit card para mag-deposit ng ETH sa mismong MetaMask account mo."
   },
   "bytes": {
     "message": "Bytes"
@@ -1039,6 +1039,10 @@
   "metametricsOptInDescription": {
     "message": "Gustong kunin ng MetaMask ang data ng paggamit para mas maunawaan kung paano ginagamit ng mga user namin ang extension. Gagamitin ang data na ito para patuloy na mapahusay ang kakayahang magamit at karanasan ng user sa paggamit ng produkto namin at Ethereum ecosystem."
   },
+  "mismatchedChain": {
+    "message": "Ang mga detalye ng network para sa chain ID na ito ay hindi tumutugma sa aming mga record. Inirerekomenda naming $1 ka bago magpatuloy.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "i-verify ang mga detalye ng network",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2157,6 +2161,10 @@
     "message": "Hindi kinikilala ang custom na network na ito. Inirerekomenda naming $1 ka bago magpatuloy",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "i-verify ang mga detalye ng network",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "updatedWithDate": {
     "message": "Na-update noong $1"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 0025ba5fa3ed..d8637876aa8e 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -137,10 +137,10 @@
     "message": "Twoja przeglądarka nie jest obsługiwana..."
   },
   "buyWithWyre": {
-    "message": "Kup $1 poprzez Wyre"
+    "message": "Kup ETH poprzez Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Dzięki Wyre możesz użyć karty kredytowej, aby wpłacić $1 bezpośrednio na swoje konto MetaMask."
+    "message": "Dzięki Wyre możesz użyć karty kredytowej, aby wpłacić ETH bezpośrednio na swoje konto MetaMask."
   },
   "bytes": {
     "message": "Bajty"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index b8b40ee7a01f..8337211df462 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 pode(m) acessar e usar esse ativo",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Acesse sua carteira com sua Frase de Recuperação Secreta"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "A MetaMask não consegue recuperar sua senha. Usaremos sua Frase de Recuperação Secreta para validar sua posse, restaurar sua carteira e definir uma nova senha. Primeiro, insira a Frase de Recuperação Secreta que você recebeu ao criar sua carteira. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Acessando sua câmera..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Adicionar rede"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Esta conexão de rede depende de terceiros. Esta conexão pode ser menos confiável ou permitir que terceiros rastreiem atividades. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Adicionar tokens sugeridos"
   },
@@ -411,14 +400,6 @@
     "message": "Comprar $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Comprar $1 com o Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Você pode comprar ou transferir criptomoedas facilmente com sua conta na Coinbase.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Compre $1 com o MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Comprar $1 com Wyre"
+    "message": "Comprar ETH com Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Com o Wyre, você pode usar um cartão de débito para depositar $1 diretamente na sua conta da MetaMask."
+    "message": "Com o Wyre, você pode usar um cartão de débito para depositar ETH diretamente na sua conta da MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -466,6 +447,9 @@
     "message": "Para $1 uma transação, a taxa de gás deve ser aumentada em pelo menos 10% para que seja reconhecida pela rede.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Cancelar swap"
+  },
   "cancellationGasFee": {
     "message": "Taxa de gás por cancelamento"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Continuar"
   },
-  "continueToCoinbasePay": {
-    "message": "Prosseguir para o Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Continuar para o MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Interação com contrato"
   },
   "convertTokenToNFTDescription": {
-    "message": "Detectamos que esse ativo é um NFT. A MetaMask agora oferece suporte nativo a NFTs. Gostaria de removê-lo da sua lista de tokens e adicioná-lo como NFT?"
+    "message": "Detectamos que esse ativo é um NFT. A Metamask agora oferece suporte nativo a NFTs. Gostaria de removê-lo da sua lista de tokens e adicioná-lo como NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Detectamos que esse ativo foi adicionado como NFT. Deseja removê-lo da sua lista de tokens?"
@@ -1244,10 +1225,6 @@
     "message": "Todas as APIs do Flask são experimentais. Elas podem ser alteradas ou removidas sem aviso prévio, ou podem permanecer no Flask indefinidamente, sem jamais serem migradas para a MetaMask estável. Use-as com cautela.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Certifique-se de desativar sua extensão MetaMask regular ao usar o Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Eu aceito os riscos",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Ocultar"
   },
-  "hideFullTransactionDetails": {
-    "message": "Ocultar detalhes completos da transação"
-  },
   "hideSeedPhrase": {
     "message": "Ocultar seed phrase (frase de recuperação)"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Histórico"
   },
-  "ignoreAll": {
-    "message": "Ignorar tudo"
-  },
-  "ignoreTokenWarning": {
-    "message": "Se você ocultar tokens, eles não serão exibidos em sua carteira. No entanto, você ainda pode pesquisá-los para adicioná-los."
-  },
   "import": {
     "message": "Importar",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Importar carteira"
   },
-  "importWithCount": {
-    "message": "Importar $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"
-  },
   "importYourExisting": {
     "message": "Importe sua carteira existente usando uma Frase de Recuperação Secreta"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "seta de nível"
   },
-  "lightTheme": {
-    "message": "Claro"
-  },
   "likeToImportTokens": {
     "message": "Gostaria de adicionar estes tokens?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Junte-se a mais de 6 milhões de usuários para melhorar a MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Os detalhes da rede para esse ID da cadeia não correspondem aos dos nossos registros. Recomendamos que você $1 antes de continuar.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "verifique os detalhes da rede",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Novo na MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Você importou $1 com sucesso.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Token importado"
-  },
   "newTotal": {
     "message": "Novo total"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Não há gás suficiente"
   },
-  "notifications": {
-    "message": "Notificações"
-  },
   "notifications10ActionText": {
     "message": "Veja em configurações",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Estamos facilitando a leitura das transações."
   },
-  "notificationsEmptyText": {
-    "message": "Nada para ver aqui."
-  },
-  "notificationsHeader": {
-    "message": "Notificações"
-  },
-  "notificationsInfos": {
-    "message": "$1 de $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Marcar todas como lidas"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 novos tokens encontrados nesta conta",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Origem"
   },
-  "osTheme": {
-    "message": "Sistema"
-  },
-  "padlock": {
-    "message": "Cadeado"
-  },
   "parameters": {
     "message": "Parâmetros"
   },
@@ -2435,10 +2371,6 @@
     "message": "Ver endereço, saldo da conta, atividade e iniciar transações",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Executar indefinidamente.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Controlar suas contas e ativos do \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "E mais $1",
     "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": "Redes personalizadas populares"
-  },
   "preferredLedgerConnectionType": {
     "message": "Tipo de conexão preferencial com o Ledger",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Certifique-se de usar a frase secreta de recuperação correta antes de prosseguir. Você não poderá desfazer isso."
   },
-  "restartMetamask": {
-    "message": "Reiniciar a MetaMask"
-  },
   "restore": {
     "message": "Restaurar"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Enviar valor"
   },
-  "sendBugReport": {
-    "message": "Envie-nos um relatório de erros."
-  },
   "sendSpecifiedTokens": {
     "message": "Enviar $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Conecte sua carteira diretamente ao seu computador.  Desbloqueie seu Ledger e abra o aplicativo do Ethereum. Para obter mais informações sobre como usar seu dispositivo de carteira de hardware, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Ainda está recebendo essa mensagem?"
-  },
   "storePhrase": {
     "message": "Guarde essa frase em um gerenciador de senhas, como o 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Você ainda pode fazer swap com seus tokens mesmo quando as Transações Inteligentes estiverem indisponíveis."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Enviando seu swap de forma privada..."
+  "stxPendingFinalizing": {
+    "message": "Finalizando..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Otimizando as taxas de gás..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Enviando seu swap de forma pública..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Enviando a Swap de forma privada..."
   },
   "stxSubDescription": {
     "message": "* A função de Transações Inteligentes tentará enviar a sua transação várias vezes de forma privada. Se todas as tentativas falharem, a transação será transmitida publicamente para garantir que sua Swap seja realizada com sucesso."
@@ -3179,10 +3102,6 @@
     "message": "Seu $1 já está disponível.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "O swap será concluído em <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Simule as transações antes de finalizar para diminuir os custos de transação e reduzir a possibilidade de falhas."
   },
@@ -3261,6 +3180,10 @@
     "message": "Nenhum token disponível correspondente a $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"
   },
+  "swapCompleteIn": {
+    "message": "Swap concluído em <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Confirme com sua carteira de hardware"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "O slippage deve ser maior ou igual a zero"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Fonte de liquidez"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Símbolo do Token"
   },
-  "tokensFoundTitle": {
-    "message": "$1 novos tokens encontrados",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Eu compreendo"
   },
@@ -3804,9 +3719,6 @@
     "message": "Tivemos dificuldade para conectar-nos à sua $1. Revise $2 e tente novamente.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "A MetaMask teve problemas para iniciar. Esse erro pode ser intermitente, por isso tente reiniciar a extensão."
-  },
   "troubleTokenBalances": {
     "message": "Tivemos um problema a carregar o balanço dos seus tokens. Pode vê-los em ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Digite a sua Palavra-passe"
   },
-  "typeYourSRP": {
-    "message": "Digite sua Frase de Recuperação Secreta"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Essa rede personalizada não foi reconhecida. Recomendamos que você $1 antes de continuar",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "verifique os detalhes da rede",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "O envio de tokens colecionáveis (ERC-721) não é suportado no momento",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Carteira criada com sucesso"
   },
-  "warning": {
-    "message": "Atenção"
-  },
   "weak": {
     "message": "Fraca"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 35a8c9b30350..3062c1574fec 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -363,10 +363,10 @@
     "message": "Comprar"
   },
   "buyWithWyre": {
-    "message": "Comprar $1 com Wyre"
+    "message": "Comprar ETH com Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Com o Wyre, você pode usar um cartão de débito para depositar $1 diretamente na sua conta da MetaMask."
+    "message": "Com o Wyre, você pode usar um cartão de débito para depositar ETH diretamente na sua conta da MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -1627,6 +1627,10 @@
   "metametricsTitle": {
     "message": "Junte-se a mais de 6 milhões de usuários para melhorar a MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Os detalhes da rede para esse ID da cadeia não correspondem aos dos nossos registros. Recomendamos que você $1 antes de continuar.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "verifique os detalhes da rede",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3195,6 +3199,10 @@
     "message": "Essa rede personalizada não foi reconhecida. Recomendamos que você $1 antes de continuar",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "verifique os detalhes da rede",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "O envio de tokens colecionáveis (ERC-721) não é suportado no momento",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 002236935c12..929bede12e3d 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -137,10 +137,10 @@
     "message": "Browserul dvs. nu este compatibil..."
   },
   "buyWithWyre": {
-    "message": "Cumpărați $1 cu Wyre"
+    "message": "Cumpărați ETH cu Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vă permite să folosiți un card de credit pentru a depune $1 direct în contul dvs. MetaMask."
+    "message": "Wyre vă permite să folosiți un card de credit pentru a depune ETH direct în contul dvs. MetaMask."
   },
   "bytes": {
     "message": "Octeți"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 16fa10c056e9..c61d7d9a5d64 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 может получить доступ к этому активу и потратить его",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Получайте доступ к кошельку с помощью секретной фразы для восстановления"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask не может восстановить ваш пароль. Мы используем вашу cекретную фразу для восстановления, чтобы подтвердить ваше право собственности, восстановить ваш кошелек и установить новый пароль. Сначала введите секретную фразу для восстановления, которую вы получили при создании кошелька. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Доступ к камере..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Добавить сеть"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Это сетевое подключение зависит от третьих сторон. Оно может быть менее надежным или позволять третьим лицам отслеживать активность. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Добавить рекомендованные токены"
   },
@@ -411,14 +400,6 @@
     "message": "Купить $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Купите $1 с помощью Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Вы можете легко купить или перевести криптовалюту с помощью своего счета Coinbase.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Купить $1 с помощью MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Купить $1 с помощью Wyre"
+    "message": "Купить ETH с помощью Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre позволяет использовать дебетовую карту для внесения $1 прямо на ваш счет MetaMask."
+    "message": "Wyre позволяет использовать дебетовую карту для внесения ETH прямо на ваш счет MetaMask."
   },
   "bytes": {
     "message": "Байты"
@@ -466,6 +447,9 @@
     "message": "Чтобы $1 транзакции плата за газ должна быть увеличена как минимум на 10%. Это позволит обеспечить прием транзакции сетью.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Отменить обмен"
+  },
   "cancellationGasFee": {
     "message": "Плата за газ при отмене"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Продолжить"
   },
-  "continueToCoinbasePay": {
-    "message": "Перейти на Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Перейти в MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Взаимодействие по контракту"
   },
   "convertTokenToNFTDescription": {
-    "message": "Мы обнаружили, что этот актив является NFT. MetaMask теперь имеет полную встроенную поддержку NFT. Хотите удалить его из списка токенов и добавить в качестве NFT?"
+    "message": "Мы обнаружили, что этот актив является NFT. Metamask теперь имеет полную встроенную поддержку NFT. Хотите удалить его из списка токенов и добавить в качестве NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Мы обнаружили, что этот актив был добавлен как NFT. Хотите удалить его из списка токенов?"
@@ -1244,10 +1225,6 @@
     "message": "Все API Flask являются экспериментальными. Они могут быть изменены или удалены без предварительного уведомления или могут оставаться во Flask на неопределенный срок без переноса в стабильную версию MetaMask. Используйте их на свой страх и риск.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Обязательно отключите свое обычное расширение MetaMask при использовании Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Я принимаю риски",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Скрыть"
   },
-  "hideFullTransactionDetails": {
-    "message": "Скрыть полную информацию о транзакции"
-  },
   "hideSeedPhrase": {
     "message": "Скрыть сид-фразу"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "История"
   },
-  "ignoreAll": {
-    "message": "Игнорировать все"
-  },
-  "ignoreTokenWarning": {
-    "message": "Если вы скроете токены, они не будут отображаться в вашем кошельке. Однако вы все равно можете добавить их, выполнив поиск по ним."
-  },
   "import": {
     "message": "Импорт",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Импорт кошелька"
   },
-  "importWithCount": {
-    "message": "Импортировать $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"
-  },
   "importYourExisting": {
     "message": "Импортируйте существующий кошелек, используя начальную секретную фразу восстановления"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "стрелка «уровень»"
   },
-  "lightTheme": {
-    "message": "Светлая"
-  },
   "likeToImportTokens": {
     "message": "Вы хотели бы импортировать эти токены?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Присоединяйтесь к более чем 6 млн пользователей, чтобы улучшить MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Сведения о сети для этого ID цепочки не совпадают с указанными в записях. Мы рекомендуем $1 до того, как продолжить.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "проверить сведения о сети",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Впервые в MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Вы успешно импортировали $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Токен импортирован"
-  },
   "newTotal": {
     "message": "Новая общая сумма"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Недостаточно газа"
   },
-  "notifications": {
-    "message": "Уведомления"
-  },
   "notifications10ActionText": {
     "message": "Смотреть в настройках",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Мы упрощаем просмотр реквизитов транзакций."
   },
-  "notificationsEmptyText": {
-    "message": "Здесь не на что смотреть."
-  },
-  "notificationsHeader": {
-    "message": "Уведомления"
-  },
-  "notificationsInfos": {
-    "message": "$1 из $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Отметить все как прочитанные"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 новых токена(-ов) найдены в этом аккаунте",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Источник"
   },
-  "osTheme": {
-    "message": "Системная"
-  },
-  "padlock": {
-    "message": "Замок"
-  },
   "parameters": {
     "message": "Параметры"
   },
@@ -2435,10 +2371,6 @@
     "message": "См. адрес, баланс счета, активность и инициируйте транзакции",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Выполнять бесконечно.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Контролируйте свои счета и активы «$1».",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ еще $1",
     "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": "Популярные пользовательские сети"
-  },
   "preferredLedgerConnectionType": {
     "message": "Предпочтительный тип подключения к леджеру",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Прежде чем продолжить, убедитесь, что вы используете правильную секретную фразу восстановления. Вы не сможете отменить это."
   },
-  "restartMetamask": {
-    "message": "Перезапустить MetaMask"
-  },
   "restore": {
     "message": "Восстановить"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Сумма для отправки"
   },
-  "sendBugReport": {
-    "message": "Отправьте нам сообщение об ошибке."
-  },
   "sendSpecifiedTokens": {
     "message": "Отправить $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Подключите кошелек напрямую к компьютеру. Разблокируйте леджер и откройте приложение Ethereum. Для получения дополнительной информации об использовании аппаратного кошелька $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Все еще получаете это сообщение?"
-  },
   "storePhrase": {
     "message": "Сохраните эту фразу в диспетчере паролей, например, в 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Вы по-прежнему можете обменивать свои токены, даже если смарт-транзакции недоступны."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Приватная отправка вашей операции обмена..."
+  "stxPendingFinalizing": {
+    "message": "Завершение..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Публичная отправка вашей операции обмена..."
+  "stxPendingOptimizingGas": {
+    "message": "Оптимизация газа..."
+  },
+  "stxPendingPrivatelySubmitting": {
+    "message": "Конфиденциальная отправка ооперации обмена..."
   },
   "stxSubDescription": {
     "message": "* Смарт-транзакции попытаются несколько раз отправить вашу транзакцию в конфиденциальном порядке. Если все попытки не увенчаются успехом, транзакция будет показана публично, чтобы гарантировать успешное завершение вашего обмена."
@@ -3179,10 +3102,6 @@
     "message": "Ваши $1 уже доступны.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Обмен завершится через <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Моделируйте транзакции перед отправкой, чтобы снизить транзакционные издержки и сократить число отказов."
   },
@@ -3261,6 +3180,10 @@
     "message": "Нет доступных токенов, соответствующих $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"
   },
+  "swapCompleteIn": {
+    "message": "Обмен завершится через <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Подтвердите с помощью аппаратного кошелька"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Проскальзывание должно быть больше нуля или равно нулю"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Источник ликвидности"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Символ токена"
   },
-  "tokensFoundTitle": {
-    "message": "Найдены $1 новых токена(-ов)",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Я понимаю"
   },
@@ -3804,9 +3719,6 @@
     "message": "Не удалось подключиться к вашему $1, попробуйте проверить $2 и повторите попытку.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "У MetaMask возникли проблемы с запуском. Эта ошибка может быть непостоянной, поэтому попробуйте перезапустить расширение."
-  },
   "troubleTokenBalances": {
     "message": "У нас возникли проблемы с загрузкой вашего баланса токенов. Вы можете просмотреть их ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Введите свой пароль MetaMask"
   },
-  "typeYourSRP": {
-    "message": "Введите секретную фразу для восстановления"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Эта пользовательская сеть не распознана. Мы рекомендуем $1, прежде чем продолжить",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "проверить сведения о сети",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Отправка коллекционных активов (ERC-721) сейчас не поддерживается",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Кошелек создан"
   },
-  "warning": {
-    "message": "Предупреждение"
-  },
   "weak": {
     "message": "Слабый"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 2bfd7e540dcc..b5f1a087f71e 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -131,10 +131,10 @@
     "message": "Váš prehliadač nie je podporovaný..."
   },
   "buyWithWyre": {
-    "message": "Kúpte $1 s Wyre"
+    "message": "Kúpte ETH s Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vám umožňuje použiť kreditnú kartu na vloženie depozitu $1 priamo na váš účet MetaMask."
+    "message": "Wyre vám umožňuje použiť kreditnú kartu na vloženie depozitu ETH priamo na váš účet MetaMask."
   },
   "bytes": {
     "message": "Bajty"
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index c49155135358..8a49c004a919 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš brskalnik ni podptrt ..."
   },
   "buyWithWyre": {
-    "message": "Kupi $1 z Wyre"
+    "message": "Kupi ETH z Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vam omogoča, da s kreditno kartico nakažete $1 neposredno na svoj račun MetaMask."
+    "message": "Wyre vam omogoča, da s kreditno kartico nakažete ETH neposredno na svoj račun MetaMask."
   },
   "bytes": {
     "message": "Bajti"
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 5ebbd176e554..9f29a6bf553a 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš pregledač nije podržan..."
   },
   "buyWithWyre": {
-    "message": "Kupite $1 preko servisa Wyre"
+    "message": "Kupite ETH preko servisa Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vam dozvoljava da koristite kreditnu karticu kako biste deponovali $1 pravo na vaš MetaMask nalog."
+    "message": "Wyre vam dozvoljava da koristite kreditnu karticu kako biste deponovali ETH pravo na vaš MetaMask nalog."
   },
   "bytes": {
     "message": "Bajtovi"
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index c8d77d1677ed..2e1c5721e176 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -137,10 +137,10 @@
     "message": "Din webbläsare stöds inte..."
   },
   "buyWithWyre": {
-    "message": "Köp $1 med Wyre"
+    "message": "Köp ETH med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre låter dig använda ett kreditkort för att sätta in $1 direkt på ditt MetaMask-konto."
+    "message": "Wyre låter dig använda ett kreditkort för att sätta in ETH direkt på ditt MetaMask-konto."
   },
   "cancel": {
     "message": "Avbryt"
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 9a060e45ec42..990fd2e43991 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -134,10 +134,10 @@
     "message": "Kivinjari chaku hakiwezeshwi..."
   },
   "buyWithWyre": {
-    "message": "Nunua $1 kwa kutumia Wyre"
+    "message": "Nunua ETH kwa kutumia Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre inakuwezesha kutumia kadi ya benki kuweka $1 moja kwa moja kwenye akaunti yako ya MetaMask."
+    "message": "Wyre inakuwezesha kutumia kadi ya benki kuweka ETH moja kwa moja kwenye akaunti yako ya MetaMask."
   },
   "cancel": {
     "message": "Ghairi"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 5ed22eaba946..fb3fcb92a20d 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 maaaring i-access at gamitin ang asset na ito",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "I-access ang iyong wallet gamit ang iyong Secret Recovery Phrase"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "Hindi mabawi ng MetaMask ang iyong password. Gagamitin namin ang iyong Secret Recovery Phrase upang patunayan ang iyong pagmamay-ari, i-restore ang iyong wallet at mag-set up ng bagong password. Una, ilagay ang Secret Recovery Phrase na ibinigay sa iyo noong ginawa mo ang iyong 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": "Ina-access ang iyong camera..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Magdagdag ng Network"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Ang koneksyon sa network na ito ay umaasa sa mga third party. Ang koneksyon na ito ay maaaring hindi gaanong maaasahan o binibigyang-daan ang mga third-party na mag-track ng aktibidad. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Magdagdag ng Mga Iminumungkahing Token"
   },
@@ -411,14 +400,6 @@
     "message": "Bumili ng $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Bumili ng $1 gamit ang Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Madali kang makakabili o makakapagtransfer ng crypto gamit ang iyong Coinbase account.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Bumili ng $1 gamit ang MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Bumili ng $1 gamit ang Wyre"
+    "message": "Bumili ng ETH gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Madaling onboarding para sa mga pagbili hanggang $ 1000. Mabilis na interactive na high limit na pag-verify ng pagbili. Sinusuportahan ang Debit/Credit Card, Apple Pay, Bank Transfers. Available sa 100+ na mga bansa. Deposito ng mga token sa iyong MetaMask Account"
+    "message": "Nagbibigay-daan sa iyo ang Wyre na gumamit ng debit card para mag-deposit ng ETH sa mismong MetaMask account mo."
   },
   "bytes": {
     "message": "Bytes"
@@ -466,6 +447,9 @@
     "message": "Sa $1 na transaksyon ang singil sa gas ay dapat tumaas nang hindi bababa sa 10% para ito ay makilala ng network.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Kanselahin ang pagpapalit"
+  },
   "cancellationGasFee": {
     "message": "Bayarin sa Gasolina para sa Pagkansela"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Magpatuloy"
   },
-  "continueToCoinbasePay": {
-    "message": "Magpatuloy sa Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Magpatuloy sa MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Interaksyon ng Kontrata"
   },
   "convertTokenToNFTDescription": {
-    "message": "Natukoy namin na ang asset na ito ay isang NFT. Ang MetaMask ay mayroon na ngayong ganap na native support para sa mga NFT. Gusto mo bang alisin ito sa iyong listahan ng token at idagdag ito bilang isang NFT?"
+    "message": "Natukoy namin na ang asset na ito ay isang NFT. Ang Metamask ay mayroon na ngayong ganap na native support para sa mga NFT. Gusto mo bang alisin ito sa iyong listahan ng token at idagdag ito bilang isang NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Napansin namin na naidagdag ang asset na ito bilang NFT. Gusto mo ba itong alisin mula sa listahan ng iyong token?"
@@ -1244,10 +1225,6 @@
     "message": "Ang lahat ng API ng Flask ay eksperimental. Maaaring baguhin o alisin ang mga ito nang walang abiso, o maaari silang manatili sa Flask nang walang katapusan nang hindi nalilipat sa matatag na MetaMask. Gamitin ang mga ito sa iyong sariling pananagutan.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Siguraduhing i-disable ang iyong regular na MetaMask extension kapag ginagamit ang Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Tinatanggap ko ang mga panganib",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Itago"
   },
-  "hideFullTransactionDetails": {
-    "message": "Itago ang buong detalye ng transaksyon"
-  },
   "hideSeedPhrase": {
     "message": "Itago ang seed phrase"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "History"
   },
-  "ignoreAll": {
-    "message": "Huwag pansinin ang lahat"
-  },
-  "ignoreTokenWarning": {
-    "message": "Kung itatago mo ang mga token, hindi ipapakita ang mga ito sa iyong wallet. Gayunpaman, maaari mo pa ring idagdag ang mga ito sa pamamagitan ng paghahanap sa kanila."
-  },
   "import": {
     "message": "Mag-import",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "I-import ang wallet"
   },
-  "importWithCount": {
-    "message": "Mag-isport ng $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"
-  },
   "importYourExisting": {
     "message": "I-import ang iyong kasalukuyang wallet gamit ang isang Secret Recovery Phrase"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "arrow ng level"
   },
-  "lightTheme": {
-    "message": "Maliwanag"
-  },
   "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Sumali sa 6M+ user upang mapabuti ang MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Ang mga detalye ng network para sa chain ID na ito ay hindi tumutugma sa aming mga talaan. Inirerekomenda namin na $1 ka bago magpatuloy.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "i-verify ang mga detalye ng network",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Bago ka ba sa MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Matagumpay mong na-import ang $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Na-import ang token"
-  },
   "newTotal": {
     "message": "Bagong Kabuuan"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Hindi Sapat ang Gas"
   },
-  "notifications": {
-    "message": "Mga Abiso"
-  },
   "notifications10ActionText": {
     "message": "Bisitahin sa mga setting",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2154,7 +2109,7 @@
     "message": "Paganahin ang dark mode"
   },
   "notifications12Description": {
-    "message": "Nandito na sa wakas ang dark mode sa Extension! Upang i-on ito, pumunta sa Mga Setting -> Eksperimental at pumili ng isa sa mga opsyon sa pagpapakita: Light, Dark, System."
+    "message": "Pagaganahin ang Dark Mode para sa mga bagong user depende sa kanilang mga kagustuhan sa sistema. Para sa mga kasalukuyang user, manu-manong paganahin ang Dark Mode sa ilalim ng Mga Setting -> Eksperimental."
   },
   "notifications12Title": {
     "message": "Wen dark mode? Ngayon dark mode! 🕶️🦊"
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Pinadadali naming mabasa ang mga transaksyon."
   },
-  "notificationsEmptyText": {
-    "message": "Walang makikita dito."
-  },
-  "notificationsHeader": {
-    "message": "Mga Abiso"
-  },
-  "notificationsInfos": {
-    "message": "$1 mula $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Markahan ang lahat bilang nabasa na"
-  },
   "numberOfNewTokensDetected": {
     "message": "$1 bagong token ang nakita sa account na ito",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Pinagmulan"
   },
-  "osTheme": {
-    "message": "Sistema"
-  },
-  "padlock": {
-    "message": "Padlock"
-  },
   "parameters": {
     "message": "Mga Parameter"
   },
@@ -2435,10 +2371,6 @@
     "message": "Tingnan ang mga address, balanse ng account, aktibidad at simulan ang iyong mga transaksyon",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Patakbuhin ng walang katapusan.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Kontrolin ang iyong mga account at asset sa \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 pa",
     "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": "Mga sikat na custom na network"
-  },
   "preferredLedgerConnectionType": {
     "message": "Napiling Uri ng Ledger Connection",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Tiyakin na ginagamit mo ang wastong Secret Recovery Phrase bago magpatuloy. Hindi mo na ito maaaring pawalang-bisa."
   },
-  "restartMetamask": {
-    "message": "I-restart ang MetaMask"
-  },
   "restore": {
     "message": "I-restore"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Halaga ng Ipapadala"
   },
-  "sendBugReport": {
-    "message": "Padalhan kami ng ulat ng bug."
-  },
   "sendSpecifiedTokens": {
     "message": "Magpadala ng $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Direktang ikonekta ang iyong wallet sa iyong computer. I-unlock ang iyong Ledger at buksan ang Ethereum app. Para sa higit pa sa paggamit ng iyong hardware wallet device, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Nakukuha pa rin ang mensaheng ito?"
-  },
   "storePhrase": {
     "message": "I-store ang phrase na ito sa isang password manager gaya ng 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Maaari mo parin papalitan ang iyong mga token kahit na hindi available ang mga Smart Transaction."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Pribadong isinusumite ang iyong Swap..."
+  "stxPendingFinalizing": {
+    "message": "Isinasapinal..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Pinapahusay ang gas..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Pampublikong isinusumite ang iyong Swap..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Pribadong isinusumite ang Pagpapalit..."
   },
   "stxSubDescription": {
     "message": "* Susubukan ng mga Smart Transaction na isumite nang pribado ang iyong transaksyon, maraming beses. Kapag nabigo ang lahat ng pagsubok, ipapakita sa publiko ang transaksyon upang matiyak na ang Pagpapalit ay naging matagupay."
@@ -3179,10 +3102,6 @@
     "message": "Ang iyong $1 ay available na ngayon.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Matatapos ang Swap sa <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Gayahin ang mga transaksyon bago isumite upang bumaba ang gastos sa transaksyon at mabawasan ang mga pagkabigo."
   },
@@ -3261,6 +3180,10 @@
     "message": "Walang available na token na tumutugma sa $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"
   },
+  "swapCompleteIn": {
+    "message": "Kumpleto na ang pagpapalit sa <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Kumpirmahin gamit ang iyong hardware wallet"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Ang slippage ay dapat mas malaki o katumbas ng zero"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Pinagkunan ng liquidity"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Simbolo ng Token"
   },
-  "tokensFoundTitle": {
-    "message": "$1 bagong token ang nakita",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Nauunawaan ko"
   },
@@ -3804,9 +3719,6 @@
     "message": "Nagkaproblema kami sa pagkonekta sa iyong $1, subukang suriin ang $2 at subukan ulit.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "Nagkaproblema ang MetaMask sa pagsisimula. Maaaring paulit-ulit ang error na ito, kaya subukang i-restart ang extension."
-  },
   "troubleTokenBalances": {
     "message": "Nagkaproblema kami sa pag-load ng mga balanse ng iyong token. Puwede mong tingnan ang mga iyon ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Uri ng password ng iyong MetaMask"
   },
-  "typeYourSRP": {
-    "message": "I-type ang iyong 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."
@@ -3870,6 +3779,10 @@
     "message": "Hindi nakikilala ang custom network na ito. Nirerekomenda namin na ikaw ay $1 bago magpatuloy",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "i-verify ang mga detalye ng network",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Ang pagpapadala ng collectible (ERC-721) token ay kasalukuyang hindi magagamit",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Matagumpay ang paggawa ng wallet"
   },
-  "warning": {
-    "message": "Babala"
-  },
   "weak": {
     "message": "Madali"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index 05719bd53a38..df04f15ba167 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 bu varlığa erişebilir ve harcayabilir",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Gizli Kurtarma İfadenizle cüzdanınıza erişin"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask parolanızı kurtaramaz. Sahipliğinizi doğrulamak, cüzdanınızı yenilemek ve yeni bir parola belirlemek için Gizli Kurtarma İfadenizi kullanırız. İlk olarak, cüzdanınızı oluştururken size verilmiş olan Gizli Kurtarma İfadenizi girin. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Kameranıza erişim sağlanıyor..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Ağ ekle"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Bu ağ bağlantısı üçüncü taraflara dayalıdır. Bu bağlantı daha az güvenli olabilir veya üçüncü tarafların aktiviteleri takip etmesine olanak sağlayabilir. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Önerilen Tokenleri ekle"
   },
@@ -411,14 +400,6 @@
     "message": "$1 satın al",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Coinbase Pay ile 1 USD al",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Coinbase hesabınla kolayca kripto para satın alabilir veya transfer edebilirsin.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay ile $1 satın al",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre ile $1 satın al"
+    "message": "Wyre ile ETH satın al"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre, doğrudan MetaMask hesabınıza $1 yatırma işlemleri için banka kartı kullanmanıza izin verir."
+    "message": "Wyre, doğrudan MetaMask hesabınıza ETH yatırma işlemleri için banka kartı kullanmanıza izin verir."
   },
   "bytes": {
     "message": "Bayt"
@@ -466,6 +447,9 @@
     "message": "İşlemi $1 için, gaz ücretinin ağ tarafından tanınması amacıyla en az %10 oranında artırılması gerekir.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Takası iptal et"
+  },
   "cancellationGasFee": {
     "message": "İptal İşlemi Gaz Ücreti"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Devam et"
   },
-  "continueToCoinbasePay": {
-    "message": "Coinbase Pay'e devam et"
-  },
   "continueToMoonPay": {
     "message": "MoonPay'e devam et"
   },
@@ -650,7 +631,7 @@
     "message": "Sözleşme Etkileşimi"
   },
   "convertTokenToNFTDescription": {
-    "message": "Bu varlığın bir NFT olduğunu tespit ettik. MetaMask artık NFT'ler için tam yerel desteğe sahiptir. Bunu token listenden çıkarmak ve bir NFT olarak eklemek ister misin?"
+    "message": "Bu varlığın bir NFT olduğunu tespit ettik. Metamask artık NFT'ler için tam yerel desteğe sahiptir. Bunu token listenden çıkarmak ve bir NFT olarak eklemek ister misin?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Bu varlığın bir NFT olarak eklendiğini tespit ettik. Token listenden çıkarmak ister misin?"
@@ -1244,10 +1225,6 @@
     "message": "Tüm Flask API'leri deneyseldir. Önceden haber verilmeksizin değiştirilebilir veya kaldırılabilirler ya da kararlı MetaMask'e taşınmadan süresiz olarak Flask'ta kalabilirler. Bunları kendi sorumluluğunda kullan.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Flask kullanırken normal MetaMask uzantınızı devre dışı bıraktığınızdan emin olun.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Riskleri kabul ediyorum",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Gizle"
   },
-  "hideFullTransactionDetails": {
-    "message": "Tam işlem bilgilerini gizle"
-  },
   "hideSeedPhrase": {
     "message": "Tohum ifadesini gizle"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Geçmiş"
   },
-  "ignoreAll": {
-    "message": "Tümünü yoksay"
-  },
-  "ignoreTokenWarning": {
-    "message": "Gizlediğiniz tokenler cüzdanınızda gösterilmez. Ancak, yine de onları bulup ekleyebilirsiniz."
-  },
   "import": {
     "message": "İçe Aktar",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Cüzdanı içe aktar"
   },
-  "importWithCount": {
-    "message": "$1 tokeni içe aktar",
-    "description": "$1 will the number of detected tokens that are selected for importing, if all of them are selected then $1 will be all"
-  },
   "importYourExisting": {
     "message": "Gizli Kurtarma İfadesi kullanarak mevcut cüzdanınızı içe aktarın"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "seviye oku"
   },
-  "lightTheme": {
-    "message": "Aydınlık"
-  },
   "likeToImportTokens": {
     "message": "Bu tokenleri içe aktarmak ister misiniz?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "MetaMask'i geliştirmek için 6 milyondan fazla kullanıcıya katılın"
   },
+  "mismatchedChain": {
+    "message": "Bu zincir kimliği için ağ ayrıntıları kayıtlarımızla uyumlu değil. Devam etmeden önce şunu yapmanızı öneriyoruz: $1.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "ağ bilgilerini doğrula",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "MetaMask'te yeni misiniz?"
   },
-  "newTokensImportedMessage": {
-    "message": "$1 tokeni başarılı bir şekilde içe aktardın.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Token içe aktarıldı"
-  },
   "newTotal": {
     "message": "Yeni Toplam"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Yeterli Gaz Yok"
   },
-  "notifications": {
-    "message": "Bildirimler"
-  },
   "notifications10ActionText": {
     "message": "Ayarlarda ziyaret et",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 İşlemlerin okunmasını daha kolay hale getiriyoruz."
   },
-  "notificationsEmptyText": {
-    "message": "Burada gösterilecek bir şey yok."
-  },
-  "notificationsHeader": {
-    "message": "Bildirimler"
-  },
-  "notificationsInfos": {
-    "message": "$1 tarihli bildirim: $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Tümünü okundu olarak işaretle"
-  },
   "numberOfNewTokensDetected": {
     "message": "Bu hesapta $1 yeni token bulundu",
     "description": "$1 is the number of new tokens detected"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Köken"
   },
-  "osTheme": {
-    "message": "Sistem"
-  },
-  "padlock": {
-    "message": "Asma Kilit"
-  },
   "parameters": {
     "message": "Parametreler"
   },
@@ -2435,10 +2371,6 @@
     "message": "Adrese, hesap bakiyesine, aktiviteye bakın ve işlemleri başlatın",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Süresiz çalıştır.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "\"$1\" hesaplarını ve varlıklarını kontrol et.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 tane daha",
     "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": "Popüler özel ağlar"
-  },
   "preferredLedgerConnectionType": {
     "message": "Tercih Edilen Kayıt Defteri Bağlantı Türü",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Devam etmeden önce doğru Gizli Kurtarma İfadesini kullandığından emin ol. Bunu geri alamazsın."
   },
-  "restartMetamask": {
-    "message": "MetaMask'i yeniden başlat"
-  },
   "restore": {
     "message": "Geri Yükle"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Tutarı Gönder"
   },
-  "sendBugReport": {
-    "message": "Bize bir hata raporu gönder."
-  },
   "sendSpecifiedTokens": {
     "message": "$1 Gönder",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Cüzdanınızı doğrudan bilgisayara bağlayın. Kayıt defterinizin kilidini açın ve Ethereum uygulamasını açın. Donanım cüzdanı cihazınızın kullanımı hakkında daha fazla bilgi için $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Bu mesajı almaya devam mı ediyorsun?"
-  },
   "storePhrase": {
     "message": "Bu ifadeyi 1Password gibi bir parola yöneticisinde saklayın."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Akıllı İşlemler kullanılamazken bile token'larını değiştirebilirsin."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Swap işlemin özel olarak gönderiliyor..."
+  "stxPendingFinalizing": {
+    "message": "Sonuçlandırılıyor..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Gas optimize ediliyor..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Swap işlemin herkese açık olarak gönderiliyor..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Takas özel olarak gönderiliyor..."
   },
   "stxSubDescription": {
     "message": "* Akıllı İşlemler, işlemini birden çok kez özel olarak göndermeye çalışır. Tüm denemeler başarısız olursa Takas'ının başarılı bir şekilde gerçekleşmesini sağlamak için işlem herkese açık olarak yayınlanacaktır."
@@ -3179,10 +3102,6 @@
     "message": "$1 artık kullanılabilir.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Swap işleminin tamamlanmasına kalan süre <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "İşlem maliyetlerini azaltmak ve arızaları azaltmak için göndermeden önce işlemleri simüle et."
   },
@@ -3261,6 +3180,10 @@
     "message": "$1 ile eşleşen token yok",
     "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"
   },
+  "swapCompleteIn": {
+    "message": "Değiştirme işlemi şu süre içinde tamamlandı <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Donanım cüzdanınızla onaylayın"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Fark en az sıfır olmalıdır"
   },
-  "swapSlippagePercent": {
-    "message": "%$1",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Likidite kaynağı"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Token Sembolü"
   },
-  "tokensFoundTitle": {
-    "message": "$1 yeni token bulundu",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Anladım"
   },
@@ -3804,9 +3719,6 @@
     "message": "$1 ile bağlantı kurmada sorun yaşıyoruz, $2 kısmını inceleyip tekrar deneyin.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask başlatılırken bir sorun oldu. Bu hata sürekli bir hata olmayabilir; bu yüzden uzantıyı yeniden başlatmayı dene."
-  },
   "troubleTokenBalances": {
     "message": "Token bakiyeleriniz yüklenirken sorun yaşadık. Burada görüntüleyebilirsiniz ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "MetaMask parolanızı girin"
   },
-  "typeYourSRP": {
-    "message": "Gizli Kurtarma İfadenizi girin"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Bu özel ağ tanınmadı. Devam etmeden önce $1 öneririz",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "ağ bilgilerini doğrula",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Toplanabilir (ERC-721) tokenlerin gönderilmesi şu anda desteklenmiyor",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Cüzdan oluşturma başarılı"
   },
-  "warning": {
-    "message": "Uyarı"
-  },
   "weak": {
     "message": "Zayıf"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 2b47cd8d45ef..c2e046eb4016 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -137,10 +137,10 @@
     "message": "Ваш браузер не підтримується..."
   },
   "buyWithWyre": {
-    "message": "Купити $1 через Wyre"
+    "message": "Купити ETH через Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre дає змогу використовувати кредитну картку для внесення валюти $1 безпосередньо у свій гаманець MetaMask."
+    "message": "Wyre дає змогу використовувати кредитну картку для внесення валюти ETH безпосередньо у свій гаманець MetaMask."
   },
   "bytes": {
     "message": "Байти"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index a38862ed5fb6..02eaddd38a02 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -62,13 +62,6 @@
     "message": "$1 có thể truy cập và chi tiêu tài sản này",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "Truy cập ví của bạn bằng Cụm từ khôi phục bí mật"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask không thể khôi phục mật khẩu của bạn. Chúng tôi sẽ sử dụng Cụm từ khôi phục bí mật của bạn để xác thực quyền sở hữu, khôi phục ví và thiết lập mật khẩu mới. Trước tiên, hãy nhập Cụm từ khôi phục bí mật mà bạn đã được cấp khi tạo ví. $1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "Đang truy cập máy ảnh..."
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "Thêm mạng"
   },
-  "addNetworkTooltipWarning": {
-    "message": "Kết nối mạng này dựa vào các bên thứ ba. Kết nối này có thể kém tin cậy hơn hoặc cho phép các bên thứ ba theo dõi hoạt động. $1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "Thêm token được đề xuất"
   },
@@ -411,14 +400,6 @@
     "message": "Mua $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "Mua $1 bằng Coinbase Pay",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "Bạn có thể dễ dàng mua hoặc chuyển khoản tiền điện tử bằng tài khoản Coinbase của mình.",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "Mua $1 bằng MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Mua $1 qua Wyre"
+    "message": "Mua ETH qua Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre cho phép bạn dùng thẻ ghi nợ để nạp $1 trực tiếp vào tài khoản MetaMask của mình."
+    "message": "Wyre cho phép bạn dùng thẻ ghi nợ để nạp ETH trực tiếp vào tài khoản MetaMask của mình."
   },
   "bytes": {
     "message": "Byte"
@@ -466,6 +447,9 @@
     "message": "Để $1 một giao dịch, phí gas phải tăng tối thiểu 10% để mạng nhận ra giao dịch này.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "Hủy hoán đổi"
+  },
   "cancellationGasFee": {
     "message": "Phí gas hủy"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "Tiếp tục"
   },
-  "continueToCoinbasePay": {
-    "message": "Tiếp tục đến Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "Tiếp tục đến MoonPay"
   },
@@ -650,7 +631,7 @@
     "message": "Tương tác với hợp đồng"
   },
   "convertTokenToNFTDescription": {
-    "message": "Chúng tôi phát hiện tài sản này là một NFT. MetaMask hiện đã hỗ trợ gốc đầy đủ cho NFT. Bạn có muốn xóa tài sản khỏi danh sách token và thêm tài sản dưới dạng NFT không?"
+    "message": "Chúng tôi phát hiện tài sản này là một NFT. Metamask hiện đã hỗ trợ gốc đầy đủ cho NFT. Bạn có muốn xóa tài sản khỏi danh sách token và thêm tài sản dưới dạng NFT không?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Chúng tôi phát hiện tài sản này đã được thêm dưới dạng NFT. Bạn có muốn xóa tài sản khỏi danh sách token không?"
@@ -1244,10 +1225,6 @@
     "message": "Tất cả các API của Flask đều là thử nghiệm. Chúng có thể bị thay đổi hoặc xóa mà không cần thông báo, hoặc chúng có thể ở trên Flask vô thời hạn mà không bao giờ được chuyển sang phiên bản MetaMask ổn định. Bạn phải tự chịu rủi ro khi sử dụng chúng.",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "Đảm bảo bạn đã tắt tiện ích mở rộng MetaMask thông thường khi sử dụng Flask.",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Tôi chấp nhận những rủi ro này",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1416,6 @@
   "hide": {
     "message": "Ẩn"
   },
-  "hideFullTransactionDetails": {
-    "message": "Ẩn chi tiết giao dịch đầy đủ"
-  },
   "hideSeedPhrase": {
     "message": "Ẩn cụm từ khôi phục bí mật"
   },
@@ -1471,12 +1445,6 @@
   "history": {
     "message": "Lịch sử"
   },
-  "ignoreAll": {
-    "message": "Bỏ qua tất cả"
-  },
-  "ignoreTokenWarning": {
-    "message": "Nếu bạn ẩn token, chúng sẽ không hiển thị trong ví của bạn. Tuy nhiên, bạn vẫn có thể thêm chúng thông qua tìm kiếm."
-  },
   "import": {
     "message": "Nhập",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1494,6 @@
   "importWallet": {
     "message": "Nhập ví"
   },
-  "importWithCount": {
-    "message": "Nhập $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"
-  },
   "importYourExisting": {
     "message": "Nhập ví hiện tại của bạn bằng Cụm mật khẩu khôi phục bí mật"
   },
@@ -1724,9 +1688,6 @@
   "levelArrow": {
     "message": "mũi tên cấp độ"
   },
-  "lightTheme": {
-    "message": "Sáng"
-  },
   "likeToImportTokens": {
     "message": "Bạn có muốn nhập những token này không?"
   },
@@ -1888,6 +1849,10 @@
   "metametricsTitle": {
     "message": "Tham gia cùng hơn 6 Triệu người dùng để cải thiện MetaMask"
   },
+  "mismatchedChain": {
+    "message": "Thông tin về mạng cho mã chuỗi này không khớp với hồ sơ của chúng tôi. Bạn nên $1 trước khi tiếp tục.",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "xác minh thông tin về mạng",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2001,6 @@
   "newToMetaMask": {
     "message": "Bạn mới sử dụng MetaMask?"
   },
-  "newTokensImportedMessage": {
-    "message": "Bạn đã nhập thành công $1.",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "Đã nhập token"
-  },
   "newTotal": {
     "message": "Tổng mới"
   },
@@ -2125,9 +2083,6 @@
   "notEnoughGas": {
     "message": "Không đủ gas"
   },
-  "notifications": {
-    "message": "Thông báo"
-  },
   "notifications10ActionText": {
     "message": "Xem trong cài đặt",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2203,6 @@
   "notifications9Title": {
     "message": "👓 Chúng tôi đang làm cho các giao dịch dễ đọc hơn."
   },
-  "notificationsEmptyText": {
-    "message": "Không có gì ở đây."
-  },
-  "notificationsHeader": {
-    "message": "Thông báo"
-  },
-  "notificationsInfos": {
-    "message": "$1 từ $2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "Đánh dấu đã đọc tất cả"
-  },
   "numberOfNewTokensDetected": {
     "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"
@@ -2359,12 +2301,6 @@
   "origin": {
     "message": "Nguồn gốc"
   },
-  "osTheme": {
-    "message": "Hệ thống"
-  },
-  "padlock": {
-    "message": "Ổ khóa"
-  },
   "parameters": {
     "message": "Tham số"
   },
@@ -2435,10 +2371,6 @@
     "message": "Xem địa chỉ, số dư tài khoản, hoạt động và bắt đầu giao dịch",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "Chạy không giới hạn.",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "Kiểm soát các tài khoản và tài sản \"$1\" của bạn.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2400,6 @@
     "message": "+ $1 khác",
     "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": "Mạng tùy chỉnh phổ biến"
-  },
   "preferredLedgerConnectionType": {
     "message": "Dạng Kết Nối Ledger Ưu Tiên",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2574,6 @@
   "resetWalletWarning": {
     "message": "Đảm bảo bạn đang sử dụng đúng Cụm từ khôi phục bí mật trước khi tiếp tục vì bạn sẽ không thể hoàn tác."
   },
-  "restartMetamask": {
-    "message": "Khởi động lại MetaMask"
-  },
   "restore": {
     "message": "Khôi phục"
   },
@@ -2832,9 +2758,6 @@
   "sendAmount": {
     "message": "Gửi khoản tiền"
   },
-  "sendBugReport": {
-    "message": "Gửi báo cáo lỗi."
-  },
   "sendSpecifiedTokens": {
     "message": "Gửi $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3031,6 @@
     "message": "Kết nối ví của bạn trực tiếp với máy tính.  Mở khóa Ledger của bạn và mở ứng dụng Ethereum. Để biết thêm thông tin về cách sử dụng thiết bị ví cứng của bạn, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "Vẫn nhận được thông báo này?"
-  },
   "storePhrase": {
     "message": "Lưu trữ cụm mật khẩu này trong trình quản lý mật khẩu chẳng hạn như 1Password."
   },
@@ -3163,11 +3083,14 @@
   "stxFallbackUnavailable": {
     "message": "Bạn vẫn có thể hoán đổi token ngay cả khi Giao dịch thông minh không khả dụng."
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "Đang bí mật gửi yêu cầu Hoán đổi của bạn..."
+  "stxPendingFinalizing": {
+    "message": "Đang hoàn thành..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "Đang tối ưu gas..."
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "Đang công khai gửi yêu cầu Hoán đổi của bạn..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "Đang gửi yêu cầu Hoán đổi riêng tư..."
   },
   "stxSubDescription": {
     "message": "* Giao dịch thông minh sẽ cố gắng gửi giao dịch của bạn nhiều lần theo cách riêng tư. Nếu tất cả các lần thử đều không thành công, giao dịch sẽ được phát công khai để đảm bảo Hoán đổi của bạn được thực hiện thành công."
@@ -3179,10 +3102,6 @@
     "message": "$1 của bạn hiện đã có sẵn.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Hoán đổi sẽ hoàn tất sau <",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "Mô phỏng giao dịch trước khi gửi để giảm chi phí giao dịch và tỷ lệ thất bại."
   },
@@ -3261,6 +3180,10 @@
     "message": "Không có token nào khớp với $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"
   },
+  "swapCompleteIn": {
+    "message": "Hoán đổi xong sau <",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "Xác nhận ví cứng của bạn"
   },
@@ -3442,10 +3365,6 @@
   "swapSlippageNegative": {
     "message": "Mức trượt giá phải lớn hơn hoặc bằng 0"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "Nguồn thanh khoản"
   },
@@ -3679,10 +3598,6 @@
   "tokenSymbol": {
     "message": "Ký hiệu token"
   },
-  "tokensFoundTitle": {
-    "message": "Đã tìm thấy $1 token mới",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "Tôi đã hiểu"
   },
@@ -3804,9 +3719,6 @@
     "message": "Chúng tôi đã gặp phải sự cố khi kết nối với $1 của bạn, hãy thử xem lại $2 và thử lại.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask đã gặp sự cố khi khởi động. Lỗi này có thể xảy ra không liên tục, vì vậy hãy thử khởi động lại tiện ích."
-  },
   "troubleTokenBalances": {
     "message": "Chúng tôi đã gặp phải vấn đề khi tải số dư token của bạn. Bạn có thể xem số dư ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3741,6 @@
   "typePassword": {
     "message": "Nhập mật khẩu MetaMask của bạn"
   },
-  "typeYourSRP": {
-    "message": "Nhập Cụm từ khôi phục bí mật của bạn"
-  },
   "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."
@@ -3870,6 +3779,10 @@
     "message": "Không nhận ra mạng tùy chỉnh này. Bạn nên $1 trước khi tiếp tục",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "xác minh thông tin về mạng",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "Hiện không hỗ trợ gửi token sưu tập (ERC-721)",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3900,6 @@
   "walletCreationSuccessTitle": {
     "message": "Tạo ví thành công"
   },
-  "warning": {
-    "message": "Cảnh báo"
-  },
   "weak": {
     "message": "Yếu"
   },
diff --git a/app/_locales/zh/messages.json b/app/_locales/zh/messages.json
index 66984cbd436f..5e6bfd118063 100644
--- a/app/_locales/zh/messages.json
+++ b/app/_locales/zh/messages.json
@@ -62,13 +62,6 @@
     "message": "$1可以访问并使用此资产",
     "description": "$1 is the url of the site requesting ability to spend"
   },
-  "accessYourWalletWithSRP": {
-    "message": "使用账户助记词访问钱包"
-  },
-  "accessYourWalletWithSRPDescription": {
-    "message": "MetaMask无法恢复您的密码。我们将使用您的助记词来验证您的所有权、恢复您的钱包并设置新密码。首先，请输入创建钱包时获得的助记词。$1",
-    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
-  },
   "accessingYourCamera": {
     "message": "正在访问您的相机……"
   },
@@ -160,10 +153,6 @@
   "addNetwork": {
     "message": "添加网络"
   },
-  "addNetworkTooltipWarning": {
-    "message": "此网络连接依赖于第三方。此连接可能不太可靠，或使第三方可进行活动跟踪。$1",
-    "description": "$1 is Learn more link"
-  },
   "addSuggestedTokens": {
     "message": "添加推荐代币"
   },
@@ -411,14 +400,6 @@
     "message": "购买$1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
-  "buyCryptoWithCoinbasePay": {
-    "message": "用Coinbase Pay购买$1",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
-  "buyCryptoWithCoinbasePayDescription": {
-    "message": "您可以使用Coinbase账户轻松购买或转移加密货币。",
-    "description": "$1 represents the crypto symbol to be purchased"
-  },
   "buyCryptoWithMoonPay": {
     "message": "用MoonPay购买$1",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -435,10 +416,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "使用 Wyre 购买 $1"
+    "message": "使用 Wyre 购买 ETH"
   },
   "buyWithWyreDescription": {
-    "message": "您可以通过 Wyre 使用借记卡将 $1 存入您的 MetaMask 账户。"
+    "message": "您可以通过 Wyre 使用借记卡将 ETH 存入您的 MetaMask 账户。"
   },
   "bytes": {
     "message": "字节"
@@ -466,6 +447,9 @@
     "message": "若要$1交易，燃料费用必须增加至少10%才能被网络认可。",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
+  "cancelSwap": {
+    "message": "取消交换"
+  },
   "cancellationGasFee": {
     "message": "取消燃料费用"
   },
@@ -622,9 +606,6 @@
   "continue": {
     "message": "继续"
   },
-  "continueToCoinbasePay": {
-    "message": "继续使用Coinbase Pay"
-  },
   "continueToMoonPay": {
     "message": "继续使用MoonPay"
   },
@@ -737,6 +718,9 @@
   "customGasSubTitle": {
     "message": "提升费用可能会缩短处理时间，但不能保证。"
   },
+  "customNetworks": {
+    "message": "自定义网络"
+  },
   "customSpendLimit": {
     "message": "自定义消费限额"
   },
@@ -1244,10 +1228,6 @@
     "message": "所有Flask API都是实验性的。它们可能会在未事先通知的情况下被更改或删除，它们也可能会无限期地留在Flask上而不会迁移到稳定的MetaMask。您需要自行承担使用它们的风险。",
     "description": "This message warns developers about unstable Flask APIs"
   },
-  "flaskWelcomeWarning4": {
-    "message": "确保在使用Flask时禁用常规MetaMask扩展程序。",
-    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
-  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "我接受风险",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1439,9 +1419,6 @@
   "hide": {
     "message": "隐藏"
   },
-  "hideFullTransactionDetails": {
-    "message": "隐藏完整的交易细节"
-  },
   "hideSeedPhrase": {
     "message": "隐藏助记词"
   },
@@ -1471,12 +1448,6 @@
   "history": {
     "message": "历史记录"
   },
-  "ignoreAll": {
-    "message": "忽略所有"
-  },
-  "ignoreTokenWarning": {
-    "message": "如果您隐藏代币，它们将不会在您的钱包中显示。但您仍然可以通过搜索代币来添加它们。"
-  },
   "import": {
     "message": "导入",
     "description": "Button to import an account from a selected file"
@@ -1526,10 +1497,6 @@
   "importWallet": {
     "message": "导入钱包"
   },
-  "importWithCount": {
-    "message": "导入$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"
-  },
   "importYourExisting": {
     "message": "使用账户助记词导入您的现有钱包"
   },
@@ -1646,7 +1613,7 @@
     "message": "已知合约地址。"
   },
   "knownTokenWarning": {
-    "message": "此操作将编辑已经在您的钱包中列出的代币，有可能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
+    "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
   },
   "kovan": {
     "message": "Kovan 测试网络"
@@ -1724,9 +1691,6 @@
   "levelArrow": {
     "message": "水平箭头"
   },
-  "lightTheme": {
-    "message": "浅色"
-  },
   "likeToImportTokens": {
     "message": "您想导入这些代币吗？"
   },
@@ -1888,6 +1852,10 @@
   "metametricsTitle": {
     "message": "和600多万用户一起改进 MetaMask"
   },
+  "mismatchedChain": {
+    "message": "此链 ID 的网络信息与我们的记录不符。我们建议您在继续操作之前 $1。",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "验证网络信息",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2036,13 +2004,6 @@
   "newToMetaMask": {
     "message": "MetaMask 的新用户？"
   },
-  "newTokensImportedMessage": {
-    "message": "您已成功导入$1。",
-    "description": "$1 is the string of symbols of all the tokens imported"
-  },
-  "newTokensImportedTitle": {
-    "message": "已导入代币"
-  },
   "newTotal": {
     "message": "新总额"
   },
@@ -2125,9 +2086,6 @@
   "notEnoughGas": {
     "message": "燃料不足"
   },
-  "notifications": {
-    "message": "通知"
-  },
   "notifications10ActionText": {
     "message": "在设置中访问",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2248,19 +2206,6 @@
   "notifications9Title": {
     "message": "👓 我们正在使交易更容易阅读。"
   },
-  "notificationsEmptyText": {
-    "message": "此处无内容。"
-  },
-  "notificationsHeader": {
-    "message": "通知"
-  },
-  "notificationsInfos": {
-    "message": "$1，来自$2",
-    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
-  },
-  "notificationsMarkAllAsRead": {
-    "message": "将所有标记为已读"
-  },
   "numberOfNewTokensDetected": {
     "message": "在此账户中发现 $1 新代币",
     "description": "$1 is the number of new tokens detected"
@@ -2340,6 +2285,9 @@
   "onlyConnectTrust": {
     "message": "只连接您信任的网站。"
   },
+  "onlyInteractWith": {
+    "message": "仅与您信任的实体互动。"
+  },
   "openFullScreenForLedgerWebHid": {
     "message": "全屏打开 MetaMask 以通过 WebHID 连接您的 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."
@@ -2359,12 +2307,6 @@
   "origin": {
     "message": "来源"
   },
-  "osTheme": {
-    "message": "系统"
-  },
-  "padlock": {
-    "message": "挂锁"
-  },
   "parameters": {
     "message": "参数"
   },
@@ -2435,10 +2377,6 @@
     "message": "查看您允许的账户的地址（必填）",
     "description": "The description for the `eth_accounts` permission"
   },
-  "permission_longRunning": {
-    "message": "无限期运行。",
-    "description": "The description for the `endowment:long-running` permission"
-  },
   "permission_manageBip44Keys": {
     "message": "控制您的“$1”账户和资产。",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2468,9 +2406,6 @@
     "message": "另外 $1 项",
     "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": "流行自定义网络"
-  },
   "preferredLedgerConnectionType": {
     "message": "首选 Ledger 连接类型",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2645,9 +2580,6 @@
   "resetWalletWarning": {
     "message": "在继续之前，请确保您所使用的助记词正确无误。您将无法撤消此操作。"
   },
-  "restartMetamask": {
-    "message": "重新启动MetaMask"
-  },
   "restore": {
     "message": "恢复"
   },
@@ -2832,9 +2764,6 @@
   "sendAmount": {
     "message": "发送金额"
   },
-  "sendBugReport": {
-    "message": "向我们发送错误报告。"
-  },
   "sendSpecifiedTokens": {
     "message": "发送 $1",
     "description": "Symbol of the specified token"
@@ -3108,9 +3037,6 @@
     "message": "将您的钱包直接连接到电脑。解锁 Ledger 并打开 Ethereum 应用程序。若要了解有关使用您的硬件钱包设备的更多信息，$1。",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
-  "stillGettingMessage": {
-    "message": "仍然收到此消息？"
-  },
   "storePhrase": {
     "message": "通过如 1Password 等密码管理工具保存该账户助记词。"
   },
@@ -3163,11 +3089,14 @@
   "stxFallbackUnavailable": {
     "message": "即使智能交易不可用，您仍然可以交换代币。"
   },
-  "stxPendingPrivatelySubmittingSwap": {
-    "message": "正在秘密提交您的Swap..."
+  "stxPendingFinalizing": {
+    "message": "最终确定中..."
+  },
+  "stxPendingOptimizingGas": {
+    "message": "正在优化燃料......"
   },
-  "stxPendingPubliclySubmittingSwap": {
-    "message": "正在公开提交您的Swap..."
+  "stxPendingPrivatelySubmitting": {
+    "message": "正在隐秘提交交换......"
   },
   "stxSubDescription": {
     "message": "*智能交易将尝试多次隐秘提交您的交易。如果所有尝试都失败，交易将会公开广播，以确保您的交换能成功进行。"
@@ -3179,10 +3108,6 @@
     "message": "您的$1现在可用。",
     "description": "$1 is a token symbol, e.g. ETH"
   },
-  "stxSwapCompleteIn": {
-    "message": "Swap距离完成尚有<",
-    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
-  },
   "stxTooltip": {
     "message": "在提交前模拟交易，以降低交易成本并减少失败。"
   },
@@ -3261,6 +3186,10 @@
     "message": "没有与 $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"
   },
+  "swapCompleteIn": {
+    "message": "交换将在此时间內完成<",
+    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
+  },
   "swapConfirmWithHwWallet": {
     "message": "使用您的硬件钱包确认"
   },
@@ -3442,10 +3371,6 @@
   "swapSlippageNegative": {
     "message": "滑点必须大于或等于0"
   },
-  "swapSlippagePercent": {
-    "message": "$1%",
-    "description": "$1 is the amount of % for slippage"
-  },
   "swapSource": {
     "message": "流动性来源"
   },
@@ -3679,10 +3604,6 @@
   "tokenSymbol": {
     "message": "代币符号"
   },
-  "tokensFoundTitle": {
-    "message": "发现$1新代币",
-    "description": "$1 is the number of new tokens detected"
-  },
   "tooltipApproveButton": {
     "message": "我理解"
   },
@@ -3804,9 +3725,6 @@
     "message": "我们在连接您的 $1 时遇到问题，尝试检查 $2 并重试。",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
-  "troubleStarting": {
-    "message": "MetaMask无法启动。可能发生间歇性错误，因此请尝试重新启动扩展程序。"
-  },
   "troubleTokenBalances": {
     "message": "我们在加载您的代币余额时遇到问题。您可以查看它们 ",
     "description": "Followed by a link (here) to view token balances"
@@ -3829,9 +3747,6 @@
   "typePassword": {
     "message": "输入您的 MetaMask 密码"
   },
-  "typeYourSRP": {
-    "message": "输入助记词"
-  },
   "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."
@@ -3870,6 +3785,10 @@
     "message": "这个自定义网络无法识别。我们建议您在继续操作之前 $1",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "验证网络信息",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "当前不支持发送可收藏的 (ERC-721) 代币",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3987,9 +3906,6 @@
   "walletCreationSuccessTitle": {
     "message": "钱包创建成功"
   },
-  "warning": {
-    "message": "警告"
-  },
   "weak": {
     "message": "弱"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 64633eb4ba1b..8e5ed751e5fe 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -363,10 +363,10 @@
     "message": "购买"
   },
   "buyWithWyre": {
-    "message": "使用 Wyre 购买 $1"
+    "message": "使用 Wyre 购买 ETH"
   },
   "buyWithWyreDescription": {
-    "message": "您可以通过 Wyre 使用信用卡将 $1 存入您的 MetaMask 账户。"
+    "message": "您可以通过 Wyre 使用信用卡将 ETH 存入您的 MetaMask 账户。"
   },
   "bytes": {
     "message": "字节"
@@ -1377,7 +1377,7 @@
     "message": "已知接收方地址。"
   },
   "knownTokenWarning": {
-    "message": "此操作将编辑已经在您的钱包中列出的代币，有可能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
+    "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
   },
   "kovan": {
     "message": "Kovan 测试网络"
@@ -1597,6 +1597,10 @@
   "metametricsTitle": {
     "message": "加入 6M+ 用户来改进MetaMask"
   },
+  "mismatchedChain": {
+    "message": "此链路的网络详细信息与我们的记录不匹配。我们建议您在继续操作之前$1。",
+    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
+  },
   "mismatchedChainLinkText": {
     "message": "验证网络详细信息",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3153,6 +3157,10 @@
     "message": "这个自定义网络无法识别。我们建议您在继续操作之前$1",
     "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."
   },
+  "unrecognizedChainLinkText": {
+    "message": "验证网络详细信息",
+    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
+  },
   "unsendableAsset": {
     "message": "当前不支持发送可收藏的 (ERC-721) 代币",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 4bed5f928ef6..94a79bdb3474 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -140,10 +140,10 @@
     "message": "買"
   },
   "buyWithWyre": {
-    "message": "用 Wyre 購買 $1"
+    "message": "用 Wyre 購買 ETH"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre 讓你使用信用卡在 MetaMask 帳號中直接存入 $1 。"
+    "message": "Wyre 讓你使用信用卡在 MetaMask 帳號中直接存入 ETH。"
   },
   "bytes": {
     "message": "位元組"
diff --git a/app/home.html b/app/home.html
index 46bbb857e374..97334c73c762 100644
--- a/app/home.html
+++ b/app/home.html
@@ -8,10 +8,7 @@
     <link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
   </head>
   <body>
-    <div id="app-content">
-      <img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" />
-      <img class="loading-spinner" src="./images/spinner.gif" alt="" />      
-    </div>
+    <div id="app-content"></div>
     <div id="popover-content"></div>
     <script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
     <script src="./sentry-install.js" type="text/javascript" charset="utf-8"></script>
diff --git a/app/images/fantom-opera.svg b/app/images/fantom-opera.svg
deleted file mode 100644
index 02297ee3a331..000000000000
--- a/app/images/fantom-opera.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle fill="#1969FF" cx="512" cy="512" r="512"/><path d="M480.953 162.82c17.25-9.093 43.496-9.093 60.746 0l176.016 92.795c10.39 5.477 16.095 13.638 17.117 22.063H735V744.11c-.23 9.19-5.988 18.32-17.285 24.275L541.7 861.18c-17.25 9.093-43.497 9.093-60.746 0l-176.017-92.795c-11.249-5.93-16.647-15.123-16.914-24.275a32.372 32.372 0 0 1-.001-2.35V280.82a24 24 0 0 1 0-1.937v-1.204h.08c.781-8.518 6.228-16.47 16.835-22.063l176.017-92.795ZM707 537l-165.355 87.46c-17.225 9.111-43.433 9.111-60.658 0L316 537.195v205.474l164.987 86.802c9.75 5.217 19.888 10.3 29.76 10.521l.569.008c9.852.032 19.418-4.978 29.117-9.72L707 741.92V537ZM260.424 734c0 17.88 2.06 29.633 6.15 37.912 3.389 6.863 8.475 12.107 17.761 18.489l.53.362c2.038 1.387 4.283 2.839 7.016 4.545l3.223 1.992 9.896 6.025L290.806 827l-11.076-6.75-1.862-1.153c-3.202-1.995-5.857-3.707-8.333-5.392-26.467-18.003-36.337-37.63-36.532-78.461L233 734h27.424ZM498 413c-1.28.44-2.481.951-3.575 1.53l-175.748 93.094c-.185.097-.36.194-.528.29L318 508l.276.159.4.217 175.749 93.094c1.094.579 2.294 1.09 3.575 1.53V413Zm28 0v190a25.085 25.085 0 0 0 3.576-1.53l175.747-93.094c.184-.097.36-.194.528-.29L706 508l-.276-.159-.401-.217-175.747-93.094A25.085 25.085 0 0 0 526 413Zm181-102-158 83 158 83V311Zm-391 0v166l158-83-158-83Zm213.422-123.373c-9.147-4.836-25.697-4.836-34.844 0l-175.9 92.997c-.185.098-.362.194-.529.29L318 281l.276.158.401.218 175.9 92.996c9.148 4.837 25.698 4.837 34.845 0l175.9-92.996c.185-.098.361-.194.528-.29L706 281l-.276-.158-.402-.218-175.9-92.997ZM733.194 197l11.076 6.75 1.862 1.152c3.202 1.995 5.857 3.709 8.333 5.393 26.467 18.003 36.337 37.63 36.532 78.461L791 290h-27.424c0-17.882-2.06-29.633-6.15-37.913-3.388-6.862-8.474-12.107-17.76-18.488l-.531-.362a212.559 212.559 0 0 0-7.016-4.545l-3.223-1.992-9.896-6.025L733.194 197Z" fill="#FFF" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/app/images/harmony-one.svg b/app/images/harmony-one.svg
deleted file mode 100644
index e8466d96d255..000000000000
--- a/app/images/harmony-one.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><linearGradient id="a" x1="71.37" y1="228.63" x2="228.63" y2="71.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00aee9"/><stop offset="1" stop-color="#69fabd"/></linearGradient></defs><path d="M201.17 60a38.81 38.81 0 0 0-38.84 38.71v42.92c-4 .27-8.09.44-12.33.44s-8.31.17-12.33.41V98.71a38.84 38.84 0 0 0-77.67 0v102.58a38.84 38.84 0 0 0 77.67 0v-42.92c4-.27 8.09-.44 12.33-.44s8.31-.17 12.33-.41v43.77a38.84 38.84 0 0 0 77.67 0V98.71A38.81 38.81 0 0 0 201.17 60ZM98.83 75.86a22.91 22.91 0 0 1 22.92 22.85v45.45a130.64 130.64 0 0 0-33 9.33 60 60 0 0 0-12.8 7.64V98.71a22.91 22.91 0 0 1 22.88-22.85Zm22.92 125.43a22.92 22.92 0 0 1-45.84 0V191c0-9.09 7.2-17.7 19.27-23.06a113 113 0 0 1 26.57-7.77Zm79.42 22.85a22.91 22.91 0 0 1-22.92-22.85v-45.45a130.64 130.64 0 0 0 33-9.33 60 60 0 0 0 12.8-7.64v62.42a22.91 22.91 0 0 1-22.88 22.85Zm3.65-92.14a113 113 0 0 1-26.57 7.77V98.71a22.92 22.92 0 0 1 45.84 0V109c0 9.05-7.2 17.66-19.27 23Z" style="fill:url(#a)"/><path style="fill:none" d="M0 0h300v300H0z"/></svg>
\ No newline at end of file
diff --git a/app/images/info-fox.svg b/app/images/info-fox.svg
deleted file mode 100644
index 57660c1fe6bc..000000000000
--- a/app/images/info-fox.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg width="60" height="45" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path fill="url(#a)" d="M0 0h60v45H0z"/><defs><pattern id="a" patternContentUnits="objectBoundingBox" width="1" height="1"><use xlink:href="#b" transform="matrix(.00101 0 0 .00135 -.001 0)"/></pattern><image id="b" width="990" height="741" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA94AAALlCAYAAAAypz7xAAAACXBIWXMAAAWJAAAFiQFtaJ36AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAOdxSURBVHgB7P1fkF3lmef5vjtFI1NgIcuWWxywKkHUwdYYO0VXCyqsKMnqhqarRkbqQxxPlyMOEn1zfNMg903PTSOfqzMRZQuuKiaihpQnjuu4zqFLkpmpwrgDi2o8hTW2JQ8u2a6SIBHQqCwshCwbSw25Z/32zlfaSuVe77PWXn/etdb3E06nRK6UlHuvvfZ63ud5n8c51KLf7z+efDzmAAAAAABAsZKAe6Z/2SvJx7QDAAAAAADFWAi2F5slAAcAAAAAYEJJcL2zP94rycdDDgAAAAAAZKeM9phs92LfIfsNAAAAAEBGaqbWz4bmawAAAAAAWCxku/N4Jfl4wAEAAAAAgPGS4HlffzKzfcrPAQAAAAC4WhIwb+kX45Xk41EHAAAAAAAu69saqmUNwKcdAAAAAABd108fHzapvcnHSgcAAAAAQBf17ePDJvFKn9nfAAAAAIAu6mcfHzaJ2T7l5wAAAACArujnHx82KWZ/AwAAAADarz/5+LBJvJJ8zDgAAAAAANooCXq39+Mw26f8HAAAAADQNv3yG6pl8Uqf5msAAAAAgLbolzs+bBJH+mS/AQAAAABN1q9mfNikaL4GAAAAABWacijSI8nHtIvbnj7l5wAAAABQmZ5DIfrDMu5XXLPsSz6+3Ov15hwAAAAAoBRkvIuzxzXPzuTjO8miwaMOAAAAAFAKMt4FSALXncmnWddsc8nHZ8l+AwAAAECxCLwLoD3TLv693VaPJx9PEIADAAAAQDEoNZ/QQrZ72rWHys6/Q/M1AAAAACgGGe8JLDRU+45rV+A9ap+j+RoAAAAATITAO+Ars/t3TrneQ/1+b9+XHn7ga6NfSwLvfcmnLmSG9yTB95cdAAAAACAzAu+AvbMHlNHesvDbueTjUBJyf/nRndv1+6aND5vEXPKxKwnADzkAAAAAgBmBd4q9s/tnkofoyFJfW7nihrmNn/qd6fW3r3Uds89Rfg4AAAAAZgTeKb765P59SYCZWkq+4obfcres+Yi7Z+aOwa87Ys4Ny8+/5gAAAAAAqQi8x0iy3dML2e6V1u9RAL7+9o+5DmXB5xyzvwEAAAAg1TUOS5p3bstUhqBbXj/11uDjxaM/60oWfDr5eKXf7+9xw9nfZx0AAAAA4ApkvMfYO3tAjdOm3YTWrb1pkAXX55abc5SfAwAAAMBVCLyXsHd2/5bkofmOK5Ay3ypBVxDe8iz4PkfzNQAAAAC4hMB7CZamapPoQBZcJecKvh93AAAAANBxBN6LLDRVq2Q+dwey4HOO5msAAAAAOm7K4QpqquYqcu78r92LR3/qnnzq2+7ZF44MGrO1zLQbNl+bTT6mHQAAAAB0EBnvRYpqqpaXMt/qhq6u6C3Lgs85mq8BAAAA6CAC7xF//Kf7ty9b1tufdoyC4XVr17gjx152ZfNl6ArCW+RA8rGb8nMAAAAAXcEc7xFJ0B1sqKZstAJiBeCa133h4n91ZTl2/OTgo2VZ8O360OzvJPj+sgMAAACAliPjvcDaVO3hB++9FPxqj/ZTz3x38LkqLcuCzyUfjyYB+EEHAAAAAC1F4L3AMkJMAe99m+664r8p460GaVWUno9qWRZ8n2P2NwAAAICWotR8QRL0bQ4do2zzYsuv/Udu88Y7B8Hv84d/7KqiLLs6oft/V8Oz4DuTjy0L5ec0XwMAAADQKmS8E1+Z3b9zyvVm045RYK0y8zR1lJ6PakkWfM4x+xsAAABAixB4u8EIse+4wPzu+zZtWDLjvZhKz58//JI7dvw1V6cWZMH3JB9PJAH4WQcAAAAADdb5wDtPUzUL7ftW1/O6NTwLPueY/Q0AAACg4TofeOdtqmZRd+n5KO1FX7f2Jrdh/W1u9aobXcPsczRfAwAAANBQZLxnDyjbPZ12zBc+tyV3sKqgW9nvPKXno2PLiqSfRQG4AnEF5A2hkvPHmf0NAAAAoGk6HXhbmqopSFXgPam8pecb1q9zt6z5cBK4n3QnTp5yRWpoFnzO0XwNAAAAQIN0OvBOst2axzWTdoy1qZrF6TPvuKefO5w5g63M94P3f2bwawXgyp6XlQUv6metwD5H+TkAAACABuhs4L13dn8ScPeOpB1jGSGWlQJmdT3Pmr32TdJ8YDwMwE+610/9whVJf48asenvakAztjlH8zUAAAAAkets4F1mUzWLvKXn98x8fBAUe34PuQLworPgCsD1GDQgC34o+dhF9hsAAABAjDoZeJc1Qiyr10+95Z594Uju0vPF/zay4IPsN83XAAAAAESlk4G3pamaAk2/r7pMCrqffeGHmYNlBcCbN35y0BxtqT+zw1nwOUf5OQAAAICIdDTjHR4hVmRTNYuiSs8X63AWfJ+j+RoAAACACHQu8N47u39L8mN/J+2YMpqqWZw4+aZ7/vCPM2ep1ZF829aNqQFwR7Pgc8nHE0nw/bgDAAAAgJp0LvCuu6laiIJijRzT6LEsFHQrS68gOKSDWfA5x+xvAAAAADXpVOAdS1M1i7JKz0d1MAuuzLfKz886AAAAAA7V6FTg/ZXZ/Y9Oud7etGPWrV3jtm2928VAWWkF31mDYgW9yn5nWTzoUBZ8ztF8DQAAAECFOpbxDjdV017ppTqF10VB91PPfDfXyDH9LNr/nfXvKzMLvmH9bbE8vvsczdcAAAAAVKAzgfcf/+n+7cuW9fanHVNXUzWL5w+/5I4ce9lllaX0fNSFi/910OztyLET7vSZc65IepxVgq5S9Aiy4Mz+BgAAAFCqzgTeSbZbncy3pB1T9QixrFQKrq7nCoqzUIZZM7/zBrlq9KYA/MTJU5n/bsu/TQF4zVnwueRjRxKAH3UAAAAAULBOBN5NaqoWMknp+YP3f2ain68DWfB9jvJzAAAAAAXrROAd+wixrBQAax92laXni/ks+LHjr7mi+QDcMhqtBHOO5msAAEQvSaysTD7NJB9Hd+/awcQSAFHrSMY73FRN2eCaAr3cFPiq63nW8m8Ftio9X37tP3KTUub99VNv5eq+HqLMtxYJ9LzUkAVX2fkOst8AAMQhCbRn+m5qc8/1FWxvcQv3dlP93vZHHn7goAOAiLU+8P7K7P6dU643m3ZMzE3VQuosPV9MAfhwLFmrsuA0XwMAoGI+m93vu+3J+/Cn3TCzvXKpY+fn+7v/3b/Z8bgDgIi1PvBuQ1O1EGW81fU8T8CrzPeG9etckVqYBZ9zlJ8DAFCaYT8etyUJtGeS99vNbhhoW+3bvWv7LgcAEWt14G1pqqZy6y98bkv0TdUsVHqurudZKfBWMFtE6fliLcuC73M0XwMAYGK6R+u7qQcWl43n0e/3D37p4R3bHQBErNWBd9uaqlnEVHq++N/Vkiz4XPLxRHJeUdIGAIDRyP7sLW4YaK90xZlLMt63OgCIWGsD77975fWZ//S//ehIqPGYst2rV93o2kSBrbqeZ80yK+OtALbo0vPFWpIFn0s+Pkv2GwCAK13an+2mPp0E2spEj92fXZQk8O5Ew2AAzdXai9SRYydeOfS9l6bTjlFwpixvWyn4VoY5KwXe2vtdtpZkwZX5foIAHADQVSOBts9olx5oX+U3/Vt3f3HHnAOASLUy8O73+zuffOrbs6FgrulN1Sw0b/vp5w5HV3q+WMOz4HOO5msAgI5YCLTVCG3LQsfxLa5mjBQDELvWBd5J0L1y7vV/OHLgP704nXZck0eIZaWgW13PT5w8len7VHquzHeVixMNz4LvczRfAwC0zKJAO2vH8UowUgxA7K5x7fPI3839l+nQQbes+bDrCgWZ27benbn0XPvjn33hSBIAvzsIWKugf+swQ712EICrU3vWBYNxFMjr5xH9+RvW31b0/v6d+kgWf5j9DQBorIVAe/vCaK8H3ELH8V7E6Zrk3zbtACBircp4JwHPdBJcvfLkU98OHqtsdxtGiGWlYHYYTMddej5K/1Zfhl50FlyBtwLwdWtvKnqc2lzysSu5YTnkAACImJ+hndwWbnYTjvaqCyPFAMSubYH3viRAe8hnNcdpe1O1kGHm94dJEP6LTN+noFul5wpS63Li5JuDILyoLLinoFs/VwlZ8H2O8nMAQESKnKEdEUaKAYhaawLvJOjeknz6jrLdNFWzydv1/J6Zj1dWej5OFVnwAs+ROUfzNQBATUZmaCvQVla42o7ji6xetWLwXlt0Q1VGigGIWZsC71deP/XW9FPPfDf1uC41VbNQBvn5wz/OHLzqDXPb1o1RlOsPA/CTmTP4IfrZVB2hRYaCfs45x+xvAEDJRgLtLW6Y0a410FZfHd036D1VH5q4kmfbWxAjxQBErBWBt8aHJZ9mdRFXAJYmhmxtbPTGp5FjeiPMIobS81H6OZTFVwBe9Ju5bhQ0kqygLPgeN5z9fdYBADChJNDekgTan44h0NbWLWW0fZCtgHu0h4oW+9U4NSvdc4Te2xkpBiBmjQ+81VAt+fSd5GI8TVO1yTS59HyxBmTB5xzl5wCAHEYCbZWNq3y89kBbi/AKshcH2p6fLKImr1npPkOL36H7PEaKAYhZG8aJPZR8TIcy3aKLNkH3eHpj0+OTdYb2MMv81mDvfCyPrx9JVnQW/PLe8pOTZsGnk499C70JaL4GAFjSwmiv0dLxQaCd/NrVQUG1SsdHM9oh2tamoFtjSrPQPYXuLfT3WDBSDEDMGp3xXsh2v6JfW5qqqZO59eLdZXoctVc+z8gx7fsuuCt4YSLOgqvkXME3q/QA0HHjAm1Xk+HUjzWX9mhneY9XoK3F/Dyl5fo779t01xXZ89C9HiPFAMSs6YH3vuTTQwqmQiPEaKqWXZtKz0dFvBd8ztF8DQA65VKg3Xfbk+v/p91wj3ZthovJw2ZoKh/PW8mWdxFfgbbuITasX3fV19SPRtnzFIwUAxCtxpaaL5ToqszcWcrMaaiWnS89VyOULOVhCmrVqE2N12Is7R+Wrt01+HXRWXCV3OtDCxY5suDTyccrCwtKlJ8DQAuNC7R7NaVCfKDtS8eLeN9Whlvvg3lKy9Mq51bccF3oj5h2ABCpxma8NT4s+TStlVSaqpVrktJzlfc34XGPMAs+52i+BgCNtxBob0kC7S3JNX2zG5aO10bvyaOl40W+RyvQVgViICu9JGW4tVi9VGM2TwG9kgGpGCkGIFKNDLz9+DD92jJCTEGPz3Aiv+cPv5S86b3ssmraCLfI9oIfSD52k/0GgGaILdD2o7186XhaYDsJVXvlmc2tf48q5CyL0wroVW6ehpFiAGLVuFLzhYZqj/nfW8ZSFDR7ufM2b7zzUtfzrKXneiMuYARXJSLriK4mMduT817Z7y87AEBUFgLt5DrtZkYD7bpKx0dnaOujrEB7lCkTvQQtBqi03HpvYGns9l5/nj3eAKLUxD3ej7iFPTwKYEIBkc8yohgqBdOKedbS82EG+a3GlJ7L4r3gurE4feacK8LoXvBhoB8cdbdnodLj0eTGjpV8AKjJokD7AbdwT1JXoO0boVUZaHuTzObW/YQy3VlYfjZGigGIVaNKzUfHh8lTz7wQLAfW/Ecy3sUbjgj5aa7Sc73RLtWttAnUNE4B+ImTpzI3jQnRgoYCcH0O2OdovgYAlRgXaNdltOO4PlcZaI9SsK2y76zvhfr3KsudNynCSDEATdW0jPce/wsFQKGgezh7MhjEIIfhnqw7L3U9z0LHK3OsALyuG4a8dJOjLLhuNLTXrMgsuP48fegxDWTBd7rB/sE+zdcAoGBJoD3tBp3GB2Xjyef6Mtp6jxwtHa8z0B6l9/E8s7m1aKD30Ekq3/QYpAXeC53iASA6jcl4J0GGVi/3+9/TVC0eXeh6nsZnwY8df80VzQfgKZmBOcfsbwDIbVygXYdYA21P7/PKcut9L6uiqt2efeGHwffb3bu2N3ZqD4D2alLgPRgfpl/rwv/1bx4KljcxQqw6ei7U9Txr8KkbCjVda2rp+Sidl37fdtEjyXQe63FKGf2yJ/l4IgnAzzoAwFgxBtq+bDzmnjRKdijTnWc2t7b9FfWzMVIMQFM1otR8oanUtP+9gpvQhb/o2ZRIp5sHXz6mwNNqGLD/OAlU3w3O74zd5RLxtYNzdNjBvJgsuG9gI2Oy4HuSj52UnwPAlRRo993UAz3XV7dxVc+tdDVpUqDtDXu6/CxXabnmheveoMj3dsu93dTyKZWbzzkAiEj0gffi8WFiCewUmKB6mtmtwDBr6fmwYdmbrSg9F18mqMej6Cy4H0m2RBZ8OvnYl7xmtjiarwHoqKUC7eTXrg4KOLWvebR0vElUUq7S8jyzucuqZjOOFPuQA4DIRF9qngQR+5JPD/nfK4hRUJdGQYjKzFEfvUmr9Fzdv7MYNm37ZCs70RedBR+1RBZcJeePM/sbQNvFltFucqA9SgviWjTOU1pe5iK6/j1/8md/mXpMcu/4xJce3vGoA4CIRB14Lx4fJjRVaxaNHMtSeu7lme/ZFBXvBZ9zNF8D0CJJoD2TBNqbk0B7ixvu0a410FY5tS8bb3Kg7Smw1b2WqtCy0nt3FdvGGCkGoIliD7z3uZFsty6yutiG0FQtLnlL1drS9TxNhVnwfY7ycwANFGugrX3abXt/0nuSgu48peVqoFbVCNennnkhNFJ2bveu7bc6AIhItIH3QkO12dH/pgDFN5gaR0GGgjXEZdgc7IfB2euL+QxuG0vPR1WRBf+/fPTDcytXXE/zNQBRI9CuR94KtSJmc2dlGCl2Ngm82ecNICoxB96Xxod5odIi2bZ1Y2Urrsgu7xu7mpQpeOyCsrPgt97y0UO/M33zLrLfAGIQU6Ct4HF0j3YXquf81Ay992RV17YwRooBaKIoA++lst3aa6Ry5TQ0VWuGvKVsyjhoYaUr2wjKzoKvuOH6Pa+f+vnXdu/ixgRAdZJAe0sSaH86CbS1B1cN0Qi0a6J7K70f1z2bOytLBeRUv7f9kYcfOOgAIBLRBd4LDdW+4xZluxV0hxp9aNW1jNEVKJ4CST2n2v+dhd7s9Tx3raqhzCy4G+z/7j+RBOBHHQAUjEA7PpPM5tbjt23r3aU3UEuje4evf/NQ6jHz8/1d/+7f7NjnACASMQbe+9xIQzWhqVp7UXqejV4LPgAvOgueONrv9x7v9eYPJkH4WQcAOcQWaI92HeceIf/Ct8SS4GCkGIAmiirwXmp8mDBCrN1UyaC9WlkDSd1EqdStqzdSetz0usg6K91AQfcBsuAALGINtFUZVWdWNkaTzObWVq+YxqUxUgxA08QWeO9PPl11kbQ0VVMn87r2GmFyen6feua7uUaO1bnPLAZVZMG/9PADdEIHoCBbQfVoMzQC7QZQoK0F7lASYylqyqlMd2yPrUrNA1l7RooBiEo0gfdSDdXE0kCDpmrtQen5ZIYB+MnMY9sM5pKPQ8kr9cs0YwO6I7ZAe/WqFYOFVgJtOwWnKi3PM5tb76ux9s5hpBiApokp8L5qfJg89cwLwSBCGc+2z3nuEgWOWpnPWgqnmzCtyrOHb5gF1yKGXjslZMEPJVnwfWTBgfaJNdD2HwTa2ZjGbi2hCVNEGCkGoGmucRFIgu5H3BJB93CcUjhzR4l5u2gRRc9p1tJz7XnWyn5s+9DqMCzBH/Y8KCELvqXX62/ZO3tgjyMLDjTauEA7+bWrA4F2MbRwrSx33tncynTH/tib/n0fGNxbzjkAiEDtGe9x48OEpmp4/vBLyar2yy4rSs+vVnoW3PUO9Ny8NtzNuWGDtjm6owNxIaPdfgq2df+Up7RcFYRNGdfJSDEATRNDxnuPWyLoFstKLXO7223zxjsH2dusXVgVYOqmQ8E3pedDpWfBBzfxV67lJVlxfZpzw0B8EIwni23v9Pvu7NTU4L9f+hpZc6B4sWW0NQPaj/Yi0C6eSq/zzubW+0OT3i8t/9Zeb3C+A0AUag28F7LdDy31NQUFodVavXl3vaS4C7S4ohX4rKXnw8DyrUHHe4LvK6mcXx8lZ8G96dHf9JI7od4StTYLQfogOF/4fDa5Rry6KEiXOYJ0YGmXAu2+25681j6d/HqL/nvdgbau4fpMoF0OXb+V5c5TWt7UCjGdS3pvT3vvSl4D3CQCiEatpebjxoeJYUwETdU6RhlvBYl5Ss/VdI3qiHQldkQvS1qQfinDTpCONhsXaNeFQLt66m+ioDvPbO6mj+M03Cse3b1r+wYHABGoLeO9MD5syaBbF9FQ0K03DILubtENnC89z9qlVcefPnMuylmksag4C16EQcDhfxPIpMucGwnU5+f7r/ampt7uuflX3ZWBOvvSEa2xGe2altEJtOszXIz+Wa7Scs0+V2l5058v9QgI3C9OOwCIRG0Z73Hjw4SmaghRQJi19FwUtFN6btfALHhR5txIaTtBOupCRhtLyfseGPts7qy0SKzFh1SMFAMQiVoC74W93a8s9TW9iTz51LddyMMP3kvw1HFa7VfX82PHX8v0fW278ahCg7LgdZhzI8H4SJA+2uGd5nEwiSnQ1rVSGUUC7bgow5214ajonqlt4za1MKxkTbr+huT6e9QBQM3qKjUfmyWyNAbRfiSCbgxHn9x1qeu51TBg/3ESQL7biFmlMVjcEV03firdx8D06G+mprSeqUZWS3Z4H92XvlSHd2FfeofEVDruA23fcZxAOy5671KQqT3dWTVlNndWlkWE+fnBliQCbwC1qyXwTm4u1Ahpya9ZAiiVmQOeOrJqb3LWsjsFj7qBofQ8G78XPO+M9Y7Lsi+dDu8tRKCNPCaZza3eJm3ticNIMQBNUuc4sTm3KFOkN5bQmwpN1bAUv3db5dBZSs91vqkraptvTMqiRncnTp4y3Qjq5l43gKoyoFTdLGuQfilQH9fh3Q1L3tmXXqGFQHtL8nxsIdBGHlokztpQVPT8qrS8zQvLOn/1kVZ2z0gxALGoM/C+6ubPEjCpsQuwFF8Onaf0XJkE3/UcdhpFo0qDkFvWrL7isdVjrgBcn0d/rc8+MCdIz2Tlwse0fjMuSJeFQH3O0eG9FIsC7c1uYfGEQBtZTTKbW6XlXXk/03t+oLM5GW8AUagz8P6RG7kY6g0m1MlcVFYMpNE5okZATz93mNLzkg1v6D8c7Hqux1bja/y82GFAYEtCLBWcXx24v3vp1zCZdiMVR4F96XOODu9jEWijDAq29R7WxdncWTFSDEBT1DlO7PHk0yP+95bOlLpx37b1bgdYKDDTPmSVQ2ehGxc1oaH03MaX64duEHUjqEWNKv4947LpiwN1FG7OtbzD+7hAuw4+0PYdxwm020Fl5Xlmc2sR1Fd9dYlppJjrf4gKHgB1i6bU3NZUjUAIdsPRKXcb35Qv8+V9vus50ulx3rD+tuBjrAyObibLHuOmf4/1xvPK0vZfE6RPbnr0N23o8B5jRtsH2l3KanaBrjvKcgeyt0tSWXlXR2Qar/fTjs7mAGpWd3O1AZX3Wpqq6WYDyEql57pBzdoRdtio7SSl5wa64VOPhtDjq+BcC2ixZOWyBumjWfSlsuoXLr7HvnS7KDu8E2ijDpPM5u5aaflijBQD0BRRZLwtJVVkHjEJX+acNZugIErNw5RNYOFnvOFM9XCjNd1U6uayiU1/siy+jC9xp3lcThN3eF+0L33wNZWeEmijTv6amKe0XIuYupZ2fXtBhow3ANSq9oy3bjxDjZmEGxBMSm/OX/jcllyl5wrYlTlnAWi8LI3W1t/+MXNztSbK2jyODu+FGtPhfWzJuxse5ypHoN1tWgTO2gRUdN7ovairpeWLWUaKTU31ftsBQM1qz3jb9nZ/jFJfFEYBtG5y1cAma+m5tkW0fS7qJNTYx9JoTY99FY3WmoAO791BoA0vb2l5F2Zz58FIMQBNUFvgnWQh1EzHNJ+Spmoomr/xzVp6rmNVTt31PXXjZGm0pv3zvLaz8ZmdrM3j6PBeDwJtLKbXmt538s7mVqabzvVXY6QYgCaobZyYJCu+rxz63kvTacfoBvPhB+91QFmylp57lJ4vTTeWynqHqgl086jXNjeRcaDD++QItJFGwXbWJp/ie2jQZ2Q8RooBaII6S811kQxeAAlsUDYF0Frg0Zt21tJz3Ujphoiyv8t0k6iGP8rqpFEAd+TYy7zGIzFph3f/37vU4Z1AG1bM5i4XI8UANEFtgffe2f3Tv7lwMXXPjW5quJFBFVTyrHNNZeRZggUF3voe7blrc7OwrBSIWBqtafGCHg7Nk7fDe9ObxxFoIyud18py5y0tb+IEiDowUgxAE9QWePf7bk+oi+y6tWu4IUdl/LaG5w+/NMjEWunGSqXVlJ5fSVmaJ5/6dvA43ZTSaK29iurwPlruXlWQTqCNSagZp65vzOYuHyPFADRBLYH3cG5q74HQcYzKQB02b7zzUtfzLDdMyt6quYsyFCwYXW60FlrEUCZIN6jsX8QkHd6X7vaevcO7/n5VYSjooYoFeUwym1uVQtu23k3vi4wYKQagCWoJvOed2z41nLM6Fjc9qFPe0nMFkAq+lcEl+B7unz92/DXTeDE93txswipPh3ff3CqNFovoto+8dJ5lnZbhadGWhEN+jBQDELspV4Mp13ssdIwyDkCd9Cb+hc9tGdyIZ6EbL5VY5+mU3ja+0VqIHrMs5f1AVtbmcSyYIS9luLXtKGvQffm9hqB7EtoWEjDtAKBGlQfee2f3b3GBi5/ehMg4IAbDwPHOQfCYNRur0vM8+/vaZlg98OHgcbppbXsXbADto2u8rvVZtyeJgm0F3VT4Tc6waLZyuNURAOpReeDd77udoWMsN+lAlfzNUdZs2LHjJ00zrdtOJech/uYVKAszyFE0Zbd1jde1PgtfDZRnURdLo8EagNhVGnhrhFiv13sodJzlJh2omi8HzLoNwpee52m00xbav20p2dce3DxjdwALS+BNqTmsfGl51oVVZbcpLS9ehpFiAFCLSgPveee2hI7RDTo3PoiVMhMak5VntqrKEPOUIraFFtQsmR3K8wHETIG2Gm/qep5V3uophBkrB6YdANSk0sCbpmpoC908aeZ31punvBmSNtBNkWXOOY3WUBbL646ACGlUkaOgO2tljq5/mnaRZ9EWNnrthoJvRooBqFNlgTdN1dA2Ol91I5Wn9FzBdxdLz7VgQaM1AE2kDHfWEZOia56y3KroQ7kMC2eUmgOoTWWBt6WpGkE3mkZv8io9t2RyR6mU2peedw2N1lAXtjAgj0kWS5XhfvD+TVRSVISRYgBiVkngbW2qRpk5mkrBZJ59e7qRU+O1LmV3abSGuoQCb4IjLOYnU+SZza2KKBqoVcuwz5uRYgBqU0ngPT/vtoeOUdDNTQ+aTB1VdaO1bu2aTN/nsylZx9E0WZZGawBQNV+VlKfZo94DKC2vh3Ee+rQDgBpUPsd7HMrM0QZaPNq29e5cpee6wXvx6M9cF2RptNaVxwTlC1WWsPgL8bO5s5aW+9nceg9gNnc9GCkGIGbVBN5T7mzoEN6k0CbK6Cr7nfVG/sWjP+1M6blKMC03STRaA1AVXW/yNFCjtDwOjBQDELNKAu/kLzkaOibr/ikgdioz1I2YpYv3KD8j9sTJN13bWUbr+JJPACiLrjNPP3d4cK3JWlruZ3Mby5xRIkaKAYhZVaXmwYw33WbRRsMsyKbMpecKvnUT2PYyay1OWJoqahGCRmuY1Lnz76Z+fcUN1zl0j64tKi3PutipAO++TRsGC4hU7cWDkWIAYlVJ4L1714650DGhGyKgyVR6vm3rxlyl57ohbHOp9eaNd5puWsl6Ayha3tJyZbeV5aY/TXwMI8Xoag6gFlU2V5tL++K5879yQJutW3vToPQ8azmitmHoxrCtGV8F3ZbxYnoc8szRBbxQcLX82msdusFv6cmzoOdLy2nGFyfDQu40I8UA1CGiwJuMN9pPN2q6YctTeq6bxLaWnqsiwHITq5+fbSkoy/Jrr3FoP19annUx0zdQs/SmQH0YKQYgVpUF3v1+/9W0r9O1GF2iQFN7A/OUnucpi2wCPR4hNFoDMAldP3QNzbqApyaZw2aZzOaOnWXrEiPFANShwsA7PeOtN0EyWegS7Q3MM3JMWRrdOLZtEoBuaNetXRM87tjxkzRaQ2aWxSpKh9tLz3+e2dyiDLeaZHJ+NIMx402pOYDKVVdqPpUeeAuBN7pGN3IPP3ivaY/zKH8T2bbSc2ujtbZ3ewdQHAXbul5mXaz0W4OYzd0sxpFin3YAULHqMt7vh0eKMcsbXaWAU6XWWUfSqPRcY8faUnquGybLIoQy3jRaQxaWhV1GQrWL35qSZza3KpKYzd1chtcypeYAKldZ4L1smTsaOoaMN7rM3+hlLWfU7Nk27ftWdolGaygagXe3aCE/T2m5zgGVludZCEU8DAsmlJoDqFyVXc0NGe9zDuiySUrPn3zq260owdbNrrXRGiXnABbzpeV5Z3NTWt58K264LnQII8UAVK6ywHv3rh0KvOfSjrlw8aIDMCw9V9YlT+n5sy8caXz2W43W1EU4RDfYNFqDheU1QYaz2bQYN8ls7jzNLhEnRooBiFGVGW9JzXqT8QYu041gntJzdf1uQ+n5fZvuotEaKkXg3Vx5Z3PrOd+2dWOuhU7Ei5FiAGJUaeDd7/d/lPZ19msCV/Jdddff/rFM3+dLz5vcgIxGaygS7y/t5WdzZ11sVFWNrq/r1t7k0C6MFAMQo6gy3m1pDgUUabjn+a5BRiYr3ZCq9LypQQeN1lAUy/lBmXGz6J5BAXeehbd7Zj7ObO4WY6QYgBhVnPEOz/Im+AaWpiBUjdfylJ7naTQUAxqtAViKpjnkKS3X9VN7ue+ZucOh3UKBd7/f/5ADgAoReAMN4m8a85Se5xmtE4MsjdY0QghYSijjzf7eZvCzuZ9+7nDmKhdfWq5rCtovVG7e65HxBlCtSgPvZcsIvIFJKfhW6XnWjI2/YdVH08qy9fNa5OlmjG4g8G6+vAuIfja3Sst5nruDkWIAYlP1Hu+50AEE3oCN9ijmKT3PO+O2TvoZLQsNKjtVaT2w2IWL7zk0V97rlq8SYjZ395jeG39DgzUA1ak08F6Y5U2DNaAg/qZy3do1mb7PZ46aFKTSaA2TuHDxYurXabIVJ72W1SAyT6WOH8lo7HCNlrG8pqeWT1FuDqAyVWe8JTXw5oYZyEY3F9u23p2r9Nzf0DaBLxcN0aLCkWMvOwDN5mdzZ10g9NcKZnN3m2XB5b3+/K0OACpSR+B9NO2Lp8+ccwCyU+m5sjt5Ss8187sJ1Saat2tptPbi0Z9SPYMrUGreLLou5ZnNrWBL10FKy2HKeDNSDECFKg+8+/1+atthMt5AfrrpVOm5JTgd5efhNqH0fPPGO03HKZsPeKH3FkMjJlTAX4vyVOL40nK2DcALnQuMFANQpRoC7/SMt26OyFQB+Q33fW/KXHqu152C1djnYWtxYcP624LHqUw164xfAPXR61VBd9bXrcrJteBo2YqC7tB7Wuh+stfr0QAAQGWqLzWfSt/jLWS9gcmp9Fw3o1mzPyrTjr3ruX42y95NLSRwPYGEzmeypPVShjtPaTmzuTGOZQFnfr5/0AFARSoPvKcCe7zl9Jl3HIDJ6WZUwXfWrr56Deom+MTJN12MaLQGtEPe2dziZ3OzaIKlnDh5KnjM1JQ75ACgItF1NRcyVEBxdFOqjFCe0vOnnzscben5+tvXmvay64ae7SvdxntKnNRTQkF31sV2ZnPDwpDxntu9a0cwGQQARak88E4ucnOhY86df9cBKJbKs7dt3Zir9DxPCWgV9DOF+LFp6C5L4E3WtDp6PlRanmcryLq1aygtR5CCbsO5dcgBQIXqyHjLXNoXz53/lQNQPI3jyrPvO2/To7Lp5ptGa0BzKLudp7Tcby/ZtvVuZnMjyLZNqv81BwAVijTwJuMNlEVB98MP3pur9FzBd2yl5zRaQ4ilWoOMd/nyzub222UoLYfV66d+ETxm964dhxwAVKiWwLvf77+a9nX2YwLlU8B636YNmbNHKj3X3u9YXqf691sWEWi0BtRDC166Zqi8POviF7O5kZWu9Ya+AYccAFSspsA7PeOtN2YyU0D51KAsz02tyviUuYplAoFuzmm0BsRHWzxUWp51QoIW1NSTQuXllJYjC8u2oql+b58DgIrVU2o+lR54C4E3UA1fem7ZKz3KjwGKpfTc2mhNWTd0C6Xm9cjbmNHP5lZPCiArdcsPme/NP+8AoGL1ZLzfD48UY5Y3UK3NG+/MlV3SzbX2T9edSbY2WlPmjUZrQHkm6Qeh6hVmc2MShv3dRy0TdgCgaLUE3suWueDcRDLeQPXy7qdUhiGGkWNZGq2hOyznJeXMxdDCliphsi5u+dncWvwD8rJsaej3+2S7AdSirq7mwYw3+zCBelzuIJy99PzJp76deUxQkbI0WoutOzvqReA9Gb+NQ03Usi6c+9JyZnNjUidOngoe0+u5Aw4AalBL4L171w4F3qnBN4E3UJ/hzNw7c2WfdPNd5+guZe1Xr7oxeJwWCKisASbnS8vzLLrpGqPSchY+UARDpcVZxogBqEtdGW+ZS/sis7yB+imIVeO1PKXnKjetawHNsmBAo7XuCJ2H7CfOT8G2XutZ+7IwmxtF0zkYeq1TZg6gThEH3mS8gRj4G+T1t38s0/f5rud1lJ6rZHXd2jXB47RAQKM1IDstXKmyJc9sbj/G0FKZAlhZruXL3NR+BwA1qS3wTlYdX037OoE3EA+Vgd636S7T/ulRPquc5+Z8UiqVt5SvkvVuvwsX30v9OmXO2SizqEU1y9imUcMtLJ9MriUbeMxROEtjNcaIAahTjYF3eJY3wTcQF3UNz1N67stRq3xN699oaRCnIKLOhnAo34WLF1O/ThBol/e1rOw2peUoixZ2GSMGIHb1lZpPhTub0/gIiI8f+2Mp5R7lS8+zZskmoYUCyyKBOpxzvQHG0+tDDdTyVIgMZ3N/hr30KI2lzJz93QDqVlvgnfzFwVneWZu1AKiGbqC3bb07V+m53xdaFZW1hujfxXix9go161x+7TUO4ymoyTObW5UE27ZuHJSXU1WAMjFGDEATRNtcTSg1B+KmjLLKR/OUnmvmdxWvcTVa05xgy7+JRmvdRFA4nhbJlOnO+lr1s7nXrb3JAWVjjBiAJqgt8GaWN9AO2ruZt/RcN/RVlJ6rMZwluCLr3U5sI8huktncWpDTbG5Ky1EFxogBaIo6M96SGnhzswQ0Q97Sc90sqfS87IDX2mhNWRMarbVP6L2EAPFK6g6dp7Tc93/Ieh0AJsEYMQBNUXfgnbrP+/SZcw5AcwwzXdmbKL149Kell56rwRON1oDx/Pi/p587nPk1oIoXlZZrawdQJcaIAWiKWgPvfr+f2j2Nm1+geXTjreBbJehZ+NJWy01UHsNZ5DRa6xrL+wh7vC9PHcha8eFnc6vihccRVdN5axgjdogxYgBiUHPgnd5gTTdMBN9A8yizrOxXntJzZdvKCnxptNY9BN5heWdz+9JyZnOjLpbr9Pw8+7sBxKHeUvMpOpsDbabSc40TylN6nicQsKDRWreweDueHhstdKm8POvjpGBbi2tZK1uAIhmy3W5qijFiAOJQa+A9xUgxoPU0TijPvm91qlXpedGZ5yyN1qrouI5yWQLKLjZX87O5s27t8Fs2mM2NGBjeH+Z279px1AFABOpurjYXOoDAG2g+BTYPP3hvrtJzBd9FZ5+tjdbyZAKB2Km0PM9sbmW3leVef/taB9RNQbfhHD7kACAStQbelmYX586/6wC0g0rPlS3LU3quktiiFuJ8Q6gQGq01Hwsnl/mFLC0oZeVLyxm9hlhYqjWm+j3KzAFEo+6Mt8ylffHCxYsOQHsoW5an9Fw3WQoaVIJeBJXAWxutFfV3onqUmg/50vK8s7ktC1VAlSz7uxkjBiAmMQTeZ9O+yCxvoH186bllr/UoP/KoqCy0Gq1Z5MkQArHQ+atFq6zZfy1MKehmNjdio/cCw4KoxoiddQAQidoD736//6O0r1MmCLTX5o13DkrPszZpKqr0XAsAln3nyhKWNV8c5bKcI23NeOedzS3KcD94/yZKyxEl4xixgw4AIhJ9xls3DgTfQHup9DzP3lFfej5p8K29q5bAn0ZraBI/mzvrNglmc6MJTpw8FTxmaorGagDiUn/Gu+eCYx642QXaTTf7Cr7zlJ4/+dS3Jyo9tzZa09915NjLDs3StfcP/bxaJMqzUOQXwSgtR+wYIwagieoPvN93wf03NDYC2m8YAN+Zaz6wSs+ffeFI7iBLAYe10RojDpsldE60qZRa75V5Ssv94lOebR9A1RR0G671hxwARKb2wHvZMjLeAC7LO7bo2PGTg6Ajb2CsoD9E1yIF+EBs8s7mvlxtQmk5moExYgCaKvo93kKGCegWHwysv/1jmb7Pl57naSa1etWNplJ3ZVuyjmRCfULvH03PeGsxyM/mzrpIzWxuNBFjxAA0Ve2B98Koh2CDNQDdopJXjfvKMz847x7Xe2Y+biq1naSsHShK3tncOse3bd2Ya1sHUCfGiAFoshgy3jKX9sVz5991ALpJWTnN/M6alfNdnbMs3CkIsYwXo9Ea6qa+BnlKy9XLQFnudWtvckDTWBaZpvq9fQ4AItSQwJuMN9BlfsRRntLzrM2mFOjTaK09Qgu3K264zjWJzjkF3Hk6+evcZjY3mswyRowycwCxiiLw7vf7r6Z9nZtbAAoWVHpuyUiPGh2vZKWSc8ufS6M1VElNpfKUlvuFqzzbNoCYGBqraYzYnAOACEUSeKdnvIXgG4AoKM7TEEoZajVes1xLNMeYRmvtEHq+l197rYudXzx6+rnDmXsL+NJyZnOj6YzX2kMOACIVR6n5VLizOY2MAHjqQK4M3rq1azJ9ny891+ixEBqtdcPya69xMfOl5Xk69SvDrdJyGqihDY4df81wVP9rDgAiFUXgnfwjgrO8DV0sAXSIMt7btt6dq/RcwXJojyyN1lA33yAw6/sfs7nRRoaM99ndu3YccgAQqViaq5HxBpCLMtPKfmctPVdX6FDpOY3Wms3ynMTYaMwvDk0ym1tVIUBbaPEp9Hru9/s0VQMQtSgC74VGGKnBNxlvAONo/6qCb0uQPMqX8aY17LE2WsvSvA0YR+911u0Qo1ShodJyZnOjjSz7u5e5qf0OACIWS8ZbUgNvMt4A0gw7N2/KXHqu4FtNq8aVniuot4wxU/BOo7W4WN43YgpS88yeF2W3KS1Hmxm6mTNGDED0Ygq8U/d5nz5zzgFAiDLU27ZuzFV6Pi7o2bzxTlOARtY7Lk0JvH3lRZ7zx5eWM5sbbaXX8eunfhE67ChjxADELprAu9/vp9aSk/EGYLVu7U2D0vOs+1xV5qsAaHHm2tpoTd+fp/s0ukvn2lLnXIjOSWZzowssrw32dwNogogC7/RZ3gq8Cb4BWPnOznlKzxUILS49V2bRklXU93GtioOlZLvOjLcy3DrXspaWM5sbXXLi5KngMb2eO+AAIHLxlJpPpQfeQtdgAFmp9Py+TRtylZ4vDor054TQaK1Z6gi8/Tz5SWZzU1qOrmCMGIC2iCbwTv4hc6FjCLwB5LH+9rW5Ro75MmA/VUEZxnVr1wS/Tx2pabRWvxgrD3Ru5J3NrXOYBmroEsaIAWiTmJqrzYUOIPAGkJcCl4cfvDcJXG7L9H0+O+lLz62N1sZ1SUd1LIF3VZljXwmh+dxZFwS02ENpObqIMWIA2iSawNvSjfLc+XcdAExCgbNKxrOWGKv0XGPHxBK864aRRmsQP5s76/ngZ3Nv23o3s7nRSYwRA9AmMWW8ZS7tixcuXnQAMCmVnucZwaSbQJWeq2s6jdbiF3rsqwhmFWznaaBGaTm6jjFiANomtsD7bNoXmeUNoCi+63ne0nNL4K0bR0rO61Nn4K2/WxUSKi/PuvjiZ3NnHYcHtImlzHx+vn/QAUBDXOMi0u/3f9Tr9WbGfZ3MEYAiDUt57xwE0Vmz09bmacp4ao8u+3Ord+Hie64OOje0lztrltuXlqsiA+g6yxixqSl3yAFAQzQq401zNQBl8BnGshptkfWuR2h7UhnPd97ScmW3dQ4SdANDhsXNOcaIAWiSqALvfp/O5gDq4UvP19/+MVc0Gq21n96bFHDnmeFe9sIP0DS6Zhru9w45AGiQyErNbYE3NycAyqBS3/s23TXIPuYJoNIo661sJt2pq1NVqbmCBO3nzrodSu9l6rDPNgTgSpatPFP93gEHAA0SVcZ72TIy3gDqpwykZn4XuchHo7XqhQLhFTdc5yalBRplurMG3bes+fCgazlBN3A1U2M1xogBaJhGjRMTAm8AVfDjnIosPVe5uWY6o/l8d/s8WwjUQO3B+zdRvQUsQa8twxixQ7t37TjrAKBBogq8Fy6iNFgDEIVhKfBd7p6ZO1xRii5hx3ih94u8ga+CbQXdWRdRLo+wYzY3MA5jxAC0VWwZb0kNvBkpBqBq98x8vLDSc91UHjt+0qF59P6jhZM8s7m1v5/Z3EAYY8QAtFWMgffRtC+ePnPOAUDVfOm5ZnJPKk/ghmyKfnyV3c5TWu5nc6uJGo31gDDjGLGjDgAaJrrAu9/vv5r2dUrNAdRFwfe2rXdPXHquoPDIsZcdymMJvK0VDL60PO9sbkrLARsF3YbX7iEHAA0UYeBNgzUAcVPp+aRzl188+lOuZZFTADDJbG5VSNBADbA7cfLN4DGMEQPQVPGVmk+5YJdKSjQB1E3ZzOE4qA+7vJ594YhDOSyLGmlBsTJvynJbGj2NUjn5tq0bB+XllJYD2Ri6mTNGDEBjRRd4TwX2eAvjeADEYLjve1Pu0nMFdZYMD6rlZ3NnrUjQIowqIdatvckByEavN8P9HWPEADTWNS4+ZLwBNIpKz29Z85FBBjtrsKYgT99LdrR+eu70HGbNcovOgSLHzgFdwxgxAG0XXcY7WcmcCx1z7vy7DgBiouBZpedZx0Up2KPRWvGylpqr8iBPabnvdk/QDUyGMWIA2i7GcWIyl/bFc+d/5QAgNgrCVGqcNQhjrnd9/Gzup587nLmaypeWa9EFwGQYIwag7WIsNZe55GN63BfJeAOImcqOT585Z96/reysPuiAXRxLxtt3Lc+6PUDbArS4wpgwoBiMEQPQBVFmvJnlDaCpdPOofcJZm6bRZK16eYJuX1pO0A0U59jx1wxH9b/mAKDBosx4a5Z3rzf+67qx1QfNiADERB15VbKcZ3GQaQ3Vy1parmBbmW7ee4BiWXor7N6145ADgAaLs9R8Kn2PtxB4A4jJkWMn3ItHf5Z76oKlsRDsiqyMorQcKI/fahNwyAFAw8WZ8X7fnXXL0o9Rdoj9kADq5ptzTdogTX+OrmtZu6KjXHo+tm3dyPsNUBJLtnuq39vnAKDhogy8ly1zwa6VzPIGUDdlafLsEx5HN6AE3sUo4jlRhnvzxk86AOWxLFrO9+afdwDQcLF2NT8bOkAdgwGgLpOWli9F5eaUM9dPpeXKcjMmDCiXrp+vn/pF6LCju3ftmHMA0HBRdjVPLrAKvOfSjrlw8aIDgKr50nJ9ZA26Q30paLBWP2ZzA9WxlJn3+32y3QBaIdaMt6Rmvcl4A6ha3tJy7Q++b9OGwciwI8deHnvcMPvzFkFfAS5cfM9ltWH9bW7zxjsdgGpYmkr2eu6AA4AWiDLjLckK54/Svs4ebwBVUmn51795KHPQPZpBXbf2puDxhrJLGOhxz0pBAO8tQHUMGe+zjBED0BbRBt4ukPEuclQMAIwzSWm5GnM9eP+mSyXmlsZpltJLhOVpUqf3lWdfOOIAlE9ba0L3cpSZA2iTiDPe4VneBN8AyuRLy5XtzkKl5Q/e/5mrGqUpAA9lYnUzStZ1cnm7w2s7gJrmASiXZZFxmZva7wCgJQi8AWAJGnGj0vKsDc8UWCvoHrdPO7R/28/zxmQUeIea2Y3z4tGfZl5sAZCNFrlCGCMGoE2iDbyXLSPwBlA9X1qukuOsmed7Zj4+KC1XxnscS+M0S8MhhKU9DyE6B1gAAcrBGDEAXRRvxttNPRA6hsAbQJEmLS2/Z+aO4LGWTCwBXzFWr1rhJvH0c4d5nwFKwBgxAF0UZeC9d/bA3p7r7wkdxw0RgKKo7LGM0vLFFHSHAkLdlLLPe3J593l7fiGG5wIoFmPEAHRRVHO8987un04utWqkMTPmEHU6X+l/w80QgCKorDjPnl6Vlluy3ItprFiozFLBt2X8GMYrYh6673S+betGB6AYhoz3HGPEALRNNBnvJOhOgu3ed9z4oFtWjv7m9JlzDgDyUlClLHfWoFtZa2tp+VJsY8WY5z2pSfZ4j6LTOVAcyxixxCEHAC0TReD91dmDjyRBt4anTlu/Rze+923a4AAgj0lKy7/wuS0TZVP1vaF93paOv0g3LOufrNzco9M5UAzLtW2q3zvkAKBlag+8F/ZzP57le5TFmPTGF0B3qbRcjbOyblfRXO5Q13Kr0PVLGSG200zO0mDN+nzS6RyYnKWxGmPEALRRbXu8Dfu5l7T+9rVu88ZP5p7PCqC7/H5dy43fKF1vtMe3yMU+Zc5DmR99Xdc85DfMeL+Weoy2DKiU3NKwUws22mZQVBk70CV6jRm20RxijBiANqol423cz30VNTJSeTlBN4CsFGyrtDxr0K3ArYwKG0vjtKz/VlzNUmquygItrFjeW+h0DuRnynbP9w86AGihygPvvPu5J2lkBKDbVCKcJ1hSabmC7jKym/ozQ4EeDdYmZwm8VT6u41RNZeErJwBkYxkjNjVFYzUA7VRp4M1+bgBV8tnJPF3LlQG1BmJ5rVu7JvXr+vdbyp8xnp7L0MKJn5Chsn7rAi+dzoHsjGPEjjoAaKFK9niznxtA1XSDp6xk1sBVmU8F3VXs4dWC4rHj6fuPFeAp8478tJ/+2PHx54Ey3qqG0HuNtjSdO/9ucvxJF6JO58uvvYbnBzDQNdlQdXTIAUBLlR54L+znVtA9neX7dPNDaTmAPBQQ5clGKoAqO8s9ylLJQxftyVkarGmBxpel6xxQkGBZtNF5puexqLFlQFsZx4gdcADQUqWWmufZzy3s5waQhy8tzxp0K9Opxo1VBt2irHoos27ZE4l01n3enu8rYql6UAZPnc7ZEgCks/SsYIwYgDYrLfBOMt0rXX9+g8tBpZd0jAWQhTKUCrrzdi2va2xXaJ+3roVkvSdjC7zPXfF7Bd3acmChoDvPXHigK/QaMVzHNEbsrAOAliot8NbF80sP79jpXH+3y0h76zT2hwwCAAs1T1PQnfWaodLyumcyW4JCxopNxtJgbanHOEuncwUV6p4P4GrGMWJkuwG0WuldzZMA/PEk+L41+eVclu/TDfSTT32brrEAxlKGUQF31oBntLS87uaNlnnelJtPLrTAMW7RRosz1q1PWjTmPQu4mm2MWO+RYV8gAGinSsaJJcH3XBJ8b+j3+0+4jNQkif1zABZTBkWVMVmzwX5EYV2l5Ysp8A8FhZSaT06dzdOklfSr2WdoS4Cn9yxLR3SgS4zX6ZVqxjuchAMA7VPZHO+F0vNHkwB8l8uY/VYnTGW1LB0xAbTfJKXlCrrrLC1fiiUopNx8MpbnPG2B475Nd5nPG1VgsFgCXLZh/W3WQ6eT4Ps7BN8A2qiywNtLAvB9SfD92eSXR7N8n29eQxkf0F2TlJarrDyG0vKlWMrNLR2BMZ5tdNu5sV+j0zmQX8YRsdMLme+VDgBapPLAW1R6vnvX9g1JAP5ll5HK+LT3mxsaoFuUQZyktFzZ7ljRYK18lgZroSw1nc6B/BR8Z9jiM6Pg2wFAi9QSeHtJAL5nIfs9l+X7dEOjG3D20QHdoNLyPJMOYi0tX0xBYajcXIE3QdxkithLT6dzID81tQxd60Zs2Tt7YNYBQEssczX71sE/n7t/++cP9vvuQ71ez9zN8v335wddMs+df3dQQnjNstp/FAAFU6D5V8//IAm8X870fQpkN/2T9YMMS1OuDVpUCJWTT9/80egXEWJ26vSZ5OPtsV/X+4oycqHtCDetXjX4bCn/HwbzPVOpO9AF2lrz6hs/d79+94Ll8Jl/sf1fJ/eK32DUGIDGi+KONAm+zyYfB5IAPLlD6d2f5Xt1U/N3r7wxuJDHuHcTQD56bWs/d1qgtBQFpjvu/T3TvunYHDv+WurXl1977SD4Rj4KrPV+kUYZbUvpvwJpnaNvv3M+eKyqFXReWv5coO20GKrrmJInliqeXpL5JvgG0Aa1lpovxsxvAJK3tFzZSpWWNzHA0b85tHjIPu/JWM6LtAZri9HpHMhHrxtrs0Lpuf6eJ548+JADgAaLKvAWZn4D3aXsx7MvHMndtVz7B5ta+TKc570i9RgFbuzzzk83+aHzI0twTKdzID/frNB6zZ7v9fftnd2/xQFAQ0UXeAszv4Hu8V3LszZN9JmTmLuWW9nGipH1noRlcSMLOp0D+WVpVjg0GDM27QCggaIMvD1mfgPdoNJyLZhlzQauW7umsaXlS7E04GKe92RC54qC4qznIZ3Ogfy0RShD8L0yCb6/Q/ANoImiDryFmd9Ae42WlmfNAupGbdvWu1vVVNGyz5tqnsnY9nln34utiot7Zu4wHauqDhaGgSFd+9VoLYPpheB7pQOABmnMDK5vHfzzQ/dv//zzycV2ixuseNrogq5Owddft5yOskBEtCD25//rf85cOu1Ly5vYtdxCXdzTOmXrmqYgjxGK+WhhIzSe7vrrPpCrezydzoFs/PtAxsWus0ky5r9PEjMvOgBokEbduTHzG2gHlZZrPrdxjuslKi3XqLA2z7L+9bu/Gcy4TbPqxhsI2HLygbfeF8bRQu0dt97i8pi++R8PRpZZKji0bUABvgJ9oGu0+KQtRhnfB+aSoPtfJkH3Mw4AGqZxEWgRM7+1n4jgG6iegpHv/uAngzLbtMBnKSot37zxzta/dhWEhTKyCh7bmvGvwqtv/MNgIXYcBQL/9M7fcXno/NRzY5lRrNeAFll0fJu2TAAhfvE14/vA0YWg+6cOABoo+j3e4+Sd+a2MNzc4QPVUUqiu5brhyqJNXcstLCOvMu6HxCJlNFgbRadzYDz19MjeYLD/NTXbHY6cBYBmamzgLQsX4APW43WzpTm/AKqlYFtBd9Zg5pY1Hx50Lbd0+24TldSnmTQw7LqyGqwt/jvodA5cpuuWSsuzLr6quW5yv7dTo2YdADRYo2s2vzp78LGec//ecqwyENobSrYbqM6kpeX/7PdmOrktxNLlV9e0m1avcsjO0mDtptUfmvjx9d9vGQE3DPR7nVtkQjdM0ETti8MKRwBovsbe0Q6D7v4ey7G+VLXNDZmA2OhG68C3X8w8/sqX6eZtbtUGegy+/9Lfpx5zzbKpTj9Gk7A0WCvq8aXTObqOJmoAMNTIUvOvPnnwIWvQrRssgm6gWppTrNLyrOW6Ki3X67XrWT9dt0LXLEsWFeOFHt/TZ865oty36S7ze5BKzictcwdiobJyBd0ZexgcXdjPfdQBQIs0LuO9d3b/TK/nvpH80jR/5b/7w993q278oANQPl9a/t0fHMtcWn7PzMcHAQrbQYZUMaCZ3uPo8dUCBYuK+bz9zi9TH98i56XT6RxdpEUkbTPKpv9EEnDv0AQbBwAt06iMdxJ0TzvX25/8cqXleDVSo2QPqIYCxTyNc/xWkHtm7nC4zJL1JzOan+W9QSWyRaHTObpiwiZqjzoAaKnGBN4LQfd3kl9OW45X9kzzugGUT/u4KS0vluUxYaxYfpbAu+jO8XQ6R9v5sZEZF63URG1HEnTvcQDQYo0oNU+C7iTD3fsblyHoJnsGVMPPZKW0vFgqT9bN67nz7449RpmlT90x3cnO75O6/roPBBusXX/d8kHJd5HodI62mqCJ2u8lQfeLDgBariEZb3umW3vyCLqB8vnMRtZyQt/wkNdpWCgrq8CbcvP86mpgp0Wn0Kx278WjPx00KwRiNmETtTkHAB0QfeC9d/bAbPJpxnKsbmSsZXwA8puktPwLn9tCBs/Ikm2lu3l+q1etSP26FpfK2mdNp3O0ha96ykZN1LZvIOgG0CVRB96a1Z182mk5Vpkh3cgAKJdusPI0flI1yoP3b6ILdwa6roVK8YtsANY1ln3eZQW8WUZd6rWm11zRe86BST393PdoogYARtEG3gq6rbO6fbdY9ooC5cnbtdwHGFSjZKfHLpSVVeBN9+t86u4cT6dzNJ22TWS895pLPh53ANBBUQbeSdD9SJag25o1AJCPgrscnWoHGUVKyyfDWLHyWN43yn5s6XSOJtP5q3uwDMH3tPr2DJvmAkC3RBd4//Hs/u1J0G1aDc1SqgcgH93o52iaMygtV9DN63MyjBUrj95D6mqwNipLU1A1Wnvx6M8cEIscwfcMwTeALooq8E4uwjPLXG/WerxK9LipB8oxSWm5XpuUlhdDgTf7vMujhn9pymywNopO52gygm8ACIsm8E4uvtPJRXh/8kvTRVg39ZSvAuXw81jzlpYXPfu460L7vFWCzN7ffCwN1qpqakanczQZwTcApIsi8F4Ius2zupUZUGkegOIpm6agO2uwQWl5eSwLGRrxhuwsgXdVFQV0OkfTEXwDwHi1B97Di222oNu6Fw6AnS8tz7p/VDdY923aQGl5iWwN1s45ZFfnSLGl0OkcTUfwDQBLiyDjPSgvn7Ycuf72tQTdQAkmLS3XaxPlsczzJuOdj6XBWtWLGnQ6R9PpHLYuIC0g+AbQerUG3ntnD+xNPm2xHKuLuLJqAIo1SWk5UwWqE2q8peePsuN8Qg3W6thDT6dzNJ0qdTLetxF8A2i12gLvr84efCz59KjlWD+rG0BxFEhMWlqeoZQQE4ppL3LbxNRgbRSdztF0qoYi+AaAoVoCbwXdPdffYznWB93c4APFUYD29W8eyhyo6fVIaXk9LA3WCLzziW2f9yg6naPpCL4BYKjywPurTx58yBp0Ayie5nLTtbx59LiHHvsTJ085ZGcLvOtpXkenc7QBwTcA1BB493rzWo4/az3ed1pmFR+YjC8tz9qISTf+KiuntLx+ob3Ieo4JurKzNFirs5qATudoA4JvAF1XeeC9e9eOA871deWds36PbiRUFqtMHYDstHA1SWm5st2on2WsGN3N8wllvete0KDTOdogCb7Prlxxw1yGbyH4BtAay1wNvnXwz8/ev/3zB5OLaXJBtY0Sk1ff+Hny/z3TzSeAIS1Y5cmAKdj+g82/666/7gMOcdBCyPdf+vvUY65ZNuXuuPUWh2x+/e5vFt5jlvb++/ODjF2dVR83rV41+Pz6qV8Ejx1WifF+iXgk70Fn/z8HD509e+78tMuk/z8kSZtDDgAarpbAWxR8f+vgN76WBOC95OZgi/X7lLHTPsbpmz9K2SuQQoH2Xz3/gyTwfjnT9+l1temfrB90VL5mWW2XCCxBz8ex46+lLqL8+t0L7p/e+TsO2ehx+7tX3kg9Rllny37wMimQVlD99jvng8fq/VKLNXX/m4F3fvmrs3/+l/95ZfI5S+b6bBJ0/8sk6P6GA4AWqHWOtyQX1D3JhXV3lu/RTUee5lBAV/jS8qxlx36KAKXl8QqNl1JQTnfz7CyZ4boarC1Gp3M0yRv/8NaP/uzp57Pes81pWyKZbgBtUnvgLcmF9fG8+77ZzwhcSaXlem1kXZhSGa32c5Mdi5stQCTQysrSYC2Wx9V3OrdUfdHpHHU6+pOX5/7/f/Xd307OwyyZ7qMLQfecA4AWiSLwluQCqwvtZ12G4NvfULx49GcO6Dq9Hp594UjuruXqNsv2jfjZGqwxViyP0KJTTAsadDpH7F74wbGzh7730nTyywxBd/+J3bu2K+g2T78BgKaIagPnQtO1r/X77rper3eP9ftUVnnh4nvuptUfYk8qOslvv8jTtXzHvb/n1q29yaEZdI3T83zu/Ltjj1GA9ak7prkeZnTq9Jnk4+2xX4+hwdoovX71b0lrCudpD7s+eK2jbLr+/C/P/e9zx46fXJPtO/tfTgLuf+8AoKWiuytLgu/fJB/PZG26ppslNcbRTQVZO3SJSsuV6dZNdRbaK6yg27pXFPHQQksoQFQDSp7bbPS4NaHB2ih1Olegk3Y+eHQ6R9lUXfH/+8sXzv7DW29nCbrVRO2Lw22HANBe0ZSaL7bQdG2HG1yQbXTBV9aP/Y3ogtHS8qwlpCot37b1bhapGsqStbSMnMKVLAF1LA3WRm3eeGcSTH/YdOyLR3/qkkykA4qmzuW6B8vYuXxO2wyTe759DgBaLtrAW5IL8YG8TdeUBQTayp/nWW+glQFVAzW6ljebAsTQogmdzbPzpdtpYl3Y1UIanc5Rl7nXfz73Z08/vzJH5/LPDnv8AED7RR14y7Cr5aDpWqYLs24saLqGNsrbtVyl5XQtbwcFh6tXrUg9Ztj7gmZaWYUe11gDVjqdoy56Tzrwn/5mOuP15gCdywF0TSM676jp2rcOfuN/zLrvWzeeKgtU0zVKatF0uqn57g9+MlhQ0l7ULFRarnJUmm21h4KmUDk5+7yzs+yfj6nB2ij9m/R+d+z4a8Fjh/Pef+HuuPVmrgvILV+SQ53Ld+xSTx8HAB3SqHfb5CJ9KGvw/fY75wejdWi6hiZTkPXn/+t/NnUvHuVHDt1x6y0O7RMKsJZfe+0g+IadmhSGxrGpOdmqGz/oYkSnc1RBCzd/9fwPcvQL6O8e9vABgO5p3DL3QvB9MAm+73fG2ZB6g9AN6qobb4j2ZgkYR2V8usHJ2rVczZYevH8T53xLKcA6cuzl1OoHfU1jxWCnoFWPa5rrr/tA1AsadDpHmfxCsOX8GqHO5f8yCbq/4QCgo6Lf472UYSOOwb7vOev3+D1t7PtGU+icVRlf3q7lCrqp8mg3y35k9nlnY2mwdu78r1zs6HSOMuiaos7lOZqoaT/3IQcAHdbIwFsWmq6p4/kBB7SMH42XtTu/ggY1WKJreTdYSoRPnHzTIZtw47pmjGqj0zmKpMWZHEH30YXO5XMOADqusYG3JBdylS7tcsZZ3+tv/5i7Z+YOB8RMNzfqWp71JnhYWv4ZSkY7xPJcxzh3Onahzv+qImhCR3A6naMoqop49oUjGSto+l8j6AaAyxodeEu/7x53hr3eWvW/Z+bjDoiVLy3PfnPjBue2SsvpYN0tlnneZLyzs4zca0p22DdYtFDQreCb7QkYpWtIjm16jycB985hggQAII0OvL86e/CRXq/3kOVYrfoTlCBWk5aWU8nRXZrPnkbnFlnMbCyVBE16TPXzqO+DhRYUtAAIeNrSkuM9Zvve2f3TDgBwSWMDb13Qe67/uOVYZQMJuhErZRMoLUdeluwsWe9sLA3WXj/1lmsS9X3YsP4207Ha7kIjUozSfVTG4Hvaud53CL4B4LJGBt7JhXylLuiWY5UNIhuIGCljpsxSntJOSsvhWRqs0TQru9Brq4l75+l0jknkDL6PJPdsMw4A0NSMd+8xN7igp9ONk240gFgoS6ZMksrKn3zq25lLy32zJBaT4Ok6FwoST5w85ZBNKEDVwlkT90Jn7XSuaxQLN/AUfN+3aUOWb1Gi5MgTTx40bQsEgDZb5hpmsK/buT2WYxWgrLrxgw6ok4LtI8deds/9zY8Gn/X7PPtDFQjsuPf3TKXF6BadT6dOvz326++/Pz/IjF9/3QccbH797oXggsX0zR9tXNXJNcuWDc6FY8dfG5wXafT1V9/4uXvpZ3OD45Xl1+IflTbdpvcgnUN/98obwXPI6/fc9n+x/V+7bx38xvMOADqqUYH3cF+3+0byy+Ddo1Zl77j1ZgfUwQfbf/X89wc3rQqKJsmOaX/mH2z+XdNYIHSPJUhcdeMN7qbVqxzs9NpNowCkiY+priM3rf7QIJi20vVLmW99j6p2FIS///77gz+L61L3aBFP91i67ljf25L7ty0E3wC6rDGB98K+7r9JfrkmdKwyg/dtussBVdGNh4LrxcG2NRswjm5oleX+1B3TDhhHGcjvv/T3qcfoXFx/+1oHGwUWoQZj11+33LTHPka+gZwy2nm8/c75QdCla54+6/fXLJsiG94hOn90/hN8A4DNNa4x7Pu6CbpRBd1oqFu0sttZbjyslE3T/F1uZBGiG2CdL2l7cdmnm13oMX391C9ck6mSRtsUFDxPQo+RPrQfXNcrTVrQAriCMrLh7eZHWqpviXULVc/19+ydPTC9e9f2XQ4AOqTnGuArs/t3TrnerOVYxiuhTAqu1elXgbZuNMtqrqRu/GqCBFg9f/ilYADF9TGbZ1/4YbAc+4t/9AeNDy6feuaF0hYRdL7peqbP9KdoLwXdmtCRcYHvkHP9Hbt37TjrAKADoi81H+7r7u13xn3dlFKiaAquVTr+3R/8ZNAgTaWZusmYtIw8jfbOESAhC52PanaUZsUN13NeZaDXeagUu4kN1hbzjbLKWEj0jyEN2tpNz6net95+55eDbQdG00n+5/77t3/+W986+OcE3wBarwGl5oN53StDR6msjRFLKIpuFlVGrsy2SsmB2FkC6uG5zHXSyvKYKsPX9MUMP6YwS7lwHvqzVTHk54Mr4PfZcALx5tN5pEotS/XNiBnd5yVJls8mme85BwAtFnXgvXf2wF7Hvm5UREGJyi2Hnwm20Sy66dUCZFrJsN8ewb5bG0sw2Ja9836vbo5y4dyGi5tvDn6tMvTRsnQ01+aNdw6uMaHmhCOmCb4BdEG0peba191zvf+35Vg1oGLvGPJQgK3yx2dfODLRjG0rBUZqaBQqXx02J+LmE9no3E0LvFWO3obS6Kpo5rWuD2kl2Bcuvjd4TbeBLxfWeLqqFxT0d2oShB5vX5Kux13nqp4HNIt//8rQO0CTa7bfv/3zByk7B9BW0Wa8p1zvActxvpsvYOW7kKvcsazmaN7w/FwxKKlU/wGfaXz+8I8dULThzW56lknnPos6dlosO3Z8/GKcFjvaVEWgn+O+TRuSgPe6LBnLQl1Zkn6EBm0Npb47Op8yvN/NkfEG0GYRl5r3dyernzMuUGquGx5lK5X1Bpaic0TZmyqDbX+TyDgdVElBic63tHOcsWLZDAO99M7mChTbFhAqaJK6gu9Ro9t//Liy9bd/jAWkBsjwfjuX3PcxXgxAq0UbeGvVc+/s/l0LzdVSaY+Y5oe2pdwPkyt7xvZiPthWVtsHP0DVfIVFWnmnXhPs87azBNR6TNuYiY0p+PZo0NYcWuSznjtT/d6eRx7ePucAoMWibq6WBN+HkuBbme+9oWNVyuSbs6CbfLA93B/4TiXBtrIuuvHjvEMsdD6G9lUqUNRxCLME1G2uIlDwrYBW77FZrqnDkWHXDfZql4kGbXHyc71t+l9Ogu6vOQBouejHiSXB9+N7Zw9sTn65PXSsSs7VlZVV7+7QjaAyH1WN/dK5pZs6gm3Eypah/QWBt5GfOZ3WdLHs4LJuvpJHgZS1+aSuzevWrhuMlxpWHr05OO/KXBDVAog+VAHnS9K1R58tP9VTptt4rmhf9x4HAB3QgDneon0/4f3eusj74BvtVfWMbd8cjU7jaAKdo6F93nr9bN74SQebUIO1LoxpU+Cdddb3i0d/OnhcdK4peJfhJImTgyC8upnhNGirkhY+/FaAgLPJ/d1nHQB0RCMC72Q19Oze2f07FvZ7r0w7Vm/qKonjprJdqp6xrRvtYQOftVRQoHF07vry26W0rRN32braYG0xP+s7S/CtIEzHqlP6cNb85QVMLViMZsPLRIO2aui5tncx73+ZLuYAuqQxwzG/dfDPT92//fMXkuD7/tCxmgVKo5Xmq2vG9h9s/l33qTtuvZQ5LEOo4QzZdUzi1+/+JjgrftWNN5D5M9L8c12L0ty0+kOdeDyHjSSHfQQ0e9vi7XfOD85HzZAfvaZef90Hksdt1WCBU9dePYbXLJsazEYvsyTdT7rQc6prsbYKvP/++4N/G4tRk/n6Nw9Zn7t9SdD93zsA6JDGBN6SBN8v/ovtn7+1Nyw7T6Uy5DtuvZk30YZRcK0g+6+e/7576Wdzlzowl0Hnhm70RoNt3QRes6z8lwWBN8qkgEavozQ+gEKYHqvvv/T3qcesuOH6QWDZBXo89P6qwNvaWE7H6n153H5rXXdX3fjBwdd1TfYLnwqIrQF+XloY0L9Nrxl91u+1AMDifTbKdIcW/BbMJdnuHck93W8cAHRIQ/Z4X9Zz7tHkk5qtTacdp2BNjWC+8LktDvGqY8a2b7ZDwx20lQKG0D7vskt728TSYK2KLTAx0WMyLB+/JrjI4+nxU5m6pQnq6OKjvo8GbXHT+7ceM5v+Z7WF0AFAxzQq4y1aIb1/++cPJiH4zuS3H0g7VqvkKlnrShaiKXTTpFVxZZCe+5v/Y5DZ1vYAlXOWwWdnNm+80236J+svdeitIrM9DhlvlO3td36Z2m1br0O9FggmbBTwKRM6jq5f//TO33FdM33zPx58ti7kDCdRvDZ4X1ZlhsVwPv2NyXX8lsFj7K+NVZWka2FY71c+6Nd7h/Xf3gW+sa3tuRjs6z7gAKCDGhd4SxJ8n02C739Igu/giDEFdFq1Zi9jvfSG/HevvDEoRfvuD44tzNo+V2qw/ak7pgeB9j/7vU8PshU6D+oMtkcReKNsw7n2p1KP0WtC2ysQFto3r2tZVxcy/LXKGnzrsdKCa9735uFYx2FJuj6rX4FK0s+df9eVSQGmzgH92/17mK+G6DJVMaQtSo04lATduxwAdFTjSs295OK976tP7p/p9XqPhI5VsEezteoxYxuoj+U1YN2fC2d6/9B1zo/N6pp7Zj4+eIyU+bTSsQqW75m5w+WlwF0fCsL1njNakl7duDK3sH1pTefuNTQyzngdmRuOhm2XvbP7NWlneuFj5fy8m56a6v32wpcH/81dnsYz+mvAYm7h89mFj8F/m5/vv9qbmnq75+ZfXfjvc0wIaIbGBt7ypYd3PLp39oD2e6c2W9ObsVZktd+bsspyMWMbiINu/kP7kkMZcVxmW8g457rMb+PR+621BFyBm0wSfHu+YaBvGng5CH+r9Odm+L43HOGnx2B0bnhb6XENVW9d1t/d5MAgCbCnk09bRgJr3Xfqv10RSE9NOaBI00v9x+QcTP6/7wadrxYk8ZA+HU0+zvb7/R+53tQrSWD+I/03eirEo9GB91Bf8721xJ66iuhnS6oZDIrl98AxYxuIi2780xpf+T2sbMUJ86Om0gJKKgiGQacWubPM+lbwrcd188ZPuiLRoK08fl+3TbP2dSdBtoLqmX7fqarSN/Md3GMSWCNyg0Rkct5uGQ3Mk6B8Lvl0NMmU/2hqyh1yBOO16bkWSC6SW5If5TuWY/XGrpI0TGYYZP9iUGZXZjmf529a2rKH8vF9B1O/ruyPSjeBSej1Gbo55ppop0kZPqu5FF2bvvhHf+BwuYN5lvcHXeOHndLLv8brPUyvj7JL0hcbzYQ3ecFL1xVfZh8wt3vX9ltdxHQP2XdTn+65vvoGKXChHBxdcHT40dcN6VFK1avRgoz3YL/3oa8+uf8Jy35vlUU1/Q2vLsNsQXVjv3wZOZ2XgXyGJbfpgbde0wTeNituuC7167ouKoijEme41UFjw7RYYa0E0KLGU8/82m3burH0x3A0G65/32g2vEyjlWE+G77+9o81qiRdFQrGoPusRoe5yKhsPAm0H0gC7S3Jb/WxsjfIDgKdMjP8GEyJUlb8aL/ff77XcwcUVzmUohUZby85aZT13hI6Tm927PcOY8Z2ech4oypf/+ah1MCHLK2dAjMFkmmUse1qg7Wl6H3j2Rd+mKmfgA/a61jAqLJB22JNaNCmx+PJp75tOnaq39v5yMMPfM1FYCGrvXkkqw1gPJWhH+r3ewd6vfmDlKUXpxUZ78vUMXNQcj6ddpTfm6RVdVxp9KZDN0pVBNu60fBNeVgMAYqlxay0wNu/5mlOGGaplOp6g7XFdE3ftvVu9/zhl1L7DYzyZep1BN80aBvPN6o12ld30D0SbO9MfjtNVhsw03aL7b2eFqp6SmweIAgvRqsCb+1PSC60uyz7vfXmpsYnlFj6eb9vLswlfaeSYFuldYz9Asqn11ko4FFmj9dimIJAGqzls3njnYPHztoFW8G3qjUUfNe5NYwGbZfpuTNWAMypi7mrgcZ7JcH2I76MnGAbKMRoEL4veX1/jXL0fFpVau4lF95Hkx9tr+VYval38YaTGdv1otQcVdFr/U/+7C9Tj9FrUtdChD31zAup+4Ap3U+n/cH2EVRDsZbvd6lBm6VR42X9W6tu1LTQZPcxZ9huWLbl117jrr12WfJ52eDXK25Yfulro78GQs6dvzD4fOHi+8nHewsf77tfLvz3ms0lr7l9zs1/jcZsdq0MvCVZkdmffNoeOq7OvWRVq3rGth5T3zSGYPtKBN6okiVYfPjBe9nqYWApmdZjSYO18bIFcUO6HhYx67ssVTZoG1VFgzZffWDL8A9Gh+1xFRjJbifJluo6kSuY/uAN1yaLHtcPAukVN3wg+f3ywa99sA2UTUH46TO/HnxWIH7u/G8u/f6tM9UtBC7YRxbcpsVXh8F+bzXQmE47yu/3bmu2Rz+fSsiZsQ10l16TacGAb6TIAlmYbZ/3O1z/UvieHtovbC3XVqZcYg2+9fPoQ9vXqmzQNnyPP3mpy3gZDdoyPE8Hqgi6NWe733c7k3u8h5Kgu9SAWwH1LWtWDIJs/doH20DdtMCjc3Oc10+dGwTkp8+cHwTkb5wqtUfFTnVHT5Ker/T7vS9/KZKmijFqbcZbdHFOfkTTsrreLDXPtg2YsR0/Mt6okq4JoaZIbboGlsnS1ZnH0ibPrO8mPrZVNmgbVUSDtgxbA+Y0OqzMktMqyslvHgTZv5V8vnEQ1JC9RpsMA/B3BkH56TO/KrNknQB8jFYH3tKV/d7M2G4WAm9USdcEBYtp1wb2edtpz3zaY6lAR528EZYn+NZ7j/Z9N/G9p8oGbaPyNGizLNhdNgi6D7kSlBlwK4u9bu2HCLTRST4QP3HyTFkZ8Tn2gV+p9YG3fHV2/76e6z0UOk5vRJrv3YQSwTpmbCvYVqDd9hnbVSDwRtVC+7xFTcF4bYfRYK1YCkY1Hz1LR3hlczUStOkl/bE2aMu2IFLOvu6yAm5ltdetXeVuSz4oGwcuUwD+cvLhy9QLNDc/33/i3/2bHY+7jutE4K0GHAsl59OhY/UGpOA7Rj7Y9t3ImbHdXATeqJrGEj1/+MepxyiQ8fOLMZ6lwRqLGNno/ezZF344eG+zaltz1JgatGkhxM8UD5jbvWv7ra5AyT3bdHLPNusKDLh9sP2J21eT1QYMFHz/5PjPiw7CO1+C3onAWxYu5Aq+g404YtpDxoztdiLwRtXY510cS1duFjHysSxqjGrrZJIqG7SNGla33WhtxjpX5L7uhSSJMtyPugIowJ5Zf1PysYZgG5iAMuE/OX56kA0vSGcD8M4E3pJc1HcurKIG1Tk3lBnb7UfgjTqE9ibrWqBRWEhnabCmBQwtZCC7rLO+FSwq+K5qpnUd6mrQlmaq39v5SEE3zl+dPaixYHtcAWPBVEKugDut4zOA7DRXXHvBXzz6WlFZ8H0LW1XmXEd0KvCWrz65//Fer/dI6Liq93szY7tbCLxRB0v5KCXSNjRYK1fW4FvqXDCvUl0N2q7UfyK5WZ44M13UPm6y20C1VIJ+9NibRWTB+8k1IAm+H/iy64DOXZ16Pbcn+bQ5+ZhJO05vZCrLVPBd1k0oM7YBVEnXgFDgra93IXiZlK6hac3AYslKNpUWHvUYh0r6R+nYc+ffjXbWd1GGC+drL71Oa2jQNpd87HETKKqsXHu319++epDlJuAGqqOKEn0oC/69JAOuUvSckiRwf8/e2QMPdaH8vHMZb8my31tvbFpFLwoztiFkvFEHS4m0KmHu23SXQzoarFVDixtaBM+S1dW1s+3B9zjVNGjr3zpJaehCllvb/qZdTgq47575GOXkQCR8AF5AM7Z9bS4/72TgLcmFf3vy4++3HDvpXr0qZ2wLwXb8CLxRl1CJNKOwbCwN1rTvmK08k8sz65tGgWU1aOvvTm6Ic40EKiLLTcANxE0BuLLfCsIn0Nrma50NvCXLfu8sjVuYsY0QAm/URSObtMUljRqssR0lna7xX//modRjaLBWnDzBt94PVbHGe+JQAQ3aco8OmzTLTcANNEsBJeiSXDP6X0oW+866luh04C17Zw98xxmaeugmNG2/NzO2kQWBN+piydQSMIbpGq/qgTSU7RdLQbcaBKbtrV9M748a7cZC0pXyNmhLAu9M942TZrm1b/v3N/62+8TtH3UAmqeAAPyVJPje2pbScwLv4X5vBd/ToWO1eq43cI8Z28iLwBt1sezzpiO3jTLeaUEg49mKp/dZVW1ogduqrbO+i6Qg/MixE+HH9Tf9W3d/0XYDvHB/pS19My4jupQD7aIA/D8+87d593+3pvN5569mWkFJ3hx2LQTfqRRka7yJ3gSqGvtFsA2gSAo+9JFWslteU6Z20RaftMBbj7ECRSqSiqPHUotCluZ2ni9TJ/geT/cXw2RCeuA9tXzq027Y1TzVV588+FByr6y94Jnncqus/N5NtyfP1XIHoB30et714F2DzHeOOeC+8/mnF0rP51xDTTko+D6khiGWYzVb9PnDPy416NaNgTKeuklQk6PNG+8k6AZQGGW00/itM0hn6fvB41gOvS9m6Vyu4DtUodB1lvP5vf58cI93cnO8t9fr73MZg27dmP+r+/8b939LPgi6gXb6xO2rB69xfc5hRxKDPzespmkmAu8FC106D7maqBO5biJUlqgPlRkTbAMog+XaUkVFT9NZHkcCvfJkHRumBSUF3+pzgKtp0T9UnTE11fv0uK/pZjgJutVAIvN+bpWV/+vPfYrmaUAHaGFNVS1aaPtg9kW2ZPGv9/JX/qf9uacj1ImNM1fo71iY7z3tKsDYLwB1sASMKjmlwVo6S9kygXe5FHzreQg1DBylY8+df7ezs77T6LEMnLNL7tdOgu6Zhf3c0y7T37fc/fPkBpyAG+geve7/KFlw+97R193RY29m+dZesgj41b2zB29s2r5vAu8RalefvHn44LsUBNsA6jYcQXhj6g02AWOYHkf2y9fPT/fQPm5rk1NtGxOC7yuF+ha4JQLrvPu5leW+e+YWmqcBHTacXDDtblu7yn37heNZ9n77fd+bk8//qikjxyg1XyR54o5a93tb6MZMwbZmiWq/9oP3bxpkkQi6AdRJ16U0CmAoNw8LPY6+wRrKpcBbIz+zNE/zPVtwmWGf98q9f3J5f+VXZw8+lnU/t260/3DrHYObbYJuAKLsd869359NYvAfNmXfN4H3Ehb2ex91OflO5GqOpv3aCrbJcAOIiSpvQsjWhlkaUqVlxFGcPGPDNEJLs8FZHBmy3KcsdDYfNlFLMk4uA3Us117udUl2CwBG+b3fWpTL6NamNF0j8F7CwhOXae6k3qw2rL/tUify+zbdNdhHSbANIEaWgJGMdxiPY1x88G15XjyNClWZOgsktv4P6myeBN2zLmMTNZWW07EcQIiuFTsfvCtr47VbFzLfmeK3qhF4L2HeuS2W4xYH24z9AtAUfhtMGgWMZALTMVIsPj74Do3NG6XniODb1jBwaqq3N/m00xmNlpYDgIUW6NR47bZs1TEfUvD9xKDvRJwIvJcw5XqPhY7ZvPGTBNsAGo1xWJPzDdbSnD5zzqFael62bb17sDhupaCb4NtlKtUP/1nLKS0HkIsW7f7bZNHu7pmPZfm23nyvPxtr8E3gvchCicJ02jF6U2LMDoCms44VQ7pQ5QCLF/XR4niWzuU++O7yc5alTD+N389NaTmASWj6gapmMjRjHATfMc76JvBepN8P71kK3WQBQBNY+lCwPzmMcvO4adZ3nuD72PGTrotW3HCdm5Tfz03XcgBFUNWMFvIy7PsezPqOLfgm8F6k1+s9EDpGb+IA0Aaa25tGASP7vNMReMdP79sa62mlc/7ZF464F4/+zHXNpBlvlYWynxtA0VQ9owW9rMF3TGXnBN4jvjK7f6cLzKJUhqjI/U8AUCfLWDF1fcZ4tsCbfd5101hPzfrOMm1Es767FnxPEnhrFJDKQgGgDD74/sgqcywW1Z5vAu8RU64XfFI0nxsA2sLWYI2gMY2lwRol+3FQUKngO8sCeteC7zzJBZWU/6vkZvgTt692AFAmH3xn6Hg+CL73zu7f7mpG4L1gYXb3lrRj9GakFXMAaAsFIqEMIBnvsFCWkBnR8fDjxrIG3yo978K2C8tC0pXHD4PuW9ascABQBd/x/BO3f9T6Lb3kf0/WPeebwHtBv+/2hI6hqRqANgrNO1bQSOCYLvT+oICNxzAePvjOUlatZmtdGTdmfVx80L16FVvwAFTv3k3rsgTfmvP93EKytRYE3gt6vd7m0DGMEAPQRpabbEql01kyhDyGcfHBd2jhaZSa5HUh+LZ0NifoBhCDJgXfBN7uUlO16bRjdGNa1GxLAIiJpcEaQWM6Gqw1k8qqt229O1lYv838PX7cWJuDb8v5/M+Tm12CbgAxyBh835oE33+RBN8rXcUIvN2gqVpwhFiWN2UAaBJl/kIZ2xMnTzmMp8cvtFeekWLx2rzxzlyzvtv6nFoC74sX33MAEIuMwfeGJPj+qqtY5wPvhVKDYJc7S+dfAGgq9ihPLvQ+QeAdN836zhN8a+9321i2Tpw+8ysHADFR8J1h1NjOvbMHH3MV6nzgPT8fDro1QozZ3QDazLK4SHfzdKF9sSxexE/B932bNpiP13OqbudtGzem6o1QBce58xcdAMQmw5zvnnP9x6ocM9b5wHtqqvdI6BhGiAFoO/Z5T86yeMFjGA8tgqgKQc+JstZHjp0YjA3T77NWuel722b1qvTxYG+R8QYQoeGosY+7D96w3HK4HzM27Spwjeuw5EHe4gJN1ZTppswcQNv52b1pGdnXT/3CYTwarNVHmWdfUXDlr99LPi4OPo9+reh53G0cN6rzOe01f+78hcHjqptcAIjJiiToVub7//vN/2NwnQr40EKzta27d+0460rU6atlv+929nrpx2TZ7wUU5QJNa1ADjVU6cuzlsV9XsJInG9gVvsFaWlDHPu+w0eB4cbDsF4bOnX935Nf1l+9bKkaaxrLFTuXmq1cReAOIj4LvP9x6h/uLZ/7Wcriarf2H5POXXIk6e7UclhT0Hgodxw0m6qCyRV+6OLrXbvRGyO8nXX7ttZcyDv7ro9/jf23Zs4du0/UuLfAWBY5cF8dTeW5alrCLgfdogDz6a5+NVhC9OLBumjaOG7UE3m+dOc9IMQDRumXNCvf7G6fdXx+esxz+6BNPHvzRIw8/8DVXks4G3vPObQltcFf2h6ZqqNtoWWRRN6VLBfPD/3ZlAD/666X+G8F8u9garJ1yG9avc1haqDzXB5dNfW8JZaOHwfSVX2s7PZdtDLwtP5PKzQEgZjPrbxpcq44eCzaI7c33+nuT5Ozzu3ftmHMl6GzgPeV6wfbxNFVDW5URzI/Pto/PxhPMx0WPu/aqhjK2Ond4jpZm2+f9TjSB9+I90f6/xVrSHaM27u8Wy9YJAm8ATaCs9+un3nFvnQm+j2m/95PJ562uBJ0MvJOVjBlnaKrWxj1bQFnKuClPC+ZHS+yXKqcfF+AjnSVjS7n5eLbO5r8o5f2l7gZjXdXm14KunWnbI944RbNAAM2gTufGZmtbvvI/7X/03/2bHY+7gnUy8O733aOhpmptXcEGmqTMYH6S/fKLv79NFBCG9nkrcCTwXpotSxgew9TEBmNd1ebXgnoWpAXeFy6+7wCgCTI0W+tNTfX+Q5KoPVB0yXknA+9er/dA6Jh7Zj7ugLKEynlRnqIDlVDzu1A5fWwl9sp4hwLH4SxqJj6ME2qwpq9pbjTZ6ObT67fNFTXDrROvjf368Ly9MLihBYDYqdma9nwb9nuXUnLeucD7K7P7dyafVqYdo9VrSlNRJi3sPPXMdx2ar8zmd3Xsl9fx4cDxLfZ5p7CU6z/7whGHalyucrnuioqX0V/rXH7x6E8HzQOzaHt1nOVe6PSZXxF4A2iMDPu9Cy8571zgPWUYIbb+9o85oExa3Nmw/rZgSS+6qYyMZ5bmd8kqb/DPY5/3eG3scB0Lf/4qiL7869+6YqFq8e8ttJiUNeiWtveCsZzLv6TBGoCGMe73LrzkvFOB93B2t9uSdozesOlmjioo633s+Gu5AixlJP3Fgr2dsCj6PFGQQuC9NB4Xm8vB8TVXBczjMtNlyVuB0PZFFkvPAmW8AaBJVKVz98wtlvnehZacdyrw7vfdHpqqIRa6mbln5g73/OEfu6xuWbPabd74yav++1L7l/2vlyqJHv1vw18TzMNmuM8bS7EEK200rqR70mx02fx++6wUdHdhW1qos7mhXBMAoqO93idOnrFMZ9iSJG+3JFnvQ25CnQq8e73e5tAxG9avc0BVdL6dOPlm5kZrR46dGNwo3rdpwxU3r0VnhsbtX84azNMsqn2Y550uFKzEbjQbnRY8j/66qV48+jOXR1cqG0KdzZnlDaCp7t10u6nkXFnvJPi+Kwm+z7oJdCbw/uM/3b/dBWZ3a/WavXmoWt5GawrYn3rm1+7B+z9T2k1vGeOzRrs2Xxmgjw/wr/xv7171PaiHMoUsVi5N1VMxBd6hbPRSZd5doIZqeSt8ulIhFzof6GwOoKkylJzfOj/vHk0+73ET6EzgvWxZuKmaml0BVZuk0Zpu7L/+zUOD4LspN8tlZMfGZ9vHZ+OXCuYpsc9G+7wJvJdW5iJuWQ3Gukavd/XZyKsrGW86mwNoM2vJ+dRU798mWe99kzRa60TgvdBUbXvoOBrioC6TNFrTzaMy5k0KvotWxs+dFszb/lv798szVmy8LIH3MEiuv8FY16jEPH+2+yOdOe8t90Z0NgfQZHfPfMz9xTN/GzpMjdb+Q/L5YZdTJwLveee2TAWO0QgxbmhQl0karYkPvrdt3ch2iYIUfT0oar/84u+vG+XmS9PrMNRgTQGNFsxQvWG2+6TLq0vXWcsCA53NATTZLWtWDDLfR4+9GTp0Z5LQ/Z/zNlrrROA95XqPhY5hhBjqlrfRmjcafFO9EZ8y98tLeG98OfvlKTcfT02p0l7PTW6+1nR5G6p569aucV3hqy/SFvxosAag6bTX+yfHT1sarSnrfcjl0PrAW+3fXaCpmt5QCFQQg7yN1jwFT/p+dTtnMan9ygzmtQhkqcCg3Hw8ZUXTAm89bgq+qVKp1qTZbunac6afNy3wZqQYgKbTlq+Z9Wvc946+Hjo093ixUAV24/X7bmfoGJX4AjHwjdYm9ewLRybO6KCbRvcZW00axLTVurU3BY9hHnr1nn7usJtEl/Z3e2rkl2Y4NjI1SwQA0dNe7w+GG0X6rHdmrQ681VSt1wt3MyfbjZgo613ETZ3G5BB8owoqN8fVLFlRys2rpUWiSR/zrowRG2U5l8+dv+gAoOk029tgy0JVdSatDrzVVC10jPZp0VQNMfGN1opA8I28suz5VtaWUWxXs8zEztvTAfkUcT3s4mK9JfB+68x5BwBNp0ZrNycfAbmy3q0OvKdc75HQMeyDRYzUrKqorIqCb5WeA1lkbbY2yTzkNgu9jrVgkbexHbJRtnvSBSItpnQx8LbO8gaANlDJuUHmrHdrA+/kgZhJPs2kHaM3EssePKAOKjkvim44v/7NQ9zgozTsVV6aJUjjsSufAu4ist1dbYRnqd6g1BxAW2TIev9bl0FrA+9+3z0aOqaL+7TQHEU1WvO0r1HBNyXBKIOCRwLIq9kCb8rNy1ZEtlu6NEZssdCiw1tkvAG0iDHrvT1J9q50Rq0NvHu93ubQMUVmFIEyFNVozfOzvgm+EZLnHCGAvJqlQzwN1spVVLZbujz6LdTZXLO86WwOoC2sWe/5+XCy12tl4P2V2f07XWB2t7IQNFVD7IpstOYRfKMsjBVbWijrrcCbbSDlsQbdoQWSru7v9uhsDqBrLFnvqanev7VmvVsZeE+58Aix9bebygeA2qnRWtFZFgXdKjsn04Zx8mSudF5Rbn610LYmBd28Fsuhc9KyIKR7gtDiR9e3p1mSFXQ2B9Amynob5nqvTLLeO51B6wJvze52gTFievOgmzmaZPPGT7qi6SZTwTdZSizlwsV8mStmel+Ned71ef7wS8FjdE9geY66nO0W23nMPm8A7bL+9tWhQ3pJ1vtzzqB1gXe/7/aEjqGpGppGN3zWKg2VpmfZF65RY8z6RlFYyLmaJWChUqB4J06+aVoI0jXz9JlzweO6HnjrfSX03kKpOYC2mVl/U3LtuyZ0mGm0WOsCb0tTNZXuAk2zeeOdpoBa85QfvP8zmXoYaNY3wTeKoEoKgsgr6XUbCr5pTFe85w//OHiMr4ALnbPWrHjbhd5X6GwOoG0UdH/CkPVOkr8PhA5qVeD9x3+6f7sLNFXTGydvnmgia6M17WlUlofgG5M4d/5dlxfl5lez7POm4WFxrOPDdE3VcaFjV68KdrbthNDjoM7mANA2hsBbyd+HQk3WWhV4L1sWbqpW5FxkoGrWRmtHjp0YfM4TfKv0HJgE5eZXo9y8WpZFRD0nlmy3rFt7k4O1sznBN4B2Wb3qestoMQXdM2kHtCbwXmiqtj10XNf3aKH5LI3WlD1TmaWC7i98bkumKg8FTWq6xngj5EW5+dUs7z2WfcYI0wKiJdt936YNg8+WCg3uHYYsC7lvnKJRIID2Wbd2VeiQXvK//5B2QGsC7/lAJ3NRcypmd6PprI3W1FhIwY9K1JX5ztLJXx2WFXxT+tpdkz73lJtfSe89oR4NLFZMbjg+7LXgcbqG+gXJUEd5PXfcOwyR8QbQVSo3NzRZm0krN29N4D3leo+FjmGEGNrC2mjNl43rWGV3smy10A3sU898l+AbuVBufrVQ1lQBIJUmk1GJuW1v98cHn/WYh45nEspllgUkAm8AbWRssqaZ3mMrsFsReC+0b59OO0ZvFpSKoS2yNFob3euogN3yfaPfT/CNPCg3v5olgGOed37DbHd4wWe0+s3yeHPvcKVwZ3PeLwC0022GcvOpqd7/Y9wXWxF49/tuZ+iYLMEG0ARZGq2NBs7K9GQNvlV2TkDQHZaFFsu5R9b7SpbHrKjXWRcfe0tDNQWNPtst7O/Ojs7mALrqljUrJio3b3zgraZqat8eOo43TrRRlkZro3Tjafne0T9DwTeBFDxlDUMlpwpqKJ2+rKrO5voztM3k6ecOd6ZaRQsWtmz32isytqHHW88Z+7uvFDqPL1x8j+AbQGtZys2n+ss2L/WFxgfelqZq69au4Y0TrZS10dooZcy3bd1o2ivu6WaeWd8QnTe6tqZR0E2lxGV6zEJBy+unfuEm5R9zve61YObHC7aZFhlChtnuy9U+lj31zO++muV+6vSZXzkAaCNLufl8b/6Bpb7Q+MB7yvUeCR1DUzW0WdZGa6M0mzbPrG+C73azZEl1zliurZwrVwrt81YgOHlH+Tev+PNU8fLkU99ubfZbmW5bQ7Urt9gwvzsfS+XGL8l4A2gpY7n5kg3WGh14753dryHlqYPKdXPIGyfaTEG3pVv54kZrnm6iCL6Rh86d0KIPnbqvVHa5+bCp3dVZc73+FXy38XVr3du9eKFodIFiHLapXY2MN4Cuu23th0KHrFyIU6/Q6MC733ePho5hDAi6QHu2LTdDixutefrePMH3Ull0dIe13NwS4HSFJZA7feacyytU2q/XbZuy39Zs91I9LUKPs2VhqavobA6gy25ZE15En5+/ejt0owPvXq+3OXTMaPdSoM00pztkqUZrng++LRk5Tze92kNKRrNdLM+nD0gs5ebHjr/mMKTXWShomSTjbVnkaEv2e1wVz2Lqg7G48k2Pceg8J9s9XiipQXM1AG1myHhrrNjnFv/HxgbeX5ndv9MFZnfrTZOmaugKne+h7KMs1WjN88G35c/xlGFj1nfxFBQoqKgjOMoSeOu8C2UFLUFOl4SClknK87M0Z/PZ76bOW7fv7b56Ad62v9t+Heya0L0Vnc0BtJn2eK9eFYwx21NqPuXCI8Qs3Z6BNrE2WhuX9RZ9/7atd5v2jXsE38XxAfcwI/nTwUfsgZHlWssousvKmuet11/W79P36LWra0KTXr9Zst1LBYmW11SW6p+uYZ83gK67OVxurn3eW0b/QyMDb83udoExYtaOu0Cb6Ly3BMy6OQ+NGFIQv7gLcBp/A0/wnc/igHs046m99FVmjLNkvMXSwFIzvTFka7CWfazYJKPbdD3Q67cpCyTWSpBx281Cj6+lkqPL6GwOoOsMY8W0z/uKrHcjA+9+3+0JHUNTNXSVtdGablxDAZb+rKzBt/Z8M7vZLi3g9qzZvSL/TSGjQQnl5tlYH6+sJl3c0HmmRR59xLyApn+bZYFg3LWQbPfkLO8x587/xgFAWxlKzXu9nruiH1kjA29LU7UN69c5oKsmbbQ2SjevS3UETvtzm5Q5q4sPctIC7lHKSMZcck65eTarV61I/Xqexauizg89TzG/hp994YfBY4ZVb0ufk5YGdOzvTqeFo1DwfZrO5gBazLLPO4lZPz36+8YF3n/8p/s1kHw67RitVLNajS6zNlrTjbXlZl0LWdu2bjSXXiqIVFAZKmfvotGAW49/lixwVSXnef4Oys2zCb1H6TnIknXWsUVmqWPNfg+vWeEyfFXqjAsMLYsadDQPC53DlJoDaDvDPu/pvbP7V/rfNC7wXrYs3FQtS1MooK2KaLQ2SoFV1lnf+rObPrKoKFrgGA2486iq5DwUeC91DlBuno0lsMuSwbYcm2fPcmzZb8v5n9bjReefZX83wlbccF3q19XVXN3NAaCtVq+6PnjMVH/ZpUrtRgXeC03VtoeO400TKLbRmqcMR9bge9iZu7vBtwIiBS5FBS8xl5xbzjfKzYeKDrwt1QSqWskz7cNnv+tunmgfHza+LwVjxIpjqSw8d/6iA4C2unnNiuAx7/Xfv9X/ulGB93ygk7mMGx0CdFGRjdY8P+s7a/Btzay3xWjAXXSgXHbJeShLNS5zagkmKTcfsuyRzdLZPFQ+rb9Lz899m+4a9IDI8z6p83jYk6CehTTL36ufMW2iCY3VimN5nN46c94BQFutuGH5YK93it7UVO9T/jeNCrynXO+x0DGMEAOuVGSjNc8H31luUJWpffq5w60vNS4z4PbKLjm/cDE9S5UWeIeDybcYObcgNH1Dj5Pl9aKgO/SYjv5dep/U6zfvtiwtpCkAr/J51N9p+ftC17vQYobObarmbJjlDQC6Fl4bOmSL/0VjAu+FAeTTacf4FX0AlxXdaM3zwXeWskx1E27rrO8qAu5RsZac27qbv+Zgnef9ViHHLG5+p9ev+kBkrV7x9BquKvutv+vIsZeDx4Uq3vTnhCoDyHbbWao2KDUH0HYfCe/znva/aEzg3e+7naFjaKoGLK3oRmue/sxtW+/O9NrTjW+bgu8iA249ntqfaqlSkKq6nGdhqTqKeSxalWz7vMPl5pbxWOMCSv0bHn7w3tR90WmqyH5bt8Joa00aSzdz9ndnE1qoeIuMN4CWszRY2/sngz5lzQi81VSt1wt3M7eMswG6qIxGa6MU2Ge5cddNetOD7yIDbj0/Cra/+Ed/MAgeFLxaAoCySs7PnX839etp3YyHlUfpJdR6vAi+h0FLaEHMEiyePnPOhf6eUGZS550C8Emy31q4K3ohSH+2pSGfpb+Lpb8AVXPZ0NkcQNdpn3fI1PJlg3nejQi8LU3VdJNKUzVgPM3iLrrR2ijduOcJvi2BRUzKCLgV8CzOFKsJlqVKIcaS86IyuV2welV6R9TQ68Myos0aTOp8nCT7rXPx6988VOj5aB0fFsp2S+ix1OuNUvNsLO8plJsDaDNDqfmlzuaNCLynXO+R0DFku4F0uqkso9HaKN38bt74SfPxPvi2lMrWrciAWxnhcQG3Z32+JLaSc0u5OWPFhkKBnp7XtICxjPFYk2a/9RrROTlpRYt+Nlu2e61hr3F4f3eoUgNXo7M5gK4zZLx7vZ77bf0i+sB77+z+meTTTNoxesOlmzkQpsyX5eYya6O1UcqsK2C0ZGtFgYW6necpca+CHguV0RYVcKuZ1YP3bzJds7SgWEfJeShgCgU5lnJz/R2Um08+z7us8Vg++62FNOtreZReN5POrlfwHjLMdocz9Hka0CGMzuYA4NwHw8H3tP4v+sC733ePho5hlRqws5YwTxLI+XFFWW7YlWWvaz7wUnzAXUTmbjTgzrqHtKkl55YghpnetsB7XKZWi1ahkn39+XkCZ08LaV/43JZcTcf0utHrJ89rSK8/y/dYy+ItWxsoM89OgXfo/Lpw8X0HAG0WynonKe9Bxjt14ncMkn/o5tAxlr1dAIZ8o7VQkKsgTsGcbrzz0E2sbtizNFFTh2TJu8d0UgpkdMOv0UVFNH5TwK3r0yQNm3zJuaoCQhTg6DGfJNAqihZfQlsW9Fhn2ZrQRn4kU9r5Ni5otCy0FLEwrX+fphfo+dJ1I08QrX+rXtfW6jTr3m7rnxd6rPRnEXjno8curYz/jVPpzf9w2bnzv3Evn3w7OV/PDSoFfnn+wuC/L7/2miSjdu2ge/Ita1a429auGvy3tlEjvp8cPz342fUY+J9fPrLqt5Jz7QPJIuCH3M1rbjQ1tGoa/fwvnzwz+Nn1cTFZtPLNCZVR1c+8Lnnu9fy38edvMj0fb6QfslL/F/Wr9iuz+3e6wOxu3dDSVA3IRsG0ZimHbqB186sb27yBnJ/1nTX4VgBcZUCmv0/BthYaitgrXUTAPcqXnIcyxL7kfJLHzvI8Wa65Omf0OKRlGvVY699b10JLLPQ4HTs+/nH3ZfmLzydb4F1cl25dC/Tn6TWadRa7z37rfNDznXYOWbPd1h4ICgpDfx6Vc/mpQWBa4H1uJHjC0l4/9Y773tHXxy5SKPi6cOY999aZXw8C0xU3vD4IvmbW39SKAEznyPeOvjb42cbRz64PBabyidtXu7tnPtaKn1/P79FjbyYfp8ZOAdAihD50jvz14blk8WGFu3fT7QTgkTAshE3r/5a5iP3L7f96rwsE3noDZ5UayOaaZcsGr5vQzfP7788PPqZv/qjLSwGYAkfdcP/6XdsN2KnTbw9GJE0nf6/+rWVR4Pf9l467v3r+++7VN34++FknMWyadtcg6C56QXD65n/sXvrZXPDfqMdukgVJvwiRRs+n5bqrP0uPaxrdsH/qjulSn+fYKSgMPU4a8bY4u/vdH/wk9TWl194/+71PuyL51/Mwy3ku80KVnm9dd65ZNuVuWr3qqq/7AD3052p8mLUaR49taNFKfxb3EvlYzt9P3P7RVmZoJ6Ug63/7wUn3nb955Yrsbvj73k+u9ecHQejya5eZ5gjHSgHnM8///eDnyUJBuL5XblnT3NfuieQ5/ItnjiWvobOZ7kF0vujn17nw2zevdKjX2++8O3gO09x//+e/Fu2djmZ3O9d7PO0Y3QD8webfdQCy042zMmahmc2TBnKi1+odt96c/Flngn+f9/Y75wc3cwq+iy6dblLA7SkwXXXjDe7vXnkjeKwWORSk5Qlmiwy8V934weRx/vvUY/TY69/Z5fnJ11/3geBjruBmtBxav//uD46lfo9eO3fceosrg/4dOg+GXdezlRLrOdfrTgG4/ozR17cqIEJBnKj03Xpd0J+p60mazRvvjGKLRhNp8Sd0XVJ2btWN6TO/u0ZZ3oPf/smgtDwvBV3++5sYfH77hePuBy/9l4neg5UBbmrwqSy/Fl0m+fm1YKHg/bdv/hCLWzV6+53fXKrGGOs990S0zdX6fbcndEyeZi8ALqui0Zqnv8fazdtTdixLmXqIL21W0zRf0j6JSZqm5VFFl/OiSs1Fz7n6CYQUVeLfVJYu8DL6nFZdZr6U4Rz6uwYl33lHjw1fiz+79HvLdANlu7P8faExYvqz2LKWn2UR7peUm19Bme7/+MzfDrK2RVCZuoK4JlHQnVZanoUyv/rzmkTPl563Iug8+ovkfBpXpo7yqfIk6ANuOtrA29JULW/TJwBDvtFaiG+0VgTdpGfZ0+vnAk8SfBcdcCv4rTLgHtW0LueqAgh3Pf6vUXW0r4OlSaheA348l6VLd1XnphbT1NTPci1Zil6Tem2GmvF5WRqqsr+7fJbO5owUu9J/euFE4YsRCuJ+cjxcLRKD0H7uPPTnNWXxYfhvLSbo9lRB8b881+330Tpdawi8p/rLbowy8P7jP92/3QX2dtOBFCiGFrAs2R4FRkVlJXXjnCf4DmWuFis64FamTbONVeZaV2m073JuYdkrW7YsWe+iKhuaSOdTlqx3bF269TyrXFuvj7zZ7xMn3wwel3U7B/O7qxF6TorK7LaBgq4ToZLUnP768KvRZz2HjdSKDTo9/bmvR95FXz//iyUtEKjs3u97R7XUcT/kvf77H4oy8F62rPdQ6Jiud8EFimIN5IrOSuYNvi0352UF3Mo2x1CSqkDBEszmKTm3PFZZ98JqcaeqLQ1NpvMrxDcfizWLq9eHXitlvEdbK3RGMb+7GupsnobO5kNlBl2ioLusoLYoKrEvU+xZb/37ytx6oeefkvN4RRd4D5uque2h47rciAcomjXbVnT5soJva/ZWFBRqnvW4sncfaBYRcCtQVPDwxT/6g2gC7lHWzF/W56yMwNua9fbznrtqOJf6Y8HjfLl5mrrfI3V+5s1+j/8z78h87oXOJwXd7O+eXGjxQoEAwfcwI1n2fndl1GMNvDQ2reyf/42FGdgx0mug6BL7xfxoMkRpZXSB97xzW0LHZG2sAiCsykZro/z+0Cw31NoLOvrv8FnAIgPuYdbu45lv9KvStJLzLFsauizL/uU0MSxOF5n9Hi5K2BszioLu0HnPIn4xLNdJ9nmrCdh/cWVT4FV2cJdXVf+uWPe6v1HRgkDs5fZtZJin3nMxBt5TrvdY6Jisb74AwupotOYpW6LgO8uCmgJsBeA+4LZkAdM0JeAepaCh6JJzyz7rPI+Nf3xDdH6R9Q5nvdPElsX12e9Jyt/zBO+WnhA0ViuGZQGj653Nle08XdFe97L2kE+qqoBwkhFtZTpW0YLAcMQa5eYxiirw3ju7f4szNFVjhRooRx2N1jz9veoUniVg0AJAFwPuUWWVnKfJ+xhp0dSyn5as92TnYWi/bR3089yyZrXLQ+/5eRbcLf0guJ8ohuUa1PWM91sV/vwxNrPTwkNViy+xbm2o8nkh6x2nqALvft/tDB2Td1wJgLC6Gq15eYLvvJoecHtNKznfvPGTwWO0QGAJmtoqTxOxUTF16VYFhSpT/DaQPCznzFJCjdUUdDf1dR8jOpunqzIQVOAZW8bz3PnfuCrFFnhX/Zx0vcIkVtEE3mqq1uuFu5kz9gMoV12N1jzdvKnsvKxOw20JuEcVWXIeCswnfbys55d1pnNbWTvBLyWGLK7KvP02EF0rJu27kJXl2kQ382KFHs+uN1erOhC+cPF9h3hU/XxQah6naAJvS1O1dWvX0FQNqEBdjdY8/d0Kvovs59DGgHtUUSXnZQfeYmkgpkWConsJNIm1E/xidWdxdW5p7N/Xv3lo4m0gXp757rb53WscirPihutSvx5jFhYAqhRN4D3leo+EjiHbDVSjzkZro1RCXdQ8YAUj586/a2q41ERNKjm3Zr3L6CXQJHmy3nVlcX3ArY+iK2HKCrzJeBfL8nie7nC5+YobPuCqZOiyXKnl117juqzq5yO25x9DUQTee2f3zySfZtKOyTNKBEB+dTZaG6XsaBHBt27elYFTYKDyVwWfbeueXUTJeSgjVVQ2dfPGO4PH6Lw6cuxl11V5st5VZ3HLDLjz0nnD/u7qWQLvtzrcYO2DFQZCq1dd72JTdSC4elV8FbJVngMfrHihp+sM1Tz95ONsFIF3v+8eDR3DyA+gWnU3WhtVVPDttTkIn7Tk/MLFi6nfV1Swopt0y9isSfcHN13WrHdV+7urDLizZrwZI1YPy3Wn6gZbMVEgWFXW9yMRBp362W9eU83EBS08xJhhv2VNdRMnqvy7YN7DH0fg3ev1NoeOsewJBFCsuhutjSprX3bbgvAmlZxbnlOy3vasdxVBt14r2r9dRMBtne2eFWPE6qHnMxR8nzufvrDXZgoEqwqIb1u7ysWoqmDwtrUfcjH6xO0fdVWI9flHBKXmX5ndv9MFZnfrDZKmakA96m60Nqrs0tC2BOFFdjkvk7WXgBZ28uzzbQtr1rus98nh4seJS6+JSfskLG50GA7Wsj33oTLz4UxxAu8yhMrNu1xqLnfPhKt8JqWS7nWRBl4z66vp1VRVgJuVFh6qyMRX9TjjMks1z9SUm6s98J5y4RFilnJEAOWIpdHa8N9ynatK04PwvCXnakCXpujnwBJUVrGdIWbWrLfO1yIXKPzjrvNf490m/bN1Pmomd9bJAlmqMnRsaGGApmrlCV0fNFKsy53NFXiVXW5998wtLlYKOssOCj9x++qoG4uV/fyoqoIy83jVGnhrdrcLjBHTGzPdzIF6xdJora7Kl9Eg/E/+7C8HQbilnLVOTSk5zxJUtq0ZXhbWrHcRCxSjAfeLR3868bmh7So6FxVwL/VzWMZQWTFGrF6WRY0ul5vL72+81ZVFAWes2V5PgWdZTcb081dRVTAJLTyUufjy325la24dfmm7rtW7x9vSVE1vkHQeBeoVS6M1y7VAN/f6t5bVPEk/o4LAp587HH0QnqfkvI4AvMqgsqmqyHqXEXA/eP9nko9NqVNJll97beqfk+XnOXHyVPAYMt7lsXU2P++6TE3Wfn/jtCuags5/df9/42KnrPe9m253ZfjDrR9vxBgt/fxlLD5o0YExYvUwLRD/pubAu9frPRA6hhFiQBxiaLRmzXjruqGbfYLw7CXnoWCrjKoDa5Mt/fu6nPW2Ppc6D7MoM+C27KUucs9jqMyc/d3lspyfpzu+z1uU9SwyM6vXUFOCTlEp9D8vOPhWMBvjCLGl6HlSZrrIa5/Op5i3GbSdJfDe/cUdc8tcTf74T/dvn5rq/T/TjhnuBwvPegVQDd2wHjv+mnv//fnU47RPuIxFs7ffOR/MaOnvvf664fxK3WQPx1atHXzo1woqQvuY89Bjopv+v3vljUEXbv1bRf+Wa5bVdqkd/N36ufW8hagpVSjoGi7AFB+43LR61eDfGPr7yzq3mkLndOg1oAyxpSmpjtPe7b96/vuDBY3Q6zpkWFJ+l3mBwNPffer022O/rnPCMtlEP893f3As9Zjpmz/q7riVm9Oy6Hqj61/aufRb113r/q+3svgx3Ifbc2+cOucmoSDu//6Hd7pVN1bXA6UIGvn1keTj5BvvTHTtUfB6/+bfadw5df11/2jwbz5x8oy7aBtFNZYqKH73zpsd6vOT46fdW2dSq7POfuvgN/6H2u4G79/+3/37JOM9k3aMmrBQEgbEQzf977//frBrsG6AdayCqSINM8zpAaRurFfd+MGr/vtSQbj4ALlIo0H491/6++TX5waPm4KROoJw/b167NKCG7FkOssKvMWyQGANKtvKP0aTLFAo0FVWXEH3pB3KJW/A7em8DF1TtB0h9NrRz6XXXJpP3TFd+HUJV3r1jX9IXdzU9ZGuy0MKvrUnO2/wpcdRQef1113rmkiLBQo+lS0MBC1L0l7pB+79RPKa/qBrIi0aqAP9JD+/Mv0sZNXv6LE33S/PX0g75KdJ4P0/1jJdfthULdzNnHIwID66AdaNf2jfpUpXdeNfZI8Gy029JXjUn+MDcB2v8vDhR3h/aB7+z3fuyKBZpHpX6HOV/SsUFOnnK6IzdVn8doZQEKagUdsIukpl+aFycl+WP/o+qt/rdVlUub4mjuQNtkdZX9eh14vl9ct9Rfm0OJT2GvadzasYq9QEyljvevCuQcbs2PGfBzPgetw+cftH3G1rP9yK7tX6+RU8agFCwcvLySJEiAJOlVa36efXz/O9o68lP//bwbJl/fxadIl1bFwXXQyXmp/V/9Vy1Zt3bktoc7ne0JndDcRHN7+qRtG+5jR+36iOLfLvDskaWOrP7EIQ7hvkqTN7zBTIhf6Neo61J12LQF2kc3XY5T19gUKvvwfv/0ihAbdv8mZtiFcUy4Ja6OfTPQVVdOWz3Lups/nqVQTeozQGSx9amNA+eM08P7eQQVt+7bLkcf3AoDRb+5jbuGihIFofCjpPJ9nfN069c+nnF5WmqyFZVbOwq+YDcHk9WXwZPv+/SR6P9y99XefAbWs/xKJVhE4HKhb6/f6P9LmWZ27K9R4LHUNTNSBeChQtmUkFRwosi8oy6UZfH2k34ZNkdGMIwssso/ZdzrUHM1bWrHcZFRVNYlmgUCD69W8eKqScvMyAu4hKFr3uQ6/91auYbVsFy/OpzuZNaYRVtWGAtbyz2UwFlT4I76qu//xNY2gYmcTd7lX9ovLAe+/s/i3Jp+m0Y3TRphwMiJv2dKoLcojPuhUlFHgXNQ5rcRCuIMYH4WWM3LochA+DT1X9lBGET1pyXkUlkiWo1HOgBQRLN/Q2si5QTBp0V5HhtmVI089X2/xu9hVXwTbL+4IDgDawdDS/prfslcFnV7Ek4t/Z66UfQ7YbiJ9ulhX0hGYr64ZYZbFFva51U5d2E15Gx3IFHMOM9PDGfTQTXkYQPjo2q+ggvAkl5/5nDjVaG5ab30bWuwR1lZTnxf7ueOg6Fa5MIvAG0A6Wxnjzvferz3gn2e6VlqZquuECED9rozV1Ty5qH3Nob9OkzcMsmh6EN6Hk3GfmQ9UNZL3DWe8sdF7p3KiyjL+IjHcos6+/g74x1dFjnfacTDpCCwBiYVlI3L1rx1F9rjTwnndue6ipWpfHxABNU0ejtdD1oYzgN01Tg/C8JedVBmMKAEMVFcp6d7kZZ1FZb1/BUlfFWXgLyfhSPgV4ofNYCxSojvbTpwXeFyacWwwAsTDs8T7qf1Fp4D3leo+EjiHbDTRLlkZren1P2lXY2tm8jkBsNAj3JfZ6XMrIwk8ahOctOa+y7FgVFcpoh7LeCs71s3TRpFlvfa+C97rLsMOB98WxX7PsY6fMvFrD6/z4rSJaSFGWSE3EAKDJ3gp3NH/V/7qywHs4u9vNpB3jZ+sCaBZrozWVnD94/2fcJIqa5V22YUA0vNmPNQiPveTc7zMOZb312Oq4ro6KypP1jiXg9kILOmmvafZ3x8dynVaWiMAbQJPpOhZqrtbvux/5X1cWeCd/6Z5QUzVKwYBmqrLRmu2G7p2ogrCYg/CsJedVVxJYst5SxKJOU2XJescWcHvh3g3jmyaGOprrWsAWtmpZrr+/pMEagIYzXMf61/SWHfG/CW25Lkyv19scOkY3AwCaSQGS5eZWAdIkGWlLqXMMGe9xFPCoQuDhB+8dBIpl7k9WQPLsC0cG1Qia56xy/8UBti85j5X+fZbmaaMLDl1kff/UoleM2d+8vRu0yBZ6vTO/u3q+s3kaw75IAIja64ZGkfO99y9lvCsJvL8yu3+nC8zupqka0Gy+0VqI35Obl60DcvEjxcpQZRCuAEWLHksF4b7kPFbWRZ1Jzqum81nvkKY+RuOCa+Z3xyv0mrWM4AGAmBkWEM/u3rVjzv+mksB7ihFiQCf4RmshCvosDZHGCWfHLrqmqTsIVyY09PfVOc/ZsqhD1juc9dZii7Y6xCZvxltTBELY312PUKUBs7wBNJn2dhtGIx4d/U3pgfdCU7UtacfoZo4VaaAdFDxaKPDLKxQANiXjPU4dQbgC8FDJbp2Bt3VRZ5Lzqun8nv4QZb1j246RdwvJ6TPpNz3aa1znedtl4cWU9wi+ATSWIdvdn5/vf3P0P5QeePf77tHQMevWruGNEWgJ32gtxDcZy/t3pCmjaVldFgfhKgkvKwiPeW+8WDK6WkiIMaNbFWvWO7ZO9nkCb11DQucs2e76WDubA0ATGbLdbmqq4ox3r9d7IHQMI8SAdtGeXMuNdN5Ga6EOyLEHkHkpiNi88c5BEP6Fz20pNQhfSt0LpFn2Mbf1HAgZjuUMZ721vSCmx8hybi1eULPt717jUA/LogedzQE0laWx2u5dOw6N/r7UwHvv7P4tLtBUTTcJrEgD7VJ2ozXLftC2B14qoa06CI+hMqmpGd0qWR4jvT5ieozyZrxDujrbPQaW55SMN4AmMu7vPrT4P5QaePf7bmfoGEtJKoDmGY4tKqfRmiXA7FLGs6ogXM/TJE3xiqCFWksWM7aMbpX03Fu61Mf0GOV5TYfmlutcYRtbffTYh7cFkfEG0DyWMvP5+f5fL/5vpQXeaqrW64W7mZPtBtpLwaBF1oZYecpSu2JxEK7Kg6LmGCvweeqZ79YefFvOq9gyulVT1jv0OmnaYzQaeJPtbobQc8BIMQBNdOLkmdAh/ampCjPe84FO5lJmp14A9dNNlyXzpptoy1ggzzbLmxu64eO/LgnAPzsIxIsIwmMIvpuY0a2agu4mPUZZM96W6wX7u+u34obrUr+uck19AECTGPZ3n128v1tKC7ynXO+x0DE0VQPaz5J5kyyN1vKOHuqyYbBaTBAeQ/Btzeh2ebyYpclhTFnv8JjAy4tplnOPirr6WaoOzp2/6ACgKV4/9U6wMWS/339+qf9eSuBNUzUAnrXRWpaGWLaMd7NneZepiCC87uDbmtHVaLGuVj80Lett3Y+tf6tlfzfqZwm83zpz3gFAU/zk+OnQIf1lburAUl8oJfC2NFUj2w10h7XR2otHf2oOksKdzcmiWCwOwu/btMG8Baju4Ns6tu7ZF464rmpS1juc8R4upjFGrDmY5Q2gbSxjxOZ78weX+u+FB95JtnulbXZ3eM4ogPawNlqzBknWm3TYDWdArx00ZbM2pqoz+LZmdBWoWYK1NmpS1tsyJlBorNYcts7mLJICaAZLmXni0O5dO84u9YXCA+9557Ynn1amHaMSMJqqAd1SdKO18M0czdXy0s3yg/d/phHBt/Z6W95P8syLb4umZL2XX3tN6tcvB96/CPw5/4hS84iEO5uT8QbQDJYy86l+72vjvlh44D3lwiPEyHYD3VRkozXrTTryyRt817Hgcc/MHcFjyHrbst51LlhZFgf07wst8JDtjkuos7lmedPZHEATGMvMnx/3tUIDb83udoExYr6UEUD3FNlozVKWSvA9maYE3/YeAmS90+j5q/Mxsvz7LFUV7O+ujl8MUZWSGhmqT8ezL/zQPf3cYffkU992f/Jnf2mqpKDcHEDslO02lpnPjftiesooo37f7en10o+x3BwBaC8FSbpBC5WL6gZO1THjAmzr3F9rp2QszQff1lJy3YTrWH1PlVuKVE2hvzeNMt4697q4+Ouz3qHAWo+PKgjq2A5m+TstQRxl5sXwi5d63fsAWx/KTvv/VtTipjqbr17FFkQA8Tp2/OehQ1LLzKXQwLvX620OHaObIwDdpkZrX//moeBxarSmAG4ploBaN4n0k5icD771nFmy2XUE3wq2tLAbXtD5WZIRvamTCzLKeitwDQVLeozU3T5GocUfPa+UmodVGVRbqLP5JxwAxElbYt4Il5mfHdfN3Css8P7K7P6dLjC7m6ZqAMQ3Wgtlr3yjNQVKS/0ZITRYK85o5jvW4NuS9fbbGCz7wttGz6F+bvVQSKOst16fVQew1iqWNFTVXQ6qfTBdd1BtQak5gJh97+hrlsMOjOtm7hUWeNNUDUAWCpKOHX8teAOoIEGLdoszlNaMN4qjwCjm4Nua9VYTMQWWXc56h54/ve7GVZuUpYjnY6lFujZJC6ov/7p5vS3obA4gZoamav3kf/9z6KBCAm9LUzW9obb9DRGAnTX7Ni5DablJp1Nu8WIPvu/bdNegqVMaPzqri1lv0c+tbRxpfBf4KvdLFxF4N73M/Mpg2peCNzuotjgXblgEALUwNlWbS7Ldh0IHFRJ4z8+7nVOB/ujqMkqTIwCjlH1TKXneRmv6fVrwd+Ei5YtliDn41p9v2cbQ5ay3mstpH3foudMxD97fnMBbz33MgffioPrc+XcX/b7bFToKvlfcsNwBQExeDJeZq6nal51BIYH31JSlzJwRYgCuZtmXK0s1WgvdqJ8+E563iHxiDr4t2xj86CzLeLs20s+tkU9pqs56Txp417m/+8oMNUF1HmqwRuANICavn3rHku1Ond09auLAe+/s/i0u0FRNN1mM9wCwFF0brI3WFgcBq1etSO1yzBzvcsUafFtHZ/msdxebfmrrl7ULfJVZ71AVS5qy7jOWCqpVTaOFPYLqq+n1N+wuv2LwWc9p6LW4/NprknNylQOAmHzv6OuWw/alze4eNXHg3e+7naHZ3V3dRwfAxtpoTVnvL3xuy6XMWChDxg1x+WINvq2js9JG1rWddfZ51Xu988rzbySozmapoFoffoyb//oobScKuW3thxwAxETZ7jdsTdX+X85oosB72FQtXGZOthtAmryN1qzjh+gvUa4Yg29r1rtJgWXRssw+ryrrveKG63IFuz4AHEVQnU2eoNrixMlTwWNuI9sNIDJqqmZgznbLRIH3vHNbAj3VlmyIBACLWRutqTzYX1esI8Wa3um4CWIMvnVOqZIitiZiMYkt67382mtdHgqkn33hhwTVY5QVVFvo3En/t1FmDiAuynYbAm/TCLFREwXeU673WOgYmqoBsLIEAcMb7CPmgI3AuzqxBd++kiLG0VmxiC3rrSAsD10XtMjSRT5oVrWAD6irCqpD9LoKXQtuXrPCAUBMjHu7D1lGiI3KHXjTVA1A0bI2WrOWmqM6sQXfWvzV+ZTWhE/IeseR9WZbyNV8pnpxUD3661hZFkPWsb8bQEROnDxj2ts91Z96wmUUqhQf/7f13c7QMWS7AWSlIMByIxnKYnqUnFbPB9/WQNoH32U9V5aRYQoqjx0/6brIZ71DQvvli0DgfSW9hh5+8N7k9bTJ3bfprsH1UfdW6krvs9kxC5WZC/u7AcTkrw/PWQ6be+Thzx10GeUKvJNs98per/dA6DjtwwSALHx5cIiCNGVT6Gwep5iC75gCy1gpoAupYnGiTT1hhlV/Hx7cC6mSRwtA+rAGy/411NTFCEuZuYLuvNsLAKBo2tdtmNudZLt7X3Y55LrazTu3PYnYV6YdoxsdmqoByCNLo7UQSs3rE1PZuaWcWn+/gu8ujsDMstebaja3UOJ9zaWs81Jl4Ev5+jcPma9J27ZubPR9FGXmAJrkwsX3kvc4U6+QQ488/MDXXA65Au8pwwgxst0AJmFttBaiEUKoTyzBtzWw1GKOspNdLHm2Lk4o611W8B1DoLlUUD3aqCzvv1HjEkO9BjxlxpveFJIycwBNcvTYm6Zsd5a53YtlDryHs7vdlrRj9KbEijiASVgbrYWQ8a5fLMG39sg++dS3U4/R+TI6K75LYsh6lx14lxVUh7x49KemCh3RAoiqfpqMMnMATXIuCbiNncz3Ze1kPirzFa/fd3t6vfRjLHvpACBEN6AqV5wkeGaPdxxiCL6Hi8IfC5bAdjnrbVmc0HMzfIziCg7rCqpDtG3G2j9A909tWPShzBxAkxgbqk2U7ZbMgXev19scOsbSpAUAQnyjNZVoTkKBAj0n6hdD8L15451JIHQqdTGny1lv6+KEz3oXvThheZ6VmV+3dk0UQXWIzmHrBAb9DFr4aAPKzAE0hRqqvXzyjOVQZbvn3AQydTX/yuz+nS4wu5umagCKpKzapFU0lJvHo+5u5wrSlM0OUWlwV6slLIvnfnGiDKFgfsUN1w2uCwr8FXjHHHTr3LVcf/QzlzXLvmqUmQNoCpWYGxuqvTJptlsyBd40VQNQh0mraCg3j0vdwbeCNkumtqvjxXzWO0Tl5mUsaoWem9NnzrkmUKbbes7et2lDa5IWlJkDaIrvJUG3dXzYpNluMQfelqZqerNct/YmBwBF8o3W8iLjHZ86g29r1lvduy0ls22kxa5QAFxW1jtU4aLO4LG/plUxYT139Fi36d7J8nPfvKbZHdsBNJ9KzPVhMJd3fNhi5sB7ft7tDB3j91wBQNEsgcA4ZLzjVGfwTdY7nZ4Ty+JEGVlvyxitmF/Tekys543Owzb1ErCUmd+8ZkVyfi13AFCXDCXmaqi21RXEHHhPTVnKzBkhBqAcvtFaHgTe8aor+Nb5pFnJIQokupr1tixOlJH1tgTe1nnYVdO/y9oMUj+n5RxsEkuZ+frbVzsAqNN/PjxnKTF32tddRIm5Zwq8987u3+ICTdV006RyUAAoS95Ga5Sax62u4FuLxZa/s6tZb2tJftFZb1vgHd8+b52PTz932HSszrttWze6tqHMHEDstK/7hK2L+StJ0L3HFcgUePf74TLzLo5dAVC9PI3Wzp1/1yFudQXfamoVQta72qy3ZTxYbM+HHgPr+dimDuajKDMHEDuVmH/v6OuWQwstMfeCgbeaqvV64TJzst0AqpCn0RoZ72aoI/jW+WSporDOYm6bWLPesW0fydLBXImKNo5dpcwcQMwUdP/HZ/7WeHSxJeZeMPCeD3QyF40dYXY3gKpkbbTGHu/mqCP4tlRR6M9XcNlFdWS9Q4sh+vti2eetDuYnTr5pOlbnmh7PNqLMHEDM7Pu6iy8x96bCB/QeCx1DUzUAVcrTaI3guzmqDr6tWW/t9e5i9UQdWW/Lcx9D4J2lg7kmv7R1W56eC8rMAcQqw77uUkrMvdTAm6ZqAGKVtdEa5ebNUnXwbcl6lzW3ugmsWe+iGtFZ7ivqbrCmc8368+o8vm/TXa6tNPM+hDJzAHVQwG3c1+3KKjH3rkn7opqq9XouFdluAGlGAyHdmPsAePTXi4+78nveM31PyP/Z3t0F2VHe+R1/usF2WNtYQMhCsbACnMImOBbeRGbLlDUmZZYlMRIbquzgKuslN+Emg5ybVC4CvsyFPXC1lQszo1R5q7ZKWzpjdrcUa0sc2aLWVsWlcczKsCtgzEtQlhcJmTULWc5J/7rPozlzdE7306ffu7+fqsMZMa2XmTkvz6////4/qsi4TEtGfdjw7RqobfieZ3CVgp4um0q6TlUVTlV/591Tvqls1TspaNrvT9bLz+yAtbife5UVb/tYczmhZx/HbX7MPP/SmcRjaDMHUDZd1/0Xx50vE1suqsXcmhm8g2r3FmO8nSaBFioAmqcugbgsVLybqczwraq3AkTcY8VWvbu4k4eq3vrak55LCucu0+KT6ERZXYO3tg1zfZ3TtmFtnoNDmzmAOrLD1LRedfCiqt2mYDOD98CYXb4xW0wMVQgYqgbkq2uBuCwKDOrQ6Vqlsg3KCt861rWq28Whoq5Vb7Ud5zG5++orL48dWqbXNv2sy/45HDvxjHPo37H9ttZ32tBmDqButBZW6HYcphZe111ki7k1M3j7JnkLMard6JJZIZhA3AzRVOpuVirboKzw7VLVtdcy51HVbRp9f9SOn/QzUDhVpTcLl8CqSdplXvKmCeau0+3bPMF8HG3mAOrmT48+lyZ0f7OM0C1Tg7f27jYJ24hpIcP13WiK8aCrBePkr8fvbUDe+PX/o025JbpaqWyLMsJ3mqquHktdGy5qdxRI2tdclWqF4izfH5fgXeaANX1NrsPUNPixCyf5aDMHUDdHjp82r55xfW8Ih6k9ZkoyNXgPh+bRpKFqaaYJA1lMBuDJX0dB+f3Rse9O/T2A6LGgSpzaPwnfzVRG+E5zLfMD93RvVw+ddNfXnvT9z/r90c9LQT/u51DWdd76WpNONlhtn2A+jjZzAHWibcN+cfp118OfKnqY2qSpwdvzvB0mgcvWK+i2+Kry5tBsq8zTfg+QJ1WtdLv5hmvDfXXp3GmeosO3rerqJE0cVXSzVnWbyqXqncf3R7837jrvMoJ3mgnmeuzMM9ivqWgzB1AXCt3u24aFw9T2mZJdFLy/vXxoj0nYu1vtX1SL2m08BM8KxLRmo8lsAFe4UgjvYttwkxUdvm3Vu+iqblPphJWqna+ceTP2uOxV78tiP1/GgDWdYHA9Eazr/ruyPqLNHEBdzBG67yrruu5xFwVvl6Fquv4N9ZWlNZsqM+pgfOH6kQ9femESue7Hp5KPH+d67eUkPScUIHTTn6fwrdc49vyuv6LDt0KUjo/T7ar3pwr//uj36QRI0t9RVOeKhqnpz3eh74dO4nWFy/eFNnMARUsZus8GofsPqgjdsil4uwxVky69sZQprqo8q8pMazbKNE8g3vx7PuT0e9Jyuc7QhZ5D4yFcAVyvd3T41FeR4VuhT/NMkqq6qojue+DLpmtcvz9Zqt5VDljTMEbXE3rqkOjajgmabp+ENnMARUoZujXBfF8QutdMRTYF78HA7PH9+N+gdkz2wb3YxVVlWrNRnroG4rLMW+2Oo+en2tB1U8CwreiE8PqZJ3w/efRE+HuS3s9cqrr2hE0X5wUUXfWuasCa/syka/wtnRzQwMYu0WM+6ft+9ZUfpc0cQGF+eGLdrJ16zfVwu21Yz1RoU/D2fZe9u9u3sEjbmk2VGa66HojLoAV90c9DGxyEoWz1lDZ8KzTYyndc+Hat6tpZAV07MV1O1fvy2D8/7+BtT8y40OMu637lTRQ38M76NG3mAAqgXKbQnWJ6uSl727BZLgTvpeVDCyZhqJq9/rEu5tmbmdCMWWywtQF5POjqse+yvZBak3ds/4xBeVzaHfPEULb6suH7e9/vO3URuYZvl6qu/j69RnSt3ViKrnqrohwXvPMcsKY/y/XkTdcmmI9zed296YYrDQDkSXnuTw7/lXnjrTQZbvitsrcNm+VC8B4OzZ6kvbvzXFCkac1mb2YksQsfG5o3fv2hqSF62r2LpJZmLUa0COVyjHLYFt8kCsdauOd5sm3aUDZCePXGK995hW/7s00KG7omWCffqHpPN2/V2+0677dzCcBpJphrTdTF0E2bOYAqnH/nvTB0/yq4d1ef0C1h8I6GqiW3mdsF5eyBX7RmI53Ngfiy0f30YBwXostgtxeKW8x3uepVhaRpx6LXrbvv/Fz4sSpuCsraezbPk3eTQ9nUhq6gxuUA1VBQyzt864RaUvCm6l1M1dvleIX+rINfNcHcpYVa9PXqPaGLaDMHULbXgwr3nx59ttGhW8LgPTBmwXc4+ImDRwxgTVaZ46rK9nOTv24S/XtVzUqqemvxRugqh8sCcHz7w6gyFy3iowD+WhjC86QQrseAbgqA+vsZyla+vMO3fn4K1EnPf6re+U+Adxmwdv6dvzNZpJlgrhkPXT65Sps5gDJpgJqu6U6nfqFbwuDtG+8Rg07ZCMabq8yzqspVVZnrxqXqLVrAaQ9gFEfBOamDRo/VWVWwqCp9Q/hn2Ep4UmhIS2FOQUNsu3IXB3BVJe/w7dr1ouv/u/j8L3ICfNKAtSzP3ehkmVvo1muK7aDpItrMAZQp5eTykXqGbrnUZaga6mOyNdulykxozo9r1VsLy65e/1cWl2u7XapSG63hUQhXFVx/dt57A29MRj8Z/l2qmmVtjUWyPMM3z/94aa71Th+8ixmwZvd1d3ls2PkBXT5xRps5gDLoem61lqcbonZhn+4VU1OXugxVQz5mtWa7DP5qYmt2W1H1rp7CkUuFK+21pHq+6eerm/4OtZ/mPZRNGMpWrjzDt+vzX50O+v1dU1TVu6gBa9o2zPX5rW3Dun4y1SV402YOIItXzrxt/uzoX4czw1I4G4TuPwhCd9/U2KWe5+0wiBU3AIzW7O7Rz3XH9tsutBDPEi0sCVRFcBmqlvU6ey30J4ey5R3CJ4eyqQKuiiqvGfnLK3y7Vr2zbJ/VZK4T4PX9S3PZhcv3Me1zU5cEuO4Brtd8l/DfZtFlOfEnPGkzB5DFfK3l5sVR6F4zNadrvNdNi1vNs7RmU2XGLKrUaOGYtNCbd/sczOa6hZgqb3kZH8pm9/HOe/9wfV2qsOvGULZi5BW+7YRznv/TuUyAjx7v7hPgXQas6USH66RxDT/Uc81FlyeYj4sulYl33TUfNwCQ1pyt5XJyFLrXTQNcOhgMV33fWzA1lGVvZkIziqYFY1LVu6tVryK5LP6KDKyq0um2Y/tnLlwPzlC25sgvfPP8nyWam5D/vudJA9Zc5zLoecsE8/RcTnh++pO/aQAgDVW4f7L2StrW8sBwJfjP/iB0nzMNcanvm5XgfsnkiNZsdAFV72q4LJi16C+aXq8mJ6MrSBQ5lE3h24ZwzC+P8K2fu8tJF6res6Xd9zxpwJqeh/oz44K8jkk6YWJpLaITbHBrM1eL+dVXsn4D4EZV7iPHT5tXz8yzbqrv5PI44Vi1peXeU8HdQtyBOutrr29q097MQBYKREmDhEQLdqre2SnoJC2a9XqUdp/gPNmWce0PnvdQNouhbPmwgdolfIsN7PZ9zvX5ryGLaad4t8GxEz9PnMeg76Wery5rB5fnvwagzToxZSeYuzwv7QRzCgERl+/9tluvMV/cfqMBgDiqbNsq9xzOjiaX90wDXaL/3H3fV2/0vPh283/5mX8aXuOkRZ4WH7pd+YmPb6pWX3rJJQboEj3+tfg+/867scfp811ceOdNC/mk77WqZ9deXd1UXb0Wbr3uNy+8XoreZFzDnQv9WQqNqijqpiq7HosfvewfGbjT92vrdf/E/PWLr5oPPhgkHv/rd98zv3z1b80tN14Xvt+5Pv/189Hzv2vvkXoe/vy59djvrT6n74vrCST9efF/5xUzn/+aYO46TE0nS6p8Hakbl9feL/3uzcFziuILgNk0sXz1yLPmhZfOmjnoeu67gtD9Y9NQ4Srg9+//WvBfb0/Swbfc+FsGwGZafLsMEmJQVjb6HmoKcZJ/9bufrU3nzcak8pvDk5WXXuLn3opuQ7gCiX0cKlDSfeQmj/Dt0lKdJly2hb7mDz74ILFFWY/ff37L1sQTE/pZqYIe93PSc2zaWkXD1FwHIqpNXv8eRFxee9Vm/oXf4eQygOmi4WnPmRNBlfv99z8w6Q0fC/6jSvcZ02Dhu9z/XP3j9Xt2fe3h4MOZ5RItNlzeGIGuoepdDpetf9R6XdfvsTqEbAi/8hMfC8NY0mMmLf2ZCoUKJzbscAlQsizhWz9XPS7Pvv1O7O9xDZdtoxNOeVa99TPS9z/uz5qcQK5LP57+6S+MC/3eO3/nVoMN0U4O8WvdT3/yavPb111hAGCcOv5++vNXzV8cfz54n5xrzaPW8geDwP14kFf/3jTchRXA7+386rWe590x60C9mWlhQsUOuBhV72K5DkTSvtt1b7dWwFAYsYPZ9HERIVzfMy2WFcJVZVflsev7EMfJEr71vE66ljltS3Vb5F31Pvv2r8yZ12e3KOq5pPBs/xz9uWoxd6Hnh64Rx2a0mQNIywbuw8dOB++V55zeV6d4Kgjd9za5tXzShXe4oOL990nt5h/58IfDhQmAzah6F8ul4qJAo1kUTaJK9HgI16/1GMnzenBRNdaGcH08PhQTG+YN3wqMCpdxgVCoemeveut7nvRaYIsEOvnUO/Jjp+eTjr//y79Ld8gElzZzbfn6xe1bDQDkFLhV5f4vQeB+KKhyN2arMBfjwTv4wrz/YBLazSdbuABEqHoXRxWrpMWzhqo1uaKrBb8eG0UOZdMbIEPZ4s0bvrXtlL6nSeHSdo91Sd5V76QBa3b46x//2Y+cJpjrufe1f/1FXpencDnpqcf0L06/bj7+sY8E3/fLDIDuySlwi61yHzYtdOHdTX3zQfi+J/hw66yDtQC0VRkAm1H1LoYWfkkLbX3v1WbeFuND2WwI1+MmwxvZRRjKNts84VuhUttuJlW99fkuvo/mVfXW5//Xz//GxPnoZR8Jfnb/J/FnYWkgI9vyTefSZi7vvf+B+ZsX3wwHKF195UfDKjiA9ssxcLe2yj1u02nlu+/76hWe590T9xu0IGSLDWA616q3juN6WzdH//JniQs/DVXTFl5tZEO42uhtRS5pkFdaDGW72DzhW6FQ38uk4+32Yl2Spuqt6+ZnPfb056gCGzdgTd9f1+eIJpjTyTed604S495469fh/rxy+cf+EQEcaCltC6bn+l8cfyFr4JblUZW7b1puU/D+/fu/9qwx3n+O+w36xlKtA6ZLs68vi71krgu/e3f8i06ERJ2s0VZJZQ1lsyFJj+su7miRNnzre+d6XBcvOXGtequCopNNs5x5/a1ctuXTCTtdIoDpXNrMZ3n1zHnzwktvhR9fc/XHDYDm02uzQvZTf/lCuC3YmdffyRq4+0Hg3tuWieUuNq2kRu3mCyam3VwLhvGJoQA2c93Xl6p3sqZvIVaUyaFseiypwpf3UDYbwhWWujqUTeH72quvcN4D2lUXLzlJU/WOa8fX41IdGlnocfyVuz7PWiaGa5v5LGo/1yJd139rwU4FHGim8eq2ns+/euc9k9F4W/m66ZCL3nHuvu+rN3qetxD3m7QHLYEBmC5N1VuLSxZ+0ylEPv3TU4lhUhWrLg9FUjjR5T86IaoqoYJNGUPZuhTC9XXqNm/1bxqq3vFVkriqt14zk+Y+xNH3/IF7vsBQwRjztJnPogCuCrgW7lwDDjTD+Xf+PnzO/iSobOdU3ZZzQeD+b8H9v+tCW/k0F634f//+r5nkbcU+FNsGBnSdy76+CkZd3NfXldp7k6qMWkDTKrpBQaKsoWw2hOvP18nYtrf6KzDmH767WfW+9BI/sWKtx5gey9PCscuAtTgK3Zp6jtmytJnHsdeAvxIEcc+YMIQDqAdVtlXRVtj+0YlfhifMcqhuy3jgPtyVtvJpLgreKvnfs+trD5uYbcW0WGjafrlAmaL9mH+deB1iV/f1deGyhdiO7bfRfTNDWUPZNDlaJ5m0SFegavNQtrzDd1cHLapDQydtkp7ferxOOzGh10uX3z+NXjMoHCTL2maeRIv5F146G4TwM8HP+d3gNeOSsBUdQHmia7bPmmee+7/hVHLd5xi25dxwOPzvnmd0HXevy4Hbmrra/72dX/2053nbZv0mVU/YixiIp8V0UtXbZfucLlKrftL3rm1biBWpjKFsmjLdhaFseYfvrg5a1MmZpO9hXDu+TlqmHbCmCeYUDZLp9eHoX/7vpMPWNRTJGO+O4OMtZk56D1QVXFU23V5/6++C/zs0H73sw+GJPAD5GQ/aT//0pbCqrW0Ac2ojH3ehwv3NfWHgbu32YGlNvchmMDC9YK20O+436g2TsADMpsXi7bfelBggT556PjyO/ZM3uAyy+q1rrjJIR49JO5BNoSY6wfF8LhOix+nP1S14dId/l/a3blOV0VZhf3D8pMlKP4cfrz0XhMJbTJfoe6ivW19/HB3zwD0XrzWiLgH3gXd6DHbtezwvtZk76KuCFdz3lpYP7QkC+CMmZjCvC13/fX4UwOW6ay4Pfs6/YW664UquCwdSUsjWiSyd2NL9K/lWsmdR4H48uH8seH0gbE8x9VUsCN19E37zZp/F1AuzWrYAzKYKS1JLpD6ncM6iMKKF+KnTLyUep+8t5jcewqNrtl8KT6gmBaG09Ofqpr9PJ2s1hb4NJ23zDN9dPfmmNYQuKYljT+JMPmbStOczCyIdt26O4QH7UbDAXgnCdz/4cM8ogOdCLa/RULbo3/OPr/yNsB1dYXzjY64RR3cpXOuE1RtBsNYQQwXs6Ne/Dj9Xor4/9FYG3mCVwB3Pm/WJpeXeU8Hdgomx74Ev024OJPjx2rNh1SaOFtx6PlH1joJMUvBWeKPNvBgKOfr+q1087xBu2evPFTab/h6i71Ue4Vsnkrp48u3g4eOJ24spdGsg2jidsPzDP/pzk8ROMGet4sbx+7q+f++uG6d9IgjgW4dD86jneTtNhhb0NFQJVxCXyz/2kfBm/7+uHbc+PLqOnLC+mQKahmq9HwQ31IeCtA3P50eVav0/TRvXfQnV6yS6fvuA55leVyeUz2Nm385gMFz1/fhtxVT17uK1aUAaeo6ook3V203Uohyva5Ogy6SQY6uL0WTj1wrYw/rXYZVXN1UuFcCbOjckr8p3V6veOuFw8PDTscdMq3rb7eySTg7pNZXQ7c61zXzWJ4IF+Hpwt0cB3EQVcF22uNUUSOFElXF51eF4BXO1sX9+2/UXQnoXqaX/1Om/vfC9Axyput0LqtsHvrmP6nZaM4O37xtdu7NkYqgdieANxNMCUQvqpKo313pH1cOkhbRtWUbxVJXWTW26UQB/KbE6mZba3G1oHW9Fb1JYyiN86+SbXiO6dglXdKLnqsTH1bRrvXXdtssQRrhL22Y+yyiAP6rb6BrwxeDjbaYG7LXkmqr++W2/Zbbd2q0p96puHzn+fB0qpmiOfvC8P2a4djszL+6TS8u9F03CmcqHHryX9lgggRbVTxw8krj9TVfbTS19j5KC99133k7Fu0JFDmUbp8CvEN6koWx5tJ138RIuPZ6Sqt6ilvHxk24uv0/FAebRuMnaZp4kCOALw6HZU2YbuguFb1W/204nHI4cP02FG676o7C9MjqRhhzEjogcDoerwQvkYtwxqoKwCAbiUfVOpkW0S7WbPXirNTkZXY/ZIoay2TZ3PRdsCK97p0Mele9jJ54xX7lru+mSeaveukxBj4+4E5oMgnWXtc08yeg6UN3MqAquAL7LVOwna6+E920O3z9ZezkcUlfywC00iyrZvVHY7lHZLkZs8NYF88FdbPDWYpngDSTjWu94rluI0WFTH3ZatG5FDWXTc2JyMrpOTqWZal2mrOFb4WfaFO820eMj2kt+4z6hAS80ea23XguuvvLy2MCuP1s3Ws6T5dVm7kKT0IM7TUNX5XtXUAlfqLISrvB93TWfCB5bl5s2oa0cMRSs13zj9QZm8DMGpJUj8Z1uabl31sS8EOqNT+3mAJK5Tjj/+n0LnVooamGsNvMk7KTQDLZarYV80uUV89LjQAFc1fA6PiaytJ1Pm+LdBNMCdfTxP0yE7PlNTilXx4W6BOKo4s08mnhFt5m7Uju6b/zPDsxQlXBdE15aENfAtX97zz8zbaC28h+dWA9eg98ywMiaiYL2WhC0jwVBe82gdJcmHTBqN9896/N6sW772XkgL65Vb4VzXcvcFUkDkqSpU6+7yA5l02O5qKFsCnAKXLrVcShblsr3rL2rq1JGoE7zb9FJOhum9ThLCt4Mgk3mspuEydBm7mqsHf1x/ToI4tuCIL7jg+Hg9mAt+tumwDCua59fCW5Nr3rTVt5568FtLchvv/S8KGyb8KQZreN1kBy8PdMPyuK7447RgorgDSRzvdZbQaVL2+C4XFuo7xuaRY/38evBx9vR82SDqkSh/5paXAKVJXxPm+KdtzoF6rQUtjXcTwFclx1oOv4s+py+Fi5Tma3MNvM0RlW5TZU5hfHgbosq4/8wGFzh+95nTRTG7W2rmdMLL73Z2OCttvIfBlXuN96q53MWmZybuK0HwfrtSzz/xaB6rRe/dROF63WDWnNoNdf1N97ZuGP0pqfWWADJXCeca9Hehaq3S0uuTkCozRztoDCnky3qdCgq2NVpKNu8becasjbPMEG9tuhmA6cN0++9/34YVuscqNPSa4PWIEkn7+b9XnaF2swT3pPO7d+76wrTIKPrx211PLyWPFjPPhL3e2664Urzb+5q1owVPbcVuLUvdwYroxMr6wZ1cY4qdfskVrz1Q19a7vWDDxdmHaM3d4aXAG4UCFTNTmqP1GK9CZOcs9LXmaTLW6y1UXR99s3hTe8fuk63zUPZ5q186zViPCzaQL1RmdbH77YyULuy34skenwRvKfTSQuHWQw90zCj0DIeXNaC9ewOE7OefeOtvzNNsnbqtXAwXIa28rUgcO9nsBZQjsTgLYPBcNX3vYW4Y/TCzTVUgBt7rXfSgrGMdtMqKXS5tB1zKUt7KQjffefnwo9tK3reQ9n0PBsP4VH7+/WlniyeJ3zr3619qm3ILmpQXRfoZ8+2YtO5tJn7Q69xwXua6LrX5An6dZdDW3lwQmL4rSBwP2YAlMYpePt+eKZzKe4YhpcA6aiKm7QIr9uQpby5DFUrOyChOtF+ztFjPQrgrzlee+pOITbaXeDZ0oeyzRO+HYdeIQGDYGdzmLFxbnHfzlWDyqmyrQq3Kt0ZrIyq3LQxAyVzCt66WH9pubduYgZWMLwESEeLcFW0u1r1tlXIJHds+5RB95Q9lM2GcLUjF/k+lnWfb8yPQbAXa2ubeRvRVg40n1PwltG2YouzPm/PJnMNFeBOw9PUShqnrVVvl0oeW4hhozX8hkKHsm2E8JPh36XJ6EW9nxG+qxH9fJkXMa5LbeZNpbZyBW5tdzYntZU/HgTuRw2ASjkHb88Lz3guxh3D8BIgnai19qrESl4bq95JW6qJKpCAVcZQNpkcylbEkEOu1y6fgjedeZvRZl5fObWV90ZV7nUDoHLOwVutKUvLPV0PsmXWMQwvAdJTK3XXqt56rUgKS7bSCUwzbShb3iF8ciibTixrMnqWLgz9map0c+12NRQ0eV2J0GZeXzm0la8HgXsvbeVAvTgHbxm1m++e9XmGlwDpdbHqzRZiyNP4UDaFCTsZPU8KzKqw66bQrwCe9lII/V49j6l2V0drFIJ3hDbz+qGtHGi3dMHbM33PmN1xxzC8BEivS1XvaFgWW4ihGKpK61bkUDa1udvrs12GslHlrg+7VR3t5k5zNmgzL0lObeX9UZV73QCopVTB249ajpbjjmF4CZBel6rertd2M1QNWUwOZdN7kyrOr781dyVpqqShbFS560U/B50E+cpd202X6TGbdFnGcDg8ZlC4X5x+PdyTm7ZyoP1SBW/t+be03OsHHy7MOobhJcB8ulD1dt1CTMOzgLxMhnCFYVU+ix7KZgM/6iWajP98p19nTp1+OfGYS4x/yKAwr7/16yBwv5i5rTy4f4w9uYFmSBW8ZTAYrvq+txB3jBYeLJyBdLpQ9XbdQkzX0AJFUCjesf0z4a3ooWyoL72Odvm1xuW1eOANaDMvAG3lQHelDt6+H7abL8Udo0oCwRtIz7XqrUV9EwcEsYUY6mRyKFs0mC25EojmU2fek0dPmK/ft9C5Dj3HNvPVb+6jipq35196K2wr/9U775k5rdNWDjSXb1IanV1bjztGg2e4ng1Iz1a9k7gE2LpRqGELMdSVrsvW9mQPPXhvcH+70/MQzabXo2MnnjFdQ5t5+c4HQftPDv+V+bOjz80butVW/q3gdjuhG2iu1BVvGW0rtjjr8wrdCt9MJQbSc6l621bWJoVUXVOZRIOpgCqp+jk5lE3hjJPJ7aTX0auvvLxTXXq0mZdHbeV2T+4M+rSVA+0wV/D2vLDdfDHuGLWbE7yB9NJc6x23hVGduG4hxiUqqAM9XtWhoRPIdvsptJd9Le3CTgq0mZcnp7by/UHgZi91oCXmCt6BNRO2vZgtsw7QWeQd228zANJTy+sTB4/EHhNNZ34hqJDXf/s+thBDndkuLYVsl0si0C76+avLqAvXe9NmXjy1lR85fjrLtHITtZUzrRxom7mC99i2YrtmHaM3siZvewRUKbrW+frERVK0Jc5NtV4s2teCJFzbjTLpMWnDNnNJoJMtOkHY9oIBbebFsW3la6fOZNmTu09bOdBe81a8zcAMV33j7Yo7Rq2lBG9gPrrWOyl4KyzUvertOlSN1woUSc8VPRYVPGgfxzQ6kanrvdt6EpA28+K8cubtoMr9fJa28nP+0Ht4cd/OAwZAa80dvH0TXue9HHdMdGa1/m2wQB0pjKqarWAdp+5Vb5c28ya0y6NZxtvHbXUbSKJBejoJ2MbLXmgzz19ObeWPB/95dHHfLk54AC03d/AeazdfmHWMFjta/HRtj0wgL7bqHVedq3PV26XCwhZiyIvCta1o0z6OeYzv7902jm3mxwwS5dhWruFpawZAJ8wdvGUwGB7zfW8h7hgNWWNSMTAfnbRSNTupalzXqrdLhYX9kjGvqtvH9XzT41cVUv3dLt0dqD+dtFHlu03Xe7ucBA30ubY4WR5t5RqeFnyvHzMAOiVT8PZ9na0zj8Qdo8UQwRuYn54/qmg3rept9xpPoqo+4Gq8ou1SwcubDdr2Zh078XOD9tDJTP2stc1YG7icBPWH3orBTHm2lTOtHOimTME7eOHoLy33YrcVs+1+tJsD82lq1ZstxJAHu6d2Ve3jenzefMM1F4L2rOfX+XfeNWgXu793G9Bmns1P1l7Oo61cVe6+AdBZmYK3DIfDA57nLc76vB1ww8RiYH5NrHqzhRjmYbef064YVeyprWCtydYKXLq5nhhi7+/20eOgDWgznx9t5QDylDl4e1443Xwx7hhVKgjewPyaVvVWizlbiMGVDdrRfX3ax9MgeLdPW04M0maentrKf3RiPVi/vmXmR1s5gM0yB++ApjHGtpuratGmISVAFZpU9WYLMcSx7eM2bFcxFM22j6uqnfVElf79TFBvl2hwXjtODNJmno6mlf9k7RXaygHkLnPwHm0rpvC9MOsYLbLUbn71lZ8wAOaTpupd5bXTrluIteXaSSQb31O76vZxham834vYI7x92rLbgh6btJm7U6X7h0Gle060lQOIlUfFW9uKrSZtK6YFF8EbyMa16q1wfvedt5squG4hxsDFdqu6fVxB21a09d5T5OONanf7tGeaefLOErSZ54G2cgDJcgnevm9WgruluGOihRetpUAWrlVvLbbUyl121ZstxLqrDntq59k+ngbXd7dPW9rM9VxMQpt5JmtB6N5PWzkAF7kE71G7ed/EtJvb6/iocgHZuFS9pYqqt/5dSbSgZQux5mt7+3gaBO92actrFG3mhaKtHEBquQRvGQyGx5LbzV9j+yAgIwUOVbOPnXgm9jhVnnWtd5mVGz3Hk6hij2bSQt5WtKvcU7uM9vE0uMa7XfQYawPazKfKoxV8ZVTlpq0cQCq5BW/f1xRH80jcMVqwEbyB7GzVO6maoar3A/eUE7xdtxBjqFpz1KV9XCE7zZ7aZcsw/Rg1RJt5e7lsgRtjPQjce2krBzCv3IK3XoiWlnsJ24olvwkAcKOq9w+On4w9xg62KmMh6XZtN3Me6my8fVyPmyoquXnsqV02Ws3bQyd32jAIljbz6UZr1fXgw60pfpvayh8Pfu+jBgAyyC14y3A4POB53swziVrUlRUCgLZT94gq2nWoekctyG8mHsdzv37sntpVt4/boN20OSDs4d0ubdlGjDbzOMO9Qe37aPCBl3RgcOsFd9/kOngAecg1eLu08Ghxx+IbyMeO7beZJ4+eiD2mjKq3y1C1KvcWxwbbPv76W+fDxXkV7eO2ql3n9nFXXN/dLm25HI4289miqvehPwhWrd8JfnnjlEMUuNeDu320lQPIU67B24TbKoSDK7bMOkALPoUFANlFE52vSqw2F1n1Zgux+qt6T+0mto+7otrdHtFJoeY/PmkzTxZ87b0gfK8Nh2bR87wdwf/aZqL165pvvNWBGRxgeBqAvOUavEfbiil8L8w6Rm8GulH5AvKhQHvw8NOxxxRZ9XaZZM4WYuWy7eM2bFfVPm6HorV5G0kq3u3RljZzl5Nr3W0z3zA68bDfAEBJ8q54a1uxVZdtxTSVGUB2URWxuqq3a5s5imPnZ+gxUPWe2m1oH0+Dind7tGXHhVOnX048pqtt5gBQpdyDt+9rf0OzFHeMrj0ieAP5qarq7bqFGNsI5q8O7eO2ol2nPbXLRsW7PdoQvPV67PCY7HSbOQBUJffgPWo375uYdnPb+tjVhRqQt6qq3mwhVh7bPm63+6pqT207FI3X7wh7eLdDEyfqT+Ny6Y86Ew0AoHS5B28JXtSPubSbUwUD8lN21VtBkC3EijO+p3bV7eP6GbZhb+MiUPFuB51UagOXNnPfD3egAQCUrJDgHbyo94O7R+KO0eKf4A3kp+yqt/6cJGwhlo5eF23YrmJPbQVtW9Hucvu4K67vbo8OtZmv0WYOANUoJHhHeyT2ErYVS95jEkA6rlVvtYhnOfHluoUYsxzi2T219TOhfbx5qHa3g04OtuEEoWOb+QEDAKhEIcFbhsPhqud5u2d93k7hpQ0VyE+aqneW4O0yzIv25IuNt4/b6nbZ2ryndtmoeLdDl6aZ02YOANUpLHgPBqZ3ySVmd9wxWnyy8APy5VL1thXrecO3a5s5oqqorWhX0T5u99SmfTx/VLzboQ3Xd9NmDgD1V1jwDkJ3P7hLaDd/zezYfpsBkJ80Ve952otdBn11eQuxOrSP26p21/bULhsV7+bT86MNBQDazAGg/goL3qNtxdZMzLZiWrzrxsIQyNfdd37OPHHwSOwxeu6dPPVC6u2+Tp56PvGYtkwIdjHePm6r22WjfbwaVLybT8+dNnAJ3rSZA0C1Cgveor0iXbYVYwATkK+o4nx94jV/CtG333qTc9XbdQuxtj+n7Z7aVbeP26BN+3g12MO7+doyzdzhdZk2cwCoWKHBe3R2dSnuGC1cCd5A/nStd1LwVmBMU/Xu6hZidhikFrdV76lN+3h9UPFuvjZ0iLh02dBmDgDVKzR46+zq0nJvPfhw66xj9IahRS0VGyBfeVe97bXLSdpybbcN2tE97ePYrOyTL8hfW7pFXLZ2DAohfQMAqFShwVtG24otxh2jxXxXBzEBRdqx/TOJA75cq956nia1VDd5UJFtH7dhmz21EYfg3Q7qWmjytoeObebrQSFkzQAAKlV48Pa8sN08NnhrkUvwBvKn8KZqdlKLuEvV26XNPO2gtiqND0WjfRxpMdG8+bT2+N73+6OZCdeGHUJNC+Eu3TgqgBgAQOUKD97BWdb+0nIvYVuxMwZAMTRDQRXtLFVvLe7asIVY1e3jCtq2os2e2s3G9d3tEe3w8Hx4a1oId2kzDwogKwYAULnCg7eM2s13z/q8HVzEdYxA/vKoeiuUJ6njtjx12FOb9vF2otW8nZoUwmkzB4BmKSd4e6bvGbM77hi9eRC8gWJkqXrba5+TaIp61erUPq7XsyZfO4p4BO/2q3sIp80cAJqllODtm/A67+W4Y7RIbtL1oUCTZKl6130LMQVtW9Guck9t2se7hT28u2VaCNdrZZWzGWgzB4BmKSV47997/7ml5V4/+HBh1jFaMOuNjQFDQDHmrXq7VFXKvLa7Lu3jCtn6ugna3cQ13t01HsKj14HrSx+QSJs5ADRPKcFbBoPhqu97C3HHaDGtcAAgf2mq3raCrYqKy1C1Ii8TGW8fV9iuIvCwpzbG0WYOS69Hx07o9kypIZw2cwBontKCt++H7eZLccdoYU3wBorjWvVWOL/7ztsr20LMXldedfu4DdpUtTGO4N0aw+DmmZyUGcJpMweA5ikteO/fe//60nJvPfhw66xj7AKbRS5QDNeqtxZ1qvK6VLu1sMyqDu3jtqrNntpIwh7ezTcYDL8VFATWg3j6DbNxGVwjQjht5gDQTKUFbxltK7Y46/O2pZRWTqA4LlVv+cHxkyaJwuq8J8qq3lOb9nHMi+u7W0HBdCW4X1laPrTVhOG7GSHc8fWybwAAtVJq8Pa8sN18Me4YVbtYBAPFUVBWe7gWgVml2UKsLu3jWviypzayoNW8XdSRF9ytmIaEcJc286DUccAAAGoltzcTV0vLvbPB3ZZZn9di+KEH7zUAivXEwSOZAoROkD1wzxdmfl7B2la1q95Tm/Zx5Ong4eMurb6oscFguPc//fuw4j1T0SF8nGsI1+uoXrsTBNX8XTcaAECtlFrxllG7+e5Zn7eLdareQLFU9XZpJ59F14pPqkP7uK1os6c2inL+nXcNms33k1uxZ1TC/2Nwv210SGGVcL2+ah00GcJpMweA5io/eHumH7xT7Y47Rgt3gjdQLO1BrSFr81Si7VA12z5uw3ZVe2rboWgEbZSBVvPGOzkK1c4mQ7hv/J0DM9RappAQbk+K6rVNlXAbwmkzB4DmqqDV/NCW4K89G3dMUgsrgHwoND959IRJSxUZhewq28f1OqF/B1Amx1Zf1Jg/9PYs7tuZSzgtOoSP02ueQ8WbNnMAqKnSK97BWeNzS8u9vtm4XuoitnJG9QooVhRgr0p9vWqZU50VtG1Fm/ZxVI1qd32pIuzy8xl4g2MmJ6NK+OO6FR3CaTMHgGYrPXjLYDBc9X1vIe4YtVNp2yMAxVKgrdOgKNrHUWcE7/IpUH/kw5eO7j8U3o9/bO8dO3j6advMXZUZwmejzRwA6qqS4O0y1ERbDhG8gWKocqLnmE5wlX1d9jSqutuKNvMdUGcE73woLEeB+bKpIdp+nObEm17TkvhDb8WUoKIQrr3J+wYAUEuVBO/gjWFtabm3Hny4ddYxdp9fql1APuoUtu2e2rSPo2kI3vGmVac3QvZ8gdqFXtNcBo8NvMGqKVmJIbxvAAC1VUnwltG2YouzPq83UYVvql/AfOxzqE6VbSv6t503Wm/qYy3GGZSGJuhq8LaB2j5PZ7V7V0Vt5g5WNGfGVGhGCNdaaKvJHMBpMweAOqsseHue6QV3i3HHKDAQvAF3NmwraOv5U6ewPU7/LrvX98lTz1/4/3ZSudpPdU81HHXTpj28i2j3ropLtdsf+j1TIxMhfNtwaHYHBYmdZr4QTps5ANRcZcE7sBbcdOZ5y6wD9Ea6Y/ttBsBsCrHRXtpv1Dpsu7BhfFwUxH/jwnRzwjiq1ISKd1y7t33+NCVQu9DPxGFA5PrivvtKbzN3pUvwTLQu2j9nCO8bAECtVRa8x7YV2zXrGFsVo+oNbGbD9qnTL1+Yh9BW+vqilnm1kj4X/j8bIKJhbFfRqo5SlLmN3jR1b/euStu22ZovhNNmDgB1V2XF2wzMcNU33q64Y3QWm+ANbAwPUlW74LA9HN33h8PhL4MF328HHy+YUrbCcRPXqm6r47SqI29FPOfa1O5dlZOnXnA4qpnB1DGE02YOAA1QafD2TXid93LcMdGZ7FsM0EXjYduxqjOvC2E7OBm2OjCDA+NDiIIF30KwxvuvpmYBfNK079Fkq7oNM0BaebeZq1vj7js/x+MxA/1MHDoRWhFMY0J43wAAaq/yBfTScu8pEy3mZ3rowXs524/OKDlsK1yvTQvb0wSLvT2jAL7V1DiAJ6FVHfP48dqzwe05k5Uef3dsu8XcfuvNBtkcO/HzxIr3cDh8/Jv77n/YtFTwuryl6mntAIBklVa8ZTAYHvN9byHuGIUQFihosyrCdvDh/wjue2kWbMGxK8HdStMDOK3qmEe0BV422r9eVW4eV/nQa2YSzzOPmRYjdANAM1QevH0/bJF6JO4YLY4J3mgbtUhqONq0Sd45s2G7F3z4Q5MybE/TlgA+iVZ1xHnv/ffNvPSYufvO25lZkiM9Xx3a/0+Otu0CAKBStVgoLy33zpqYbcVUGdj3wJepEKDxKgrbqmyvFVkVaVsAT0Krejf94R/9+VwD1nTiWK3lvIfl6wfHTybu3+0PvT2L+3Yy8RsAULnKK94yHA4PeJ63OOvzWuhoeAqVAjRRFLLfDBeIBe8BHIbt6PlktF/tWlktiFMq4DeajG6+4dpw6yTHPXpLRat69+j67rShWz//Hdtv472rIC4nLwfe4JgBAKAGahG8g5Cg6eaLccfoOi4WL2iKqsJ21ZN7FcCD8N0PPtwTPLO/YTIEcO3bref8ju2fCQOMTr5FIfyN0d7e52u3fzmt6u2kx12aoWoMTyueXh8cXlv7tJkDAOqiJq3mh7YE/5QXTUy7uRaqajcH6kqhSyeIFLYLDoS1CtuzBM/rrSYK4KqAZ3qtufWTN4RBZjKw2m4YG8ajrYWyD8AqGq3qzeLS0myxRVg5aDMHADRNba7FdNlW7Ov3LbA4Ra0QtpMpgA+H5hHP83abggL4OBvGN4L427VrVZ/FhnFa1etDz22FvCRUucuj57iut082vIKJ3wCAuqhN8P72dw897PveUtwxd2z7VLiwAapUctheHw1H6zcpbE9TdgCf1IRW9WnGW9VtGKeaWg49Xg4efjqxpVmhWyeG+bmUw/FkyMr+vbv2GgAAaqJGFe+w3fxs3DG6PvKBe75ggDLZCiphOx9VB/BxtKojjmuLuQaoUekuz8HDxxO7WPyhv2tx332rBgCAmqjVtj8u7eYPPXgvrZconA1kWnQrcJcQtvtje2yvmQ6oUwAfR6s6RD/7Jw4eSTyO+SPlcvy5rAfV7sw7KwAAkKdaTDW3BoPhMd/3FuKO0SRTLbKBvNktovQYKzhsD0f3/VHYXuni5N3R17w3CODfyhrAdYJEPzu9Ntz6yeszBXAFVXXXTO6i0IRWdXvCYByt6vNRi7kLurDK5bKFmAlfWwEAqJeaVbwPLQT/pKfijtGiWhNjgTwoOClonzr9chhYygjbvvFWB2awyjY3m42e/5qAHtzP/9qkUGkr4EWjVb2dtGe3y/Zhai9XmznK873v9y86uXSx4ZfaeJkOAKDZahW8ZWm5p+u8Z24rpgWj2s2BeVUYtg8wYTdZEMB3BS9N3wk+3GoyBnCF77I7ZGhVb7Y0LeYaqEYrf3loMwcANFmtWs0l2i7JW5z1edsOPNkGCsTR48Zer+3YqjgvwnZGwferF9z1ggC+Z1QB32rmCOBapGs41rETz4SvFzffcE14X3SbNa3qzeZS6Rad1CF0l+vkqecTjwnWEAxUAwDUUg0r3snt5rT3wQVhux2yBvBJUXv1RhCv0nh1XI9RWtWr5bpnN5c8VUPV7qSt3YKX4xu5jAcAUEd1DN7aVuxFE9NuzhRZzFJy2Fa4Xhtt/dUjbBcr7wAutjpdVjXcxbRW9abtOa4w3rRWdfbsrje9njsMvDu5f+8uzogAAGqpdsFbXLYVU/Bm4QPRQtlOIidst99YAM/9Os46VcMnNaFVfZrJVvW6VsfZs7veXH4+/tDbs7hv5wEDAEAN1e4abxkMhqsu24qx+OkuBRANR1MIKSls90Zhe42wXa3g+78S3K0EAfzRIIB/w+QYwG2l2V5LOh7Cqw6LtoJ88w3XXvh/TWhVt/8+vWZbdWtVj15PkkO3/p2871TD5XV+4A2OGQAAaqqmFe9DW0ft5jNpIcz+qd0Shew3Cdu4IHqtMHvyDuDTRC3UG0G8ri3UtKqn53btMJ1WVdFJmyePnkg6rL9/764vGQAAaqqWwVuWlnuacLMt7hhtK8ZU2XazYVvVKJeFcQZh2I6m6ptV9oBtFgXw4dA84nneblPS61qdquEuaFWfznXP7ju2faqUveFxMdrMAQBtUMtWcxm1m8cGb50FL3uPXhRPwUDXa+vnS9iGi9EU471BAP/WWACXwkL4eOdFE6rhtKpfTF+vS+iOWsxvMiifHZiZZOAN2EYMAFBrNa54J28rxpYu7WHDthZYBVfhCNsdEO2OYBaCEL4zCOE7TDQJXUqrhisQTtvPu+661KruOlDt7jtv5yRvRRy3eFvZv3fXXgMAQI3VNnjL0nLvrInZVkwLKrWbo5lKDtvrQdheJWx3UxDEt/nG3zEww51mY8eEUl7/bDW2TluWzaNtrers2d0MBw8fDy83iuMP/V2L++6j4g0AqLVaB+/vPHFoZaxldCoNWGtaRanLyg7bo+FofcI2rKqr4XXesiytJrSqT2Or4EmvQQrpeo9hoFo19HjS4LsE60G1u9DBigAA5KG213jLYGB6l1xiYoO3QhzBu77swlxBWz+rEsJ2P7j7oSFsY4bRhPre6GYnoy+MJqNrroSCeWEhfHzLMgXA8RDetIBn//26jW+zZavidW1Vd/236LpuQnd1HHev6BsAABqg1sE7CN39pGM0cGfH9tsM6qPEsD0c3fdHYXtlNGQLcDZ6zKyMbuF8ibFquB3wWEgQ13NDr2F2cFhbquHTrm0fD+JRMK93qzp7dlfv5KkXHI4aMskcANAItW41l6XlngasLcQdw96q1bMB4tTpl8OFdRlh2zfe6sAMVgnbKMpYNfy+6L7YavgkhVddY2wHhbVNnVvVeV+pFm3mAIC2qXXFW0bbii3EHaPAR2WifBWG7QOjdmGgUFVWw6VpW5alVddWde3ZTeiuli7FSKKBmQYAgIaoffD2/fA6zKW4Y9TOTPAuh91TVd9zx+vv5kXYRu2M5gbodqEaHgTxHWUMaVMI1XPPbn81HsLbVg2vslVdJwPYs7t6eo9J4nnmMQMAQEPUvtVclpZ7L5qNRe1FtFBSW2AbKkB1RNgGkqka7hv/s1VtWda2ariLolrVtU0l7yfV0c/y4OGnkw47uX/vLvZ5AwA0RiOC93eeOPRYUFFajDvmK3dtDxad1xrko+SwrXC9Ntr6q0fYRtNVvWVZVDG+amrluAuytqrffeft5tZP3mBQDe2vbjs7ZvGH3p7FfTsZrAYAaIzat5qL54Xt5rHBW9caE7yz0SI1mrBM2AaymLJl2bagGr6jrGr4xrXhz12ohtsg3oVrl+Na1fV9SZqW3YS9yNvM5f1n4A2OGQAAGqQRFW9ZWu6dNdFE4anUFqj2QKQTXTf68qYhTgWxYTsIIsPvm2ifbcI2OqfqanhbtizL4g//6M9jK+A6OaHLl1A+nfx98uiJpMOC949dXzIAADRIIyreoumlwSJ196zPaxGl4NjVhWQaqvzYqnaJYVuV7TXCNrpuSjV8q4m2LPuGKaEabq+J1tRoO1XchvCuTPLW16sTjrPohKRuTDYvn8tQNX/orRgAABqmOcHbM/1gJbo77phXzrxJ8J4hCtlvhtfNaUFZoDBsBydKDnie0VYvhG0gRpVbltktAXWTrlTDoynwL8ceo9dMrvMul50tkmTgDdhGDADQOA1qNVd7pnc27hgtpr5+34JBpKqwPdpyCUBGY9Xw+6L78HKbUl63VQ3Xa+qtn7y+ddVwvR4+cfBI7DH6uu++k6HZZdJ7lQarJVjZv3fXXgMAQMM0puKtqunScq9vNloxL6L2SZ0x7/I2MArbatXTAqaIPW7HELaBglVdDR+/HKVNW5bpa9Et7oSkS8sz8uVS7faHfs8AANBAjQneMhgMV33fW4g7Rm/ct996s+kSwjbQDaPnnG6T1XCFcP26sGp4NIjxpQvhaDyER63bzaIp76dOzw7eei3lOu/yRBPn30w6bH1x3320mQMAGqlRwdv3w2FES3HHKIB2IXiXHLbXR8PR+oRtoB6mVcMHA7MQnJz8oil1y7JmVsP174wbsCa69r1rJ3Kr4jjos28AAGioxlzjbS0t9140G9vvXEQLPm0D07Z2c4VrO42csA0gTtVbltkQboe11ZFeQ7WtWBx9DV+56/MGxfve9/vhe1y84Zd4PwIANFWjKt4y2lZscdbnbUBtw0Re+7UoaCtwlxC2+8HdD004vCaspgFooClblm3zjb9jYIY7TUXVcLV212lIm07OJl3n7dD6jBzoZ5Acus06oRsA0GSNC96eFy4kF+OOUUhtavC22/vYVvICw/ZwdN8nbAPtFjy314I73R4vuxo+eW14nbYs07/h5KkXZn7eDphjm8p82Ovm7SDUaE/58067buikuwEAoMEa12ouS8s9bSu2ZdbnVcl46MF7TVPYsK3rDe2CpCAXwrZvvNWBGRxgj22g21QNN+FwNu8bpoRq+Di9Vo+H8LKr4XrdffLoidhjdmy/jeu8UxgP17qPPo7Cdbb3tuGNnBwGADRZ4yreMmo33z3r802oUujfaFvICdsAqjJWDV/Rr8veskzhVzcpuxru8nd0ZWBnGjZE24r1e++/n1O4nukkoRsA0HTNDN6e6QerwN1xx+javLoF7/Gw7TjBdV6EbQBzidmyLLgPO40Kq4ZHQe5tc/LU86VUw6O/46rYa7ntidG2DexMsrkl/PymXxc8b+Qi/tB73AAA0HCNDN5+NDBoOe6YKNjeYqpWcthWuF4jbAPIw7Qty6qqhhe1ZZmq7HHBu00DOydtbgl/d9Ov62TgDY4ZAAAarpHXeMvScu8ps3E94lS6zruKKkUVYXu09VePsA2gDGVXwyeNh3CF53npNfrg4adjj7lj26eCW/UnctOy1WkbpqOK9T/UMlzH6O/fu+tLBgCAhmtkxVsGg+Ex3/cW4o5R+C3r2rxocu/Lm7bRKYgN273RNHLCNoDSTauGDwZmIXhd/qKpaMuyearhLqG9Lh1U08yaFG7/f9P5Q2/FAADQAo0N3r4ftps/EndM0UNxKgrbqmyvEbYB1MnEteGVblmWphrucp23Xt+rvM67uEnhtTOc+PX6wBuwjRgAoBUa22ouS8u9F83Ggu4iWiTte+DLuS6WopD9ZrjAK7iaQNgG0Arassw3/o6BGe40JW9ZZqvhCtezhrT9eO3Z4PZc7J/zwD1fKPQ67womhVdlPFyfG93WhsPhLz3P/Mz+minmAIC2aWzFW0bbii3O+nxeQ3HKDtvB13UgWICsjipIANBoY1uWPV6Hariq4ONblkX38cFbHVRZ30vqNCm8YJPhet1E4frtUbjWY+Ec4RoA0CWNDt7BG7jazRfjjpl3saSwrd+ribqEbQDIx6hzpze6lV4Nt5cGjW9Zpmp4EgVkF02ZFJ7RZEv4hXA9GAxf8v3oY/0/OrUAAIg0vNVclRNP7eZbZh2jhZWmm7uwYVuVkYKrD4RtAJhitGXZ7qAa/llT8JZladn3khZMCndx0fXWZmPLyp8NzEBnIgjXAAA4anTwlqXl3qHgblfcMXHX5pUcttdH12v3CdsAEK/qLcsm6URu24eZmVEb+Chc/9JstIUTrgEAyKDxwfvb3z30sO97S3HHjO/BaisVhG0AaJZRNdxeG16raniNTQ3XGmZ2ieev23DN9dYAABSrBRXvsN38bNwxqnYreCtoK3CXELb7oz22CdsAUIC6VcMrxqRwAABqrhWLlKXl3lNmYyhP2eyCpz8K2yssbgCgXKqGDwZmwfe9L5qStywrCZPCAQBosFYsSr793UOPBoutR0x5LoRt33irAzNYZbEDAPUwqoZvK2vLspwwKRwAgBZrScX70ELwpTxlijUZtg+w+AGA+it7y7IYTAoHAKCjWtOGt7Tc03XeW0y+CNsA0CLRXBCzUGA1nEnhAADgIq0J3t954tBjwSJq0WRH2AaAjpizGs6kcAAAkEqLKt6Z2s21iArb/UZbf/UI2wDQPaMty3ZPVMOZFA4AADJpU/DWtmIvGvd2c8I2AGCmUVv6FsI1AADIqlV7njpsK2bDdm8UttcI2wAAAACAIl1qWmQwGK76vrcw8b8J2wAAAACAyrQqePu+WQnuvjP65bnhcHjA84z22O4bAAAAAACQ3be/e+jhaNAaAAAAAAAAAAAAAKDV/j+7XrzzT9fTyQAAAABJRU5ErkJggg=="/></defs></svg>
\ No newline at end of file
diff --git a/app/images/videos/recovery-onboarding/subtitles/de.vtt b/app/images/videos/recovery-onboarding/subtitles/de.vtt
index 4f32049535bb..9b5612285457 100644
--- a/app/images/videos/recovery-onboarding/subtitles/de.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/de.vtt
@@ -2,91 +2,109 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask ist eine neue Möglichkeit zur Verbindung mit Webseiten und Applikationen.
+MetaMask ist eine neue Möglichkeit, sich mit
+Webseiten und Anwendungen zu verbinden.
 
 2
-00:00:04.580 --> 00:00:08.860 
-Auf traditionellen Webseiten ist eine zentrale Datenbank verantwortlich für die Kontrolle und
+00:00:04.580 --> 00:00:08.860
+Auf traditionellen Webseiten ist eine
+zentrale Datenbank für die Steuerung und
 
 3
 00:00:08.860 --> 00:00:10.179
-Wiederherstellung Ihrer Konten.
+Wiederherstellung der Konten zuständig.
 
 4
 00:00:10.179 --> 00:00:15.050
-Auf MetaMask liegt diese Macht aber beim Inhaber des Generalschlüssels.
+Bei MetaMask gehört all diese Macht dem
+Besitzer eines „Hauptschlüssels“.
 
 5
 00:00:15.050 --> 00:00:18.460
-Wer den Generalschlüssel hat, kontrolliert die Konten.
+Wer den Schlüssel besitzt, kontrolliert
+das Wallet und damit die Konten.
 
 6
 00:00:18.460 --> 00:00:21.110
-Ihr geheime Wiederherstellungsphrase ist Ihr „Generalschlüssel“.
+Der geheime Satz zur Wiederherstellung
+Deines Wallets ist der „Hauptschlüssel“.
 
 7
 00:00:21.110 --> 00:00:26.070
-Dies ist eine Serie von 12 Worten, die generiert werden, wenn Sie MetaMask zum ersten Mal einrichten, und erlaubt Ihnen
+Es ist eine Reihe von 12 Wörtern, welche generiert werden,
+wenn MetaMask zum ersten Mal eingerichtet wird, diese erlauben dir
 
 8
 00:00:26.070 --> 00:00:30.120
-Ihr Wallet und Ihr Guthaben wiederherzustellen, falls Sie jemals den Zugriff verlieren sollten.
+Deinen „Hauptschlüssel“ zu Deinem Wallet wieder herzustellen,
+solltest Du jemals den Zugriff darauf verlieren.
 
 9
 00:00:30.120 --> 00:00:33.451
-Es ist wichtig, dass Sie Ihr Wallet sichern, indem Sie
+Es ist wichtig, dass Du Dein Wallet sicherst,
+indem Du Deinen geheimen
 
 10
 00:00:33.451 --> 00:00:37.510
-ihre geheime Wiederherstellungsphrase an einem sicheren und geheimen Ort aufbewahren.
+Wiederherstellungssatz sicher
+und geheim verwahrst.
 
 11
 00:00:37.510 --> 00:00:41.429
-Wenn jemand den Zugriff darauf erhält, hat diese Person den „Generalschlüssel“ zu Ihrem Wallet und kann
+Wenn jemand Zugriff darauf erhält, hat er
+den „Hauptschlüssel“ für Dein Wallet und kann
 
 12
 00:00:41.429 --> 00:00:45.190
-frei auf Ihr Guthaben zugreifen und es Ihnen wegnehmen.
+frei auf Deine Konten zugreifen und alle Gelder stehlen.
 
 13
 00:00:45.190 --> 00:00:50.109
-Sie sollten Ihre geheime Wiederherstellungsphrase sicher aufbewahren, um Ihr MetaMask-Wallet zu schützen.
+Um Dein MetaMask-Wallet zu sichern, musst Du Deinen
+geheimen Wiederherstellungssatz sicher speichern.
 
 14
 00:00:50.109 --> 00:00:54.930
-Sie können sie aufschreiben, irgendwo verstecken, in einem Bankschließfach aufbewahren
+Du kannst ihn aufschreiben, irgendwo verstecken,
+in ein Schließfach legen
 
 15
 00:00:54.930 --> 00:00:57.729
-oder einen sicheren Passwortmanager verwenden.
+oder in einen sicheren Passwort-Manager speichern.
 
 16
 00:00:57.729 --> 00:01:01.050
-Einige Benutzer gravieren Ihre Phrase sogar auf eine Metallplatte ein!
+Einige Benutzer gravieren ihren
+Satz sogar auf eine Metallplatte.
 
 17
 00:01:01.050 --> 00:01:04.440
-Niemand, nicht einmal das MetaMask-Team, kann Ihnen dabei helfen,
+Niemand, nicht einmal das Team von MetaMask,
+kann Dir dabei helfen
 
 18
 00:01:04.440 --> 00:01:07.820
-ihr Wallet wiederherzustellen, falls Sie Ihre geheime Wiederherstellungsphrase verloren haben.
+Dein Wallet wiederherzustellen, wenn Du Deinen
+geheimen Wiederherstellungssatz verlierst.
 
 19
 00:01:07.820 --> 00:01:12.072
-Falls Sie sich Ihre geheime Wiederherstellungsphrase nicht aufgeschrieben und diese an einem sicheren Ort aufbewahren,
+Wenn Du Deinen geheimen Wiederherstellungssatz noch nicht
+aufgeschrieben und an einem sicheren Ort aufbewahrt hast,
 
 20
 00:01:12.072 --> 00:01:15.492
-machen Sie es jetzt. Wir warten.
+mach es jetzt. Wir warten solange.
 
 21
 00:01:15.500 --> 00:01:20.780
-Und denken Sie daran: Teilen Sie Ihre geheime Wiederherstellungsphrase niemals mit anderen, nicht einmal mit uns.
+Und denk daran, teilen Deinen geheimen Wiederherstellungssatz
+niemals: nicht einmal mit uns.
 
 22
 00:01:20.780 --> 00:01:24.910
-Sollte Sie jemand danach fragen, ist dies ein Betrugsversuch.
+Wenn dich jemals jemand danach fragt,
+versucht er dich zu betrügen.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -94,5 +112,5 @@ Das ist alles!
 
 24
 00:01:26.250 --> 00:01:31.020
-Jetzt wissen Sie, was eine geheime Wiederherstellungsphrase ist und wie Sie Ihr Wallet sicher halten und beschützen.
-
+Jetzt weist Du, was ein geheimer Wiederherstellungssatz ist
+und wie Du dafür sorgst, das Dein Wallete sicher bleibt.
diff --git a/app/images/videos/recovery-onboarding/subtitles/el.vtt b/app/images/videos/recovery-onboarding/subtitles/el.vtt
deleted file mode 100644
index fc537aef807c..000000000000
--- a/app/images/videos/recovery-onboarding/subtitles/el.vtt
+++ /dev/null
@@ -1,98 +0,0 @@
-WEBVTT
-
-1
-00:00:00.780 --> 00:00:04.580
-Το MetaMask είναι ένας νέος τρόπος για να συνδέεστε σε ισότοπους και εφαρμογές.
-
-2
-00:00:04.580 --> 00:00:08.860 
-Στους παραδοσιακούς ιστότοπους, μια κεντρική βάση δεδομένων ή τράπεζα είναι υπεύθυνη για τον έλεγχο και
-
-3
-00:00:08.860 --> 00:00:10.179
-την ανάκτηση των λογαριασμών σας.
-
-4
-00:00:10.179 --> 00:00:15.050
-Αλλά στο MetaMask, ο κάτοχος του κύριου κλειδιού έχει όλη τη δύναμη στα χέρια του.
-
-5
-00:00:15.050 --> 00:00:18.460
-Όποιος έχει το κλειδί, ελέγχει τους λογαριασμούς.
-
-6
-00:00:18.460 --> 00:00:21.110
-Η μυστική σας φράση ανάκτησης είναι το «κύριο κλειδί» σας.
-
-7
-00:00:21.110 --> 00:00:26.070
-Είναι μια σειρά από 12 λέξεις που παράγονται όταν ρυθμίσετε για πρώτη φορά το MetaMask, η οποία σας επιτρέπει
-
-8
-00:00:26.070 --> 00:00:30.120
-να ανακτήσετε το πορτοφόλι σας και τα χρήματά σας εάν κάποια στιγμή χάσετε την πρόσβαση.
-
-9
-00:00:30.120 --> 00:00:33.451
-Είναι σημαντικό να θωρακίσετε το πορτοφόλι σας με το να κρατήσετε τη
-
-10
-00:00:33.451 --> 00:00:37.510
-μυστική σας φράση ανάκτησης απόλυτα ασφαλή και μυστική.
-
-11
-00:00:37.510 --> 00:00:41.429
-Εάν κάποιος αποκτήσει πρόσβαση σε αυτήν, θα έχει το «κύριο κλειδί» για το πορτοφόλι σας και θα μπορεί
-
-12
-00:00:41.429 --> 00:00:45.190
-να έχει ελεύθερη πρόσβαση και να πάρει όλα σας τα χρήματα.
-
-13
-00:00:45.190 --> 00:00:50.109
-Για να θωρακίσετε το πορτοφόλι MetaMask θα πρέπει να αποθηκεύσετε με ασφάλεια την μυστική σας φράση ανάκτησης.
-
-14
-00:00:50.109 --> 00:00:54.930
-Μπορείτε να την γράψετε σε ένα χαρτί, να την κρύψετε κάπου, να την βάλετε σε μια ασφαλή θυρίδα
-
-15
-00:00:54.930 --> 00:00:57.729
-ή να χρησιμοποιήσετε έναν ασφαλή διαχειριστή κωδικών.
-
-16
-00:00:57.729 --> 00:01:01.050
-Μερικοί χρήστες έχουν χαράξει τη φράση τους ακόμα και σε μεταλλική πλάκα!
-
-17
-00:01:01.050 --> 00:01:04.440
-Κανένας, ούτε καν η ομάδα του MetaMask, δεν μπορεί να σας βοηθήσει να
-
-18
-00:01:04.440 --> 00:01:07.820
-ανακτήσετε το πορτοφόλι σας εάν χάσετε τη μυστική φράση ανάκτησης.
-
-19
-00:01:07.820 --> 00:01:12.072
-Αν δεν έχετε καταγράψει την μυστική σας φράση ανάκτησης και δεν την έχετε αποθηκεύσει κάπου με ασφάλεια,
-
-20
-00:01:12.072 --> 00:01:15.492
-κάντε το τώρα. Θα περιμένουμε.
-
-21
-00:01:15.500 --> 00:01:20.780
-Και να θυμάστε: μην μοιραστείτε ποτέ και με κανέναν τη μυστική σας φράση ανάκτησης. Ούτε καν με εμάς.
-
-22
-00:01:20.780 --> 00:01:24.910
-Εάν κάποιος σας την ζητήσει κάποια στιγμή, θα προσπαθεί να σας εξαπατήσει.
-
-23
-00:01:24.910 --> 00:01:26.250
-Αυτό ήταν!
-
-24
-00:01:26.250 --> 00:01:31.020
-Τώρα ξέρετε τι είναι η μυστική φράση ανάκτησης και πώς να κρατήσετε το πορτοφόλι σας σίγουρο και ασφαλές.
-
diff --git a/app/images/videos/recovery-onboarding/subtitles/es.vtt b/app/images/videos/recovery-onboarding/subtitles/es.vtt
index aec4427ff72a..2f56d35be5b3 100644
--- a/app/images/videos/recovery-onboarding/subtitles/es.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/es.vtt
@@ -6,7 +6,7 @@ MetaMask es una nueva forma de conectarse
 a sitios y aplicaciones.
 
 2
-00:00:04.580 --> 00:00:08.860 
+00:00:04.580 --> 00:00:08.860
 En los sitios web tradicionales, una base de datos
 o un banco central es responsable de controlar y
 
@@ -113,4 +113,3 @@ será con intenciones de estafarlo.
 00:01:26.250 --> 00:01:31.020
 Ahora ya sabe qué es una frase secreta de recuperación
 y qué debe hacer para mantener protegida su cartera.
-
diff --git a/app/images/videos/recovery-onboarding/subtitles/fr.vtt b/app/images/videos/recovery-onboarding/subtitles/fr.vtt
deleted file mode 100644
index a80e4d6e479a..000000000000
--- a/app/images/videos/recovery-onboarding/subtitles/fr.vtt
+++ /dev/null
@@ -1,98 +0,0 @@
-WEBVTT
-
-1
-00:00:00.780 --> 00:00:04.580
-MetaMask offre une nouvelle façon de se connecter aux sites et aux applications.
-
-2
-00:00:04.580 --> 00:00:08.860 
-Sur les sites traditionnels, une base de données centrale ou une banque est chargée du contrôle et de
-
-3
-00:00:08.860 --> 00:00:10.179
-la récupération des comptes.
-
-4
-00:00:10.179 --> 00:00:15.050
-Mais sur MetaMask, tout le pouvoir appartient au détenteur de la clé maîtresse.
-
-5
-00:00:15.050 --> 00:00:18.460
-Celui qui détient la clé, contrôle les comptes.
-
-6
-00:00:18.460 --> 00:00:21.110
-Votre phrase de récupération secrète est votre « clé maîtresse ».
-
-7
-00:00:21.110 --> 00:00:26.070
-Il s’agit d’une série de 12 mots générés lors de la première installation de MetaMask qui vous permet
-
-8
-00:00:26.070 --> 00:00:30.120
-de récupérer votre portefeuille et vos fonds, si vous en perdez l’accès.
-
-9
-00:00:30.120 --> 00:00:33.451
-Pour éviter tout accès non autorisé à votre portefeuille, veuillez garder votre
-
-10
-00:00:33.451 --> 00:00:37.510
-phrase de récupération secrète dans un lieu sûr et sécurisé.
-
-11
-00:00:37.510 --> 00:00:41.429
-Car toute personne ayant accès à votre phrase de récupération secrète, et donc à la « clé maîtresse » de votre portefeuille, pourra
-
-12
-00:00:41.429 --> 00:00:45.190
-accéder librement à vos fonds et les dérober.
-
-13
-00:00:45.190 --> 00:00:50.109
-Pour éviter tout accès non autorisé à votre portefeuille MetaMask, veuillez garder votre phrase de récupération secrète dans un lieu sûr et sécurisé.
-
-14
-00:00:50.109 --> 00:00:54.930
-Vous pouvez l’écrire sur un bout de papier et la cacher dans un lieu sûr comme dans un coffre-fort
-
-15
-00:00:54.930 --> 00:00:57.729
-ou utiliser un gestionnaire de mots de passe sécurisé.
-
-16
-00:00:57.729 --> 00:01:01.050
-Certains utilisateurs préfèrent même graver leur phrase de récupération secrète sur une plaque de métal !
-
-17
-00:01:01.050 --> 00:01:04.440
-Personne, pas même l’équipe de MetaMask, ne peut vous aider
-
-18
-00:01:04.440 --> 00:01:07.820
-à récupérer votre portefeuille si vous perdez votre phrase de récupération secrète.
-
-19
-00:01:07.820 --> 00:01:12.072
-Si vous n’avez pas encore écrit votre phrase de récupération secrète sur un bout de papier ou ne l’avez pas encore cachée dans un endroit sûr,
-
-20
-00:01:12.072 --> 00:01:15.492
-faites-le maintenant. Nous vous attendrons.
-
-21
-00:01:15.500 --> 00:01:20.780
-Et n’oubliez surtout pas que vous ne devriez jamais partager votre phrase de récupération secrète avec quiconque ; pas même avec nous.
-
-22
-00:01:20.780 --> 00:01:24.910
-Si quelqu’un vous la demande, c’est qu’il essaie de vous escroquer.
-
-23
-00:01:24.910 --> 00:01:26.250
-Voilà, c’est tout !
-
-24
-00:01:26.250 --> 00:01:31.020
-Maintenant vous savez ce qu’est une phrase de récupération secrète et ce que vous devez faire pour protéger votre portefeuille.
-
diff --git a/app/images/videos/recovery-onboarding/subtitles/hi.vtt b/app/images/videos/recovery-onboarding/subtitles/hi.vtt
index ec3d9ec37d11..f82c695660f9 100644
--- a/app/images/videos/recovery-onboarding/subtitles/hi.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/hi.vtt
@@ -2,93 +2,108 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-मेटामास्क साइटों और एप्लीकेशन से जुड़ने का एक नया तरीका है।
+MetaMask साइटों और एप्लिकेशन से
+जुड़ने का एक नया तरीका है।
 
 2
-00:00:04.580 --> 00:00:08.860 
-पारंपरिक वेबसाइटों पर, एक केंद्रीय डेटाबेस
-या बैंक नियंत्रित करने के लिए जिम्मेदार है और
+00:00:04.580 --> 00:00:08.860
+पारंपरिक वेबसाइटों पर, आपके खातों को नियंत्रित करने और
+पुनर्प्राप्त करने के लिए एक केंद्रीय डेटाबेस या
 
 3
 00:00:08.860 --> 00:00:10.179
-अपने खाते पुनर्प्राप्त करना
+बैंक ज़िम्मेदार होता है।
 
 4
 00:00:10.179 --> 00:00:15.050
-लेकिन मेटामास्क पर, समस्त शक्ति मास्टर कुंजी के धारक के पास होती है।
+लेकिन MetaMask पर, सारी शक्ति
+मास्टर कुंजी के धारक की होती है।
 
 5
 00:00:15.050 --> 00:00:18.460
-जिसके पास कुंजी होती है, वह खातों को नियंत्रित करता है।
+जो भी कुंजी रखता है, वह खातों को नियंत्रित करता है।
 
 6
 00:00:18.460 --> 00:00:21.110
-आपका गुप्त पुनर्प्राप्ति वाक्यांश आपकी "मास्टर कुंजी" है।
+आपका गुप्त रिकवरी फ्रेज़
+आपकी "मास्टर कुंजी" है।
 
 7
 00:00:21.110 --> 00:00:26.070
-यह उत्पन्न होने वाले 12 शब्दों की एक श्रृंखला है
-जब आप पहली बार मेटामास्क सेट करते हैं, जो अनुमति देता है
+यह 12 शब्दों की एक सीरीज़ होती है, जो
+आपके द्वारा पहली बार MetaMask सेट करने पर जेनरेट होती है, जिससे
 
 8
 00:00:26.070 --> 00:00:30.120
-एक्सेस खोने की स्थिति में अपने वॉलेट और धन को रिकवर करने की सुविधा प्रदान करती है।
+आप कभी भी एक्सेस खोने पर अपने वॉलेट और धन को
+पुनर्प्राप्त कर सकते हैं।
 
 9
 00:00:30.120 --> 00:00:33.451
-यह महत्वपूर्ण है कि आप अपने वॉलेट को सुरक्षित रखे
+यह महत्वपूर्ण है कि आप
+अपने गुप्त रिकवरी फ्रेज़ को
 
 10
 00:00:33.451 --> 00:00:37.510
-गुप्त पुनर्प्राप्ति वाक्यांश बहुत सुरक्षित, और बहुत ही गुप्त।
+बहुत सुरक्षित और बहुत गुप्त रखकर
+अपने वॉलेट को सुरक्षित रखें।
 
 11
 00:00:37.510 --> 00:00:41.429
-यदि किसी को इसकी एक्सेस मिलती है, तो उनके पास आपके वॉलेट की "मास्टर कुंजी" होगी और वह कर सकता है
+अगर किसी को भी इसकी सुविधा का एक्सेस मिल जाता है, तो
+उनके पास आपके वॉलेट की "मास्टर कुंजी" होगी और
 
 12
 00:00:41.429 --> 00:00:45.190
-वह बहुत आसानी से आपके पूरे फण्ड को एक्सेस करके उसे चुरा सकता है।
+वे आपके सारे धन को आसानी से एक्सेस कर सकते हैं।
 
 13
 00:00:45.190 --> 00:00:50.109
-अपने मेटामास्क वॉलेट को सुरक्षित रखने के लिए आपको अपने गुप्त पुनर्प्राप्ति वाक्यांश को सुरक्षित ढंग से सहेजना चाहिए।
+अपने MetaMask वॉलेट को सुरक्षित करने के लिए आप अपने
+गुप्त रिकवरी फ्रेज़ को सुरक्षित रूप से सहेजना चाहेंगे।
 
 14
 00:00:50.109 --> 00:00:54.930
-आप इसे लिख सकते हैं, इसे कहीं छुपा सकते हैं, इसे सुरक्षित जमा बॉक्स में रख सकते हैं
+आप इसे लिख सकते हैं, इसे कहीं छुपा सकते हैं,
+इसे सेफ़ डिपोज़िट बॉक्स में रख सकते हैं
 
 15
 00:00:54.930 --> 00:00:57.729
-या एक सुरक्षित पासवर्ड मैनेजर का उपयोग करें।
+या सुरक्षित पासवर्ड मैनेजर का उपयोग कर सकते हैं।
 
 16
 00:00:57.729 --> 00:01:01.050
-कुछ उपयोगकर्ता अपने वाक्यांश को धातु की प्लेट पर भी उकेरते हैं!
+कुछ उपयोगकर्ता अपने
+फ्रेज़ को धातु की प्लेट पर भी उकेर कर रखते हैं!
 
 17
 00:01:01.050 --> 00:01:04.440
-कोई नहीं, यहां तक कि मेटामास्क की टीम भी आपकी मदद नहीं कर सकती
+यदि आप अपना गुप्त रिकवरी फ्रेज़ खो देते हैं, तो
+कोई भी, यहां तक कि MetaMask की टीम भी,
 
 18
 00:01:04.440 --> 00:01:07.820
-यदि आप अपना गुप्त पुनर्प्राप्ति वाक्यांश खो देते हैं तो अपना वॉलेट पुनर्प्राप्त करें।
+आपके वॉलेट को पुनर्प्राप्त करने में आपकी
+सहायता नहीं कर सकती है।
 
 19
 00:01:07.820 --> 00:01:12.072
-यदि आपने अपने गुप्त पुनर्प्राप्ति वाक्यांश को लिखकर किसी सुरक्षित स्थान पर स्टोर नहीं किया है
+यदि आपने अपना गुप्त रिकवरी फ्रेज़
+लिखा नहीं है और इसे कहीं सुरक्षित संग्रहीत नहीं किया है,
 
 20
 00:01:12.072 --> 00:01:15.492
-अभी करें। हम प्रतीक्षा करेंगे।
+तो अभी करें। हम इंतजार करेंगे।
 
 21
 00:01:15.500 --> 00:01:20.780
-और याद रखें, कभी भी अपने गुप्त पुनर्प्राप्ति वाक्यांश को किसी के भी साथ, यहां तक हमारे साथ भी, साझा नहीं करें।
+और याद रखें, कभी भी अपना गुप्त रिकवरी फ्रेज़
+किसी के साथ साझा न करें: हमसे भी नहीं।
 
 22
 00:01:20.780 --> 00:01:24.910
-अगर कभी कोई आपसे इसके लिए पूछे, वे आपको धोखा देने की कोशिश कर रहे हैं।
+यदि कोई आपसे कभी भी इसे मांगता है, तो
+वे आपके साथ धोखाधड़ी करने की कोशिश कर सकते हैं।
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -96,5 +111,5 @@ WEBVTT
 
 24
 00:01:26.250 --> 00:01:31.020
-अब आप जानते हैं कि गुप्त पुनर्प्राप्ति वाक्यांश क्या है और अपने वॉलेट को संरक्षित और सुरक्षित कैसे रखें।
-
+अब आपको पता चल गया है कि गुप्त रिकवरी फ्रेज़ क्या है
+और अपने वॉलेट को कैसे सकुशल और सुरक्षित रखा जाए।
diff --git a/app/images/videos/recovery-onboarding/subtitles/id.vtt b/app/images/videos/recovery-onboarding/subtitles/id.vtt
index 12807086ebc8..94761496b213 100644
--- a/app/images/videos/recovery-onboarding/subtitles/id.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/id.vtt
@@ -2,11 +2,13 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask adalah cara baru untuk terhubung ke situs dan aplikasi.
+MetaMask adalah cara baru untuk terhubung
+ke situs dan aplikasi.
 
 2
-00:00:04.580 --> 00:00:08.860 
-Di situs web biasa, basis data pusat atau bank bertanggung jawab untuk mengendalikan dan
+00:00:04.580 --> 00:00:08.860
+Di situs web tradisional, database sentral
+atau bank bertanggung jawab untuk mengontrol dan
 
 3
 00:00:08.860 --> 00:00:10.179
@@ -14,47 +16,56 @@ memulihkan akun Anda.
 
 4
 00:00:10.179 --> 00:00:15.050
-Namun, di MetaMask, seluruh kuasa milik pemegang kunci utama.
+Tetapi di MetaMask, semua kuasa milik
+pemegang kunci induk.
 
 5
 00:00:15.050 --> 00:00:18.460
-Siapa pun yang memegang kunci, ia mengendalikan akun.
+Siapa pun yang memegang kunci tersebut, akan mengontrol akun.
 
 6
 00:00:18.460 --> 00:00:21.110
-Frasa pemulihan rahasia Anda adalah "kunci rahasia" Anda.
+Frasa pemulihan rahasia
+adalah "kunci induk" Anda.
 
 7
 00:00:21.110 --> 00:00:26.070
-Frasa pemulihan ini berupa 12 kata yang dihasilkan saat pertama kali Anda menyiapkan MetaMask, yang memungkinkan
+Ini adalah rangkaian 12 kata yang dibuat
+saat Anda menyiapkan MetaMask pertama kali, yang memungkinkan
 
 8
 00:00:26.070 --> 00:00:30.120
-Anda untuk memulihkan dompet dan dana Anda jika Anda kehilangan akses.
+Anda memulihkan dompet dan dana jika Anda
+kehilangan akses.
 
 9
 00:00:30.120 --> 00:00:33.451
-Anda perlu mengamankan dompet Anda dengan menjaga
+Penting agar Anda mengamankan
+dompet Anda dengan menjaga
 
 10
 00:00:33.451 --> 00:00:37.510
-frasa pemulihan rahasia dengan sangat aman, dan sangat rahasia.
+frasa pemulihan rahasia
+Anda dengan sangat aman dan sangat rahasia.
 
 11
 00:00:37.510 --> 00:00:41.429
-Jika seseorang mendapatkan akses ke frasa tersebut, ia akan memiliki "kunci utama" ke dompet Anda dan dapat
+Jika seseorang mendapatkan aksesnya, mereka akan memiliki
+"kunci induk" ke dompet Anda dan dapat
 
 12
 00:00:41.429 --> 00:00:45.190
-dengan bebas mengakses serta mengambil seluruh dana Anda.
+mengakses secara bebas dan mengambil semua dana Anda.
 
 13
 00:00:45.190 --> 00:00:50.109
-Untuk mengamankan dompet MetaMask Anda, Anda perlu menyimpan frasa pemulihan rahasia dengan aman.
+Untuk mengamankan dompet MetaMask, Anda pasti ingin
+menyimpan frasa pemulihan rahasia Anda secara aman.
 
 14
 00:00:50.109 --> 00:00:54.930
-Anda dapat menuliskannya, menyembunyikannya, menaruhnya di brankas,
+Anda dapat menuliskannya, menyembunyikannya di suatu tempat,
+menempatkannya di kotak deposit yang aman
 
 15
 00:00:54.930 --> 00:00:57.729
@@ -62,19 +73,23 @@ atau menggunakan pengelola kata sandi yang aman.
 
 16
 00:00:57.729 --> 00:01:01.050
-Sebagian pengguna bahkan mengukir frasa yang mereka miliki di lempengan logam!
+Beberapa pengguna bahkan mengukir frasa
+mereka pada pelat logam!
 
 17
 00:01:01.050 --> 00:01:04.440
-Tidak seorang pun, bahkan tim di MetaMask sekalipun, dapat membantu Anda
+Tidak ada seorang pun, bahkan tidak juga tim
+di MetaMask, dapat membantu Anda
 
 18
 00:01:04.440 --> 00:01:07.820
-untuk memulihkan dompet jika Anda kehilangan frasa pemulihan rahasia Anda.
+memulihkan dompet Anda jika Anda menghilangkan
+frasa pemulihan rahasia Anda.
 
 19
 00:01:07.820 --> 00:01:12.072
-Jika Anda belum menuliskan frasa pemulihan rahasia dan menyimpannya di tempat yang aman,
+Jika belum menuliskan frasa pemulihan rahasia Anda
+dan menyimpannya di suatu tempat yang aman,
 
 20
 00:01:12.072 --> 00:01:15.492
@@ -82,17 +97,19 @@ lakukan sekarang. Kami akan menunggu.
 
 21
 00:01:15.500 --> 00:01:20.780
-Dan ingat, jangan pernah membagikan frasa pemulihan rahasia kepada siapa pun: bahkan kepada kami.
+Dan ingat, jangan membagikan frasa pemulihan rahasia
+Anda kepada siapa pun: bahkan tidak kepada kami.
 
 22
 00:01:20.780 --> 00:01:24.910
-Jika ada orang yang menanyakannya kepada Anda, mereka mencoba menipu Anda.
+Jika ada yang menanyakannya,
+mereka akan mencoba menipu Anda.
 
 23
 00:01:24.910 --> 00:01:26.250
-Itu saja!
+Begitulah!
 
 24
 00:01:26.250 --> 00:01:31.020
-Sekarang, Anda mengetahui apa itu frasa pemulihan rahasia dan cara mempertahankan agar dompet Anda tetap aman dan terjaga.
-
+Sekarang, Anda tahu apa itu frasa pemulihan rahasia
+dan cara menjaga dompet Anda tetap aman.
diff --git a/app/images/videos/recovery-onboarding/subtitles/ja.vtt b/app/images/videos/recovery-onboarding/subtitles/ja.vtt
index 91849500b416..e99b3b7a48d6 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ja.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ja.vtt
@@ -2,91 +2,108 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask はサイトやアプリケーションに接続する新たな手段となります。
+MetaMask は
+をサイトとアプリケーションにつなぐ新たな方法です。
 
 2
-00:00:04.580 --> 00:00:08.860 
-従来の Web サイトでは、中央データベースや銀行がアカウントの
+00:00:04.580 --> 00:00:08.860
+従来のウェブサイト上では、中央データベース
+または銀行がアカウントの制御と
 
 3
 00:00:08.860 --> 00:00:10.179
-管理と復元を行います。
+回復の責任を負います。
 
 4
 00:00:10.179 --> 00:00:15.050
-一方 MetaMask では、マスターキーの所有者がすべての権限を握っています。
+しかし、MetaMask 上では、全ての権限は
+マスターキーの保持者に属します。
 
 5
 00:00:15.050 --> 00:00:18.460
-キーを持っている人がアカウントを管理できるのです。
+当該のキーの保持者が、アカウントを制御します。
 
 6
 00:00:18.460 --> 00:00:21.110
-秘密のリカバリーフレーズがその「マスターキー」となります。
+あなたのシークレット リカバリー フレーズ
+があなたの「マスターキー」です。
 
 7
 00:00:21.110 --> 00:00:26.070
-これは MetaMask のセットアップ時に生成される 12 単語からなるフレーズで、
+これは一連の 12 の単語で
+あなたが最初に MetaMask を設定した際に自動生成され、これにより
 
 8
 00:00:26.070 --> 00:00:30.120
-万が一アクセスできなくなった際にウォレットと資金を復元できます。
+あなたは万が一アクセス出来なくなった場合に
+ウォレットと資金を復元できます。
 
 9
 00:00:30.120 --> 00:00:33.451
-ウォレットの安全を保つため、
+ウォレットの安全性を確保することは非常に重要
+であり、あなたの
 
 10
 00:00:33.451 --> 00:00:37.510
-秘密のリカバリーフレーズは厳重に保管し、絶対に秘密にしてください。
+シークレット リカバリー フレーズ
+を非常に安全かつ秘密に保つことで実現します。
 
 11
 00:00:37.510 --> 00:00:41.429
-誰かの手に渡ると、ウォレットへの「マスターキー」として使用され、
+誰かがそれにアクセスすれば、彼らは
+あなたのウォレットの「マスターキー」を得て、
 
 12
 00:00:41.429 --> 00:00:45.190
-すべての資金にアクセスし盗むことが可能になります。
+あなたの資金に自由にアクセスして全てを奪えます。
 
 13
 00:00:45.190 --> 00:00:50.109
-MetaMask ウォレットを安全に保つため、秘密のリカバリーフレーズは大切に保管してください。
+MetaMask ウォレットの安全性を確保するため
+あなたは シークレット リカバリー フレーズを安全に保存したくなるでしょう。
 
 14
 00:00:50.109 --> 00:00:54.930
-書き留めて、どこかに隠したり、安全な金庫に保管したり、
+それを書き留めたり、どこかへ隠したり、
+セーフティボックスに入れたり
 
 15
 00:00:54.930 --> 00:00:57.729
-セキュアなパスワードマネージャーを使用することもできます。
+または安全確保のためのパスワードマネジャーを使用できます。
 
 16
 00:00:57.729 --> 00:01:01.050
-金属製のプレートにフレーズを彫るユーザーもいます！
+自分たちの
+フレーズをメタルプレートに彫るユーザーさえいます！
 
 17
 00:01:01.050 --> 00:01:04.440
-秘密のリカバリーフレーズをなくした場合、MetaMask チームを含め、
+何者も、
+MetaMask のチームのメンバーですら、あなたが
 
 18
 00:01:04.440 --> 00:01:07.820
-誰にもウォレットの復元を行うことはできません。
+シークレット リカバリー フレーズを無くしたら
+あなたのウォレットを復元する手助けはできません。
 
 19
 00:01:07.820 --> 00:01:12.072
-秘密のリカバリーフレーズを書き留めて安全な場所に保管していない場合は、
+あなたがシークレット リカバリー
+フレーズを書き留め安全な場所に保管していないのならば、
 
 20
 00:01:12.072 --> 00:01:15.492
-今すぐ行ってください。その間お待ちします。
+ぜひ今それを実行してください。お待ちしております。
 
 21
 00:01:15.500 --> 00:01:20.780
-繰り返しになりますが、秘密のリカバリーフレーズは MetaMask チームを含め、絶対に誰にも教えないでください。
+さらに、あなたのシークレット リカバリー
+フレーズを誰とも決して共有しないことを忘れないでください。私たちでさえも。
 
 22
 00:01:20.780 --> 00:01:24.910
-誰かに尋ねられたら、それは詐欺だと思ってください。
+それを尋ねる者がいたら、
+彼らはあなたを騙そうとしているのです。
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -94,5 +111,5 @@ MetaMask ウォレットを安全に保つため、秘密のリカバリーフ
 
 24
 00:01:26.250 --> 00:01:31.020
-これで秘密のリカバリーフレーズとウォレットの安全を保つ方法の説明は終わりです。
-
+これでシークレット リカバリ フレーズ
+が何であるか、あなたのウォレットと資金の安全を確保する方法が判りました。
diff --git a/app/images/videos/recovery-onboarding/subtitles/ko.vtt b/app/images/videos/recovery-onboarding/subtitles/ko.vtt
index 60ff4e771e25..68c04d1ae46d 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ko.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ko.vtt
@@ -2,97 +2,114 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask는 사이트와 애플리케이션을 연결하는 새로운 방법입니다.
+MetaMask는 사이트와 애플리케이션에
+연결할 수 있는 새로운 방법입니다.
 
 2
-00:00:04.580 --> 00:00:08.860 
-기존의 웹사이트는 중앙 데이터베이스나 은행에 계정 복구의
+00:00:04.580 --> 00:00:08.860
+전통적인 웹사이트에서는 중앙 데이터베이스
+또는 은행에게 계정을 제어 및
 
 3
 00:00:08.860 --> 00:00:10.179
-책임이 있습니다.
+복구할 책임이 있습니다.
 
 4
 00:00:10.179 --> 00:00:15.050
-MetaMask에서는 모든 권한이 마스터 키 소유자에게 있습니다.
+하지만 MetaMask에서는 모든 권한이
+마스터 키의 소유자에게 있습니다.
 
 5
 00:00:15.050 --> 00:00:18.460
-마스터 키를 소유한 사람이 해당 계정의 소유자가 됩니다.
+키를 보유하고 있는 사람은 계정을 제어합니다.
 
 6
 00:00:18.460 --> 00:00:21.110
-여러분이 가지고 계시는 비밀 복구 구문이 바로 '마스터 키'입니다.
+계정 시드 구문은
+"마스터 키"입니다.
 
 7
 00:00:21.110 --> 00:00:26.070
-이는 처음 MetaMask 계정을 만들 때 생성된 12개의 단어로 이루어진 암호이며
+먼저 MetaMask를 설정하면, 일련의
+12단어가 생성되어,
 
 8
 00:00:26.070 --> 00:00:30.120
-이를 사용하면 유사시에 지갑과 자금을 회복할 수 있습니다.
+접근 권한을 상실했을 때 지갑과
+자금을 복구할 수 있습니다.
 
 9
 00:00:30.120 --> 00:00:33.451
-따라서 지갑을 안전하게 지키려면 이러한 비밀 복구 구문을
+계정 시드 구문을
+안전하게 비밀을
 
 10
 00:00:33.451 --> 00:00:37.510
-매우 안전한 비밀장소에 보관하는 것이 중요합니다.
+유지하여 지갑을 안전하게
+지키는 것이 중요합니다.
 
 11
 00:00:37.510 --> 00:00:41.429
-누구든지 비밀 복구 구문을 알게 되면 해당 지갑에 대한 '마스터 키'를 손에 넣게 되며
+계정 시드 구문에 액세스하는 사람에게는
+지갑에 대한 "마스터 키"가 있어 자유롭게
 
 12
 00:00:41.429 --> 00:00:45.190
-해당 계정의 자금을 모두 인출할 수 있게 됩니다.
+액세스하여 모든 자금을 가져갈 수 있습니다.
 
 13
 00:00:45.190 --> 00:00:50.109
-MetaMask 지갑의 보안을 유지하려면 비밀 복구 구문을 안전하게 저장해야 합니다.
+MetaMask 지갑을 안전하게 보호하려면, 계정 시드
+구문을 저장할 수 있습니다.
 
 14
 00:00:50.109 --> 00:00:54.930
-이를 적어 별도의 장소나 안전 금고에 보관할 수도 있고
+계정 시드 구문을 적어서 어딘가에 숨겨두거나
+대여 금고에 두거나
 
 15
 00:00:54.930 --> 00:00:57.729
-비밀번호 관리자를 이용하셔도 좋습니다.
+보안 암호 관리자를 사용할 수 있습니다.
 
 16
 00:00:57.729 --> 00:01:01.050
-사용자에 따라 이를 금속판에 새겨 놓기도 합니다!
+일부 사용자는 자신의 구문을
+금속판에 새겨두기도 합니다!
 
 17
 00:01:01.050 --> 00:01:04.440
-이러한 비밀 복구 구문을 분실하면 아무도, 심지어 MetaMask도
+계정 시드 구문을 잊으면,
+MetaMask의 팀이라고
 
 18
 00:01:04.440 --> 00:01:07.820
-계정 복구를 도와드릴 수 없습니다.
+해도 지갑을
+복구할 수 없습니다.
 
 19
 00:01:07.820 --> 00:01:12.072
-아직 비밀 복구 구문을 적어 안전한 곳에 보관하지 않으셨다면,
+게정 시드 구문을 적어두지
+않으면, 안전한 장소에
 
 20
 00:01:12.072 --> 00:01:15.492
-지금 바로 하세요. 기다리겠습니다.
+보관하십시오. 기다리겠습니다.
 
 21
 00:01:15.500 --> 00:01:20.780
-절대로 본인의 비밀 복구 구문을 다른 사람에게 알려주지 마세요. MetaMask에도 알리면 안 됩니다.
+다른 사람과 계정 시드 구문을
+고유하면 안 됩니다. 당사하고도 공유하지 마십시오.
 
 22
 00:01:20.780 --> 00:01:24.910
-이를 묻는 사람이 있다면 피싱 범죄자임에 틀림없습니다.
+계정 시드 구문을 요청하는 사람은
+사기를 치려고 하는 것입니다.
 
 23
 00:01:24.910 --> 00:01:26.250
-그렇습니다!
+이제 다 됐습니다.
 
 24
 00:01:26.250 --> 00:01:31.020
-이제 비밀 복구 구문과 지갑을 안전하게 보관하는 방법에 대하여 확인하였습니다.
-
+이제 여러분은 계정 시드 구문이 무엇이고
+지갑을 안전하게 보관하는 방법을 알고 있습니다.
diff --git a/app/images/videos/recovery-onboarding/subtitles/pt.vtt b/app/images/videos/recovery-onboarding/subtitles/pt.vtt
index 6a05682e922c..bebef88e17b7 100644
--- a/app/images/videos/recovery-onboarding/subtitles/pt.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/pt.vtt
@@ -2,108 +2,108 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-A MetaMask é uma nova forma
-de se conectar a sites e aplicativos.
+O MetaMask é um novo jeito de se conectar
+a sites e aplicativos.
 
 2
-00:00:04.580 --> 00:00:08.860 
-Em sites tradicionais, uma base de dados central
-ou um banco é responsável por controlar e
+00:00:04.580 --> 00:00:08.860
+Em websites tradicionais, um banco ou base de dados central
+é responsável por controlar e
 
 3
 00:00:08.860 --> 00:00:10.179
-recuperar suas contas.
+recuperar as suas contas.
 
 4
 00:00:10.179 --> 00:00:15.050
-Mas, na MetaMask, todo o poder pertence
+Mas, no MetaMask, todo o poder pertence
 ao titular de uma chave-mestra.
 
 5
 00:00:15.050 --> 00:00:18.460
-Quem tiver a chave controla as contas.
+Quem quer que detenha a chave controla as contas.
 
 6
 00:00:18.460 --> 00:00:21.110
-Sua frase de recuperação secreta
-é sua "chave-mestra".
+A sua frase de recuperação secreta
+é a sua "chave-mestra".
 
 7
 00:00:21.110 --> 00:00:26.070
-Ela é uma série de 12 palavras geradas quando você
-configura a MetaMask pela primeira vez, a qual permite
+É uma série de 12 palavras que são geradas
+quando você configura o MetaMask na primeira vez, o que permite que
 
 8
 00:00:26.070 --> 00:00:30.120
-recuperar sua carteira e fundos
-caso você perca o acesso.
+você recupere a sua carteira e recursos, caso você
+venha a perder o acesso.
 
 9
 00:00:30.120 --> 00:00:33.451
-É importante que você proteja
-sua carteira guardando sua
+É importante que você mantenha protegida
+a sua carteira ao manter a sua
 
 10
 00:00:33.451 --> 00:00:37.510
 frase de recuperação secreta
-de forma bem segura e sigilosa.
+muito segura e muito secreta.
 
 11
 00:00:37.510 --> 00:00:41.429
-Se alguém tiver acesso a ela, terá em mãos
-a "chave-mestra" da sua carteira e poderá
+Caso alguém obtenha acesso a ela, essa pessoa terá
+a "chave-mestra" para a sua carteira e poderá
 
 12
 00:00:41.429 --> 00:00:45.190
-acessar e retirar livremente todos os seus fundos.
+acessá-la livremente e tome todos os seus recursos.
 
 13
 00:00:45.190 --> 00:00:50.109
-Para proteger sua carteira MetaMask, recomenda-se
-salvar sua frase de recuperação secreta de modo seguro.
+A fim de proteger a sua carteira MetaMask, você desejará
+manter em segurança a sua frase de recuperação secreta.
 
 14
 00:00:50.109 --> 00:00:54.930
-Você pode anotá-la por escrito, escondê-la
-em algum lugar, colocá-la em um cofre
+Você pode escrevê-la, escondê-la em algum lugar,
+colocá-la em um cofre
 
 15
 00:00:54.930 --> 00:00:57.729
-ou usar um gerenciador de senhas protegido.
+ou usar um gerenciador de senhas seguras.
 
 16
 00:00:57.729 --> 00:01:01.050
-Alguns usuários até mesmo gravam
-a frase em uma placa de metal!
+Alguns usuários até mesmo gravam sua
+frase em uma placa de metal!
 
 17
 00:01:01.050 --> 00:01:04.440
 Ninguém, nem mesmo a equipe
-da MetaMask, pode ajudar você
+na MetaMask, pode lhe ajudar
 
 18
 00:01:04.440 --> 00:01:07.820
-a recuperar sua carteira caso perca
-sua frase de recuperação secreta.
+a recuperar a sua carteira, caso você perca
+a sua frase de recuperação secreta.
 
 19
 00:01:07.820 --> 00:01:12.072
-Se não tiver anotado por escrito sua frase de recuperação
-secreta e a armazenado em um lugar seguro,
+Caso você não tenha escrito a sua frase de recuperação
+secreta e a tenha armazenado em algum lugar seguro,
 
 20
 00:01:12.072 --> 00:01:15.492
-faça isso agora. A gente espera.
+faça isso agora. Iremos aguardar.
 
 21
 00:01:15.500 --> 00:01:20.780
-E lembre-se: nunca compartilhe sua frase de recuperação
-secreta com ninguém, nem mesmo conosco.
+E lembre-se de jamais compartilhar a sua frase de recuperação
+secreta com ninguém: nem mesmo conosco.
 
 22
 00:01:20.780 --> 00:01:24.910
-Se alguém a pedir a você,
-é uma tentativa de fraude.
+Caso alguém venha a lhe pedir a sua frase de recuperação secreta,
+essa pessoa está tentando dar um golpe em você.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -111,6 +111,5 @@ Se alguém a pedir a você,
 
 24
 00:01:26.250 --> 00:01:31.020
-Agora você sabe o que é uma frase de recuperação
-secreta e como manter sua carteira segura.
-
+Agora, você sabe o que é uma frase de recuperação secreta
+e como manter a sua carteira protegida e segura.
diff --git a/app/images/videos/recovery-onboarding/subtitles/ru.vtt b/app/images/videos/recovery-onboarding/subtitles/ru.vtt
index 221c48547546..46c165a6aa6d 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ru.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ru.vtt
@@ -6,8 +6,9 @@ MetaMask — это новый способ подключения
 к сайтам и приложениям.
 
 2
-00:00:04.580 --> 00:00:08.860 
-На традиционных сайтах центральная база данных или банк отвечает за контроль и
+00:00:04.580 --> 00:00:08.860
+На традиционных сайтах центральная база данных
+или банк несет ответственность за контроль и
 
 3
 00:00:08.860 --> 00:00:10.179
@@ -15,72 +16,80 @@ MetaMask — это новый способ подключения
 
 4
 00:00:10.179 --> 00:00:15.050
-Но в MetaMask все полномочия в руках
-обладателя главного ключа.
+На MetaMask все полномочия находятся
+в руках владельца мастер-ключа.
 
 5
 00:00:15.050 --> 00:00:18.460
-Тот, кто имеет этот ключ, контролирует счета.
+Тот, в чьих руках находится ключ, контролирует счета.
 
 6
 00:00:18.460 --> 00:00:21.110
-Ваша секретная фраза восстановления — это ваш главный ключ.
+Ваша секретная фраза восстановления
+— это ваш «мастер-ключ».
 
 7
 00:00:21.110 --> 00:00:26.070
-Это последовательность из 12 слов, которые генерируются при первой настройке MetaMask и позволяет
+Это набор из 12 слов, которые генерируются
+при первой настройке MetaMask, он позволяет
 
 8
 00:00:26.070 --> 00:00:30.120
-вам восстановить свой кошелек и средства, если вы
-когда-либо утратите доступ к ним.
+вам восстанавливать ваш кошелек и средства, если вы
+теряете к ним доступ.
 
 9
 00:00:30.120 --> 00:00:33.451
 Важно, чтобы вы обезопасили
-свой кошелек, сохранив
+свой кошелек, храня вашу
 
 10
 00:00:33.451 --> 00:00:37.510
-секретную фразу для восстановления
-в очень надежном месте и в полной тайне.
+секретную фразу восстановления
+в очень надежном и тайном месте.
 
 11
 00:00:37.510 --> 00:00:41.429
-Если кто-то узнает ее, у этого человека будет
-главный ключ к вашему кошельку, и он сможет
+Если кто-то получит доступ к ней, у этого человека окажется в руках
+«мастер-ключ» от вашего кошелька, и он сможет
 
 12
 00:00:41.429 --> 00:00:45.190
-получить свободный доступ ко всем вашим средствам и забрать их.
+распоряжаться им и завладеть всеми вашими средствами.
 
 13
 00:00:45.190 --> 00:00:50.109
-Чтобы защитить кошелек MetaMask, вам необходимо безопасно сохранить секретную фразу восстановления.
+Чтобы обезопасить ваш кошелек MetaMask,
+сохраните секретную фразу восстановления в безопасном месте.
 
 14
 00:00:50.109 --> 00:00:54.930
-Вы можете записать ее и спрятать куда-нибудь, положить в сейф
+Вы можете записать ее, спрятать ее где-то,
+положить ее в банковский сейф
 
 15
 00:00:54.930 --> 00:00:57.729
-или использовать безопасный менеджер паролей.
+или воспользоваться безопасным диспетчером паролей.
 
 16
 00:00:57.729 --> 00:01:01.050
-Некоторые пользователи даже гравируют свою фразу на металлической пластине!
+Некоторые пользователи даже гравируют свою
+фразу на металлической пластине!
 
 17
 00:01:01.050 --> 00:01:04.440
-Никто, даже команда MetaMask, не сможет вам помочь
+Никто, даже команда
+MetaMask, не сможет помочь вам
 
 18
 00:01:04.440 --> 00:01:07.820
-восстановить кошелек, если вы потеряете секретную фразу для восстановления.
+восстановить ваш кошелек, если вы потеряете
+вашу секретную фразу восстановления.
 
 19
 00:01:07.820 --> 00:01:12.072
-Если вы не записали свою секретную фразу для восстановления и не сохранили ее в безопасном месте,
+Если вы еще не записали секретную фразу
+восстановления и не поместили ее в надежное место,
 
 20
 00:01:12.072 --> 00:01:15.492
@@ -88,11 +97,13 @@ MetaMask — это новый способ подключения
 
 21
 00:01:15.500 --> 00:01:20.780
-И помните: никогда никому не сообщайте свою секретную фразу для восстановления, даже нам.
+И помните, никогда не сообщайте свою секретную фразу
+восстановления никому: даже нам.
 
 22
 00:01:20.780 --> 00:01:24.910
-Если кто-то когда-нибудь попросит вас предоставить ее, этот человек пытается вас обмануть.
+Если кто-нибудь когда-либо спросит у вас ее,
+этот человек пытается вас обмануть.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -100,5 +111,5 @@ MetaMask — это новый способ подключения
 
 24
 00:01:26.250 --> 00:01:31.020
-Теперь вы знаете, что такое секретная фраза для восстановления и как сохранить свой кошелек в целости и сохранности.
-
+Теперь вы знаете, что такое секретная фраза восстановления
+и как обезопасить ваш кошелек.
diff --git a/app/images/videos/recovery-onboarding/subtitles/tl.vtt b/app/images/videos/recovery-onboarding/subtitles/tl.vtt
index b4fdbb7cd1ef..cfb3ebca76d3 100644
--- a/app/images/videos/recovery-onboarding/subtitles/tl.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/tl.vtt
@@ -6,7 +6,7 @@ Ang MetaMask ay isang bagong paraan para kumonekta
 sa mga site at application.
 
 2
-00:00:04.580 --> 00:00:08.860 
+00:00:04.580 --> 00:00:08.860
 Sa mga tradisyonal na website, ang isang central database
 o bangko ang magiging responsable sa pagkontrol at
 
@@ -113,4 +113,3 @@ sinusubukan ka nilang i-scam.
 00:01:26.250 --> 00:01:31.020
 Ngayon ay alam mo na kung ano ang lihim na recovery phrase
 at kung paano mapapanatiling ligtas ang iyong wallet.
-
diff --git a/app/images/videos/recovery-onboarding/subtitles/tr.vtt b/app/images/videos/recovery-onboarding/subtitles/tr.vtt
deleted file mode 100644
index 0e1fef01d754..000000000000
--- a/app/images/videos/recovery-onboarding/subtitles/tr.vtt
+++ /dev/null
@@ -1,116 +0,0 @@
-WEBVTT
-
-1
-00:00:00.780 --> 00:00:04.580
-MetaMask site ve uygulamalara
-bağlanmanın yeni bir yoludur.
-
-2
-00:00:04.580 --> 00:00:08.860 
-Geleneksel web sitelerinde,
-merkezi bir veritabanı veya banka
-
-3
-00:00:08.860 --> 00:00:10.179
-hesaplarınızı korumaktan sorumludur.
-
-4
-00:00:10.179 --> 00:00:15.050
-Ama MetaMask'ta tüm güç
-ana anahtar sahibine aittir.
-
-5
-00:00:15.050 --> 00:00:18.460
-Anahtar kimdeyse hesapları o kontrol eder.
-
-6
-00:00:18.460 --> 00:00:21.110
-Gizli kurtarma ifadeniz
-sizin "ana anahtarınızdır".
-
-7
-00:00:21.110 --> 00:00:26.070
-MetaMask'ı ilk kurduğunuzda oluşturulan
-12 sözcükten oluşan bir dizi olup
-
-8
-00:00:26.070 --> 00:00:30.120
-erişiminizi kaybettiğiniz takdirde
-cüzdanınızı ve paralarınızı kurtarabilmenize olanak sağlar.
-
-9
-00:00:30.120 --> 00:00:33.451
-Gizli kurtarma ifadenizi
-çok güvenli ve çok gizli tutarak
-
-10
-00:00:33.451 --> 00:00:37.510
-cüzdanınızı korumanız
-önemlidir.
-
-11
-00:00:37.510 --> 00:00:41.429
-Gizli kurtarma ifadenize sahip olan kişi
-cüzdanınızın "ana anahtarı"na sahip olacak ve
-
-12
-00:00:41.429 --> 00:00:45.190
-serbestçe erişim sağlayıp tüm paranızı alabilecektir.
-
-13
-00:00:45.190 --> 00:00:50.109
-MetaMask cüzdanınızı korumak için gizli kurtarma
-ifadenizin güvenli bir şekilde saklamak isteyeceksiniz.
-
-14
-00:00:50.109 --> 00:00:54.930
-Yazıp bir yere saklayabilir,
-güvenli bir kasaya koyabilirsiniz
-
-15
-00:00:54.930 --> 00:00:57.729
-veya güvenli bir şifre yöneticisi kullanabilirsiniz.
-
-16
-00:00:57.729 --> 00:01:01.050
-İfadelerini metal bir levhaya kazıyan
-kullanıcılar bile görülmüştür!
-
-17
-00:01:01.050 --> 00:01:04.440
-Gizli kurtarma ifadenizi kaybettiğiniz takdirde
-MetaMask ekibi dahil olmak üzere hiç kimse
-
-18
-00:01:04.440 --> 00:01:07.820
-cüzdanınızı kurtarmanıza 
-yardımcı olamaz.
-
-19
-00:01:07.820 --> 00:01:12.072
-Gizli kurtarma ifadenizi yazmadıysanız veya
-güvenli bir yere saklamadıysanız
-
-20
-00:01:12.072 --> 00:01:15.492
-bunu şimdi yapın. Bekleyeceğiz.
-
-21
-00:01:15.500 --> 00:01:20.780
-Ayrıca gizli kurtarma ifadenizi asla
-biz dahil hiç kimse ile paylaşmamanız gerektiğini unutmayın.
-
-22
-00:01:20.780 --> 00:01:24.910
-Birisi gizli kurtarma ifadenizi sizden istiyorsa
-sizi dolandırmaya çalışıyordur.
-
-23
-00:01:24.910 --> 00:01:26.250
-Bu kadar!
-
-24
-00:01:26.250 --> 00:01:31.020
-Artık gizli kurtarma ifadesinin ne olduğunu ve
-cüzdanınızı nasıl güvende tutacağınızı biliyorsunuz.
-
diff --git a/app/images/videos/recovery-onboarding/subtitles/vi.vtt b/app/images/videos/recovery-onboarding/subtitles/vi.vtt
index 69875b90a592..a05e97d85562 100644
--- a/app/images/videos/recovery-onboarding/subtitles/vi.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/vi.vtt
@@ -2,114 +2,114 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask là một cách mới để kết nối
-đến các trang web và ứng dụng.
+MetaMask là cách thức mới để kết nối
+với các trang web và ứng dụng.
 
 2
-00:00:04.580 --> 00:00:08.860 
-Trên các trang web truyền thống, cơ sở dữ liệu trung tâm
-hoặc ngân hàng sẽ chịu trách nhiệm kiểm soát và
+00:00:04.580 --> 00:00:08.860
+Trên các trang web truyền thống, một cơ sở dữ liệu trung tâm
+hay ngân hàng sẽ chịu trách nhiệm kiểm soát và
 
 3
 00:00:08.860 --> 00:00:10.179
-khôi phục tài khoản của bạn.
+khôi phục các tài khoản của bạn.
 
 4
 00:00:10.179 --> 00:00:15.050
-Nhưng trên MetaMask, tất cả quyền lực thuộc về
-người nắm giữ chìa khóa chính.
+Tuy nhiên, trên MetaMask, toàn bộ quyền sẽ thuộc về
+người nắm giữ khóa chính.
 
 5
 00:00:15.050 --> 00:00:18.460
-Ai nắm giữ chìa khóa, người đó kiểm soát tài khoản.
+Người có khóa chính sẽ kiểm soát được tài khoản.
 
 6
 00:00:18.460 --> 00:00:21.110
-Cụm từ khôi phục bí mật
-là "chìa khóa chính" của bạn.
+Cụm mật khẩu khôi phục bí mật
+là “khóa chính” của bạn.
 
 7
 00:00:21.110 --> 00:00:26.070
-Đó là một chuỗi 12 từ được tạo ra
-khi bạn thiết lập MetaMask lần đầu tiên, cho phép
+Đây là chuỗi gồm 12 từ được tạo
+vào lần đầu tiên bạn thiết lập MetaMask, chuỗi này cho phép
 
 8
 00:00:26.070 --> 00:00:30.120
-bạn khôi phục ví và tiền của mình nếu bị mất quyền truy cập.
+bạn khôi phục ví và tiền của mình nếu
+bạn bị mất quyền truy cập.
 
 9
 00:00:30.120 --> 00:00:33.451
-Điều quan trọng là bạn phải bảo mật
-cho ví của mình bằng cách cất giữ
+Bạn cần phải bảo vệ an toàn cho
+ví của mình bằng cách lưu giữ
 
 10
 00:00:33.451 --> 00:00:37.510
-cụm từ khôi phục bí mật ở một nơi
-cực kỳ an toàn và bí mật.
+cụm mật khẩu khôi phục bí mật
+thật an toàn và bí mật.
 
 11
 00:00:37.510 --> 00:00:41.429
-Nếu bất kỳ ai có quyền truy cập, họ sẽ biết
-"chìa khóa chính" để vào ví của bạn và có thể
+Nếu ai đó có được cụm mật khẩu khôi phục bí mật của bạn thì người đó sẽ có
+“khóa chính” cho ví của bạn và có thể
 
 12
 00:00:41.429 --> 00:00:45.190
-tự do truy cập và lấy hết tiền của bạn.
+tự do truy cập và lấy toàn bộ tiền của bạn.
 
 13
 00:00:45.190 --> 00:00:50.109
-Để bảo mật cho ví MetaMask của mình, bạn sẽ cần
-cất giữ cụm từ khôi phục bí mật ở một nơi an toàn.
+Để bảo vệ an toàn cho ví MetaMask, bạn cần
+lưu giữ cụm mật khẩu khôi phục bí mật một cách an toàn.
 
 14
 00:00:50.109 --> 00:00:54.930
-Hãy viết ra giấy, giấu ở đâu đó,
-bỏ vào hộp ký gửi an toàn
+Bạn có thể chép lại và giấu ở một nơi nào đó,
+cất trong hộp ký gửi an toàn
 
 15
 00:00:54.930 --> 00:00:57.729
-hoặc sử dụng trình quản lý mật khẩu an toàn.
+hoặc dùng một trình quản lý mật khẩu an toàn.
 
 16
 00:00:57.729 --> 00:01:01.050
 Một số người dùng thậm chí còn khắc
-cụm từ của họ lên một tấm kim loại!
+cụm mật khẩu của họ lên một tấm kim loại!
 
 17
 00:01:01.050 --> 00:01:04.440
-Sẽ không có ai, kể cả nhóm
-MetaMask, có thể giúp bạn
+Không một ai, kể cả đội ngũ
+tại MetaMask, có thể giúp bạn
 
 18
 00:01:04.440 --> 00:01:07.820
-khôi phục ví nếu bạn làm mất
-cụm từ khôi phục bí mật.
+khôi phục lại ví nếu bạn đánh mất
+cụm mật khẩu khôi phục bí mật của mình.
 
 19
 00:01:07.820 --> 00:01:12.072
-Nếu bạn chưa viết cụm từ khôi phục bí mật
-ra giấy và cất giữ ở một nơi nào đó an toàn,
+Nếu chưa ghi lại cụm mật khẩu khôi phục bí mật
+của mình và lưu giữ ở nơi an toàn,
 
 20
 00:01:12.072 --> 00:01:15.492
-thì bạn cần thực hiện ngay. Chúng tôi sẽ đợi.
+thì bạn hãy thực hiện ngay bây giờ. Chúng tôi sẽ chờ bạn.
 
 21
 00:01:15.500 --> 00:01:20.780
-Và hãy nhớ, không bao giờ chia sẻ cụm từ khôi phục
-bí mật của bạn với bất kỳ ai: ngay cả chúng tôi.
+Và đừng bao giờ chia sẻ cụm mật khẩu khôi phục
+bí mật với bất kỳ ai: kể cả chúng tôi.
 
 22
 00:01:20.780 --> 00:01:24.910
-Nếu bất kỳ ai hỏi bạn về cụm từ khôi phục
-bí mật, thì họ đang cố lừa bạn đó.
+Nếu ai đó hỏi bạn cụm mật khẩu khôi phục bí mật,
+thì họ đang cố gắng lừa đảo bạn.
 
 23
 00:01:24.910 --> 00:01:26.250
-Đó là tất cả những gì bạn cần ghi nhớ!
+Xin hãy ghi nhớ!
 
 24
 00:01:26.250 --> 00:01:31.020
-Bây giờ bạn đã biết cụm từ khôi phục bí mật là gì
-và cách để đảm bảo an toàn và bảo mật cho ví của bạn.
-
+Bây giờ bạn đã biết cụm mật khẩu khôi phục bí mật
+là gì và cách bảo vệ ví của bạn an toàn và bảo mật.
diff --git a/app/images/videos/recovery-onboarding/subtitles/zh.vtt b/app/images/videos/recovery-onboarding/subtitles/zh.vtt
deleted file mode 100644
index 8e1a572f276c..000000000000
--- a/app/images/videos/recovery-onboarding/subtitles/zh.vtt
+++ /dev/null
@@ -1,98 +0,0 @@
-WEBVTT
-
-1
-00:00:00.780 --> 00:00:04.580
-MetaMask是连接站点和应用程序的一种新方法。
-
-2
-00:00:04.580 --> 00:00:08.860 
-在传统网站上，中央数据库或银行负责控制和
-
-3
-00:00:08.860 --> 00:00:10.179
-恢复您的账户。
-
-4
-00:00:10.179 --> 00:00:15.050
-但在MetaMask，所有的权限都属于主密钥的持有者。
-
-5
-00:00:15.050 --> 00:00:18.460
-谁拿着密钥，谁就控制着账户。
-
-6
-00:00:18.460 --> 00:00:21.110
-您的私钥助记词是您的“主密钥”。
-
-7
-00:00:21.110 --> 00:00:26.070
-这是在您第一次设置MetaMask时生成的12个单词的字串，
-
-8
-00:00:26.070 --> 00:00:30.120
-如果您一旦失去访问权限，可以使用该助记词恢复您的钱包和资金。
-
-9
-00:00:30.120 --> 00:00:33.451
-重要的是，您应通过非常保险而私密的方式保护您的
-
-10
-00:00:33.451 --> 00:00:37.510
-私钥助记词的安全，从而确保您的钱包安全。
-
-11
-00:00:37.510 --> 00:00:41.429
-如果有人可以获取您的私钥助记词，他们将拥有您钱包的“主密钥”，可以
-
-12
-00:00:41.429 --> 00:00:45.190
-自由访问并拿走您的所有资金。
-
-13
-00:00:45.190 --> 00:00:50.109
-为了保护MetaMask钱包的安全，您需要安全地保存您的私钥助记词。
-
-14
-00:00:50.109 --> 00:00:54.930
-您可以把它写下来，藏在某处，放在保险箱里，
-
-15
-00:00:54.930 --> 00:00:57.729
-或者使用安全的密码管理器保存。
-
-16
-00:00:57.729 --> 00:01:01.050
-一些用户甚至将他们的助记词刻在金属板上！
-
-17
-00:01:01.050 --> 00:01:04.440
-如果您丢失了私钥助记词，没有人能帮助您找回钱包，即使是MetaMask
-
-18
-00:01:04.440 --> 00:01:07.820
-的团队也毫无办法。
-
-19
-00:01:07.820 --> 00:01:12.072
-如果您尚未写下您的私钥助记词并将其存储在安全的地方，
-
-20
-00:01:12.072 --> 00:01:15.492
-请即刻着手做此事。我们会等待您的。
-
-21
-00:01:15.500 --> 00:01:20.780
-记住，永远不要与任何人分享您的私钥助记词：即便是我们也不可以。
-
-22
-00:01:20.780 --> 00:01:24.910
-如果有人向您索要私钥助记词，他们就是妄图欺诈您。
-
-23
-00:01:24.910 --> 00:01:26.250
-就是这样！
-
-24
-00:01:26.250 --> 00:01:31.020
-现在，您了解了什么是私钥助记词，以及如何确保您的钱包安全。
-
diff --git a/app/manifest/v2/_base.json b/app/manifest/_base.json
similarity index 95%
rename from app/manifest/v2/_base.json
rename to app/manifest/_base.json
index d10900224f27..c2b20b4dbeac 100644
--- a/app/manifest/v2/_base.json
+++ b/app/manifest/_base.json
@@ -66,12 +66,12 @@
     "clipboardWrite",
     "http://localhost:8545/",
     "https://*.infura.io/",
-    "https://chainid.network/chains.json",
     "https://lattice.gridplus.io/*",
     "activeTab",
     "webRequest",
     "*://*.eth/",
     "notifications"
   ],
-  "short_name": "__MSG_appName__"
+  "short_name": "__MSG_appName__",
+  "web_accessible_resources": ["inpage.js", "phishing.html"]
 }
diff --git a/app/manifest/v2/brave.json b/app/manifest/brave.json
similarity index 100%
rename from app/manifest/v2/brave.json
rename to app/manifest/brave.json
diff --git a/app/manifest/v2/chrome.json b/app/manifest/chrome.json
similarity index 100%
rename from app/manifest/v2/chrome.json
rename to app/manifest/chrome.json
diff --git a/app/manifest/v2/firefox.json b/app/manifest/firefox.json
similarity index 100%
rename from app/manifest/v2/firefox.json
rename to app/manifest/firefox.json
diff --git a/app/manifest/v2/opera.json b/app/manifest/opera.json
similarity index 100%
rename from app/manifest/v2/opera.json
rename to app/manifest/opera.json
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
deleted file mode 100644
index 38494de8fda9..000000000000
--- a/app/manifest/v3/_base.json
+++ /dev/null
@@ -1,76 +0,0 @@
-{
-  "action": {
-    "default_icon": {
-      "16": "images/icon-16.png",
-      "19": "images/icon-19.png",
-      "32": "images/icon-32.png",
-      "38": "images/icon-38.png",
-      "64": "images/icon-64.png",
-      "128": "images/icon-128.png",
-      "512": "images/icon-512.png"
-    },
-    "default_title": "MetaMask",
-    "default_popup": "popup.html"
-  },
-  "author": "https://metamask.io",
-  "background": {
-    "service_worker": "app-init.js"
-  },
-  "commands": {
-    "_execute_browser_action": {
-      "suggested_key": {
-        "windows": "Alt+Shift+M",
-        "mac": "Alt+Shift+M",
-        "chromeos": "Alt+Shift+M",
-        "linux": "Alt+Shift+M"
-      }
-    }
-  },
-  "content_scripts": [
-    {
-      "matches": ["file://*/*", "http://*/*", "https://*/*"],
-      "js": [
-        "disable-console.js",
-        "globalthis.js",
-        "lockdown-install.js",
-        "lockdown-run.js",
-        "lockdown-more.js",
-        "contentscript.js"
-      ],
-      "run_at": "document_start",
-      "all_frames": true
-    },
-    {
-      "matches": ["*://connect.trezor.io/*/popup.html"],
-      "js": ["vendor/trezor/content-script.js"]
-    }
-  ],
-  "default_locale": "en",
-  "description": "__MSG_appDescription__",
-  "icons": {
-    "16": "images/icon-16.png",
-    "19": "images/icon-19.png",
-    "32": "images/icon-32.png",
-    "38": "images/icon-38.png",
-    "48": "images/icon-48.png",
-    "64": "images/icon-64.png",
-    "128": "images/icon-128.png",
-    "512": "images/icon-512.png"
-  },
-  "manifest_version": 3,
-  "name": "__MSG_appName__",
-  "permissions": [
-    "storage",
-    "unlimitedStorage",
-    "clipboardWrite",
-    "http://localhost:8545/",
-    "https://*.infura.io/",
-    "https://chainid.network/chains.json",
-    "https://lattice.gridplus.io/*",
-    "activeTab",
-    "webRequest",
-    "*://*.eth/",
-    "notifications"
-  ],
-  "short_name": "__MSG_appName__"
-}
diff --git a/app/manifest/v3/brave.json b/app/manifest/v3/brave.json
deleted file mode 100644
index 0967ef424bce..000000000000
--- a/app/manifest/v3/brave.json
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
deleted file mode 100644
index e4bb01cdd4b6..000000000000
--- a/app/manifest/v3/chrome.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "externally_connectable": {
-    "matches": ["https://metamask.io/*"],
-    "ids": ["*"]
-  },
-  "minimum_chrome_version": "66"
-}
diff --git a/app/manifest/v3/firefox.json b/app/manifest/v3/firefox.json
deleted file mode 100644
index 918311d54b77..000000000000
--- a/app/manifest/v3/firefox.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "applications": {
-    "gecko": {
-      "id": "webextension@metamask.io",
-      "strict_min_version": "68.0"
-    }
-  },
-  "background": {
-    "page": "background.html",
-    "persistent": true
-  },
-  "browser_action": {
-    "default_icon": {
-      "16": "images/icon-16.png",
-      "19": "images/icon-19.png",
-      "32": "images/icon-32.png",
-      "38": "images/icon-38.png",
-      "64": "images/icon-64.png",
-      "128": "images/icon-128.png",
-      "512": "images/icon-512.png"
-    },
-    "default_title": "MetaMask",
-    "default_popup": "popup.html"
-  },
-  "manifest_version": 2
-}
diff --git a/app/manifest/v3/opera.json b/app/manifest/v3/opera.json
deleted file mode 100644
index 6cfefd402510..000000000000
--- a/app/manifest/v3/opera.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "permissions": [
-    "storage",
-    "tabs",
-    "clipboardWrite",
-    "clipboardRead",
-    "http://localhost:8545/"
-  ]
-}
diff --git a/app/phishing.html b/app/phishing.html
new file mode 100644
index 000000000000..e854d79faa5d
--- /dev/null
+++ b/app/phishing.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>MetaMask Phishing Detection</title>
+    <script
+      src="./globalthis.js"
+      type="text/javascript"
+      charset="utf-8"
+    ></script>
+    <script
+      src="./lockdown-install.js"
+      type="text/javascript"
+      charset="utf-8"
+    ></script>
+    <script
+      src="./lockdown-run.js"
+      type="text/javascript"
+      charset="utf-8"
+    ></script>
+    <script
+      src="./lockdown-more.js"
+      type="text/javascript"
+      charset="utf-8"
+    ></script>
+    <script src="./phishing-detect.js"></script>
+    <link rel="stylesheet" type="text/css" href="./index.css" title="ltr" />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      href="./index-rtl.css"
+      title="rtl"
+      disabled
+    />
+    <style>
+      * {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }
+      body,
+      html {
+        background-color: var(--color-error-default);
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        font-family: Roboto, Arial, sans-serif;
+        width: 100vw;
+        min-height: 100vh;
+      }
+      .content {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        width: 80%;
+        background-color: var(--color-background-default);
+        box-shadow: 0 0 15px #737373;
+      }
+      .content__header {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        color: var(--color-error-default);
+        border-bottom: 1px solid var(--color-border-default);
+        padding: 2em;
+      }
+      .content__header h1 {
+        font-size: 24px;
+        font-weight: normal;
+      }
+      .content__header h1 i {
+        margin-right: 0.25em;
+      }
+      .content__header img {
+        margin-bottom: 3em;
+        width: 130px;
+      }
+      .content__body {
+        background-color: var(--color-background-alternative);
+        font-size: 12pt;
+        color: var(--color-text-default);
+      }
+      .content__body p {
+        margin: 2em;
+      }
+      .content__body p a {
+        text-decoration: underline;
+        color: var(--color-primary-default);
+        cursor: pointer;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="content">
+      <div class="content__header">
+        <img src="./images/logo/metamask-fox.svg" alt="MetaMask Logo" />
+        <h1>
+          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+          MetaMask Phishing Detection
+        </h1>
+      </div>
+      <div class="content__body">
+        <p>
+          This domain is currently on the MetaMask domain warning list. This
+          means that based on information available to us, MetaMask believes
+          this domain could currently compromise your security and, as an added
+          safety feature, MetaMask has restricted access to the site. To
+          override this, please read the rest of this warning for instructions
+          on how to continue at your own risk.
+        </p>
+        <p>
+          There are many reasons sites can appear on our warning list, and our
+          warning list compiles from other widely used industry lists. Such
+          reasons can include known fraud or security risks, such as domains
+          that test positive on the
+          <a href="https://github.com/metamask/eth-phishing-detect"
+            >Ethereum Phishing Detector</a
+          >. Domains on these warning lists may include outright malicious
+          websites and legitimate websites that have been compromised by a
+          malicious actor.
+        </p>
+        <p>
+          To read more about this site
+          <a id="csdbLink" href="https://cryptoscamdb.org/search"
+            >please search for the domain on CryptoScamDB</a
+          >.
+        </p>
+        <p>
+          Note that this warning list is compiled on a voluntary basis. This
+          list may be inaccurate or incomplete. Just because a domain does not
+          appear on this list is not an implicit guarantee of that domain's
+          safety. As always, your transactions are your own responsibility. If
+          you wish to interact with any domain on our warning list, you can do
+          so by <a id="unsafe-continue">continuing at your own risk</a>.
+        </p>
+        <p>
+          If you think this domain is incorrectly flagged or if a blocked
+          legitimate website has resolved its security issues,
+          <a
+            id="new-issue-link"
+            href="https://github.com/metamask/eth-phishing-detect/issues/new"
+            >please file an issue</a
+          >.
+        </p>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/app/popup.html b/app/popup.html
index 831fe6122370..90117fc7996e 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -8,10 +8,7 @@
     <link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
   </head>
   <body style="width:357px; height:600px;">
-    <div id="app-content">
-      <img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" />
-      <img class="loading-spinner" src="./images/spinner.gif" alt="" />
-    </div>
+    <div id="app-content"></div>
     <div id="popover-content"></div>
     <script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
     <script src="./sentry-install.js" type="text/javascript" charset="utf-8"></script>
diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
deleted file mode 100644
index c333e248a3de..000000000000
--- a/app/scripts/app-init.js
+++ /dev/null
@@ -1,124 +0,0 @@
-// This file is used only for manifest version 3
-
-// Represents if importAllScripts has been run
-// eslint-disable-next-line
-let scriptsLoaded = false;
-
-// Variable testMode is set to true when preparing test build.
-// This helps in changing service worker execution in test environment.
-const testMode = false;
-
-const loadTimeLogs = [];
-
-// eslint-disable-next-line import/unambiguous
-function tryImport(...fileNames) {
-  try {
-    const startTime = new Date().getTime();
-    // eslint-disable-next-line
-    importScripts(...fileNames);
-    const endTime = new Date().getTime();
-    loadTimeLogs.push({
-      name: fileNames[0],
-      value: endTime - startTime,
-      children: [],
-      startTime,
-      endTime,
-    });
-
-    return true;
-  } catch (e) {
-    console.error(e);
-  }
-
-  return false;
-}
-
-function importAllScripts() {
-  // Bail if we've already imported scripts
-  if (scriptsLoaded) {
-    return;
-  }
-
-  const files = [];
-
-  // In testMode individual files are imported, this is to help capture load time stats
-  const loadFile = (fileName) => {
-    if (testMode) {
-      tryImport(fileName);
-    } else {
-      files.push(fileName);
-    }
-  };
-
-  const startImportScriptsTime = Date.now();
-  // value of applyLavaMoat below is dynamically replaced at build time with actual value
-  const applyLavaMoat = true;
-
-  loadFile('./globalthis.js');
-  loadFile('./sentry-install.js');
-
-  if (applyLavaMoat) {
-    loadFile('./runtime-lavamoat.js');
-    loadFile('./lockdown-more.js');
-    loadFile('./policy-load.js');
-  } else {
-    loadFile('./init-globals.js');
-    loadFile('./lockdown-install.js');
-    loadFile('./lockdown-run.js');
-    loadFile('./lockdown-more.js');
-    loadFile('./runtime-cjs.js');
-  }
-
-  // Mark scripts as loaded
-  scriptsLoaded = true;
-
-  const fileList = [
-    // The list of files is injected at build time by replacing comment below with comma separated strings of file names
-    // https://github.com/MetaMask/metamask-extension/blob/496d9d81c3367931031edc11402552690c771acf/development/build/scripts.js#L406
-    /** FILE NAMES */
-  ];
-
-  fileList.forEach((fileName) => loadFile(fileName));
-
-  // Import all required resources
-  tryImport(...files);
-
-  const endImportScriptsTime = Date.now();
-
-  // for performance metrics/reference
-  console.log(
-    `SCRIPTS IMPORT COMPLETE in Seconds: ${
-      (Date.now() - startImportScriptsTime) / 1000
-    }`,
-  );
-
-  // In testMode load time logs are output to console
-  if (testMode) {
-    console.log(
-      `Time for each import: ${JSON.stringify(
-        {
-          name: 'Total',
-          children: loadTimeLogs,
-          startTime: startImportScriptsTime,
-          endTime: endImportScriptsTime,
-          value: endImportScriptsTime - startImportScriptsTime,
-          version: 1,
-        },
-        undefined,
-        '    ',
-      )}`,
-    );
-  }
-}
-
-// eslint-disable-next-line no-undef
-self.addEventListener('install', importAllScripts);
-
-/*
- * Message event listener below loads script if they are no longer available.
- * chrome below needs to be replaced by cross-browser object,
- * but there is issue in importing webextension-polyfill into service worker.
- * chrome does seems to work in at-least all chromium based browsers
- */
-// eslint-disable-next-line no-undef
-chrome.runtime.onMessage.addListener(importAllScripts);
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 0246c5d738d4..ae85d781bb24 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -23,15 +23,11 @@ import {
   REJECT_NOTFICIATION_CLOSE,
   REJECT_NOTFICIATION_CLOSE_SIG,
 } from '../../shared/constants/metametrics';
-import { isManifestV3 } from '../../shared/modules/mv3.utils';
-import { maskObject } from '../../shared/modules/object.utils';
 import migrations from './migrations';
 import Migrator from './lib/migrator';
 import ExtensionPlatform from './platforms/extension';
 import LocalStore from './lib/local-store';
 import ReadOnlyNetworkStore from './lib/network-store';
-import { SENTRY_STATE } from './lib/setupSentry';
-
 import createStreamSink from './lib/createStreamSink';
 import NotificationManager, {
   NOTIFICATION_MANAGER_EVENTS,
@@ -49,14 +45,6 @@ import { getPlatform } from './lib/util';
 const { sentry } = global;
 const firstTimeState = { ...rawFirstTimeState };
 
-const metamaskInternalProcessHash = {
-  [ENVIRONMENT_TYPE_POPUP]: true,
-  [ENVIRONMENT_TYPE_NOTIFICATION]: true,
-  [ENVIRONMENT_TYPE_FULLSCREEN]: true,
-};
-
-const metamaskBlockedPorts = ['trezor-connect'];
-
 log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'info');
 
 const platform = new ExtensionPlatform();
@@ -79,29 +67,8 @@ if (inTest || process.env.METAMASK_DEBUG) {
   global.metamaskGetState = localStore.get.bind(localStore);
 }
 
-const phishingPageUrl = new URL(process.env.PHISHING_WARNING_PAGE_URL);
-
-const ONE_SECOND_IN_MILLISECONDS = 1_000;
-// Timeout for initializing phishing warning page.
-const PHISHING_WARNING_PAGE_TIMEOUT = ONE_SECOND_IN_MILLISECONDS;
-
-/**
- * In case of MV3 we attach a "onConnect" event listener as soon as the application is initialised.
- * Reason is that in case of MV3 a delay in doing this was resulting in missing first connect event after service worker is re-activated.
- */
-
-const initApp = async (remotePort) => {
-  browser.runtime.onConnect.removeListener(initApp);
-  await initialize(remotePort);
-  log.info('MetaMask initialization complete.');
-};
-
-if (isManifestV3()) {
-  browser.runtime.onConnect.addListener(initApp);
-} else {
-  // initialization flow
-  initialize().catch(log.error);
-}
+// initialization flow
+initialize().catch(log.error);
 
 /**
  * @typedef {import('../../shared/constants/transaction').TransactionMeta} TransactionMeta
@@ -161,83 +128,15 @@ if (isManifestV3()) {
 /**
  * Initializes the MetaMask controller, and sets up all platform configuration.
  *
- * @param {string} remotePort - remote application port connecting to extension.
  * @returns {Promise} Setup complete.
  */
-async function initialize(remotePort) {
+async function initialize() {
   const initState = await loadStateFromPersistence();
   const initLangCode = await getFirstPreferredLangCode();
-  await setupController(initState, initLangCode, remotePort);
-  await loadPhishingWarningPage();
+  await setupController(initState, initLangCode);
   log.info('MetaMask initialization complete.');
 }
 
-/**
- * An error thrown if the phishing warning page takes too long to load.
- */
-class PhishingWarningPageTimeoutError extends Error {
-  constructor() {
-    super('Timeout failed');
-  }
-}
-
-/**
- * Load the phishing warning page temporarily to ensure the service
- * worker has been registered, so that the warning page works offline.
- */
-async function loadPhishingWarningPage() {
-  let iframe;
-  try {
-    const extensionStartupPhishingPageUrl = new URL(
-      process.env.PHISHING_WARNING_PAGE_URL,
-    );
-    // The `extensionStartup` hash signals to the phishing warning page that it should not bother
-    // setting up streams for user interaction. Otherwise this page load would cause a console
-    // error.
-    extensionStartupPhishingPageUrl.hash = '#extensionStartup';
-
-    iframe = window.document.createElement('iframe');
-    iframe.setAttribute('src', extensionStartupPhishingPageUrl.href);
-    iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
-
-    // Create "deferred Promise" to allow passing resolve/reject to event handlers
-    let deferredResolve;
-    let deferredReject;
-    const loadComplete = new Promise((resolve, reject) => {
-      deferredResolve = resolve;
-      deferredReject = reject;
-    });
-
-    // The load event is emitted once loading has completed, even if the loading failed.
-    // If loading failed we can't do anything about it, so we don't need to check.
-    iframe.addEventListener('load', deferredResolve);
-
-    // This step initiates the page loading.
-    window.document.body.appendChild(iframe);
-
-    // This timeout ensures that this iframe gets cleaned up in a reasonable
-    // timeframe, and ensures that the "initialization complete" message
-    // doesn't get delayed too long.
-    setTimeout(
-      () => deferredReject(new PhishingWarningPageTimeoutError()),
-      PHISHING_WARNING_PAGE_TIMEOUT,
-    );
-    await loadComplete;
-  } catch (error) {
-    if (error instanceof PhishingWarningPageTimeoutError) {
-      console.warn(
-        'Phishing warning page timeout; page not guaraneteed to work offline.',
-      );
-    } else {
-      console.error('Failed to initialize phishing warning page', error);
-    }
-  } finally {
-    if (iframe) {
-      iframe.remove();
-    }
-  }
-}
-
 //
 // State and Persistence
 //
@@ -306,10 +205,9 @@ async function loadStateFromPersistence() {
  *
  * @param {Object} initState - The initial state to start the controller with, matches the state that is emitted from the controller.
  * @param {string} initLangCode - The region code for the language preferred by the current user.
- * @param {string} remoteSourcePort - remote application port connecting to extension.
  * @returns {Promise} After setup is complete.
  */
-function setupController(initState, initLangCode, remoteSourcePort) {
+function setupController(initState, initLangCode) {
   //
   // MetaMask Controller
   //
@@ -356,8 +254,6 @@ function setupController(initState, initLangCode, remoteSourcePort) {
     },
   );
 
-  setupSentryGetStateGlobal(controller.store);
-
   /**
    * Assigns the given state to the versioned object (with metadata), and returns that.
    *
@@ -398,13 +294,17 @@ function setupController(initState, initLangCode, remoteSourcePort) {
   //
   // connect to other contexts
   //
-  if (isManifestV3() && remoteSourcePort) {
-    connectRemote(remoteSourcePort);
-  }
-
   browser.runtime.onConnect.addListener(connectRemote);
   browser.runtime.onConnectExternal.addListener(connectExternal);
 
+  const metamaskInternalProcessHash = {
+    [ENVIRONMENT_TYPE_POPUP]: true,
+    [ENVIRONMENT_TYPE_NOTIFICATION]: true,
+    [ENVIRONMENT_TYPE_FULLSCREEN]: true,
+  };
+
+  const metamaskBlockedPorts = ['trezor-connect'];
+
   const isClientOpenStatus = () => {
     return (
       popupIsOpen ||
@@ -462,23 +362,12 @@ function setupController(initState, initLangCode, remoteSourcePort) {
         remotePort.sender.origin === `chrome-extension://${browser.runtime.id}`;
     }
 
-    const senderUrl = remotePort.sender?.url
-      ? new URL(remotePort.sender.url)
-      : null;
-
     if (isMetaMaskInternalProcess) {
       const portStream = new PortStream(remotePort);
       // communication with popup
       controller.isClientOpen = true;
       controller.setupTrustedCommunication(portStream, remotePort.sender);
 
-      if (isManifestV3()) {
-        // Message below if captured by UI code in app/scripts/ui.js which will trigger UI initialisation
-        // This ensures that UI is initialised only after background is ready
-        // It fixes the issue of blank screen coming when extension is loaded, the issue is very frequent in MV3
-        remotePort.postMessage({ name: 'CONNECTION_READY' });
-      }
-
       if (processName === ENVIRONMENT_TYPE_POPUP) {
         popupIsOpen = true;
         endOfStream(portStream, () => {
@@ -517,15 +406,6 @@ function setupController(initState, initLangCode, remoteSourcePort) {
           );
         });
       }
-    } else if (
-      senderUrl &&
-      senderUrl.origin === phishingPageUrl.origin &&
-      senderUrl.pathname === phishingPageUrl.pathname
-    ) {
-      const portStream = new PortStream(remotePort);
-      controller.setupPhishingCommunication({
-        connectionStream: portStream,
-      });
     } else {
       if (remotePort.sender && remotePort.sender.tab && remotePort.sender.url) {
         const tabId = remotePort.sender.tab.id;
@@ -600,14 +480,8 @@ function setupController(initState, initLangCode, remoteSourcePort) {
     if (count) {
       label = String(count);
     }
-    // browserAction has been replaced by action in MV3
-    if (isManifestV3()) {
-      browser.action.setBadgeText({ text: label });
-      browser.action.setBadgeBackgroundColor({ color: '#037DD6' });
-    } else {
-      browser.browserAction.setBadgeText({ text: label });
-      browser.browserAction.setBadgeBackgroundColor({ color: '#037DD6' });
-    }
+    browser.browserAction.setBadgeText({ text: label });
+    browser.browserAction.setBadgeBackgroundColor({ color: '#037DD6' });
   }
 
   function getUnapprovedTransactionCount() {
@@ -760,15 +634,3 @@ browser.runtime.onInstalled.addListener(({ reason }) => {
     platform.openExtensionInBrowser();
   }
 });
-
-function setupSentryGetStateGlobal(store) {
-  global.getSentryState = function () {
-    const fullState = store.getState();
-    const debugState = maskObject(fullState, SENTRY_STATE);
-    return {
-      browser: window.navigator.userAgent,
-      store: debugState,
-      version: global.platform.getVersion(),
-    };
-  };
-}
diff --git a/app/scripts/constants/contracts.js b/app/scripts/constants/contracts.js
index e822ccc7e5d7..90df403c2b07 100644
--- a/app/scripts/constants/contracts.js
+++ b/app/scripts/constants/contracts.js
@@ -6,17 +6,3 @@ export const SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN =
   '0xb8e671734ce5c8d7dfbbea5574fa4cf39f7a54a4';
 export const SINGLE_CALL_BALANCES_ADDRESS_KOVAN =
   '0xb1d3fbb2f83aecd196f474c16ca5d9cffa0d0ffc';
-export const SINGLE_CALL_BALANCES_ADDRESS_GOERLI =
-  '0x9788C4E93f9002a7ad8e72633b11E8d1ecd51f9b';
-export const SINGLE_CALL_BALANCES_ADDRESS_BSC =
-  '0x2352c63A83f9Fd126af8676146721Fa00924d7e4';
-export const SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM =
-  '0xB1c568e9C3E6bdaf755A60c7418C269eb11524FC';
-export const SINGLE_CALL_BALANCES_ADDRESS_POLYGON =
-  '0x2352c63A83f9Fd126af8676146721Fa00924d7e4';
-export const SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE =
-  '0xD023D153a0DFa485130ECFdE2FAA7e612EF94818';
-export const SINGLE_CALL_BALANCES_ADDRESS_FANTOM =
-  '0x07f697424ABe762bB808c109860c04eA488ff92B';
-export const SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM =
-  '0x151E24A486D7258dd7C33Fb67E4bB01919B7B32c';
diff --git a/app/scripts/constants/on-ramp.js b/app/scripts/constants/on-ramp.js
index 0d621f46e8be..bfce16f700b6 100644
--- a/app/scripts/constants/on-ramp.js
+++ b/app/scripts/constants/on-ramp.js
@@ -1,3 +1,2 @@
 export const TRANSAK_API_KEY = '25ac1309-a49b-4411-b20e-5e56c61a5b1c'; // It's a public key, which will be included in a URL for Transak.
 export const MOONPAY_API_KEY = 'pk_live_WbCpe6PxSIcGPCSd6lKCbJNRht7uy'; // Publishable key.
-export const COINBASEPAY_API_KEY = 'ab4b8829-a59d-44d3-accc-de77e4f18df2'; // Publishable key.
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 663cfa760d38..037f3de14055 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -1,3 +1,4 @@
+import querystring from 'querystring';
 import pump from 'pump';
 import { WindowPostMessageStream } from '@metamask/post-message-stream';
 import ObjectMultiplex from 'obj-multiplex';
@@ -5,8 +6,6 @@ import browser from 'webextension-polyfill';
 import PortStream from 'extension-port-stream';
 import { obj as createThoughStream } from 'through2';
 
-import { isManifestV3 } from '../../shared/modules/mv3.utils';
-
 // These require calls need to use require to be statically recognized by browserify
 const fs = require('fs');
 const path = require('path');
@@ -18,13 +17,8 @@ const inpageContent = fs.readFileSync(
 const inpageSuffix = `//# sourceURL=${browser.runtime.getURL('inpage.js')}\n`;
 const inpageBundle = inpageContent + inpageSuffix;
 
-// contexts
 const CONTENT_SCRIPT = 'metamask-contentscript';
 const INPAGE = 'metamask-inpage';
-const PHISHING_WARNING_PAGE = 'metamask-phishing-warning-page';
-
-// stream channels
-const PHISHING_SAFELIST = 'metamask-phishing-safelist';
 const PROVIDER = 'metamask-provider';
 
 // TODO:LegacyProvider: Delete
@@ -33,14 +27,7 @@ const LEGACY_INPAGE = 'inpage';
 const LEGACY_PROVIDER = 'provider';
 const LEGACY_PUBLIC_CONFIG = 'publicConfig';
 
-const phishingPageUrl = new URL(process.env.PHISHING_WARNING_PAGE_URL);
-
-if (
-  window.location.origin === phishingPageUrl.origin &&
-  window.location.pathname === phishingPageUrl.pathname
-) {
-  setupPhishingStream();
-} else if (shouldInjectProvider()) {
+if (shouldInjectProvider()) {
   injectScript(inpageBundle);
   setupStreams();
 }
@@ -55,12 +42,7 @@ function injectScript(content) {
     const container = document.head || document.documentElement;
     const scriptTag = document.createElement('script');
     scriptTag.setAttribute('async', 'false');
-    // Inline scripts do not work in MV3 due to more strict security policy
-    if (isManifestV3()) {
-      scriptTag.setAttribute('src', browser.runtime.getURL('inpage.js'));
-    } else {
-      scriptTag.textContent = content;
-    }
+    scriptTag.textContent = content;
     container.insertBefore(scriptTag, container.children[0]);
     container.removeChild(scriptTag);
   } catch (error) {
@@ -68,47 +50,6 @@ function injectScript(content) {
   }
 }
 
-async function setupPhishingStream() {
-  // the transport-specific streams for communication between inpage and background
-  const pageStream = new WindowPostMessageStream({
-    name: CONTENT_SCRIPT,
-    target: PHISHING_WARNING_PAGE,
-  });
-  const extensionPort = browser.runtime.connect({ name: CONTENT_SCRIPT });
-  const extensionStream = new PortStream(extensionPort);
-
-  // create and connect channel muxers
-  // so we can handle the channels individually
-  const pageMux = new ObjectMultiplex();
-  pageMux.setMaxListeners(25);
-  const extensionMux = new ObjectMultiplex();
-  extensionMux.setMaxListeners(25);
-
-  pump(pageMux, pageStream, pageMux, (err) =>
-    logStreamDisconnectWarning('MetaMask Inpage Multiplex', err),
-  );
-  pump(extensionMux, extensionStream, extensionMux, (err) => {
-    logStreamDisconnectWarning('MetaMask Background Multiplex', err);
-    window.postMessage(
-      {
-        target: PHISHING_WARNING_PAGE, // the post-message-stream "target"
-        data: {
-          // this object gets passed to obj-multiplex
-          name: PHISHING_SAFELIST, // the obj-multiplex channel name
-          data: {
-            jsonrpc: '2.0',
-            method: 'METAMASK_STREAM_FAILURE',
-          },
-        },
-      },
-      window.location.origin,
-    );
-  });
-
-  // forward communication across inpage-background for these channels only
-  forwardTrafficBetweenMuxes(PHISHING_SAFELIST, pageMux, extensionMux);
-}
-
 /**
  * Sets up two-way communication streams between the
  * browser extension and local per-page browser context.
@@ -357,15 +298,12 @@ function blockedDomainCheck() {
 
 /**
  * Redirects the current page to a phishing information page
- *
- * @param data
  */
-function redirectToPhishingWarning(data = {}) {
-  console.debug('MetaMask: Routing to Phishing Warning page.');
-  const { hostname, href } = window.location;
-  const { newIssueUrl } = data;
-  const baseUrl = process.env.PHISHING_WARNING_PAGE_URL;
-
-  const querystring = new URLSearchParams({ hostname, href, newIssueUrl });
-  window.location.href = `${baseUrl}#${querystring}`;
+function redirectToPhishingWarning() {
+  console.debug('MetaMask: Routing to Phishing Warning component.');
+  const extensionURL = browser.runtime.getURL('phishing.html');
+  window.location.href = `${extensionURL}#${querystring.stringify({
+    hostname: window.location.hostname,
+    href: window.location.href,
+  })}`;
 }
diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
index b6261504d0ca..d9cfe9b14ee6 100644
--- a/app/scripts/controllers/detect-tokens.js
+++ b/app/scripts/controllers/detect-tokens.js
@@ -6,10 +6,8 @@ import { MINUTE } from '../../../shared/constants/time';
 import { MAINNET_CHAIN_ID } from '../../../shared/constants/network';
 import { isTokenDetectionEnabledForNetwork } from '../../../shared/modules/network.utils';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-} from '../../../shared/constants/transaction';
+import { TOKEN_STANDARDS } from '../../../ui/helpers/constants/common';
+import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
 
 // By default, poll every 3 minutes
diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js
index 5161cf44bd56..4fd5605b0d51 100644
--- a/app/scripts/controllers/detect-tokens.test.js
+++ b/app/scripts/controllers/detect-tokens.test.js
@@ -8,19 +8,12 @@ import {
   TokenListController,
   TokensController,
 } from '@metamask/controllers';
-import {
-  MAINNET,
-  MAINNET_NETWORK_ID,
-  ROPSTEN,
-} from '../../../shared/constants/network';
+import { MAINNET, ROPSTEN } from '../../../shared/constants/network';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import DetectTokensController from './detect-tokens';
 import NetworkController from './network';
 import PreferencesController from './preferences';
 
-const tokenIconsApiBaseUrl =
-  'https://static.metaswap.codefi.network/api/v1/tokenIcons';
-
 describe('DetectTokensController', function () {
   let tokenListController;
   const sandbox = sinon.createSandbox();
@@ -134,6 +127,7 @@ describe('DetectTokensController', function () {
     });
     tokenListController = new TokenListController({
       chainId: '1',
+      useStaticTokenList: false,
       onNetworkStateChange: sinon.spy(),
       onPreferencesStateChange: sinon.spy(),
       messenger: tokenListMessenger,
@@ -185,6 +179,7 @@ describe('DetectTokensController', function () {
     });
     tokenListController = new TokenListController({
       chainId: '3',
+      useStaticTokenList: false,
       onNetworkStateChange: sinon.spy(),
       onPreferencesStateChange: sinon.spy(),
       messenger: tokenListMessengerRopsten,
@@ -246,7 +241,7 @@ describe('DetectTokensController', function () {
         ),
       );
 
-    await tokensController.ignoreTokens([tokenAddressToSkip]);
+    await tokensController.removeAndIgnoreToken(tokenAddressToSkip);
     await controller.detectNewTokens();
 
     assert.deepEqual(tokensController.state.tokens, [
@@ -254,8 +249,7 @@ describe('DetectTokensController', function () {
         address: toChecksumHexAddress(existingTokenAddress),
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
-        aggregators: [],
-        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
+        image: undefined,
         isERC721: false,
       },
     ]);
@@ -309,16 +303,14 @@ describe('DetectTokensController', function () {
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
         isERC721: false,
-        aggregators: [],
-        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
+        image: undefined,
       },
       {
         address: toChecksumHexAddress(tokenAddressToAdd),
         decimals: tokenToAdd.decimals,
         symbol: tokenToAdd.symbol,
+        image: undefined,
         isERC721: false,
-        aggregators: [],
-        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${tokenAddressToAdd}.png`,
       },
     ]);
   });
@@ -371,17 +363,15 @@ describe('DetectTokensController', function () {
         address: toChecksumHexAddress(existingTokenAddress),
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
-        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
+        image: undefined,
         isERC721: false,
-        aggregators: [],
       },
       {
         address: toChecksumHexAddress(tokenAddressToAdd),
         decimals: tokenToAdd.decimals,
         symbol: tokenToAdd.symbol,
-        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${tokenAddressToAdd}.png`,
+        image: undefined,
         isERC721: false,
-        aggregators: [],
       },
     ]);
   });
diff --git a/app/scripts/controllers/ens/ens.js b/app/scripts/controllers/ens/ens.js
index 2242a2b8cd00..0a629dd407b1 100644
--- a/app/scripts/controllers/ens/ens.js
+++ b/app/scripts/controllers/ens/ens.js
@@ -1,6 +1,5 @@
-import { ethers } from 'ethers';
+import EthJsEns from 'ethjs-ens';
 import ensNetworkMap from 'ethereum-ens-network-map';
-import { NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP } from '../../../../shared/constants/network';
 
 export default class Ens {
   static getNetworkEnsSupport(network) {
@@ -8,21 +7,17 @@ export default class Ens {
   }
 
   constructor({ network, provider } = {}) {
-    const networkName = NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP[network];
-    const ensAddress = ensNetworkMap[network];
-    const ethProvider = new ethers.providers.Web3Provider(provider, {
-      chainId: parseInt(network, 10),
-      name: networkName,
-      ensAddress,
+    this._ethJsEns = new EthJsEns({
+      network,
+      provider,
     });
-    this._ethProvider = ethProvider;
   }
 
   lookup(ensName) {
-    return this._ethProvider.resolveName(ensName);
+    return this._ethJsEns.lookup(ensName);
   }
 
   reverse(address) {
-    return this._ethProvider.lookupAddress(address);
+    return this._ethJsEns.reverse(address);
   }
 }
diff --git a/app/scripts/controllers/ens/index.test.js b/app/scripts/controllers/ens/index.test.js
index d325e2885084..c94f73a5d9a6 100644
--- a/app/scripts/controllers/ens/index.test.js
+++ b/app/scripts/controllers/ens/index.test.js
@@ -20,7 +20,7 @@ describe('EnsController', function () {
   describe('#constructor', function () {
     it('should construct the controller given a provider and a network', async function () {
       const ens = new EnsController({
-        provider: sinon.fake(),
+        provider: {},
         getCurrentChainId,
         onNetworkDidChange,
       });
diff --git a/app/scripts/controllers/incoming-transactions.js b/app/scripts/controllers/incoming-transactions.js
index 9577632c5e76..c56509314a0e 100644
--- a/app/scripts/controllers/incoming-transactions.js
+++ b/app/scripts/controllers/incoming-transactions.js
@@ -18,8 +18,9 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
 } from '../../../shared/constants/network';
+import { SECOND } from '../../../shared/constants/time';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 /**
  * @typedef {import('../../../shared/constants/transaction').TransactionMeta} TransactionMeta
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 7e1b6c6ec224..8c1ecbca1bc8 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -558,15 +558,6 @@ export default class MetaMetricsController {
       [TRAITS.NETWORKS_ADDED]: metamaskState.frequentRpcListDetail.map(
         (rpc) => rpc.chainId,
       ),
-      [TRAITS.NETWORKS_WITHOUT_TICKER]: metamaskState.frequentRpcListDetail.reduce(
-        (networkList, currentNetwork) => {
-          if (!currentNetwork.ticker) {
-            networkList.push(currentNetwork.chainId);
-          }
-          return networkList;
-        },
-        [],
-      ),
       [TRAITS.NFT_AUTODETECTION_ENABLED]: metamaskState.useCollectibleDetection,
       [TRAITS.NUMBER_OF_ACCOUNTS]: Object.values(metamaskState.identities)
         .length,
@@ -630,9 +621,11 @@ export default class MetaMetricsController {
    * @returns {[]}
    */
   _getAllNFTsFlattened = memoize((allCollectibles = {}) => {
-    return Object.values(allCollectibles).reduce((result, chainNFTs) => {
-      return result.concat(...Object.values(chainNFTs));
-    }, []);
+    return Object.values(allCollectibles)
+      .reduce((result, chainNFTs) => {
+        return result.concat(Object.values(chainNFTs));
+      }, [])
+      .flat();
   });
 
   /**
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 804132295ab1..76982e445356 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -9,10 +9,8 @@ import {
 } from '../../../shared/constants/metametrics';
 import waitUntilCalled from '../../../test/lib/wait-until-called';
 import {
-  ETH_SYMBOL,
   MAINNET_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
-  TEST_ETH_SYMBOL,
 } from '../../../shared/constants/network';
 import MetaMetricsController from './metametrics';
 import { NETWORK_EVENTS } from './network';
@@ -675,9 +673,8 @@ describe('MetaMetricsController', function () {
         },
         allTokens: MOCK_ALL_TOKENS,
         frequentRpcListDetail: [
-          { chainId: MAINNET_CHAIN_ID, ticker: ETH_SYMBOL },
-          { chainId: ROPSTEN_CHAIN_ID, ticker: TEST_ETH_SYMBOL },
-          { chainId: '0xaf' },
+          { chainId: MAINNET_CHAIN_ID },
+          { chainId: ROPSTEN_CHAIN_ID },
         ],
         identities: [{}, {}],
         ledgerTransportType: 'web-hid',
@@ -691,8 +688,7 @@ describe('MetaMetricsController', function () {
       assert.deepEqual(traits, {
         [TRAITS.ADDRESS_BOOK_ENTRIES]: 3,
         [TRAITS.LEDGER_CONNECTION_TYPE]: 'web-hid',
-        [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, ROPSTEN_CHAIN_ID, '0xaf'],
-        [TRAITS.NETWORKS_WITHOUT_TICKER]: ['0xaf'],
+        [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, ROPSTEN_CHAIN_ID],
         [TRAITS.NFT_AUTODETECTION_ENABLED]: false,
         [TRAITS.NUMBER_OF_ACCOUNTS]: 2,
         [TRAITS.NUMBER_OF_NFT_COLLECTIONS]: 3,
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 2969041aabb1..cb572773a387 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -20,6 +20,7 @@ import {
   INFURA_BLOCKED_KEY,
   TEST_NETWORK_TICKER_MAP,
 } from '../../../../shared/constants/network';
+import { SECOND } from '../../../../shared/constants/time';
 import {
   isPrefixedFormattedHexString,
   isSafeChainId,
@@ -30,7 +31,7 @@ import createInfuraClient from './createInfuraClient';
 import createJsonRpcClient from './createJsonRpcClient';
 
 const env = process.env.METAMASK_ENV;
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 let defaultProviderConfigOpts;
 if (process.env.IN_TEST) {
@@ -271,11 +272,6 @@ export default class NetworkController extends EventEmitter {
     return NETWORK_TYPE_TO_ID_MAP[type]?.chainId || configChainId;
   }
 
-  getCurrentRpcUrl() {
-    const { rpcUrl } = this.getProviderConfig();
-    return rpcUrl;
-  }
-
   setRpcTarget(rpcUrl, chainId, ticker = 'ETH', nickname = '', rpcPrefs) {
     assert.ok(
       isPrefixedFormattedHexString(chainId),
diff --git a/app/scripts/controllers/permissions/flask/snap-permissions.js b/app/scripts/controllers/permissions/flask/snap-permissions.js
index 07024c9ae19f..bde8c4c91623 100644
--- a/app/scripts/controllers/permissions/flask/snap-permissions.js
+++ b/app/scripts/controllers/permissions/flask/snap-permissions.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
+import { endowmentPermissionBuilders } from '@metamask/controllers';
 import {
   restrictedMethodPermissionBuilders,
   selectHooks,
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 9b9c16d1116f..706260b24340 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -69,7 +69,6 @@ export default class PreferencesController {
         ? LEDGER_TRANSPORT_TYPES.WEBHID
         : LEDGER_TRANSPORT_TYPES.U2F,
       theme: 'light',
-      customNetworkListEnabled: false,
       ...opts.initState,
     };
 
@@ -180,17 +179,6 @@ export default class PreferencesController {
     this.store.updateState({ theme: val });
   }
 
-  /**
-   * Setter for the `customNetworkListEnabled` property
-   *
-   * @param customNetworkListEnabled
-   */
-  setCustomNetworkListEnabled(customNetworkListEnabled) {
-    this.store.updateState({
-      customNetworkListEnabled,
-    });
-  }
-
   /**
    * Add new methodData to state, to avoid requesting this information again through Infura
    *
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index af968ab82d73..4e06c295100c 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -41,7 +41,6 @@ import {
   PRIORITY_LEVELS,
 } from '../../../../shared/constants/gas';
 import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
-import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import {
   HARDFORKS,
@@ -61,7 +60,6 @@ import PendingTransactionTracker from './pending-tx-tracker';
 import * as txUtils from './lib/util';
 
 const MAX_MEMSTORE_TX_LIST_SIZE = 100; // Number of transactions (by unique nonces) to keep in memory
-const UPDATE_POST_TX_BALANCE_TIMEOUT = 5000;
 
 const SWAP_TRANSACTION_TYPES = [
   TRANSACTION_TYPES.SWAP,
@@ -447,7 +445,7 @@ export default class TransactionController extends EventEmitter {
    * @param {string} editableParams.gasPrice
    * @returns {TransactionMeta} the txMeta of the updated transaction
    */
-  async updateEditableParams(txId, { data, from, to, value, gas, gasPrice }) {
+  updateEditableParams(txId, { data, from, to, value, gas, gasPrice }) {
     this._throwErrorIfNotUnapprovedTx(txId, 'updateEditableParams');
 
     const editableParams = {
@@ -462,24 +460,8 @@ export default class TransactionController extends EventEmitter {
     };
 
     // only update what is defined
-    editableParams.txParams = pickBy(
-      editableParams.txParams,
-      (prop) => prop !== undefined,
-    );
-
-    // update transaction type in case it has changes
-    const transactionBeforeEdit = this._getTransaction(txId);
-    const { type } = await determineTransactionType(
-      {
-        ...transactionBeforeEdit.txParams,
-        ...editableParams.txParams,
-      },
-      this.query,
-    );
-    editableParams.type = type;
-
+    editableParams.txParams = pickBy(editableParams.txParams);
     const note = `Update Editable Params for ${txId}`;
-
     this._updateTransaction(txId, editableParams, note);
     return this._getTransaction(txId);
   }
@@ -1007,7 +989,7 @@ export default class TransactionController extends EventEmitter {
    *
    * @param {Object} txMeta - The txMeta object
    * @param {string} getCodeResponse - The transaction category code response, used for debugging purposes
-   * @returns {Promise<object>} Object containing the default gas limit, or the simulation failure object
+   * @returns {Promise<Object>} Object containing the default gas limit, or the simulation failure object
    */
   async _getDefaultGasLimit(txMeta, getCodeResponse) {
     const chainId = this._getCurrentChainId();
@@ -1470,39 +1452,6 @@ export default class TransactionController extends EventEmitter {
     this._trackTransactionMetricsEvent(txMeta, TRANSACTION_EVENTS.SUBMITTED);
   }
 
-  async updatePostTxBalance({ txMeta, txId, numberOfAttempts = 6 }) {
-    const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
-    const latestTxMeta = this.txStateManager.getTransaction(txId);
-    const approvalTxMeta = latestTxMeta.approvalTxId
-      ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
-      : null;
-    latestTxMeta.postTxBalance = postTxBalance.toString(16);
-    const isDefaultTokenAddress = isSwapsDefaultTokenAddress(
-      txMeta.destinationTokenAddress,
-      txMeta.chainId,
-    );
-    if (
-      isDefaultTokenAddress &&
-      txMeta.preTxBalance === latestTxMeta.postTxBalance &&
-      numberOfAttempts > 0
-    ) {
-      setTimeout(() => {
-        // If postTxBalance is the same as preTxBalance, try it again.
-        this.updatePostTxBalance({
-          txMeta,
-          txId,
-          numberOfAttempts: numberOfAttempts - 1,
-        });
-      }, UPDATE_POST_TX_BALANCE_TIMEOUT);
-    } else {
-      this.txStateManager.updateTransaction(
-        latestTxMeta,
-        'transactions#confirmTransaction - add postTxBalance',
-      );
-      this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
-    }
-  }
-
   /**
    * Sets the status of the transaction to confirmed and sets the status of nonce duplicates as
    * dropped if the txParams have data it will fetch the txReceipt
@@ -1566,10 +1515,21 @@ export default class TransactionController extends EventEmitter {
       );
 
       if (txMeta.type === TRANSACTION_TYPES.SWAP) {
-        await this.updatePostTxBalance({
-          txMeta,
-          txId,
-        });
+        const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
+        const latestTxMeta = this.txStateManager.getTransaction(txId);
+
+        const approvalTxMeta = latestTxMeta.approvalTxId
+          ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
+          : null;
+
+        latestTxMeta.postTxBalance = postTxBalance.toString(16);
+
+        this.txStateManager.updateTransaction(
+          latestTxMeta,
+          'transactions#confirmTransaction - add postTxBalance',
+        );
+
+        this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
       }
     } catch (err) {
       log.error(err);
@@ -1627,10 +1587,21 @@ export default class TransactionController extends EventEmitter {
       );
 
       if (txMeta.type === TRANSACTION_TYPES.SWAP) {
-        await this.updatePostTxBalance({
-          txMeta,
-          txId,
-        });
+        const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
+        const latestTxMeta = this.txStateManager.getTransaction(txId);
+
+        const approvalTxMeta = latestTxMeta.approvalTxId
+          ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
+          : null;
+
+        latestTxMeta.postTxBalance = postTxBalance.toString(16);
+
+        this.txStateManager.updateTransaction(
+          latestTxMeta,
+          'transactions#confirmTransaction - add postTxBalance',
+        );
+
+        this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
       }
     } catch (err) {
       log.error(err);
@@ -1991,7 +1962,6 @@ export default class TransactionController extends EventEmitter {
 
   async _buildEventFragmentProperties(txMeta, extraParams) {
     const {
-      id,
       type,
       time,
       status,
@@ -2008,7 +1978,6 @@ export default class TransactionController extends EventEmitter {
       defaultGasEstimates,
       metamaskNetworkId: network,
     } = txMeta;
-    const { transactions } = this.store.getState();
     const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
 
     const { assetType, tokenStandard } = await determineTransactionAssetType(
@@ -2071,10 +2040,6 @@ export default class TransactionController extends EventEmitter {
       gasParams.estimate_used = estimateUsed;
     }
 
-    if (extraParams?.gas_used) {
-      gasParams.gas_used = extraParams.gas_used;
-    }
-
     const gasParamsInGwei = this._getGasValuesInGWEI(gasParams);
 
     let eip1559Version = '0';
@@ -2083,36 +2048,12 @@ export default class TransactionController extends EventEmitter {
       eip1559Version = eip1559V2Enabled ? '2' : '1';
     }
 
-    const contractInteractionTypes = [
-      TRANSACTION_TYPES.CONTRACT_INTERACTION,
-      TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-      TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
-      TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
-      TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-      TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
-      TRANSACTION_TYPES.SMART,
-      TRANSACTION_TYPES.SWAP,
-      TRANSACTION_TYPES.SWAP_APPROVAL,
-    ].includes(type);
-
-    let transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
-    let transactionContractMethod;
-    if (type === TRANSACTION_TYPES.CANCEL) {
-      transactionType = TRANSACTION_TYPES.CANCEL;
-    } else if (type === TRANSACTION_TYPES.RETRY) {
-      transactionType = TRANSACTION_TYPES.RETRY;
-    } else if (type === TRANSACTION_TYPES.DEPLOY_CONTRACT) {
-      transactionType = TRANSACTION_TYPES.DEPLOY_CONTRACT;
-    } else if (contractInteractionTypes) {
-      transactionType = TRANSACTION_TYPES.CONTRACT_INTERACTION;
-      transactionContractMethod = transactions[id]?.contractMethodName;
-    }
-
     const properties = {
       chain_id: chainId,
       referrer,
       source,
       network,
+      type,
       eip_1559_version: eip1559Version,
       gas_edit_type: 'none',
       gas_edit_attempted: 'none',
@@ -2120,7 +2061,6 @@ export default class TransactionController extends EventEmitter {
       device_model: await this.getDeviceModel(this.getSelectedAddress()),
       asset_type: assetType,
       token_standard: tokenStandard,
-      transaction_type: transactionType,
     };
 
     const sensitiveProperties = {
@@ -2130,9 +2070,8 @@ export default class TransactionController extends EventEmitter {
         : TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
       first_seen: time,
       gas_limit: gasLimit,
-      transaction_contract_method: transactionContractMethod,
-      ...extraParams,
       ...gasParamsInGwei,
+      ...extraParams,
     };
 
     return { properties, sensitiveProperties };
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index 52cface7aa2b..a324c56fe9f1 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -17,7 +17,6 @@ import {
   TRANSACTION_ENVELOPE_TYPES,
   TRANSACTION_EVENTS,
   ASSET_TYPES,
-  TOKEN_STANDARDS,
 } from '../../../../shared/constants/transaction';
 
 import { SECOND } from '../../../../shared/constants/time';
@@ -27,6 +26,7 @@ import {
 } from '../../../../shared/constants/gas';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../ui/helpers/constants/transactions';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
+import { TOKEN_STANDARDS } from '../../../../ui/helpers/constants/common';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
 import TransactionController from '.';
 
@@ -1471,7 +1471,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: ORIGIN_METAMASK,
             source: EVENT.SOURCE.TRANSACTION.USER,
-            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+            type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1482,7 +1482,6 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
-            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1551,7 +1550,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: ORIGIN_METAMASK,
             source: EVENT.SOURCE.TRANSACTION.USER,
-            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+            type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1562,7 +1561,6 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
-            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1641,7 +1639,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: 'other',
             source: EVENT.SOURCE.TRANSACTION.DAPP,
-            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+            type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1652,7 +1650,6 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
-            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1723,7 +1720,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: 'other',
             source: EVENT.SOURCE.TRANSACTION.DAPP,
-            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+            type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1734,7 +1731,6 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
-            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1805,7 +1801,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+          type: TRANSACTION_TYPES.SIMPLE_SEND,
           account_type: 'MetaMask',
           asset_type: ASSET_TYPES.NATIVE,
           token_standard: TOKEN_STANDARDS.NONE,
@@ -1814,7 +1810,6 @@ describe('Transaction Controller', function () {
         sensitiveProperties: {
           gas_price: '2',
           gas_limit: '0x7b0d',
-          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
@@ -1865,7 +1860,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+          type: TRANSACTION_TYPES.SIMPLE_SEND,
           chain_id: '0x2a',
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
@@ -1880,7 +1875,6 @@ describe('Transaction Controller', function () {
           foo: 'bar',
           gas_price: '2',
           gas_limit: '0x7b0d',
-          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
@@ -1943,7 +1937,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
+          type: TRANSACTION_TYPES.SIMPLE_SEND,
           account_type: 'MetaMask',
           asset_type: ASSET_TYPES.NATIVE,
           token_standard: TOKEN_STANDARDS.NONE,
@@ -1955,7 +1949,6 @@ describe('Transaction Controller', function () {
           max_fee_per_gas: '2',
           max_priority_fee_per_gas: '2',
           gas_limit: '0x7b0d',
-          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET,
           status: 'unapproved',
@@ -2252,126 +2245,4 @@ describe('Transaction Controller', function () {
       assert.equal(result.destinationTokenAddress, VALID_ADDRESS_TWO); // not updated even though it's passed in to update
     });
   });
-
-  describe('updateEditableParams', function () {
-    let txStateManager;
-
-    beforeEach(function () {
-      txStateManager = txController.txStateManager;
-      txStateManager.addTransaction({
-        id: '1',
-        status: TRANSACTION_STATUSES.UNAPPROVED,
-        metamaskNetworkId: currentNetworkId,
-        txParams: {
-          gas: '0x001',
-          gasPrice: '0x002',
-          // max fees can not be mixed with gasPrice
-          // maxPriorityFeePerGas: '0x003',
-          // maxFeePerGas: '0x004',
-          to: VALID_ADDRESS,
-          from: VALID_ADDRESS,
-        },
-        estimateUsed: '0x005',
-        estimatedBaseFee: '0x006',
-        decEstimatedBaseFee: '6',
-        type: 'simpleSend',
-        userEditedGasLimit: '0x008',
-        userFeeLevel: 'medium',
-      });
-    });
-
-    it('updates editible params when type changes from simple send to token transfer', async function () {
-      providerResultStub.eth_getCode = '0xab';
-      // test update gasFees
-      await txController.updateEditableParams('1', {
-        data:
-          '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-      });
-      const result = txStateManager.getTransaction('1');
-      assert.equal(
-        result.txParams.data,
-        '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-      );
-      assert.equal(result.type, TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER);
-    });
-
-    it('updates editible params when type changes from token transfer to simple send', async function () {
-      // test update gasFees
-      txStateManager.addTransaction({
-        id: '2',
-        status: TRANSACTION_STATUSES.UNAPPROVED,
-        metamaskNetworkId: currentNetworkId,
-        txParams: {
-          gas: '0x001',
-          gasPrice: '0x002',
-          // max fees can not be mixed with gasPrice
-          // maxPriorityFeePerGas: '0x003',
-          // maxFeePerGas: '0x004',
-          to: VALID_ADDRESS,
-          from: VALID_ADDRESS,
-          data:
-            '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
-        },
-        estimateUsed: '0x005',
-        estimatedBaseFee: '0x006',
-        decEstimatedBaseFee: '6',
-        type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-        userEditedGasLimit: '0x008',
-        userFeeLevel: 'medium',
-      });
-      await txController.updateEditableParams('2', {
-        data: '0x',
-      });
-      const result = txStateManager.getTransaction('2');
-      assert.equal(result.txParams.data, '0x');
-      assert.equal(result.type, TRANSACTION_TYPES.SIMPLE_SEND);
-    });
-
-    it('updates editible params when type changes from simpleSend to contract interaction', async function () {
-      // test update gasFees
-      txStateManager.addTransaction({
-        id: '3',
-        status: TRANSACTION_STATUSES.UNAPPROVED,
-        metamaskNetworkId: currentNetworkId,
-        txParams: {
-          gas: '0x001',
-          gasPrice: '0x002',
-          // max fees can not be mixed with gasPrice
-          // maxPriorityFeePerGas: '0x003',
-          // maxFeePerGas: '0x004',
-          to: VALID_ADDRESS,
-          from: VALID_ADDRESS,
-        },
-        estimateUsed: '0x005',
-        estimatedBaseFee: '0x006',
-        decEstimatedBaseFee: '6',
-        type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-        userEditedGasLimit: '0x008',
-        userFeeLevel: 'medium',
-      });
-      providerResultStub.eth_getCode = '0x5';
-      await txController.updateEditableParams('3', {
-        data: '0x123',
-      });
-      const result = txStateManager.getTransaction('3');
-      assert.equal(result.txParams.data, '0x123');
-      assert.equal(result.type, TRANSACTION_TYPES.CONTRACT_INTERACTION);
-    });
-
-    it('updates editible params when type does not change', async function () {
-      // test update gasFees
-      await txController.updateEditableParams('1', {
-        data: '0x123',
-        gas: '0xabc',
-        from: VALID_ADDRESS_TWO,
-      });
-      const result = txStateManager.getTransaction('1');
-      assert.equal(result.txParams.data, '0x123');
-      assert.equal(result.txParams.gas, '0xabc');
-      assert.equal(result.txParams.from, VALID_ADDRESS_TWO);
-      assert.equal(result.txParams.to, VALID_ADDRESS);
-      assert.equal(result.txParams.gasPrice, '0x002');
-      assert.equal(result.type, TRANSACTION_TYPES.SIMPLE_SEND);
-    });
-  });
 });
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index 2bd5471893e9..02b4cbeb4fec 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -2,7 +2,6 @@ import EventEmitter from 'safe-event-emitter';
 import log from 'loglevel';
 import EthQuery from 'ethjs-query';
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction';
-import { ERROR_SUBMITTING } from './tx-state-manager';
 
 /**
  * Event emitter utility class for tracking the transactions as they
@@ -107,7 +106,7 @@ export default class PendingTransactionTracker extends EventEmitter {
         // encountered real error - transition to error state
         txMeta.warning = {
           error: errorMessage,
-          message: ERROR_SUBMITTING,
+          message: 'There was an error when resubmitting this transaction.',
         };
         this.emit('tx:warning', txMeta, err);
       }
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index c924c9b66641..33e23bbf847a 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -18,8 +18,6 @@ import {
   validateConfirmedExternalTransaction,
 } from './lib/util';
 
-export const ERROR_SUBMITTING =
-  'There was an error when resubmitting this transaction.';
 /**
  * TransactionStatuses reimported from the shared transaction constants file
  *
@@ -306,23 +304,9 @@ export default class TransactionStateManager extends EventEmitter {
   updateTransaction(txMeta, note) {
     // normalize and validate txParams if present
     if (txMeta.txParams) {
-      try {
-        txMeta.txParams = normalizeAndValidateTxParams(txMeta.txParams, false);
-      } catch (error) {
-        if (txMeta.warning.message === ERROR_SUBMITTING) {
-          this.setTxStatusFailed(txMeta.id, error);
-        } else {
-          throw error;
-        }
-
-        return;
-      }
+      txMeta.txParams = normalizeAndValidateTxParams(txMeta.txParams, false);
     }
 
-    this._updateTransactionHistory(txMeta, note);
-  }
-
-  _updateTransactionHistory(txMeta, note) {
     // create txMeta snapshot for history
     const currentState = snapshotFromTxMeta(txMeta);
     // recover previous tx state obj
@@ -567,11 +551,10 @@ export default class TransactionStateManager extends EventEmitter {
       rpc: error.value,
       stack: error.stack,
     };
-    this._updateTransactionHistory(
+    this.updateTransaction(
       txMeta,
       'transactions:tx-state-manager#fail - add error',
     );
-
     this._setTransactionStatus(txId, TRANSACTION_STATUSES.FAILED);
   }
 
@@ -655,7 +638,7 @@ export default class TransactionStateManager extends EventEmitter {
 
     txMeta.status = status;
     try {
-      this._updateTransactionHistory(
+      this.updateTransaction(
         txMeta,
         `txStateManager: setting status to ${status}`,
       );
diff --git a/app/scripts/controllers/transactions/tx-state-manager.test.js b/app/scripts/controllers/transactions/tx-state-manager.test.js
index 7fbe6ec1eae4..ba3dd6be221f 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.test.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.test.js
@@ -12,7 +12,7 @@ import {
 } from '../../../../shared/constants/network';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-import TxStateManager, { ERROR_SUBMITTING } from './tx-state-manager';
+import TxStateManager from './tx-state-manager';
 import { snapshotFromTxMeta } from './lib/tx-state-history-helpers';
 
 const VALID_ADDRESS = '0x0000000000000000000000000000000000000000';
@@ -918,113 +918,6 @@ describe('TransactionStateManager', function () {
       const { history } = txStateManager.getTransaction('1');
       assert.equal(history.length, 1, 'two history items (initial + diff)');
     });
-
-    it('should set tx status to failed if updating after error submitting', function () {
-      const txMeta = {
-        id: '1',
-        status: TRANSACTION_STATUSES.UNAPPROVED,
-        metamaskNetworkId: currentNetworkId,
-        txParams: {
-          from: VALID_ADDRESS_TWO,
-          to: VALID_ADDRESS,
-          gasLimit: '0x5028',
-          maxFeePerGas: '0x2540be400',
-          maxPriorityFeePerGas: '0x3b9aca00',
-        },
-      };
-
-      txStateManager.addTransaction(txMeta);
-      const { history } = txStateManager.getTransaction('1');
-      assert.equal(history.length, 1);
-
-      txMeta.txParams.type = '0x0';
-      txMeta.warning = {
-        message: ERROR_SUBMITTING,
-        error: 'Testing tx status failed with arbitrary error',
-      };
-
-      // should result in additional 2 history entries
-      txStateManager.updateTransaction(txMeta);
-
-      const result = txStateManager.getTransaction('1');
-
-      assert.equal(result.history.length, 3);
-
-      // history[1] should contain 3 entries
-      assert.equal(result.history[1].length, 3);
-      assert.equal(
-        result.history[1][0].note,
-        'transactions:tx-state-manager#fail - add error',
-      );
-      assert.equal(result.history[1][0].op, 'add');
-      assert.equal(result.history[1][0].path, '/txParams/type');
-      assert.equal(result.history[1][0].value, '0x0');
-
-      assert.equal(result.history[1][1].op, 'add');
-      assert.equal(result.history[1][1].path, '/warning');
-      assert.equal(result.history[1][1].value.message, ERROR_SUBMITTING);
-
-      assert.equal(result.history[1][2].op, 'add');
-      assert.equal(result.history[1][2].path, '/err');
-      assert.equal(
-        result.history[1][2].value.message,
-        'Invalid transaction envelope type: specified type "0x0" but including maxFeePerGas and maxPriorityFeePerGas requires type: "0x2"',
-      );
-
-      assert.equal(result.history[2].length, 1);
-      assert.equal(
-        result.history[2][0].note,
-        'txStateManager: setting status to failed',
-      );
-      assert.equal(result.history[2][0].op, 'replace');
-      assert.equal(result.history[2][0].path, '/status');
-      assert.equal(result.history[2][0].value, 'failed');
-    });
-
-    it('should set transaction status to failed', function () {
-      const txMeta = {
-        id: '1',
-        status: TRANSACTION_STATUSES.UNAPPROVED,
-        metamaskNetworkId: currentNetworkId,
-        txParams: {
-          from: VALID_ADDRESS_TWO,
-          to: VALID_ADDRESS,
-          gasPrice: '0x01',
-        },
-      };
-
-      txStateManager.addTransaction(txMeta);
-      const { history } = txStateManager.getTransaction('1');
-      assert.equal(history.length, 1);
-
-      // should result in additional 2 history entries
-      txStateManager.setTxStatusFailed(
-        txMeta.id,
-        new Error('Testing tx status failed with arbitrary error'),
-      );
-
-      const result = txStateManager.getTransaction('1');
-      assert.equal(result.history.length, 3);
-
-      assert.equal(
-        result.history[1][0].note,
-        'transactions:tx-state-manager#fail - add error',
-      );
-      assert.equal(result.history[1][0].op, 'add');
-      assert.equal(result.history[1][0].path, '/err');
-      assert.equal(
-        result.history[1][0].value.message,
-        'Testing tx status failed with arbitrary error',
-      );
-      assert.equal(result.history[2].length, 1);
-      assert.equal(
-        result.history[2][0].note,
-        'txStateManager: setting status to failed',
-      );
-      assert.equal(result.history[2][0].op, 'replace');
-      assert.equal(result.history[2][0].path, '/status');
-      assert.equal(result.history[2][0].value, 'failed');
-    });
   });
 
   describe('#getUnapprovedTxList', function () {
diff --git a/app/scripts/init-globals.js b/app/scripts/init-globals.js
deleted file mode 100644
index a26c95266bd3..000000000000
--- a/app/scripts/init-globals.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * This script add properties in globalThis and initialises them with undefined.
- * This is workaround needed to avoid error in dependencies expecting to be run in a browser
- * these dependencies are not available to service worker in MV3.
- */
-
-// eslint-disable-next-line import/unambiguous
-const keys = ['XMLHttpRequest'];
-
-keys.forEach((key) => {
-  if (!Reflect.has(globalThis, key)) {
-    globalThis[key] = undefined;
-  }
-});
-
-if (!Reflect.has(globalThis, 'window')) {
-  globalThis.window = globalThis;
-}
diff --git a/app/scripts/lib/ComposableObservableStore.test.js b/app/scripts/lib/ComposableObservableStore.test.js
index 9d03eb98d078..0beeacdfbebf 100644
--- a/app/scripts/lib/ComposableObservableStore.test.js
+++ b/app/scripts/lib/ComposableObservableStore.test.js
@@ -165,7 +165,7 @@ describe('ComposableObservableStore', () => {
             Example: exampleController,
           },
         }),
-    ).toThrow(`Cannot read properties of undefined (reading 'subscribe')`);
+    ).toThrow(`Cannot read property 'subscribe' of undefined`);
   });
 
   it('should throw if the controller messenger is omitted and updateStructure called with a BaseControllerV2 controller', () => {
@@ -175,7 +175,7 @@ describe('ComposableObservableStore', () => {
     });
     const store = new ComposableObservableStore({});
     expect(() => store.updateStructure({ Example: exampleController })).toThrow(
-      `Cannot read properties of undefined (reading 'subscribe')`,
+      `Cannot read property 'subscribe' of undefined`,
     );
   });
 
diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index e1c1bf185acc..7abe349a35b2 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -19,13 +19,6 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
   KOVAN_CHAIN_ID,
-  GOERLI_CHAIN_ID,
-  BSC_CHAIN_ID,
-  OPTIMISM_CHAIN_ID,
-  POLYGON_CHAIN_ID,
-  AVALANCHE_CHAIN_ID,
-  FANTOM_CHAIN_ID,
-  ARBITRUM_CHAIN_ID,
 } from '../../../shared/constants/network';
 
 import {
@@ -33,13 +26,6 @@ import {
   SINGLE_CALL_BALANCES_ADDRESS_RINKEBY,
   SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN,
   SINGLE_CALL_BALANCES_ADDRESS_KOVAN,
-  SINGLE_CALL_BALANCES_ADDRESS_GOERLI,
-  SINGLE_CALL_BALANCES_ADDRESS_BSC,
-  SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM,
-  SINGLE_CALL_BALANCES_ADDRESS_POLYGON,
-  SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE,
-  SINGLE_CALL_BALANCES_ADDRESS_FANTOM,
-  SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM,
 } from '../constants/contracts';
 import { bnToHex } from './util';
 
@@ -244,55 +230,6 @@ export default class AccountTracker {
         );
         break;
 
-      case GOERLI_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_GOERLI,
-        );
-        break;
-
-      case BSC_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_BSC,
-        );
-        break;
-
-      case OPTIMISM_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM,
-        );
-        break;
-
-      case POLYGON_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_POLYGON,
-        );
-        break;
-
-      case AVALANCHE_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE,
-        );
-        break;
-
-      case FANTOM_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_FANTOM,
-        );
-        break;
-
-      case ARBITRUM_CHAIN_ID:
-        await this._updateAccountsViaBalanceChecker(
-          addresses,
-          SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM,
-        );
-        break;
-
       default:
         await Promise.all(addresses.map(this._updateAccount.bind(this)));
     }
@@ -306,17 +243,8 @@ export default class AccountTracker {
    * @returns {Promise} after the account balance is updated
    */
   async _updateAccount(address) {
-    let balance = '0x0';
-
     // query balance
-    try {
-      balance = await this._query.getBalance(address);
-    } catch (error) {
-      if (error.data.request.method !== 'eth_getBalance') {
-        throw error;
-      }
-    }
-
+    const balance = await this._query.getBalance(address);
     const result = { address, balance };
     // update accounts state
     const { accounts } = this.store.getState();
diff --git a/app/scripts/lib/buy-url.js b/app/scripts/lib/buy-url.js
index eb8e22cf4bf2..ba4a0d86f468 100644
--- a/app/scripts/lib/buy-url.js
+++ b/app/scripts/lib/buy-url.js
@@ -7,31 +7,24 @@ import {
   MAINNET_CHAIN_ID,
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
+  MAINNET_NETWORK_ID,
   BUYABLE_CHAINS_MAP,
 } from '../../../shared/constants/network';
+import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
-import {
-  TRANSAK_API_KEY,
-  MOONPAY_API_KEY,
-  COINBASEPAY_API_KEY,
-} from '../constants/on-ramp';
+import { TRANSAK_API_KEY, MOONPAY_API_KEY } from '../constants/on-ramp';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 /**
  * Create a Wyre purchase URL.
  *
- * @param {string} walletAddress - Ethereum destination address
- * @param {string} chainId - Current chain ID
+ * @param {string} address - Ethereum destination address
  * @returns String
  */
-const createWyrePurchaseUrl = async (walletAddress, chainId) => {
-  const { wyre = {} } = BUYABLE_CHAINS_MAP[chainId];
-  const { srn, currencyCode } = wyre;
-
-  const networkId = parseInt(chainId, 16);
-  const fiatOnRampUrlApi = `${SWAPS_API_V2_BASE_URL}/networks/${networkId}/fiatOnRampUrl?serviceName=wyre&destinationAddress=${walletAddress}`;
-  const wyrePurchaseUrlFallback = `https://pay.sendwyre.com/purchase?dest=${srn}:${walletAddress}&destCurrency=${currencyCode}&accountId=AC-7AG3W4XH4N2&paymentMethod=debit-card`;
+const createWyrePurchaseUrl = async (address) => {
+  const fiatOnRampUrlApi = `${SWAPS_API_V2_BASE_URL}/networks/${MAINNET_NETWORK_ID}/fiatOnRampUrl?serviceName=wyre&destinationAddress=${address}`;
+  const wyrePurchaseUrlFallback = `https://pay.sendwyre.com/purchase?dest=ethereum:${address}&destCurrency=ETH&accountId=AC-7AG3W4XH4N2&paymentMethod=debit-card`;
   try {
     const response = await fetchWithTimeout(fiatOnRampUrlApi, {
       method: 'GET',
@@ -115,28 +108,6 @@ const createMoonPayUrl = async (walletAddress, chainId) => {
   return '';
 };
 
-/**
- * Create a Coinbase Pay Checkout URL.
- *
- * @param {string} walletAddress - Ethereum destination address
- * @param {string} chainId - Current chain ID
- * @returns String
- */
-const createCoinbasePayUrl = (walletAddress, chainId) => {
-  const { coinbasePayCurrencies } = BUYABLE_CHAINS_MAP[chainId];
-  const queryParams = new URLSearchParams({
-    appId: COINBASEPAY_API_KEY,
-    attribution: 'extension',
-    destinationWallets: JSON.stringify([
-      {
-        address: walletAddress,
-        assets: coinbasePayCurrencies,
-      },
-    ]),
-  });
-  return `https://pay.coinbase.com/buy?${queryParams}`;
-};
-
 /**
  * Gives the caller a url at which the user can acquire eth, depending on the network they are in
  *
@@ -156,13 +127,11 @@ export default async function getBuyUrl({ chainId, address, service }) {
 
   switch (service) {
     case 'wyre':
-      return await createWyrePurchaseUrl(address, chainId);
+      return await createWyrePurchaseUrl(address);
     case 'transak':
       return createTransakUrl(address, chainId);
     case 'moonpay':
       return createMoonPayUrl(address, chainId);
-    case 'coinbase':
-      return createCoinbasePayUrl(address, chainId);
     case 'metamask-faucet':
       return 'https://faucet.metamask.io/';
     case 'rinkeby-faucet':
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index 3362e29ad3aa..89141357f63a 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -1,91 +1,19 @@
-import { MESSAGE_TYPE, ORIGIN_METAMASK } from '../../../shared/constants/app';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
 
-/**
- * These types determine how the method tracking middleware handles incoming
- * requests based on the method name. There are three options right now but
- * the types could be expanded to cover other options in the future.
- */
-const RATE_LIMIT_TYPES = {
-  RATE_LIMITED: 'rate_limited',
-  BLOCKED: 'blocked',
-  NON_RATE_LIMITED: 'non_rate_limited',
+const USER_PROMPTED_EVENT_NAME_MAP = {
+  eth_signTypedData_v4: EVENT_NAMES.SIGNATURE_REQUESTED,
+  eth_signTypedData_v3: EVENT_NAMES.SIGNATURE_REQUESTED,
+  eth_signTypedData: EVENT_NAMES.SIGNATURE_REQUESTED,
+  eth_personal_sign: EVENT_NAMES.SIGNATURE_REQUESTED,
+  eth_sign: EVENT_NAMES.SIGNATURE_REQUESTED,
+  eth_getEncryptionPublicKey: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REQUESTED,
+  eth_decrypt: EVENT_NAMES.DECRYPTION_REQUESTED,
+  wallet_requestPermissions: EVENT_NAMES.PERMISSIONS_REQUESTED,
+  eth_requestAccounts: EVENT_NAMES.PERMISSIONS_REQUESTED,
 };
 
-/**
- * This object maps a method name to a RATE_LIMIT_TYPE. If not in this map the
- * default is 'RATE_LIMITED'
- */
-const RATE_LIMIT_MAP = {
-  [MESSAGE_TYPE.ETH_SIGN]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.PERSONAL_SIGN]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_DECRYPT]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]:
-    RATE_LIMIT_TYPES.NON_RATE_LIMITED,
-  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: RATE_LIMIT_TYPES.RATE_LIMITED,
-  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: RATE_LIMIT_TYPES.RATE_LIMITED,
-  [MESSAGE_TYPE.SEND_METADATA]: RATE_LIMIT_TYPES.BLOCKED,
-  [MESSAGE_TYPE.GET_PROVIDER_STATE]: RATE_LIMIT_TYPES.BLOCKED,
-};
-
-/**
- * For events with user interaction (approve / reject | cancel) this map will
- * return an object with APPROVED, REJECTED and REQUESTED keys that map to the
- * appropriate event names.
- */
-const EVENT_NAME_MAP = {
-  [MESSAGE_TYPE.ETH_SIGN]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
-  },
-  [MESSAGE_TYPE.PERSONAL_SIGN]: {
-    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
-    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
-    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_DECRYPT]: {
-    APPROVED: EVENT_NAMES.DECRYPTION_APPROVED,
-    REJECTED: EVENT_NAMES.DECRYPTION_REJECTED,
-    REQUESTED: EVENT_NAMES.DECRYPTION_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]: {
-    APPROVED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_APPROVED,
-    REJECTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REJECTED,
-    REQUESTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REQUESTED,
-  },
-  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: {
-    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
-    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
-    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
-  },
-  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: {
-    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
-    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
-    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
-  },
-};
-
-const rateLimitTimeouts = {};
+const samplingTimeouts = {};
 
 /**
  * Returns a middleware that tracks inpage_provider usage using sampling for
@@ -93,113 +21,65 @@ const rateLimitTimeouts = {};
  * signature requests
  *
  * @param {object} opts - options for the rpc method tracking middleware
- * @param {Function} opts.trackEvent - trackEvent method from
- *  MetaMetricsController
- * @param {Function} opts.getMetricsState - get the state of
- *  MetaMetricsController
- * @param {number} [opts.rateLimitSeconds] - number of seconds to wait before
- *  allowing another set of events to be tracked.
+ * @param {Function} opts.trackEvent - trackEvent method from MetaMetricsController
+ * @param {Function} opts.getMetricsState - get the state of MetaMetricsController
  * @returns {Function}
  */
 export default function createRPCMethodTrackingMiddleware({
   trackEvent,
   getMetricsState,
-  rateLimitSeconds = 60,
 }) {
   return function rpcMethodTrackingMiddleware(
     /** @type {any} */ req,
     /** @type {any} */ res,
     /** @type {Function} */ next,
   ) {
-    const { origin, method } = req;
-
-    // Determine what type of rate limit to apply based on method
-    const rateLimitType =
-      RATE_LIMIT_MAP[method] ?? RATE_LIMIT_TYPES.RATE_LIMITED;
-
-    // If the rateLimitType is RATE_LIMITED check the rateLimitTimeouts
-    const rateLimited =
-      rateLimitType === RATE_LIMIT_TYPES.RATE_LIMITED &&
-      typeof rateLimitTimeouts[method] !== 'undefined';
-
-    // Get the participateInMetaMetrics state to determine if we should track
-    // anything. This is extra redundancy because this value is checked in
-    // the metametrics controller's trackEvent method as well.
-    const userParticipatingInMetaMetrics =
-      getMetricsState().participateInMetaMetrics === true;
-
-    // Get the event type, each of which has APPROVED, REJECTED and REQUESTED
-    // keys for the various events in the flow.
-    const eventType = EVENT_NAME_MAP[method];
-
-    // Boolean variable that reduces code duplication and increases legibility
-    const shouldTrackEvent =
-      // Don't track if the request came from our own UI or background
-      origin !== ORIGIN_METAMASK &&
-      // Don't track if this is a blocked method
-      rateLimitType !== RATE_LIMIT_TYPES.BLOCKED &&
-      // Don't track if the rate limit has been hit
-      rateLimited === false &&
-      // Don't track if the user isn't participating in metametrics
-      userParticipatingInMetaMetrics === true;
-
-    if (shouldTrackEvent) {
-      // We track an initial "requested" event as soon as the dapp calls the
-      // provider method. For the events not special cased this is the only
-      // event that will be fired and the event name will be
-      // 'Provider Method Called'.
-      const event = eventType
-        ? eventType.REQUESTED
-        : EVENT_NAMES.PROVIDER_METHOD_CALLED;
-
-      const properties = {};
-
-      if (event === EVENT_NAMES.SIGNATURE_REQUESTED) {
-        properties.signature_type = method;
-      } else {
-        properties.method = method;
-      }
-
-      trackEvent({
-        event,
-        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
-        referrer: {
-          url: origin,
-        },
-        properties,
-      });
-
-      rateLimitTimeouts[method] = setTimeout(() => {
-        delete rateLimitTimeouts[method];
-      }, SECOND * rateLimitSeconds);
-    }
+    const startTime = Date.now();
+    const { origin } = req;
 
     next((callback) => {
-      if (shouldTrackEvent === false || typeof eventType === 'undefined') {
+      const endTime = Date.now();
+      if (!getMetricsState().participateInMetaMetrics) {
         return callback();
       }
-
-      // An error code of 4001 means the user rejected the request, which we
-      // can use here to determine which event to track.
-      const event =
-        res.error?.code === 4001 ? eventType.REJECTED : eventType.APPROVED;
-
-      const properties = {};
-
-      if (eventType.REQUESTED === EVENT_NAMES.SIGNATURE_REQUESTED) {
-        properties.signature_type = method;
-      } else {
-        properties.method = method;
+      if (USER_PROMPTED_EVENT_NAME_MAP[req.method]) {
+        const userRejected = res.error?.code === 4001;
+        trackEvent({
+          event: USER_PROMPTED_EVENT_NAME_MAP[req.method],
+          category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+          referrer: {
+            url: origin,
+          },
+          properties: {
+            method: req.method,
+            status: userRejected ? 'rejected' : 'approved',
+            error_code: res.error?.code,
+            error_message: res.error?.message,
+            has_result: typeof res.result !== 'undefined',
+            duration: endTime - startTime,
+          },
+        });
+      } else if (typeof samplingTimeouts[req.method] === 'undefined') {
+        trackEvent({
+          event: 'Provider Method Called',
+          category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+          referrer: {
+            url: origin,
+          },
+          properties: {
+            method: req.method,
+            error_code: res.error?.code,
+            error_message: res.error?.message,
+            has_result: typeof res.result !== 'undefined',
+            duration: endTime - startTime,
+          },
+        });
+        // Only record one call to this method every ten seconds to avoid
+        // overloading network requests.
+        samplingTimeouts[req.method] = setTimeout(() => {
+          delete samplingTimeouts[req.method];
+        }, SECOND * 10);
       }
-
-      trackEvent({
-        event,
-        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
-        referrer: {
-          url: origin,
-        },
-        properties,
-      });
       return callback();
     });
   };
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
deleted file mode 100644
index ffa953fa0f75..000000000000
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
+++ /dev/null
@@ -1,217 +0,0 @@
-import { MESSAGE_TYPE } from '../../../shared/constants/app';
-import { EVENT_NAMES } from '../../../shared/constants/metametrics';
-import { SECOND } from '../../../shared/constants/time';
-import createRPCMethodTrackingMiddleware from './createRPCMethodTrackingMiddleware';
-
-const trackEvent = jest.fn();
-const metricsState = { participateInMetaMetrics: null };
-const getMetricsState = () => metricsState;
-
-const handler = createRPCMethodTrackingMiddleware({
-  trackEvent,
-  getMetricsState,
-  rateLimitSeconds: 1,
-});
-
-function getNext(timeout = 500) {
-  let deferred;
-  const promise = new Promise((resolve) => {
-    deferred = {
-      resolve,
-    };
-  });
-  const cb = () => deferred.resolve();
-  let triggerNext;
-  setTimeout(() => {
-    deferred.resolve();
-  }, timeout);
-  return {
-    executeMiddlewareStack: async () => {
-      if (triggerNext) {
-        triggerNext(() => cb());
-      }
-      return await deferred.resolve();
-    },
-    promise,
-    next: (postReqHandler) => {
-      triggerNext = postReqHandler;
-    },
-  };
-}
-
-const waitForSeconds = async (seconds) =>
-  await new Promise((resolve) => setTimeout(resolve, SECOND * seconds));
-
-describe('createRPCMethodTrackingMiddleware', () => {
-  afterEach(() => {
-    jest.resetAllMocks();
-    metricsState.participateInMetaMetrics = null;
-  });
-
-  describe('before participateInMetaMetrics is set', () => {
-    it('should not track an event for a signature request', async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: null,
-      };
-      const { executeMiddlewareStack, next } = getNext();
-      handler(req, res, next);
-      await executeMiddlewareStack();
-      expect(trackEvent).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('participateInMetaMetrics is set to false', () => {
-    beforeEach(() => {
-      metricsState.participateInMetaMetrics = false;
-    });
-
-    it('should not track an event for a signature request', async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: null,
-      };
-      const { executeMiddlewareStack, next } = getNext();
-      handler(req, res, next);
-      await executeMiddlewareStack();
-      expect(trackEvent).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('participateInMetaMetrics is set to true', () => {
-    beforeEach(() => {
-      metricsState.participateInMetaMetrics = true;
-    });
-
-    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN,
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: null,
-      };
-      const { next } = getNext();
-      handler(req, res, next);
-      expect(trackEvent).toHaveBeenCalledTimes(1);
-      expect(trackEvent.mock.calls[0][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REQUESTED,
-        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN },
-        referrer: { url: 'some.dapp' },
-      });
-    });
-
-    it(`should track a ${EVENT_NAMES.SIGNATURE_APPROVED} event if the user approves`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: null,
-      };
-      const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
-      await executeMiddlewareStack();
-      expect(trackEvent).toHaveBeenCalledTimes(2);
-      expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_APPROVED,
-        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4 },
-        referrer: { url: 'some.dapp' },
-      });
-    });
-
-    it(`should track a ${EVENT_NAMES.SIGNATURE_REJECTED} event if the user approves`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.PERSONAL_SIGN,
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: { code: 4001 },
-      };
-      const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
-      await executeMiddlewareStack();
-      expect(trackEvent).toHaveBeenCalledTimes(2);
-      expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.SIGNATURE_REJECTED,
-        properties: { signature_type: MESSAGE_TYPE.PERSONAL_SIGN },
-        referrer: { url: 'some.dapp' },
-      });
-    });
-
-    it(`should track a ${EVENT_NAMES.PERMISSIONS_APPROVED} event if the user approves`, async () => {
-      const req = {
-        method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS,
-        origin: 'some.dapp',
-      };
-
-      const res = {};
-      const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
-      await executeMiddlewareStack();
-      expect(trackEvent).toHaveBeenCalledTimes(2);
-      expect(trackEvent.mock.calls[1][0]).toMatchObject({
-        category: 'inpage_provider',
-        event: EVENT_NAMES.PERMISSIONS_APPROVED,
-        properties: { method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS },
-        referrer: { url: 'some.dapp' },
-      });
-    });
-
-    it(`should never track blocked methods such as ${MESSAGE_TYPE.GET_PROVIDER_STATE}`, () => {
-      const req = {
-        method: MESSAGE_TYPE.GET_PROVIDER_STATE,
-        origin: 'www.notadapp.com',
-      };
-
-      const res = {
-        error: null,
-      };
-      const { next, executeMiddlewareStack } = getNext();
-      handler(req, res, next);
-      expect(trackEvent).not.toHaveBeenCalled();
-      executeMiddlewareStack();
-    });
-
-    it(`should only track events when not rate limited`, async () => {
-      const req = {
-        method: 'eth_chainId',
-        origin: 'some.dapp',
-      };
-
-      const res = {
-        error: null,
-      };
-
-      let callCount = 0;
-
-      while (callCount < 3) {
-        callCount += 1;
-        const { next, executeMiddlewareStack } = getNext();
-        handler(req, res, next);
-        await executeMiddlewareStack();
-        if (callCount !== 3) {
-          await waitForSeconds(0.6);
-        }
-      }
-
-      expect(trackEvent).toHaveBeenCalledTimes(2);
-      expect(trackEvent.mock.calls[0][0].properties.method).toBe('eth_chainId');
-      expect(trackEvent.mock.calls[1][0].properties.method).toBe('eth_chainId');
-    });
-  });
-});
diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index 942b888ccd85..2d19811c3fa8 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -2,10 +2,11 @@ import base32Encode from 'base32-encode';
 import base64 from 'base64-js';
 import browser from 'webextension-polyfill';
 
+import { SECOND } from '../../../../shared/constants/time';
 import getFetchWithTimeout from '../../../../shared/modules/fetch-with-timeout';
 import resolveEnsToIpfsContentId from './resolver';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 const supportedTopLevelDomains = ['eth'];
 
diff --git a/app/scripts/lib/metaRPCClientFactory.js b/app/scripts/lib/metaRPCClientFactory.js
index 1dfe572d2c02..689774f914a7 100644
--- a/app/scripts/lib/metaRPCClientFactory.js
+++ b/app/scripts/lib/metaRPCClientFactory.js
@@ -1,7 +1,6 @@
 import { EthereumRpcError } from 'eth-rpc-errors';
 import SafeEventEmitter from 'safe-event-emitter';
 import createRandomId from '../../../shared/modules/random-id';
-import { TEN_SECONDS_IN_MILLISECONDS } from '../../../ui/helpers/constants/critical-error';
 
 class MetaRPCClient {
   constructor(connectionStream) {
@@ -11,25 +10,6 @@ class MetaRPCClient {
     this.requests = new Map();
     this.connectionStream.on('data', this.handleResponse.bind(this));
     this.connectionStream.on('end', this.close.bind(this));
-    this.responseHandled = {};
-  }
-
-  send(id, payload, cb) {
-    this.requests.set(id, cb);
-    this.connectionStream.write(payload);
-    this.responseHandled[id] = false;
-    if (payload.method === 'getState') {
-      setTimeout(() => {
-        if (!this.responseHandled[id] && cb) {
-          delete this.responseHandled[id];
-          return cb(new Error('No response from RPC'), null);
-        }
-
-        delete this.responseHandled[id];
-        // needed for linter to pass
-        return true;
-      }, TEN_SECONDS_IN_MILLISECONDS);
-    }
   }
 
   onNotification(handler) {
@@ -54,8 +34,6 @@ class MetaRPCClient {
     const isNotification = id === undefined && error === undefined;
     const cb = this.requests.get(id);
 
-    this.responseHandled[id] = true;
-
     if (method && params && !isNotification) {
       // dont handle server-side to client-side requests
       return;
@@ -101,13 +79,14 @@ const metaRPCClientFactory = (connectionStream) => {
         const cb = p[p.length - 1];
         const params = p.slice(0, -1);
         const id = createRandomId();
-        const payload = {
+
+        object.requests.set(id, cb);
+        object.connectionStream.write({
           jsonrpc: '2.0',
           method: property,
           params,
           id,
-        };
-        object.send(id, payload, cb);
+        });
       };
     },
   });
diff --git a/app/scripts/lib/metaRPCClientFactory.test.js b/app/scripts/lib/metaRPCClientFactory.test.js
index d8fbf6fe3fbe..8304cf4e98d6 100644
--- a/app/scripts/lib/metaRPCClientFactory.test.js
+++ b/app/scripts/lib/metaRPCClientFactory.test.js
@@ -131,21 +131,4 @@ describe('metaRPCClientFactory', () => {
       },
     });
   });
-
-  it('should be able to handle no message within TIMEOUT secs', async () => {
-    jest.useFakeTimers();
-    const streamTest = createThoughStream();
-    const metaRPCClient = metaRPCClientFactory(streamTest);
-
-    const errorPromise = new Promise((_resolve, reject) =>
-      metaRPCClient.getState('bad', (error, _) => {
-        reject(error);
-      }),
-    );
-
-    jest.runOnlyPendingTimers();
-    await expect(errorPromise).rejects.toThrow('No response from RPC');
-
-    jest.useRealTimers();
-  });
 });
diff --git a/app/scripts/lib/network-store.js b/app/scripts/lib/network-store.js
index f4e5997bf279..ca5f4c843d22 100644
--- a/app/scripts/lib/network-store.js
+++ b/app/scripts/lib/network-store.js
@@ -1,7 +1,8 @@
 import log from 'loglevel';
+import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 const FIXTURE_SERVER_HOST = 'localhost';
 const FIXTURE_SERVER_PORT = 12345;
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
index d3130296601c..82ac2cf846a9 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
@@ -1,10 +1,7 @@
 import { ethErrors, errorCodes } from 'eth-rpc-errors';
 import validUrl from 'valid-url';
 import { omit } from 'lodash';
-import {
-  MESSAGE_TYPE,
-  UNKNOWN_TICKER_SYMBOL,
-} from '../../../../../shared/constants/app';
+import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
 import { EVENT } from '../../../../../shared/constants/metametrics';
 import {
   isPrefixedFormattedHexString,
@@ -19,7 +16,6 @@ const addEthereumChain = {
   hookNames: {
     addCustomRpc: true,
     getCurrentChainId: true,
-    getCurrentRpcUrl: true,
     findCustomRpcBy: true,
     updateRpcTarget: true,
     requestUserApproval: true,
@@ -36,7 +32,6 @@ async function addEthereumChainHandler(
   {
     addCustomRpc,
     getCurrentChainId,
-    getCurrentRpcUrl,
     findCustomRpcBy,
     updateRpcTarget,
     requestUserApproval,
@@ -82,27 +77,14 @@ async function addEthereumChainHandler(
     );
   }
 
-  const isLocalhost = (strUrl) => {
-    try {
-      const url = new URL(strUrl);
-      return url.hostname === 'localhost' || url.hostname === '127.0.0.1';
-    } catch (error) {
-      return false;
-    }
-  };
-
   const firstValidRPCUrl = Array.isArray(rpcUrls)
-    ? rpcUrls.find(
-        (rpcUrl) => isLocalhost(rpcUrl) || validUrl.isHttpsUri(rpcUrl),
-      )
+    ? rpcUrls.find((rpcUrl) => validUrl.isHttpsUri(rpcUrl))
     : null;
 
   const firstValidBlockExplorerUrl =
     blockExplorerUrls !== null && Array.isArray(blockExplorerUrls)
-      ? blockExplorerUrls.find(
-          (blockExplorerUrl) =>
-            isLocalhost(blockExplorerUrl) ||
-            validUrl.isHttpsUri(blockExplorerUrl),
+      ? blockExplorerUrls.find((blockExplorerUrl) =>
+          validUrl.isHttpsUri(blockExplorerUrl),
         )
       : null;
 
@@ -150,21 +132,15 @@ async function addEthereumChainHandler(
 
   const existingNetwork = findCustomRpcBy({ chainId: _chainId });
 
-  // if the request is to add a network that is already added and configured
-  // with the same RPC gateway we shouldn't try to add it again.
-  if (existingNetwork && existingNetwork.rpcUrl === firstValidRPCUrl) {
+  if (existingNetwork) {
     // If the network already exists, the request is considered successful
     res.result = null;
 
     const currentChainId = getCurrentChainId();
-    const currentRpcUrl = getCurrentRpcUrl();
-
-    // If the current chainId and rpcUrl matches that of the incoming request
-    // We don't need to proceed further.
-    if (currentChainId === _chainId && currentRpcUrl === firstValidRPCUrl) {
+    if (currentChainId === _chainId) {
       return end();
     }
-    // If this network is already added with but is not the currently selected network
+
     // Ask the user to switch the network
     try {
       await updateRpcTarget(
@@ -247,32 +223,15 @@ async function addEthereumChainHandler(
       );
     }
   }
+  const ticker = nativeCurrency?.symbol || 'ETH';
 
-  const ticker = nativeCurrency?.symbol || UNKNOWN_TICKER_SYMBOL;
-
-  if (
-    ticker !== UNKNOWN_TICKER_SYMBOL &&
-    (typeof ticker !== 'string' || ticker.length < 2 || ticker.length > 6)
-  ) {
+  if (typeof ticker !== 'string' || ticker.length < 2 || ticker.length > 6) {
     return end(
       ethErrors.rpc.invalidParams({
         message: `Expected 2-6 character string 'nativeCurrency.symbol'. Received:\n${ticker}`,
       }),
     );
   }
-  // if the chainId is the same as an existing network but the ticker is different we want to block this action
-  // as it is potentially malicious and confusing
-  if (
-    existingNetwork &&
-    existingNetwork.chainId === _chainId &&
-    existingNetwork.ticker !== ticker
-  ) {
-    return end(
-      ethErrors.rpc.invalidParams({
-        message: `nativeCurrency.symbol does not match currency symbol for a network the user already has added with the same chainId. Received:\n${ticker}`,
-      }),
-    );
-  }
 
   try {
     await addCustomRpc(
@@ -289,34 +248,25 @@ async function addEthereumChainHandler(
       }),
     );
 
-    let rpcUrlOrigin;
-    try {
-      rpcUrlOrigin = new URL(firstValidRPCUrl).origin;
-    } catch {
-      // ignore
-    }
-
     sendMetrics({
       event: 'Custom Network Added',
       category: EVENT.CATEGORIES.NETWORK,
       referrer: {
         url: origin,
       },
-      properties: {
+      sensitiveProperties: {
         chain_id: _chainId,
+        rpc_url: firstValidRPCUrl,
         network_name: _chainName,
         // Including network to override the default network
         // property included in all events. For RPC type networks
         // the MetaMetrics controller uses the rpcUrl for the network
         // property.
-        network: rpcUrlOrigin,
+        network: firstValidRPCUrl,
         symbol: ticker,
         block_explorer_url: firstValidBlockExplorerUrl,
         source: EVENT.SOURCE.TRANSACTION.DAPP,
       },
-      sensitiveProperties: {
-        rpc_url: rpcUrlOrigin,
-      },
     });
 
     // Once the network has been added, the requested is considered successful
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 196389439e61..7332041bb5d0 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -103,17 +103,7 @@ export default function setupSentry({ release, getState }) {
     environment,
     integrations: [new Dedupe(), new ExtraErrorData()],
     release,
-    beforeSend: (report) => {
-      if (getState) {
-        const appState = getState();
-        if (!appState?.store?.metamask?.participateInMetaMetrics) {
-          return null;
-        }
-      } else {
-        return null;
-      }
-      return rewriteReport(report);
-    },
+    beforeSend: (report) => rewriteReport(report),
   });
 
   function rewriteReport(report) {
diff --git a/app/scripts/lib/util.js b/app/scripts/lib/util.js
index b7fdf0521cee..9800666afd3b 100644
--- a/app/scripts/lib/util.js
+++ b/app/scripts/lib/util.js
@@ -27,7 +27,7 @@ const getEnvironmentTypeMemo = memoize((url) => {
   const parsedUrl = new URL(url);
   if (parsedUrl.pathname === '/popup.html') {
     return ENVIRONMENT_TYPE_POPUP;
-  } else if (['/home.html'].includes(parsedUrl.pathname)) {
+  } else if (['/home.html', '/phishing.html'].includes(parsedUrl.pathname)) {
     return ENVIRONMENT_TYPE_FULLSCREEN;
   } else if (parsedUrl.pathname === '/notification.html') {
     return ENVIRONMENT_TYPE_NOTIFICATION;
diff --git a/app/scripts/lib/util.test.js b/app/scripts/lib/util.test.js
index 0892a4e3dea6..62c33b5a537c 100644
--- a/app/scripts/lib/util.test.js
+++ b/app/scripts/lib/util.test.js
@@ -34,6 +34,13 @@ describe('app utils', () => {
       expect(environmentType).toStrictEqual(ENVIRONMENT_TYPE_FULLSCREEN);
     });
 
+    it('should return fullscreen type for phishing.html', () => {
+      const environmentType = getEnvironmentType(
+        'http://extension-id/phishing.html',
+      );
+      expect(environmentType).toStrictEqual(ENVIRONMENT_TYPE_FULLSCREEN);
+    });
+
     it('should return background type', () => {
       const environmentType = getEnvironmentType(
         'http://extension-id/_generated_background_page.html',
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e7112e23965e..5f9139c13031 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -42,7 +42,6 @@ import {
   SubjectMetadataController,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   RateLimitController,
-  NotificationController,
   ///: END:ONLY_INCLUDE_IN
 } from '@metamask/controllers';
 import SmartTransactionsController from '@metamask/smart-transactions-controller';
@@ -51,15 +50,12 @@ import {
   SnapController,
   IframeExecutionService,
 } from '@metamask/snap-controllers';
-import { satisfies as satisfiesSemver } from 'semver';
 ///: END:ONLY_INCLUDE_IN
 
 import {
-  ASSET_TYPES,
   TRANSACTION_STATUSES,
   TRANSACTION_TYPES,
 } from '../../shared/constants/transaction';
-import { PHISHING_NEW_ISSUE_URLS } from '../../shared/constants/phishing';
 import {
   GAS_API_BASE_URL,
   GAS_DEV_API_BASE_URL,
@@ -88,13 +84,10 @@ import {
   POLLING_TOKEN_ENVIRONMENT_TYPES,
   SUBJECT_TYPES,
 } from '../../shared/constants/app';
-import { EVENT, EVENT_NAMES } from '../../shared/constants/metametrics';
+import { EVENT } from '../../shared/constants/metametrics';
 
 import { hexToDecimal } from '../../ui/helpers/utils/conversions.util';
-import {
-  getTokenIdParam,
-  getTokenValueParam,
-} from '../../ui/helpers/utils/token-util';
+import { getTokenValueParam } from '../../ui/helpers/utils/token-util';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../shared/modules/transaction.utils';
 import {
@@ -161,9 +154,6 @@ export const METAMASK_CONTROLLER_EVENTS = {
   APPROVAL_STATE_CHANGE: 'ApprovalController:stateChange',
 };
 
-// stream channels
-const PHISHING_SAFELIST = 'metamask-phishing-safelist';
-
 export default class MetamaskController extends EventEmitter {
   /**
    * @param {Object} opts
@@ -251,28 +241,35 @@ export default class MetamaskController extends EventEmitter {
       config: { provider: this.provider },
       state: initState.TokensController,
     });
-
-    this.assetsContractController = new AssetsContractController(
-      {
-        onPreferencesStateChange: (listener) =>
-          this.preferencesController.store.subscribe(listener),
-        onNetworkStateChange: (cb) =>
-          this.networkController.store.subscribe((networkState) => {
-            const modifiedNetworkState = {
-              ...networkState,
-              provider: {
-                ...networkState.provider,
-                chainId: hexToDecimal(networkState.provider.chainId),
-              },
-            };
-            return cb(modifiedNetworkState);
-          }),
-      },
-      {
-        provider: this.provider,
-      },
-      initState.AssetsContractController,
-    );
+    process.env.TOKEN_DETECTION_V2
+      ? (this.assetsContractController = new AssetsContractController({
+          onPreferencesStateChange: (listener) =>
+            this.preferencesController.store.subscribe(listener),
+          onNetworkStateChange: (cb) =>
+            this.networkController.store.subscribe((networkState) => {
+              const modifiedNetworkState = {
+                ...networkState,
+                provider: {
+                  ...networkState.provider,
+                  chainId: hexToDecimal(networkState.provider.chainId),
+                },
+              };
+              return cb(modifiedNetworkState);
+            }),
+          config: {
+            provider: this.provider,
+          },
+          state: initState.AssetsContractController,
+        }))
+      : (this.assetsContractController = new AssetsContractController(
+          {
+            onPreferencesStateChange: (listener) =>
+              this.preferencesController.store.subscribe(listener),
+          },
+          {
+            provider: this.provider,
+          },
+        ));
 
     this.collectiblesController = new CollectiblesController(
       {
@@ -300,21 +297,6 @@ export default class MetamaskController extends EventEmitter {
         getERC1155TokenURI: this.assetsContractController.getERC1155TokenURI.bind(
           this.assetsContractController,
         ),
-        onCollectibleAdded: ({ address, symbol, tokenId, standard, source }) =>
-          this.metaMetricsController.trackEvent({
-            event: EVENT_NAMES.NFT_ADDED,
-            category: EVENT.CATEGORIES.WALLET,
-            properties: {
-              token_contract_address: address,
-              token_symbol: symbol,
-              asset_type: ASSET_TYPES.COLLECTIBLE,
-              token_standard: standard,
-              source,
-            },
-            sensitiveProperties: {
-              tokenId,
-            },
-          }),
       },
       {},
       initState.CollectiblesController,
@@ -431,23 +413,50 @@ export default class MetamaskController extends EventEmitter {
     const tokenListMessenger = this.controllerMessenger.getRestricted({
       name: 'TokenListController',
     });
-
-    this.tokenListController = new TokenListController({
-      chainId: hexToDecimal(this.networkController.getCurrentChainId()),
-      onNetworkStateChange: (cb) =>
-        this.networkController.store.subscribe((networkState) => {
-          const modifiedNetworkState = {
-            ...networkState,
-            provider: {
-              ...networkState.provider,
-              chainId: hexToDecimal(networkState.provider.chainId),
-            },
-          };
-          return cb(modifiedNetworkState);
-        }),
-      messenger: tokenListMessenger,
-      state: initState.TokenListController,
-    });
+    process.env.TOKEN_DETECTION_V2
+      ? (this.tokenListController = new TokenListController({
+          chainId: hexToDecimal(this.networkController.getCurrentChainId()),
+          onNetworkStateChange: (cb) =>
+            this.networkController.store.subscribe((networkState) => {
+              const modifiedNetworkState = {
+                ...networkState,
+                provider: {
+                  ...networkState.provider,
+                  chainId: hexToDecimal(networkState.provider.chainId),
+                },
+              };
+              return cb(modifiedNetworkState);
+            }),
+          messenger: tokenListMessenger,
+          state: initState.TokenListController,
+        }))
+      : (this.tokenListController = new TokenListController({
+          chainId: hexToDecimal(this.networkController.getCurrentChainId()),
+          useStaticTokenList: !this.preferencesController.store.getState()
+            .useTokenDetection,
+          onNetworkStateChange: (cb) =>
+            this.networkController.store.subscribe((networkState) => {
+              const modifiedNetworkState = {
+                ...networkState,
+                provider: {
+                  ...networkState.provider,
+                  chainId: hexToDecimal(networkState.provider.chainId),
+                },
+              };
+              return cb(modifiedNetworkState);
+            }),
+          onPreferencesStateChange: (cb) =>
+            this.preferencesController.store.subscribe((preferencesState) => {
+              const modifiedPreferencesState = {
+                ...preferencesState,
+                useStaticTokenList: !this.preferencesController.store.getState()
+                  .useTokenDetection,
+              };
+              return cb(modifiedPreferencesState);
+            }),
+          messenger: tokenListMessenger,
+          state: initState.TokenListController,
+        }));
 
     this.phishingController = new PhishingController();
 
@@ -627,9 +636,10 @@ export default class MetamaskController extends EventEmitter {
     });
 
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    this.snapExecutionService = new IframeExecutionService({
+    this.workerController = new IframeExecutionService({
+      onError: this.onExecutionEnvironmentError.bind(this),
       iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.5.2',
+        'https://metamask.github.io/iframe-execution-environment/0.4.5',
       ),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ExecutionService',
@@ -641,8 +651,7 @@ export default class MetamaskController extends EventEmitter {
       name: 'SnapController',
       allowedEvents: [
         'ExecutionService:unhandledError',
-        'ExecutionService:outboundRequest',
-        'ExecutionService:outboundResponse',
+        'ExecutionService:unresponsive',
       ],
       allowedActions: [
         `${this.permissionController.name}:getEndowments`,
@@ -652,62 +661,28 @@ export default class MetamaskController extends EventEmitter {
         `${this.permissionController.name}:requestPermissions`,
         `${this.permissionController.name}:revokeAllPermissions`,
         `${this.permissionController.name}:revokePermissionForAllSubjects`,
-        'ExecutionService:executeSnap',
-        'ExecutionService:getRpcRequestHandler',
-        'ExecutionService:terminateSnap',
-        'ExecutionService:terminateAllSnaps',
       ],
     });
 
-    const SNAP_BLOCKLIST = [
-      {
-        id: 'npm:@consensys/starknet-snap',
-        versionRange: '<0.1.11',
-      },
-    ];
-
     this.snapController = new SnapController({
-      environmentEndowmentPermissions: Object.values(EndowmentPermissions),
+      endowmentPermissionNames: Object.values(EndowmentPermissions),
+      terminateAllSnaps: this.workerController.terminateAllSnaps.bind(
+        this.workerController,
+      ),
+      terminateSnap: this.workerController.terminateSnap.bind(
+        this.workerController,
+      ),
+      executeSnap: this.workerController.executeSnap.bind(
+        this.workerController,
+      ),
+      getRpcMessageHandler: this.workerController.getRpcMessageHandler.bind(
+        this.workerController,
+      ),
       closeAllConnections: this.removeAllConnections.bind(this),
-      // Prefix subject with appKeyType to generate separate keys for separate uses
-      getAppKey: async (subject, appKeyType) => {
-        await this.appStateController.getUnlockPromise(true);
-        return this.getAppKeyForSubject(`${appKeyType}:${subject}`);
-      },
-      checkBlockList: async (snapsToCheck) => {
-        return Object.entries(snapsToCheck).reduce(
-          (acc, [snapId, snapVersion]) => {
-            const blockInfo = SNAP_BLOCKLIST.find(
-              (blocked) =>
-                blocked.id === snapId &&
-                satisfiesSemver(snapVersion, blocked.versionRange, {
-                  includePrerelease: true,
-                }),
-            );
-
-            const cur = blockInfo
-              ? {
-                  blocked: true,
-                  reason: blockInfo.reason,
-                  infoUrl: blockInfo.infoUrl,
-                }
-              : { blocked: false };
-            return { ...acc, [snapId]: cur };
-          },
-          {},
-        );
-      },
       state: initState.SnapController,
       messenger: snapControllerMessenger,
     });
 
-    this.notificationController = new NotificationController({
-      messenger: this.controllerMessenger.getRestricted({
-        name: 'NotificationController',
-      }),
-      state: initState.NotificationController,
-    });
-
     this.rateLimitController = new RateLimitController({
       messenger: this.controllerMessenger.getRestricted({
         name: 'RateLimitController',
@@ -726,15 +701,6 @@ export default class MetamaskController extends EventEmitter {
           );
           return null;
         },
-        showInAppNotification: (origin, message) => {
-          this.controllerMessenger.call(
-            'NotificationController:show',
-            origin,
-            message,
-          );
-
-          return null;
-        },
       },
     });
     ///: END:ONLY_INCLUDE_IN
@@ -869,12 +835,7 @@ export default class MetamaskController extends EventEmitter {
           } = txMeta.txParams;
           const { chainId } = txMeta;
           const transactionData = parseStandardTokenTransactionData(data);
-          // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
-          // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
-          // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
-          const transactionDataTokenId =
-            getTokenIdParam(transactionData) ??
-            getTokenValueParam(transactionData);
+          const tokenAmountOrTokenId = getTokenValueParam(transactionData);
           const { allCollectibles } = this.collectiblesController.state;
 
           // check if its a known collectible
@@ -883,7 +844,7 @@ export default class MetamaskController extends EventEmitter {
           ].find(
             ({ address, tokenId }) =>
               isEqualCaseInsensitive(address, contractAddress) &&
-              tokenId === transactionDataTokenId,
+              tokenId === tokenAmountOrTokenId,
           );
 
           // if it is we check and update ownership status.
@@ -1041,7 +1002,6 @@ export default class MetamaskController extends EventEmitter {
       CollectiblesController: this.collectiblesController,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       SnapController: this.snapController,
-      NotificationController: this.notificationController,
       ///: END:ONLY_INCLUDE_IN
     });
 
@@ -1082,7 +1042,6 @@ export default class MetamaskController extends EventEmitter {
         CollectiblesController: this.collectiblesController,
         ///: BEGIN:ONLY_INCLUDE_IN(flask)
         SnapController: this.snapController,
-        NotificationController: this.notificationController,
         ///: END:ONLY_INCLUDE_IN
       },
       controllerMessenger: this.controllerMessenger,
@@ -1144,9 +1103,9 @@ export default class MetamaskController extends EventEmitter {
           this.controllerMessenger,
           'SnapController:get',
         ),
-        handleSnapRpcRequest: this.controllerMessenger.call.bind(
+        getSnapRpcHandler: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:handleRpcRequest',
+          'SnapController:getRpcMessageHandler',
         ),
         getSnapState: this.controllerMessenger.call.bind(
           this.controllerMessenger,
@@ -1158,7 +1117,7 @@ export default class MetamaskController extends EventEmitter {
             type: MESSAGE_TYPE.SNAP_CONFIRM,
             requestData: confirmationData,
           }),
-        showNativeNotification: (origin, args) =>
+        showNotification: (origin, args) =>
           this.controllerMessenger.call(
             'RateLimitController:call',
             origin,
@@ -1166,14 +1125,6 @@ export default class MetamaskController extends EventEmitter {
             origin,
             args.message,
           ),
-        showInAppNotification: (origin, args) =>
-          this.controllerMessenger.call(
-            'RateLimitController:call',
-            origin,
-            'showInAppNotification',
-            origin,
-            args.message,
-          ),
         updateSnapState: this.controllerMessenger.call.bind(
           this.controllerMessenger,
           'SnapController:updateSnapState',
@@ -1181,25 +1132,6 @@ export default class MetamaskController extends EventEmitter {
       }),
     };
   }
-
-  /**
-   * Deletes the specified notifications from state.
-   *
-   * @param {string[]} ids - The notifications ids to delete.
-   */
-  dismissNotifications(ids) {
-    this.notificationController.dismiss(ids);
-  }
-
-  /**
-   * Updates the readDate attribute of the specified notifications.
-   *
-   * @param {string[]} ids - The notifications ids to mark as read.
-   */
-  markNotificationsAsRead(ids) {
-    this.notificationController.markRead(ids);
-  }
-
   ///: END:ONLY_INCLUDE_IN
 
   /**
@@ -1270,7 +1202,7 @@ export default class MetamaskController extends EventEmitter {
     // Record Snap metadata whenever a Snap is added to state.
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapAdded`,
-      (snap, svgIcon = null) => {
+      (snapId, snap, svgIcon = null) => {
         const {
           manifest: { proposedName },
           version,
@@ -1278,7 +1210,7 @@ export default class MetamaskController extends EventEmitter {
         this.subjectMetadataController.addSubjectMetadata({
           subjectType: SUBJECT_TYPES.SNAP,
           name: proposedName,
-          origin: snap.id,
+          origin: snapId,
           version,
           svgIcon,
         });
@@ -1287,28 +1219,12 @@ export default class MetamaskController extends EventEmitter {
 
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapInstalled`,
-      (truncatedSnap) => {
+      (snapId) => {
         this.metaMetricsController.trackEvent({
           event: 'Snap Installed',
           category: EVENT.CATEGORIES.SNAPS,
           properties: {
-            snap_id: truncatedSnap.id,
-            version: truncatedSnap.version,
-          },
-        });
-      },
-    );
-
-    this.controllerMessenger.subscribe(
-      `${this.snapController.name}:snapUpdated`,
-      (newSnap, oldVersion) => {
-        this.metaMetricsController.trackEvent({
-          event: 'Snap Updated',
-          category: EVENT.CATEGORIES.SNAPS,
-          properties: {
-            snap_id: newSnap.id,
-            old_version: oldVersion,
-            new_version: newSnap.version,
+            snap_id: snapId,
           },
         });
       },
@@ -1316,12 +1232,12 @@ export default class MetamaskController extends EventEmitter {
 
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapTerminated`,
-      (truncatedSnap) => {
+      (snapId) => {
         const approvals = Object.values(
           this.approvalController.state.pendingApprovals,
         ).filter(
           (approval) =>
-            approval.origin === truncatedSnap.id &&
+            approval.origin === snapId &&
             approval.type === MESSAGE_TYPE.SNAP_CONFIRM,
         );
         for (const approval of approvals) {
@@ -1542,6 +1458,7 @@ export default class MetamaskController extends EventEmitter {
       ),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
+      safelistPhishingDomain: this.safelistPhishingDomain.bind(this),
       getRequestAccountTabIds: this.getRequestAccountTabIds,
       getOpenMetamaskTabsIds: this.getOpenMetamaskTabsIds,
       markNotificationPopupAsAutomaticallyClosed: () =>
@@ -1603,8 +1520,7 @@ export default class MetamaskController extends EventEmitter {
       setCustomRpc: this.setCustomRpc.bind(this),
       updateAndSetCustomRpc: this.updateAndSetCustomRpc.bind(this),
       delCustomRpc: this.delCustomRpc.bind(this),
-      addCustomNetwork: this.addCustomNetwork.bind(this),
-      requestUserApproval: this.requestUserApproval.bind(this),
+
       // PreferencesController
       setSelectedAddress: preferencesController.setSelectedAddress.bind(
         preferencesController,
@@ -1617,6 +1533,7 @@ export default class MetamaskController extends EventEmitter {
         tokensController,
       ),
       updateTokenType: tokensController.updateTokenType.bind(tokensController),
+      removeToken: tokensController.removeAndIgnoreToken.bind(tokensController),
       setAccountLabel: preferencesController.setAccountLabel.bind(
         preferencesController,
       ),
@@ -1640,9 +1557,7 @@ export default class MetamaskController extends EventEmitter {
         preferencesController,
       ),
       setTheme: preferencesController.setTheme.bind(preferencesController),
-      setCustomNetworkListEnabled: preferencesController.setCustomNetworkListEnabled.bind(
-        preferencesController,
-      ),
+
       // AssetsContractController
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
 
@@ -1842,8 +1757,6 @@ export default class MetamaskController extends EventEmitter {
       disableSnap: this.snapController.disableSnap.bind(this.snapController),
       enableSnap: this.snapController.enableSnap.bind(this.snapController),
       removeSnap: this.snapController.removeSnap.bind(this.snapController),
-      dismissNotifications: this.dismissNotifications.bind(this),
-      markNotificationsAsRead: this.markNotificationsAsRead.bind(this),
       ///: END:ONLY_INCLUDE_IN
 
       // swaps
@@ -1907,6 +1820,9 @@ export default class MetamaskController extends EventEmitter {
       fetchSmartTransactionFees: smartTransactionsController.getFees.bind(
         smartTransactionsController,
       ),
+      estimateSmartTransactionsGas: smartTransactionsController.estimateGas.bind(
+        smartTransactionsController,
+      ),
       submitSignedTransactions: smartTransactionsController.submitSignedTransactions.bind(
         smartTransactionsController,
       ),
@@ -1990,14 +1906,20 @@ export default class MetamaskController extends EventEmitter {
         : null,
 
       /** Token Detection V2 */
-      addDetectedTokens: tokensController.addDetectedTokens.bind(
-        tokensController,
-      ),
-      addImportedTokens: tokensController.addTokens.bind(tokensController),
-      ignoreTokens: tokensController.ignoreTokens.bind(tokensController),
-      getBalancesInSingleCall: assetsContractController.getBalancesInSingleCall.bind(
-        assetsContractController,
-      ),
+      addDetectedTokens: process.env.TOKEN_DETECTION_V2
+        ? tokensController.addDetectedTokens.bind(tokensController)
+        : null,
+      importTokens: process.env.TOKEN_DETECTION_V2
+        ? tokensController.importTokens.bind(tokensController)
+        : null,
+      ignoreTokens: process.env.TOKEN_DETECTION_V2
+        ? tokensController.ignoreTokens.bind(tokensController)
+        : null,
+      getBalancesInSingleCall: process.env.TOKEN_DETECTION_V2
+        ? assetsContractController.getBalancesInSingleCall.bind(
+            assetsContractController,
+          )
+        : null,
     };
   }
 
@@ -2053,68 +1975,6 @@ export default class MetamaskController extends EventEmitter {
     }
   }
 
-  async requestUserApproval(customRpc, originIsMetaMask) {
-    try {
-      await this.approvalController.addAndShowApprovalRequest({
-        origin: 'metamask',
-        type: 'wallet_addEthereumChain',
-        requestData: {
-          chainId: customRpc.chainId,
-          blockExplorerUrl: customRpc.rpcPrefs.blockExplorerUrl,
-          chainName: customRpc.nickname,
-          rpcUrl: customRpc.rpcUrl,
-          ticker: customRpc.ticker,
-          imageUrl: customRpc.rpcPrefs.imageUrl,
-        },
-      });
-    } catch (error) {
-      if (
-        !(originIsMetaMask && error.message === 'User rejected the request.')
-      ) {
-        throw error;
-      }
-    }
-  }
-
-  async addCustomNetwork(customRpc) {
-    const { chainId, chainName, rpcUrl, ticker, blockExplorerUrl } = customRpc;
-
-    await this.preferencesController.addToFrequentRpcList(
-      rpcUrl,
-      chainId,
-      ticker,
-      chainName,
-      {
-        blockExplorerUrl,
-      },
-    );
-
-    let rpcUrlOrigin;
-    try {
-      rpcUrlOrigin = new URL(rpcUrl).origin;
-    } catch {
-      // ignore
-    }
-    this.metaMetricsController.trackEvent({
-      event: 'Custom Network Added',
-      category: EVENT.CATEGORIES.NETWORK,
-      referrer: {
-        url: rpcUrlOrigin,
-      },
-      properties: {
-        chain_id: chainId,
-        network_name: chainName,
-        network: rpcUrlOrigin,
-        symbol: ticker,
-        block_explorer_url: blockExplorerUrl,
-        source: EVENT.SOURCE.NETWORK.POPULAR_NETWORK_LIST,
-      },
-      sensitiveProperties: {
-        rpc_url: rpcUrlOrigin,
-      },
-    });
-  }
-
   /**
    * Create a new Vault and restore an existent keyring.
    *
@@ -2184,7 +2044,7 @@ export default class MetamaskController extends EventEmitter {
 
       // This must be set as soon as possible to communicate to the
       // keyring's iframe and have the setting initialized properly
-      // Optimistically called to not block MetaMask login due to
+      // Optimistically called to not block Metamask login due to
       // Ledger Keyring GitHub downtime
       const transportPreference = this.preferencesController.getLedgerTransportPreference();
       this.setLedgerTransportPreference(transportPreference);
@@ -2356,7 +2216,7 @@ export default class MetamaskController extends EventEmitter {
 
     // This must be set as soon as possible to communicate to the
     // keyring's iframe and have the setting initialized properly
-    // Optimistically called to not block MetaMask login due to
+    // Optimistically called to not block Metamask login due to
     // Ledger Keyring GitHub downtime
     const transportPreference = this.preferencesController.getLedgerTransportPreference();
 
@@ -2762,14 +2622,8 @@ export default class MetamaskController extends EventEmitter {
     // Remove account from the account tracker controller
     this.accountTracker.removeAccount([address]);
 
-    const keyring = await this.keyringController.getKeyringForAccount(address);
     // Remove account from the keyring
     await this.keyringController.removeAccount(address);
-    const updatedKeyringAccounts = keyring ? await keyring.getAccounts() : {};
-    if (updatedKeyringAccounts?.length === 0) {
-      keyring.destroy?.();
-    }
-
     return address;
   }
 
@@ -3366,13 +3220,9 @@ export default class MetamaskController extends EventEmitter {
     if (sender.url) {
       const { hostname } = new URL(sender.url);
       // Check if new connection is blocked if phishing detection is on
-      const phishingTestResponse = this.phishingController.test(hostname);
-      if (usePhishDetect && phishingTestResponse?.result) {
-        this.sendPhishingWarning(
-          connectionStream,
-          hostname,
-          phishingTestResponse,
-        );
+      if (usePhishDetect && this.phishingController.test(hostname)) {
+        log.debug('MetaMask - sending phishing warning for', hostname);
+        this.sendPhishingWarning(connectionStream, hostname);
         return;
       }
     }
@@ -3415,33 +3265,6 @@ export default class MetamaskController extends EventEmitter {
     );
   }
 
-  /**
-   * Used to create a multiplexed stream for connecting to the phishing warning page.
-   *
-   * @param options - Options bag.
-   * @param {ReadableStream} options.connectionStream - The Duplex stream to connect to.
-   */
-  setupPhishingCommunication({ connectionStream }) {
-    const { usePhishDetect } = this.preferencesController.store.getState();
-
-    if (!usePhishDetect) {
-      return;
-    }
-
-    // setup multiplexing
-    const mux = setupMultiplex(connectionStream);
-    const phishingStream = mux.createStream(PHISHING_SAFELIST);
-
-    // set up postStream transport
-    phishingStream.on(
-      'data',
-      createMetaRPCHandler(
-        { safelistPhishingDomain: this.safelistPhishingDomain.bind(this) },
-        phishingStream,
-      ),
-    );
-  }
-
   /**
    * Called when we detect a suspicious domain. Requests the browser redirects
    * to our anti-phishing page.
@@ -3450,15 +3273,11 @@ export default class MetamaskController extends EventEmitter {
    * @param {*} connectionStream - The duplex stream to the per-page script,
    * for sending the reload attempt to.
    * @param {string} hostname - The hostname that triggered the suspicion.
-   * @param {object} phishingTestResponse - Result of calling `phishingController.test`,
-   * which is the result of calling eth-phishing-detects detector.check method https://github.com/MetaMask/eth-phishing-detect/blob/master/src/detector.js#L55-L112
    */
-  sendPhishingWarning(connectionStream, hostname, phishingTestResponse) {
-    const newIssueUrl = PHISHING_NEW_ISSUE_URLS[phishingTestResponse?.name];
-
+  sendPhishingWarning(connectionStream, hostname) {
     const mux = setupMultiplex(connectionStream);
     const phishingStream = mux.createStream('phishing');
-    phishingStream.write({ hostname, newIssueUrl });
+    phishingStream.write({ hostname });
   }
 
   /**
@@ -3558,6 +3377,17 @@ export default class MetamaskController extends EventEmitter {
   }
 
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  /**
+   * For snaps running in workers.
+   *
+   * @param snapId
+   * @param error
+   */
+  onExecutionEnvironmentError(snapId, error) {
+    this.snapController.stopPlugin(snapId);
+    this.snapController.addSnapError(error);
+  }
+
   /**
    * For snaps running in workers.
    *
@@ -3699,9 +3529,6 @@ export default class MetamaskController extends EventEmitter {
         getCurrentChainId: this.networkController.getCurrentChainId.bind(
           this.networkController,
         ),
-        getCurrentRpcUrl: this.networkController.getCurrentRpcUrl.bind(
-          this.networkController,
-        ),
         setProviderType: this.networkController.setProviderType.bind(
           this.networkController,
         ),
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index c0e1a08b92b1..6baf1b113de9 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -18,8 +18,6 @@ import { addHexPrefix } from './lib/util';
 
 const Ganache = require('../../test/e2e/ganache');
 
-const NOTIFICATION_ID = 'NHL8f2eSSTn9TKBamRLiU';
-
 const firstTimeState = {
   config: {},
   NetworkController: {
@@ -34,17 +32,6 @@ const firstTimeState = {
       },
     },
   },
-  NotificationController: {
-    notifications: {
-      [NOTIFICATION_ID]: {
-        id: NOTIFICATION_ID,
-        origin: 'local:http://localhost:8086/',
-        createdDate: 1652967897732,
-        readDate: null,
-        message: 'Hello, http://localhost:8086!',
-      },
-    },
-  },
 };
 
 const ganacheServer = new Ganache();
@@ -782,20 +769,12 @@ describe('MetaMaskController', function () {
   describe('#removeAccount', function () {
     let ret;
     const addressToRemove = '0x1';
-    let mockKeyring;
 
     beforeEach(async function () {
-      mockKeyring = {
-        getAccounts: sinon.stub().returns(Promise.resolve([])),
-        destroy: sinon.stub(),
-      };
       sinon.stub(metamaskController.preferencesController, 'removeAddress');
       sinon.stub(metamaskController.accountTracker, 'removeAccount');
       sinon.stub(metamaskController.keyringController, 'removeAccount');
       sinon.stub(metamaskController, 'removeAllAccountPermissions');
-      sinon
-        .stub(metamaskController.keyringController, 'getKeyringForAccount')
-        .returns(Promise.resolve(mockKeyring));
 
       ret = await metamaskController.removeAccount(addressToRemove);
     });
@@ -805,9 +784,6 @@ describe('MetaMaskController', function () {
       metamaskController.accountTracker.removeAccount.restore();
       metamaskController.preferencesController.removeAddress.restore();
       metamaskController.removeAllAccountPermissions.restore();
-
-      mockKeyring.getAccounts.resetHistory();
-      mockKeyring.destroy.resetHistory();
     });
 
     it('should call preferencesController.removeAddress', async function () {
@@ -841,16 +817,6 @@ describe('MetaMaskController', function () {
     it('should return address', async function () {
       assert.equal(ret, '0x1');
     });
-    it('should call keyringController.getKeyringForAccount', async function () {
-      assert(
-        metamaskController.keyringController.getKeyringForAccount.calledWith(
-          addressToRemove,
-        ),
-      );
-    });
-    it('should call keyring.destroy', async function () {
-      assert(mockKeyring.destroy.calledOnce);
-    });
   });
 
   describe('#newUnsignedMessage', function () {
@@ -1246,27 +1212,6 @@ describe('MetaMaskController', function () {
       assert.deepEqual(metamaskController.getState(), oldState);
     });
   });
-
-  describe('markNotificationsAsRead', function () {
-    it('marks the notification as read', function () {
-      metamaskController.markNotificationsAsRead([NOTIFICATION_ID]);
-      const readNotification = metamaskController.getState().notifications[
-        NOTIFICATION_ID
-      ];
-      assert.notEqual(readNotification.readDate, null);
-    });
-  });
-
-  describe('dismissNotifications', function () {
-    it('deletes the notification from state', function () {
-      metamaskController.dismissNotifications([NOTIFICATION_ID]);
-      const state = metamaskController.getState().notifications;
-      assert.ok(
-        !Object.values(state).includes(NOTIFICATION_ID),
-        'Object should not include the deleted notification',
-      );
-    });
-  });
 });
 
 function deferredPromise() {
diff --git a/app/scripts/migrations/072.js b/app/scripts/migrations/072.js
deleted file mode 100644
index 4e5e8aebfb8c..000000000000
--- a/app/scripts/migrations/072.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import { cloneDeep } from 'lodash';
-
-const version = 72;
-
-/**
- * Should empty the `knownMethodData` object in PreferencesController
- */
-export default {
-  version,
-  async migrate(originalVersionedData) {
-    const versionedData = cloneDeep(originalVersionedData);
-    versionedData.meta.version = version;
-    const state = versionedData.data;
-    const newState = transformState(state);
-    versionedData.data = newState;
-    return versionedData;
-  },
-};
-
-function transformState(state) {
-  const PreferencesController = state?.PreferencesController || {};
-
-  return {
-    ...state,
-    PreferencesController: {
-      ...PreferencesController,
-      knownMethodData: {},
-    },
-  };
-}
diff --git a/app/scripts/migrations/072.test.js b/app/scripts/migrations/072.test.js
deleted file mode 100644
index 70fedab84c82..000000000000
--- a/app/scripts/migrations/072.test.js
+++ /dev/null
@@ -1,427 +0,0 @@
-import migration72 from './072';
-
-describe('migration #72', () => {
-  it('should update the version metadata', async () => {
-    const oldStorage = {
-      meta: {
-        version: 71,
-      },
-      data: {},
-    };
-
-    const newStorage = await migration72.migrate(oldStorage);
-    expect(newStorage.meta).toStrictEqual({
-      version: 72,
-    });
-  });
-
-  it('should empty knownMethodData object in PreferencesController', async () => {
-    const oldStorage = {
-      meta: {
-        version: 71,
-      },
-      data: {
-        PreferencesController: {
-          knownMethodData: {
-            '0x095ea7b3': {
-              name: 'Approve',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x1249c58b': {
-              name: 'Mint',
-              params: [],
-            },
-            '0x1688f0b9': {
-              name: 'Create Proxy With Nonce',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x18cbafe5': {
-              name: 'Swap Exact Tokens For E T H',
-              params: [
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'address[]',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x23b872dd': {
-              name: 'Transfer From',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x2e1a7d4d': {
-              name: 'Withdraw',
-              params: [
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x2e7ba6ef': {
-              name: 'Claim',
-              params: [
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'bytes32[]',
-                },
-              ],
-            },
-            '0x2eb2c2d6': {
-              name: 'Safe Batch Transfer From',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256[]',
-                },
-                {
-                  type: 'uint256[]',
-                },
-                {
-                  type: 'bytes',
-                },
-              ],
-            },
-            '0x3671f8cf': {},
-            '0x41441d3b': {
-              name: 'Enter Staking',
-              params: [
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x441a3e70': {
-              name: 'Withdraw',
-              params: [
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x6f652e1a': {
-              name: 'Create Order',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0x8dbdbe6d': {
-              name: 'Deposit',
-              params: [
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'address',
-                },
-              ],
-            },
-            '0x8ed955b9': {
-              name: 'Harvest All',
-              params: [],
-            },
-            '0xa22cb465': {
-              name: 'Set Approval For All',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'bool',
-                },
-              ],
-            },
-            '0xa9059cbb': {
-              name: 'Transfer',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0xab834bab': {
-              name: 'Atomic Match_',
-              params: [
-                {
-                  type: 'address[14]',
-                },
-                {
-                  type: 'uint256[18]',
-                },
-                {
-                  type: 'uint8[8]',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'bytes',
-                },
-                {
-                  type: 'uint8[2]',
-                },
-                {
-                  type: 'bytes32[5]',
-                },
-              ],
-            },
-            '0xd0e30db0': {
-              name: 'Deposit',
-              params: [],
-            },
-            '0xddd81f82': {
-              name: 'Register Proxy',
-              params: [],
-            },
-            '0xded9382a': {
-              name: 'Remove Liquidity E T H With Permit',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'bool',
-                },
-                {
-                  type: 'uint8',
-                },
-                {
-                  type: 'bytes32',
-                },
-                {
-                  type: 'bytes32',
-                },
-              ],
-            },
-            '0xe2bbb158': {
-              name: 'Deposit',
-              params: [
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-            '0xf305d719': {
-              name: 'Add Liquidity E T H',
-              params: [
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'uint256',
-                },
-                {
-                  type: 'address',
-                },
-                {
-                  type: 'uint256',
-                },
-              ],
-            },
-          },
-        },
-      },
-    };
-
-    const newStorage = await migration72.migrate(oldStorage);
-    expect(newStorage).toStrictEqual({
-      meta: {
-        version: 72,
-      },
-      data: {
-        PreferencesController: {
-          knownMethodData: {},
-        },
-      },
-    });
-  });
-
-  it('should preserve other PreferencesController state', async () => {
-    const oldStorage = {
-      meta: {
-        version: 71,
-      },
-      data: {
-        PreferencesController: {
-          currentLocale: 'en',
-          dismissSeedBackUpReminder: false,
-          ipfsGateway: 'dweb.link',
-          knownMethodData: {
-            '0xd0e30db0': {
-              name: 'Deposit',
-              params: [],
-            },
-            '0xddd81f82': {
-              name: 'Register Proxy',
-              params: [],
-            },
-          },
-          openSeaEnabled: false,
-          useTokenDetection: false,
-        },
-      },
-    };
-
-    const newStorage = await migration72.migrate(oldStorage);
-    expect(newStorage).toStrictEqual({
-      meta: {
-        version: 72,
-      },
-      data: {
-        PreferencesController: {
-          currentLocale: 'en',
-          dismissSeedBackUpReminder: false,
-          ipfsGateway: 'dweb.link',
-          knownMethodData: {},
-          openSeaEnabled: false,
-          useTokenDetection: false,
-        },
-      },
-    });
-  });
-
-  it('should not change state in controllers other than PreferencesController', async () => {
-    const oldStorage = {
-      meta: {
-        version: 71,
-      },
-      data: {
-        PreferencesController: {
-          knownMethodData: {
-            '0xd0e30db0': {
-              name: 'Deposit',
-              params: [],
-            },
-            '0xddd81f82': {
-              name: 'Register Proxy',
-              params: [],
-            },
-          },
-        },
-        data: {
-          FooController: { a: 'b' },
-        },
-      },
-    };
-
-    const newStorage = await migration72.migrate(oldStorage);
-    expect(newStorage).toStrictEqual({
-      meta: {
-        version: 72,
-      },
-      data: {
-        PreferencesController: {
-          knownMethodData: {},
-        },
-        data: {
-          FooController: { a: 'b' },
-        },
-      },
-    });
-  });
-});
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index b2a52040dfca..321b9131951f 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -75,7 +75,6 @@ import m068 from './068';
 import m069 from './069';
 import m070 from './070';
 import m071 from './071';
-import m072 from './072';
 
 const migrations = [
   m002,
@@ -148,7 +147,6 @@ const migrations = [
   m069,
   m070,
   m071,
-  m072,
 ];
 
 export default migrations;
diff --git a/app/scripts/phishing-detect.js b/app/scripts/phishing-detect.js
new file mode 100644
index 000000000000..68c30d50111e
--- /dev/null
+++ b/app/scripts/phishing-detect.js
@@ -0,0 +1,40 @@
+import querystring from 'querystring';
+import PortStream from 'extension-port-stream';
+import browser from 'webextension-polyfill';
+import createRandomId from '../../shared/modules/random-id';
+import { setupMultiplex } from './lib/stream-utils';
+import { getEnvironmentType } from './lib/util';
+import ExtensionPlatform from './platforms/extension';
+
+document.addEventListener('DOMContentLoaded', start);
+
+function start() {
+  const hash = window.location.hash.substring(1);
+  const suspect = querystring.parse(hash);
+
+  const newIssueLink = document.getElementById('new-issue-link');
+  const newIssueUrl = `https://github.com/MetaMask/eth-phishing-detect/issues/new`;
+  const newIssueParams = `?title=[Legitimate%20Site%20Blocked]%20${encodeURIComponent(
+    suspect.hostname,
+  )}&body=${encodeURIComponent(suspect.href)}`;
+  newIssueLink.href = `${newIssueUrl}${newIssueParams}`;
+
+  global.platform = new ExtensionPlatform();
+
+  const extensionPort = browser.runtime.connect({
+    name: getEnvironmentType(),
+  });
+  const connectionStream = new PortStream(extensionPort);
+  const mx = setupMultiplex(connectionStream);
+  const backgroundConnection = mx.createStream('controller');
+  const continueLink = document.getElementById('unsafe-continue');
+  continueLink.addEventListener('click', () => {
+    backgroundConnection.write({
+      jsonrpc: '2.0',
+      method: 'safelistPhishingDomain',
+      params: [suspect.hostname],
+      id: createRandomId(),
+    });
+    window.location.href = suspect.href;
+  });
+}
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 93f06143d246..1c4a3fc1c311 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -16,9 +16,6 @@ import {
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_POPUP,
 } from '../../shared/constants/app';
-import { isManifestV3 } from '../../shared/modules/mv3.utils';
-import { SUPPORT_LINK } from '../../ui/helpers/constants/common';
-import { getErrorHtml } from '../../ui/helpers/utils/error-utils';
 import ExtensionPlatform from './platforms/extension';
 import { setupMultiplex } from './lib/stream-utils';
 import { getEnvironmentType } from './lib/util';
@@ -27,21 +24,6 @@ import metaRPCClientFactory from './lib/metaRPCClientFactory';
 start().catch(log.error);
 
 async function start() {
-  async function displayCriticalError(container, err, metamaskState) {
-    const html = await getErrorHtml(SUPPORT_LINK, metamaskState);
-
-    container.innerHTML = html;
-
-    const button = document.getElementById('critical-error-button');
-
-    button.addEventListener('click', (_) => {
-      browser.runtime.reload();
-    });
-
-    log.error(err.stack);
-    throw err;
-  }
-
   // create platform global
   global.platform = new ExtensionPlatform();
 
@@ -50,31 +32,24 @@ async function start() {
 
   // setup stream to background
   const extensionPort = browser.runtime.connect({ name: windowType });
-
   const connectionStream = new PortStream(extensionPort);
 
   const activeTab = await queryCurrentActiveTab(windowType);
+  initializeUiWithTab(activeTab);
 
-  /**
-   * In case of MV3 the issue of blank screen was very frequent, it is caused by UI initialising before background is ready to send state.
-   * Code below ensures that UI is rendered only after background is ready.
-   */
-  if (isManifestV3()) {
-    extensionPort.onMessage.addListener((message) => {
-      if (message?.name === 'CONNECTION_READY') {
-        initializeUiWithTab(activeTab);
-      }
-    });
-  } else {
-    initializeUiWithTab(activeTab);
+  function displayCriticalError(container, err) {
+    container.innerHTML =
+      '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>';
+    container.style.height = '80px';
+    log.error(err.stack);
+    throw err;
   }
 
   function initializeUiWithTab(tab) {
     const container = document.getElementById('app-content');
     initializeUi(tab, container, connectionStream, (err, store) => {
       if (err) {
-        // if there's an error, store will be = metamaskState
-        displayCriticalError(container, err, store);
+        displayCriticalError(container, err);
         return;
       }
 
@@ -115,7 +90,7 @@ async function queryCurrentActiveTab(windowType) {
 function initializeUi(activeTab, container, connectionStream, cb) {
   connectToAccountManager(connectionStream, (err, backgroundConnection) => {
     if (err) {
-      cb(err, null);
+      cb(err);
       return;
     }
 
diff --git a/development/README.md b/development/README.md
index d0c89081311c..16df8fb89342 100644
--- a/development/README.md
+++ b/development/README.md
@@ -54,24 +54,3 @@ To opt in to MetaMetrics;
 You can inspect the requests in the `Network` tab of your browser's Developer Tools (background.html)
 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 in Sentry
-
-To debug in a production Sentry environment:
-
-- 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`
-
-Errors reported whilst using the extension will be displayed in Sentry's `Issues` page.
diff --git a/development/build/README.md b/development/build/README.md
index 9d5df1e149fc..85823992b807 100644
--- a/development/build/README.md
+++ b/development/build/README.md
@@ -26,4 +26,38 @@ Source file bundling tasks are implemented in the [`./development/build/scripts.
 
 ## Usage
 
-See `node ./development/build/index.js --help`
+```text
+Usage: yarn build <entry-task> [options]
+
+Commands:
+  yarn build prod       Create an optimized build for production environments.
+
+  yarn build dev        Create an unoptimized, live-reloaded build for local
+                        development.
+
+  yarn build test       Create an optimized build for running e2e tests.
+
+  yarn build testDev    Create an unoptimized, live-reloaded build for running
+                        e2e tests.
+
+Options:
+  --build-type        The "type" of build to create. One of: "beta", "flask",
+                      "main"
+                                                      [string] [default: "main"]
+  --lint-fence-files  Whether files with code fences should be linted after
+                      fences have been removed by the code fencing transform.
+                      The build will fail if linting fails.
+                      Defaults to `false` if the entry task is `dev` or
+                      `testDev`, and `true` otherwise.
+                                                   [boolean] [default: <varies>]
+  --lockdown          Whether to include SES lockdown files in the extension
+                      bundle. Setting this to `false` is useful e.g. when
+                      linking dependencies that are incompatible with lockdown.
+                                                       [boolean] [default: true]
+  --policy-only       Stops the build after generating the LavaMoat policy,
+                      skipping any writes to disk.
+                                                       [boolean] [deafult: false]
+  --skip-stats        Whether to refrain from logging build progress. Mostly
+                      used internally.
+                                                      [boolean] [default: false]
+```
diff --git a/development/build/constants.js b/development/build/constants.js
deleted file mode 100644
index 15b87e984029..000000000000
--- a/development/build/constants.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const TASKS = {
-  CLEAN: 'clean',
-  DEV: 'dev',
-  LINT_SCSS: 'lint-scss',
-  MANIFEST_DEV: 'manifest:dev',
-  MANIFEST_PROD: 'manifest:prod',
-  MANIFEST_TEST: 'manifest:test',
-  MANIFEST_TEST_DEV: 'manifest:testDev',
-  PROD: 'prod',
-  RELOAD: 'reload',
-  SCRIPTS_PROD: 'scripts:prod',
-  SCRIPTS_CORE_DEV_STANDARD_ENTRY_POINTS:
-    'scripts:core:dev:standardEntryPoints',
-  SCRIPTS_CORE_DEV_CONTENTSCRIPT: 'scripts:core:dev:contentscript',
-  SCRIPTS_CORE_DEV_DISABLE_CONSOLE: 'scripts:core:dev:disable-console',
-  SCRIPTS_CORE_DEV_SENTRY: 'scripts:core:dev:sentry',
-  SCRIPTS_CORE_DEV_PHISHING_DETECT: 'scripts:core:dev:phishing-detect',
-  SCRIPTS_CORE_PROD_STANDARD_ENTRY_POINTS:
-    'scripts:core:prod:standardEntryPoints',
-  SCRIPTS_CORE_PROD_CONTENTSCRIPT: 'scripts:core:prod:contentscript',
-  SCRIPTS_CORE_PROD_DISABLE_CONSOLE: 'scripts:core:prod:disable-console',
-  SCRIPTS_CORE_PROD_SENTRY: 'scripts:core:prod:sentry',
-  SCRIPTS_CORE_PROD_PHISHING_DETECT: 'scripts:core:prod:phishing-detect',
-  SCRIPTS_CORE_TEST_LIVE_STANDARD_ENTRY_POINTS:
-    'scripts:core:test-live:standardEntryPoints',
-  SCRIPTS_CORE_TEST_LIVE_CONTENTSCRIPT: 'scripts:core:test-live:contentscript',
-  SCRIPTS_CORE_TEST_LIVE_DISABLE_CONSOLE:
-    'scripts:core:test-live:disable-console',
-  SCRIPTS_CORE_TEST_LIVE_SENTRY: 'scripts:core:test-live:sentry',
-  SCRIPTS_CORE_TEST_LIVE_PHISHING_DETECT:
-    'scripts:core:test-live:phishing-detect',
-  SCRIPTS_CORE_TEST_STANDARD_ENTRY_POINTS:
-    'scripts:core:test:standardEntryPoints',
-  SCRIPTS_CORE_TEST_CONTENTSCRIPT: 'scripts:core:test:contentscript',
-  SCRIPTS_CORE_TEST_DISABLE_CONSOLE: 'scripts:core:test:disable-console',
-  SCRIPTS_CORE_TEST_SENTRY: 'scripts:core:test:sentry',
-  SCRIPTS_CORE_TEST_PHISHING_DETECT: 'scripts:core:test:phishing-detect',
-  STATIC_DEV: 'static:dev',
-  STATIC_PROD: 'static:prod',
-  STYLES: 'styles',
-  STYLES_DEV: 'styles:dev',
-  STYLES_PROD: 'styles:prod',
-  TEST: 'test',
-  TEST_DEV: 'testDev',
-  ZIP: 'zip',
-};
-
-module.exports = { TASKS };
diff --git a/development/build/etc.js b/development/build/etc.js
index 3da86409f25b..e6d06c84d24c 100644
--- a/development/build/etc.js
+++ b/development/build/etc.js
@@ -7,13 +7,12 @@ const pify = require('pify');
 const pump = pify(require('pump'));
 
 const { BuildType } = require('../lib/build-type');
-const { TASKS } = require('./constants');
 const { createTask, composeParallel } = require('./task');
 
 module.exports = createEtcTasks;
 
 function createEtcTasks({ browserPlatforms, buildType, livereload, version }) {
-  const clean = createTask(TASKS.CLEAN, async function clean() {
+  const clean = createTask('clean', async function clean() {
     await del(['./dist/*']);
     await Promise.all(
       browserPlatforms.map(async (platform) => {
@@ -22,13 +21,13 @@ function createEtcTasks({ browserPlatforms, buildType, livereload, version }) {
     );
   });
 
-  const reload = createTask(TASKS.RELOAD, function devReload() {
+  const reload = createTask('reload', function devReload() {
     livereload.listen({ port: 35729 });
   });
 
   // zip tasks for distribution
   const zip = createTask(
-    TASKS.ZIP,
+    'zip',
     composeParallel(
       ...browserPlatforms.map((platform) =>
         createZipTask(platform, buildType, version),
@@ -49,10 +48,7 @@ function createZipTask(platform, buildType, version) {
       gulp.src(`dist/${platform}/**`),
       // sort files and set `mtime` to epoch to ensure zip build is deterministic
       sort(),
-      // Modified time set to an arbitrary static date to ensure build the is reproducible.
-      // The date chosen is MetaMask's birthday. Originally we chose the Unix epoch, but this
-      // resulted in invalid dates on certain timezones/operating systems.
-      gulpZip(`${path}.zip`, { modifiedTime: new Date('2016-07-14T00:00:00') }),
+      gulpZip(`${path}.zip`, { modifiedTime: new Date(0) }),
       gulp.dest('builds'),
     );
   };
diff --git a/development/build/index.js b/development/build/index.js
index d9924f86bc47..fd6dd1b7662c 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -5,12 +5,10 @@
 //
 const path = require('path');
 const livereload = require('gulp-livereload');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
+const minimist = require('minimist');
 const { sync: globby } = require('globby');
 const { getVersion } = require('../lib/get-version');
 const { BuildType } = require('../lib/build-type');
-const { TASKS } = require('./constants');
 const {
   createTask,
   composeSeries,
@@ -112,7 +110,7 @@ function defineAndRunBuildTasks() {
 
   // build for development (livereload)
   createTask(
-    TASKS.DEV,
+    'dev',
     composeSeries(
       clean,
       styleTasks.dev,
@@ -127,7 +125,7 @@ function defineAndRunBuildTasks() {
 
   // build for test development (livereload)
   createTask(
-    TASKS.TEST_DEV,
+    'testDev',
     composeSeries(
       clean,
       styleTasks.dev,
@@ -142,7 +140,7 @@ function defineAndRunBuildTasks() {
 
   // build for prod release
   createTask(
-    TASKS.PROD,
+    'prod',
     composeSeries(
       clean,
       styleTasks.prod,
@@ -152,11 +150,11 @@ function defineAndRunBuildTasks() {
   );
 
   // build just production scripts, for LavaMoat policy generation purposes
-  createTask(TASKS.SCRIPTS_PROD, scriptTasks.prod);
+  createTask('scripts:prod', scriptTasks.prod);
 
   // build for CI testing
   createTask(
-    TASKS.TEST,
+    'test',
     composeSeries(
       clean,
       styleTasks.prod,
@@ -166,108 +164,89 @@ function defineAndRunBuildTasks() {
   );
 
   // special build for minimal CI testing
-  createTask(TASKS.styles, styleTasks.prod);
+  createTask('styles', styleTasks.prod);
 
   // Finally, start the build process by running the entry task.
   runTask(entryTask, { skipStats });
 }
 
 function parseArgv() {
-  const { argv } = yargs(hideBin(process.argv))
-    .usage('$0 <task> [options]', 'Build the MetaMask extension.', (_yargs) =>
-      _yargs
-        .positional('task', {
-          description: `The task to run. There are a number of main tasks, each of which calls other tasks internally. The main tasks are:
+  const NamedArgs = {
+    ApplyLavaMoat: 'apply-lavamoat',
+    BuildType: 'build-type',
+    BuildVersion: 'build-version',
+    LintFenceFiles: 'lint-fence-files',
+    Lockdown: 'lockdown',
+    PolicyOnly: 'policy-only',
+    SkipStats: 'skip-stats',
+  };
 
-prod: Create an optimized build for a production environment.
+  const argv = minimist(process.argv.slice(2), {
+    boolean: [
+      NamedArgs.ApplyLavaMoat,
+      NamedArgs.LintFenceFiles,
+      NamedArgs.Lockdown,
+      NamedArgs.PolicyOnly,
+      NamedArgs.SkipStats,
+    ],
+    string: [NamedArgs.BuildType, NamedArgs.BuildVersion],
+    default: {
+      [NamedArgs.ApplyLavaMoat]: true,
+      [NamedArgs.BuildType]: BuildType.main,
+      [NamedArgs.BuildVersion]: '0',
+      [NamedArgs.LintFenceFiles]: true,
+      [NamedArgs.Lockdown]: true,
+      [NamedArgs.PolicyOnly]: false,
+      [NamedArgs.SkipStats]: false,
+    },
+  });
 
-dev: Create an unoptimized, live-reloading build for local development.
+  if (argv._.length !== 1) {
+    throw new Error(
+      `Metamask build: Expected a single positional argument, but received "${argv._.length}" arguments.`,
+    );
+  }
 
-test: Create an optimized build for running e2e tests.
+  const entryTask = argv._[0];
+  if (!entryTask) {
+    throw new Error('MetaMask build: No entry task specified.');
+  }
 
-testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
-          type: 'string',
-        })
-        .option('apply-lavamoat', {
-          default: true,
-          description:
-            'Whether to use LavaMoat. Setting this to `false` can be useful during development if you want to handle LavaMoat errors later.',
-          type: 'boolean',
-        })
-        .option('build-type', {
-          default: BuildType.main,
-          description: 'The type of build to create.',
-          choices: Object.keys(BuildType),
-        })
-        .option('build-version', {
-          default: 0,
-          description:
-            'The build version. This is set only for non-main build types. The build version is used in the "prerelease" segment of the extension version, e.g. `[major].[minor].[patch]-[build-type].[build-version]`',
-          type: 'number',
-        })
-        .option('lint-fence-files', {
-          description:
-            'Whether files with code fences should be linted after fences have been removed. The build will fail if linting fails. This defaults to `false` if the entry task is `dev` or `testDev`. Otherwise this defaults to `true`.',
-          type: 'boolean',
-        })
-        .option('lockdown', {
-          default: true,
-          description:
-            'Whether to include SES lockdown files in the extension bundle. Setting this to `false` can be useful during development if you want to handle lockdown errors later.',
-          type: 'boolean',
-        })
-        .option('policy-only', {
-          default: false,
-          description:
-            'Stop the build after generating the LavaMoat policy, skipping any writes to disk other than the LavaMoat policy itself.',
-          type: 'boolean',
-        })
-        .option('skip-stats', {
-          default: false,
-          description:
-            'Whether to skip logging the time to completion for each task to the console. This is meant primarily for internal use, to prevent duplicate logging.',
-          hidden: true,
-          type: 'boolean',
-        })
-        .check((args) => {
-          if (!Number.isInteger(args.buildVersion)) {
-            throw new Error(
-              `Expected integer for 'build-version', got '${args.buildVersion}'`,
-            );
-          } else if (!Object.values(TASKS).includes(args.task)) {
-            throw new Error(`Invalid task: '${args.task}'`);
-          }
-          return true;
-        }),
-    )
-    // TODO: Enable `.strict()` after this issue is resolved: https://github.com/LavaMoat/LavaMoat/issues/344
-    .help('help');
+  const buildType = argv[NamedArgs.BuildType];
+  if (!(buildType in BuildType)) {
+    throw new Error(`MetaMask build: Invalid build type: "${buildType}"`);
+  }
 
-  const {
-    applyLavamoat: applyLavaMoat,
-    buildType,
-    buildVersion,
-    lintFenceFiles,
-    lockdown,
-    policyOnly,
-    skipStats,
-    task,
-  } = argv;
+  const rawBuildVersion = argv[NamedArgs.BuildVersion];
+  const buildVersion = Number.parseInt(rawBuildVersion, 10);
+  if (rawBuildVersion.match(/^\d+$/u) === null || Number.isNaN(buildVersion)) {
+    throw new Error(
+      `MetaMask build: Invalid build version: "${rawBuildVersion}"`,
+    );
+  }
 
   // Manually default this to `false` for dev builds only.
-  const shouldLintFenceFiles = lintFenceFiles ?? !/dev/iu.test(task);
+  const shouldLintFenceFiles = process.argv.includes(
+    `--${NamedArgs.LintFenceFiles}`,
+  )
+    ? argv[NamedArgs.LintFenceFiles]
+    : !/dev/iu.test(entryTask);
+
+  const policyOnly = argv[NamedArgs.PolicyOnly];
 
   const version = getVersion(buildType, buildVersion);
 
   return {
-    applyLavaMoat,
+    // Should we apply LavaMoat to the build output?
+    applyLavaMoat: argv[NamedArgs.ApplyLavaMoat],
     buildType,
-    entryTask: task,
+    entryTask,
+    // Is this process running in lavamoat-node?
     isLavaMoat: process.argv[0].includes('lavamoat'),
     policyOnly,
-    shouldIncludeLockdown: lockdown,
+    shouldIncludeLockdown: argv[NamedArgs.Lockdown],
     shouldLintFenceFiles,
-    skipStats,
+    skipStats: argv[NamedArgs.SkipStats],
     version,
   };
 }
diff --git a/development/build/manifest.js b/development/build/manifest.js
index fb6a4092b14b..498ab2785b6d 100644
--- a/development/build/manifest.js
+++ b/development/build/manifest.js
@@ -2,12 +2,9 @@ const { promises: fs } = require('fs');
 const path = require('path');
 const { mergeWith, cloneDeep } = require('lodash');
 
-const baseManifest = process.env.ENABLE_MV3
-  ? require('../../app/manifest/v3/_base.json')
-  : require('../../app/manifest/v2/_base.json');
+const baseManifest = require('../../app/manifest/_base.json');
 const { BuildType } = require('../lib/build-type');
 
-const { TASKS } = require('./constants');
 const { createTask, composeSeries } = require('./task');
 
 module.exports = createManifestTasks;
@@ -27,7 +24,7 @@ function createManifestTasks({
             '..',
             '..',
             'app',
-            process.env.ENABLE_MV3 ? 'manifest/v3' : 'manifest/v2',
+            'manifest',
             `${platform}.json`,
           ),
         );
@@ -69,22 +66,19 @@ function createManifestTasks({
   });
 
   // high level manifest tasks
-  const dev = createTask(
-    TASKS.MANIFEST_DEV,
-    composeSeries(prepPlatforms, envDev),
-  );
+  const dev = createTask('manifest:dev', composeSeries(prepPlatforms, envDev));
 
   const testDev = createTask(
-    TASKS.MANIFEST_TEST_DEV,
+    'manifest:testDev',
     composeSeries(prepPlatforms, envTestDev),
   );
 
   const test = createTask(
-    TASKS.MANIFEST_TEST,
+    'manifest:test',
     composeSeries(prepPlatforms, envTest),
   );
 
-  const prod = createTask(TASKS.MANIFEST_PROD, prepPlatforms);
+  const prod = createTask('manifest:prod', prepPlatforms);
 
   return { prod, dev, testDev, test };
 
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 85deff7d3f28..1447b3d79a61 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -34,7 +34,6 @@ const metamaskrc = require('rc')('metamask', {
   INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID,
   ONBOARDING_V2: process.env.ONBOARDING_V2,
   COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
-  PHISHING_WARNING_PAGE_URL: process.env.PHISHING_WARNING_PAGE_URL,
   TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_V2,
   SEGMENT_HOST: process.env.SEGMENT_HOST,
   SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
@@ -134,48 +133,6 @@ function getSegmentWriteKey({ buildType, environment }) {
   throw new Error(`Invalid build type: '${buildType}'`);
 }
 
-/**
- * Get the URL for the phishing warning page, if it has been set.
- *
- * @param {object} options - The phishing warning page options.
- * @param {boolean} options.testing - Whether this is a test build or not.
- * @returns {string} The URL for the phishing warning page, or `undefined` if no URL is set.
- */
-function getPhishingWarningPageUrl({ testing }) {
-  let phishingWarningPageUrl = metamaskrc.PHISHING_WARNING_PAGE_URL;
-
-  if (!phishingWarningPageUrl) {
-    phishingWarningPageUrl = testing
-      ? 'http://localhost:9999/'
-      : 'https://metamask.github.io/phishing-warning/v1.1.0/';
-  }
-
-  // We add a hash/fragment to the URL dynamically, so we need to ensure it
-  // has a valid pathname to append a hash to.
-  const normalizedUrl = phishingWarningPageUrl.endsWith('/')
-    ? phishingWarningPageUrl
-    : `${phishingWarningPageUrl}/`;
-
-  let phishingWarningPageUrlObject;
-  try {
-    // eslint-disable-next-line no-new
-    phishingWarningPageUrlObject = new URL(normalizedUrl);
-  } catch (error) {
-    throw new Error(
-      `Invalid phishing warning page URL: '${normalizedUrl}'`,
-      error,
-    );
-  }
-  if (phishingWarningPageUrlObject.hash) {
-    // The URL fragment must be set dynamically
-    throw new Error(
-      `URL fragment not allowed in phishing warning page URL: '${normalizedUrl}'`,
-    );
-  }
-
-  return normalizedUrl;
-}
-
 const noopWriteStream = through.obj((_file, _fileEncoding, callback) =>
   callback(),
 );
@@ -196,22 +153,22 @@ function createScriptTasks({
   // internal tasks
   const core = {
     // dev tasks (live reload)
-    dev: createTasksForScriptBundles({
+    dev: createTasksForBuildJsExtension({
       taskPrefix: 'scripts:core:dev',
       devMode: true,
     }),
-    testDev: createTasksForScriptBundles({
+    testDev: createTasksForBuildJsExtension({
       taskPrefix: 'scripts:core:test-live',
       devMode: true,
       testing: true,
     }),
     // built for CI tests
-    test: createTasksForScriptBundles({
+    test: createTasksForBuildJsExtension({
       taskPrefix: 'scripts:core:test',
       testing: true,
     }),
     // production
-    prod: createTasksForScriptBundles({ taskPrefix: 'scripts:core:prod' }),
+    prod: createTasksForBuildJsExtension({ taskPrefix: 'scripts:core:prod' }),
   };
 
   // high level tasks
@@ -219,11 +176,7 @@ function createScriptTasks({
   const { dev, test, testDev, prod } = core;
   return { dev, test, testDev, prod };
 
-  function createTasksForScriptBundles({
-    taskPrefix,
-    devMode = false,
-    testing = false,
-  }) {
+  function createTasksForBuildJsExtension({ taskPrefix, devMode, testing }) {
     const standardEntryPoints = ['background', 'ui', 'content-script'];
     const standardSubtask = createTask(
       `${taskPrefix}:standardEntryPoints`,
@@ -250,19 +203,24 @@ function createScriptTasks({
     // because inpage bundle result is included inside contentscript
     const contentscriptSubtask = createTask(
       `${taskPrefix}:contentscript`,
-      createContentscriptBundle({ devMode, testing }),
+      createTaskForBundleContentscript({ devMode, testing }),
     );
 
     // this can run whenever
     const disableConsoleSubtask = createTask(
       `${taskPrefix}:disable-console`,
-      createDisableConsoleBundle({ devMode, testing }),
+      createTaskForBundleDisableConsole({ devMode, testing }),
     );
 
     // this can run whenever
     const installSentrySubtask = createTask(
       `${taskPrefix}:sentry`,
-      createSentryBundle({ devMode, testing }),
+      createTaskForBundleSentry({ devMode, testing }),
+    );
+
+    const phishingDetectSubtask = createTask(
+      `${taskPrefix}:phishing-detect`,
+      createTaskForBundlePhishingDetect({ devMode, testing }),
     );
 
     // task for initiating browser livereload
@@ -287,6 +245,7 @@ function createScriptTasks({
       contentscriptSubtask,
       disableConsoleSubtask,
       installSentrySubtask,
+      phishingDetectSubtask,
     ].map((subtask) =>
       runInChildProcess(subtask, {
         applyLavaMoat,
@@ -300,7 +259,7 @@ function createScriptTasks({
     return composeParallel(initiateLiveReload, ...allSubtasks);
   }
 
-  function createDisableConsoleBundle({ devMode, testing }) {
+  function createTaskForBundleDisableConsole({ devMode, testing }) {
     const label = 'disable-console';
     return createNormalBundle({
       browserPlatforms,
@@ -317,7 +276,7 @@ function createScriptTasks({
     });
   }
 
-  function createSentryBundle({ devMode, testing }) {
+  function createTaskForBundleSentry({ devMode, testing }) {
     const label = 'sentry-install';
     return createNormalBundle({
       browserPlatforms,
@@ -334,8 +293,25 @@ function createScriptTasks({
     });
   }
 
+  function createTaskForBundlePhishingDetect({ devMode, testing }) {
+    const label = 'phishing-detect';
+    return createNormalBundle({
+      buildType,
+      browserPlatforms,
+      destFilepath: `${label}.js`,
+      devMode,
+      entryFilepath: `./app/scripts/${label}.js`,
+      ignoredFiles,
+      label,
+      testing,
+      policyOnly,
+      shouldLintFenceFiles,
+      version,
+    });
+  }
+
   // the "contentscript" bundle contains the "inpage" bundle
-  function createContentscriptBundle({ devMode, testing }) {
+  function createTaskForBundleContentscript({ devMode, testing }) {
     const inpage = 'inpage';
     const contentscript = 'contentscript';
     return composeSeries(
@@ -369,102 +345,6 @@ function createScriptTasks({
   }
 }
 
-const postProcessServiceWorker = (
-  mv3BrowserPlatforms,
-  fileList,
-  applyLavaMoat,
-  testing,
-) => {
-  mv3BrowserPlatforms.forEach((browser) => {
-    const appInitFile = `./dist/${browser}/app-init.js`;
-    const fileContent = readFileSync('./app/scripts/app-init.js', 'utf8');
-    let fileOutput = fileContent.replace('/** FILE NAMES */', fileList);
-    if (testing) {
-      fileOutput = fileOutput.replace('testMode = false', 'testMode = true');
-    } else {
-      // Setting applyLavaMoat to true in testing mode
-      // This is to enable capturing initialisation time stats using e2e with lavamoat statsMode enabled
-      fileOutput = fileOutput.replace(
-        'const applyLavaMoat = true;',
-        `const applyLavaMoat = ${applyLavaMoat};`,
-      );
-    }
-    writeFileSync(appInitFile, fileOutput);
-  });
-};
-
-// Function generates app-init.js for browsers chrome, brave and opera.
-// It dynamically injects list of files generated in the build.
-async function createManifestV3AppInitializationBundle({
-  jsBundles,
-  browserPlatforms,
-  buildType,
-  devMode,
-  ignoredFiles,
-  testing,
-  policyOnly,
-  shouldLintFenceFiles,
-  applyLavaMoat,
-  version,
-}) {
-  const label = 'app-init';
-  // TODO: remove this filter for firefox once MV3 is supported in it
-  const mv3BrowserPlatforms = browserPlatforms.filter(
-    (platform) => platform !== 'firefox',
-  );
-  const fileList = jsBundles.reduce(
-    (result, file) => `${result}'${file}',\n    `,
-    '',
-  );
-
-  await createNormalBundle({
-    browserPlatforms: mv3BrowserPlatforms,
-    buildType,
-    destFilepath: 'app-init.js',
-    devMode,
-    entryFilepath: './app/scripts/app-init.js',
-    ignoredFiles,
-    label,
-    testing,
-    policyOnly,
-    shouldLintFenceFiles,
-    version,
-  })();
-
-  postProcessServiceWorker(
-    mv3BrowserPlatforms,
-    fileList,
-    applyLavaMoat,
-    testing,
-  );
-
-  // If the application is running in development mode, we watch service worker file to
-  // in case the file is changes we need to process it again to replace "/** FILE NAMES */", "testMode" etc.
-  if (devMode && !testing) {
-    let prevChromeFileContent;
-    watch('./dist/chrome/app-init.js', () => {
-      const chromeFileContent = readFileSync(
-        './dist/chrome/app-init.js',
-        'utf8',
-      );
-      if (chromeFileContent !== prevChromeFileContent) {
-        prevChromeFileContent = chromeFileContent;
-        postProcessServiceWorker(mv3BrowserPlatforms, fileList, applyLavaMoat);
-      }
-    });
-  }
-
-  // Code below is used to set statsMode to true when testing in MV3
-  // This is used to capture module initialisation stats using lavamoat.
-  if (testing) {
-    const content = readFileSync('./dist/chrome/runtime-lavamoat.js', 'utf8');
-    const fileOutput = content.replace('statsMode = false', 'statsMode = true');
-    writeFileSync('./dist/chrome/runtime-lavamoat.js', fileOutput);
-  }
-
-  console.log(`Bundle end: service worker app-init.js`);
-}
-
 function createFactoredBuild({
   applyLavaMoat,
   browserPlatforms,
@@ -577,7 +457,7 @@ function createFactoredBuild({
     });
 
     // wait for bundle completion for postprocessing
-    events.on('bundleDone', async () => {
+    events.on('bundleDone', () => {
       // Skip HTML generation if nothing is to be written to disk
       if (policyOnly) {
         return;
@@ -623,24 +503,6 @@ function createFactoredBuild({
               browserPlatforms,
               applyLavaMoat,
             });
-            if (process.env.ENABLE_MV3) {
-              const jsBundles = [
-                ...commonSet.values(),
-                ...groupSet.values(),
-              ].map((label) => `./${label}.js`);
-              await createManifestV3AppInitializationBundle({
-                jsBundles,
-                browserPlatforms,
-                buildType,
-                devMode,
-                ignoredFiles,
-                testing,
-                policyOnly,
-                shouldLintFenceFiles,
-                applyLavaMoat,
-                version,
-              });
-            }
             break;
           }
           case 'content-script': {
@@ -662,7 +524,7 @@ function createFactoredBuild({
       }
     });
 
-    await createBundle(buildConfiguration, { reloadOnChange });
+    await bundleIt(buildConfiguration, { reloadOnChange });
   };
 }
 
@@ -672,9 +534,11 @@ function createNormalBundle({
   destFilepath,
   devMode,
   entryFilepath,
+  extraEntries = [],
   ignoredFiles,
   label,
   policyOnly,
+  modulesToExpose,
   shouldLintFenceFiles,
   testing,
   version,
@@ -708,7 +572,14 @@ function createNormalBundle({
     });
 
     // set bundle entries
-    bundlerOpts.entries = [entryFilepath];
+    bundlerOpts.entries = [...extraEntries];
+    if (entryFilepath) {
+      bundlerOpts.entries.push(entryFilepath);
+    }
+
+    if (modulesToExpose) {
+      bundlerOpts.require = bundlerOpts.require.concat(modulesToExpose);
+    }
 
     // instrument pipeline
     events.on('configurePipeline', ({ pipeline }) => {
@@ -724,7 +595,7 @@ function createNormalBundle({
       });
     });
 
-    await createBundle(buildConfiguration, { reloadOnChange });
+    await bundleIt(buildConfiguration, { reloadOnChange });
   };
 }
 
@@ -777,7 +648,7 @@ function setupBundlerDefaults(
     // Look for TypeScript files when walking the dependency tree
     extensions,
     // Use entryFilepath for moduleIds, easier to determine origin file
-    fullPaths: devMode || testing,
+    fullPaths: devMode,
     // For sourcemaps
     debug: true,
   });
@@ -879,7 +750,7 @@ function setupSourcemaps(buildConfiguration, { devMode }) {
   });
 }
 
-async function createBundle(buildConfiguration, { reloadOnChange }) {
+async function bundleIt(buildConfiguration, { reloadOnChange }) {
   const { label, bundlerOpts, events } = buildConfiguration;
   const bundler = browserify(bundlerOpts);
 
@@ -951,7 +822,6 @@ function getEnvironmentVariables({ buildType, devMode, testing, version }) {
     METAMASK_BUILD_TYPE: buildType,
     NODE_ENV: devMode ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION,
     IN_TEST: testing,
-    PHISHING_WARNING_PAGE_URL: getPhishingWarningPageUrl({ testing }),
     PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
     PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
     CONF: devMode ? metamaskrc : {},
diff --git a/development/build/static.js b/development/build/static.js
index 7e3ccf02fadb..7efde5a72c7a 100644
--- a/development/build/static.js
+++ b/development/build/static.js
@@ -6,7 +6,6 @@ const glob = require('fast-glob');
 const locales = require('../../app/_locales/index.json');
 const { BuildType } = require('../lib/build-type');
 
-const { TASKS } = require('./constants');
 const { createTask, composeSeries } = require('./task');
 
 const EMPTY_JS_FILE = './development/empty.js';
@@ -42,7 +41,7 @@ module.exports = function createStaticAssetTasks({
   }
 
   const prod = createTask(
-    TASKS.STATIC_PROD,
+    'static:prod',
     composeSeries(
       ...copyTargetsProd.map((target) => {
         return async function copyStaticAssets() {
@@ -52,7 +51,7 @@ module.exports = function createStaticAssetTasks({
     ),
   );
   const dev = createTask(
-    TASKS.STATIC_DEV,
+    'static:dev',
     composeSeries(
       ...copyTargetsDev.map((target) => {
         return async function copyStaticAssets() {
@@ -153,10 +152,6 @@ function getCopyTargets(shouldIncludeLockdown) {
         : EMPTY_JS_FILE,
       dest: `lockdown-install.js`,
     },
-    {
-      src: './app/scripts/init-globals.js',
-      dest: 'init-globals.js',
-    },
     {
       src: shouldIncludeLockdown
         ? `./app/scripts/lockdown-run.js`
@@ -179,6 +174,10 @@ function getCopyTargets(shouldIncludeLockdown) {
       src: require.resolve('@lavamoat/lavapack/src/runtime.js'),
       dest: `runtime-lavamoat.js`,
     },
+    {
+      src: `./app/phishing.html`,
+      dest: `phishing.html`,
+    },
   ];
 
   const languageTags = new Set();
diff --git a/development/build/styles.js b/development/build/styles.js
index 926609dff8fd..ecda4b661882 100644
--- a/development/build/styles.js
+++ b/development/build/styles.js
@@ -7,7 +7,6 @@ const sourcemaps = require('gulp-sourcemaps');
 const rtlcss = require('gulp-rtlcss');
 const rename = require('gulp-rename');
 const pump = pify(require('pump'));
-const { TASKS } = require('./constants');
 const { createTask } = require('./task');
 
 let sass;
@@ -17,7 +16,7 @@ module.exports = createStyleTasks;
 
 function createStyleTasks({ livereload }) {
   const prod = createTask(
-    TASKS.STYLES_PROD,
+    'styles:prod',
     createScssBuildTask({
       src: 'ui/css/index.scss',
       dest: 'ui/css/output',
@@ -26,7 +25,7 @@ function createStyleTasks({ livereload }) {
   );
 
   const dev = createTask(
-    TASKS.STYLES_DEV,
+    'styles:dev',
     createScssBuildTask({
       src: 'ui/css/index.scss',
       dest: 'ui/css/output',
@@ -35,7 +34,7 @@ function createStyleTasks({ livereload }) {
     }),
   );
 
-  const lint = createTask(TASKS.LINT_SCSS, function () {
+  const lint = createTask('lint-scss', function () {
     return gulp.src('ui/css/itcss/**/*.scss').pipe(
       gulpStylelint({
         reporters: [{ formatter: 'string', console: true }],
diff --git a/development/build/transforms/utils.test.js b/development/build/transforms/utils.test.js
index 303b954d3568..ba273a15bdac 100644
--- a/development/build/transforms/utils.test.js
+++ b/development/build/transforms/utils.test.js
@@ -26,7 +26,7 @@ describe('transform utils', () => {
       // This error is an artifact of how we're mocking the ESLint singleton,
       // and won't actually occur in production.
       await expect(() => lintTransformedFile()).rejects.toThrow(
-        `Cannot read properties of undefined (reading '0')`,
+        `Cannot read property '0' of undefined`,
       );
       expect(mockESLint).toBeDefined();
     });
diff --git a/development/charts/flamegraph/chart/index.html b/development/charts/flamegraph/chart/index.html
deleted file mode 100644
index 7afe9f9d0dcb..000000000000
--- a/development/charts/flamegraph/chart/index.html
+++ /dev/null
@@ -1,170 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
-    <meta name="viewport" content="width=device-width, initial-scale=1" />
-
-    <link
-      rel="stylesheet"
-      href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
-    />
-    <link rel="stylesheet" type="text/css" href="../lib/d3-flamegraph.css" />
-
-    <style>
-      /* Space out content a bit */
-      body {
-        padding-top: 20px;
-        padding-bottom: 20px;
-      }
-
-      /* Custom page header */
-      .header {
-        padding-bottom: 20px;
-        padding-right: 15px;
-        padding-left: 15px;
-        border-bottom: 1px solid #e5e5e5;
-      }
-
-      /* Make the masthead heading the same height as the navigation */
-      .header h3 {
-        margin-top: 0;
-        margin-bottom: 0;
-        line-height: 40px;
-      }
-
-      /* Customize container */
-      .container {
-        max-width: 990px;
-      }
-    </style>
-
-    <title>Performance Measurements</title>
-
-    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
-    <!--[if lt IE 9]>
-      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
-      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
-    <![endif]-->
-  </head>
-  <body>
-    <div class="container">
-      <div class="header clearfix">
-        <nav>
-          <div class="pull-right">
-            <form class="form-inline" id="form">
-              <a class="btn" href="javascript: resetZoom();">Reset zoom</a>
-              <a class="btn" href="javascript: clear();">Clear</a>
-              <div class="form-group">
-                <input type="text" class="form-control" id="term" />
-              </div>
-              <a class="btn btn-primary" href="javascript: search();">Search</a>
-            </form>
-          </div>
-        </nav>
-        <h3 class="text-muted">d3-flame-graph</h3>
-      </div>
-      <div id="chart"></div>
-      <hr />
-      <div id="details"></div>
-    </div>
-
-    <!-- D3.js -->
-    <script src="https://d3js.org/d3.v7.js" charset="utf-8"></script>
-
-    <!-- d3-flamegraph -->
-    <script type="text/javascript" src="../lib/d3-flamegraph.js"></script>
-    <script
-      type="text/javascript"
-      src="../lib/d3-flamegraph-tooltip.js"
-    ></script>
-
-    <script type="text/javascript">
-      var chart = flamegraph()
-        .width(960)
-        .cellHeight(18)
-        .transitionDuration(750)
-        .minFrameSize(5)
-        .transitionEase(d3.easeCubic)
-        .sort(true)
-        //Example to sort in reverse order
-        //.sort(function(a,b){ return d3.descending(a.name, b.name);})
-        .title('')
-        .onClick(onClick)
-        .selfValue(false)
-        .setColorMapper((d, originalColor) =>
-          d.highlight ? '#6aff8f' : originalColor,
-        );
-
-      // Example on how to use custom a tooltip.
-      var tip = flamegraph.tooltip
-        .defaultFlamegraphTooltip()
-        .text((d) => 'name: ' + d.data.name + ', value: ' + d.data.value);
-      chart.tooltip(tip);
-
-      var details = document.getElementById('details');
-      chart.setDetailsElement(details);
-
-      // Example on how to use searchById() function in flamegraph.
-      // To invoke this function after loading the graph itself, this function should be registered in d3 datum(data).call()
-      // (See d3.json invocation in this file)
-      function invokeFind() {
-        var searchId = parseInt(location.hash.substring(1), 10);
-        if (searchId) {
-          find(searchId);
-        }
-      }
-
-      // Example on how to use custom labels
-      // var label = function(d) {
-      //  return "name: " + d.name + ", value: " + d.value;
-      // }
-      // chart.label(label);
-
-      // Example of how to set fixed chart height
-      // chart.height(540);
-
-      d3.json('stacks.json')
-        .then((data) => {
-          d3.select('#chart').datum(data).call(chart).call(invokeFind);
-        })
-        .catch((error) => {
-          return console.warn(error);
-        });
-
-      document
-        .getElementById('form')
-        .addEventListener('submit', function (event) {
-          event.preventDefault();
-          search();
-        });
-
-      function search() {
-        var term = document.getElementById('term').value;
-        chart.search(term);
-      }
-
-      function find(id) {
-        var elem = chart.findById(id);
-        if (elem) {
-          console.log(elem);
-          chart.zoomTo(elem);
-        }
-      }
-
-      function clear() {
-        document.getElementById('term').value = '';
-        chart.clear();
-      }
-
-      function resetZoom() {
-        chart.resetZoom();
-      }
-
-      function onClick(d) {
-        console.info(`Clicked on ${d.data.name}, id: "${d.id}"`);
-        history.pushState({ id: d.id }, d.data.name, `#${d.id}`);
-      }
-    </script>
-  </body>
-</html>
diff --git a/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js b/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
deleted file mode 100644
index cc042a0f281b..000000000000
--- a/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
+++ /dev/null
@@ -1,3117 +0,0 @@
-(function webpackUniversalModuleDefinition(root, factory) {
-	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory();
-	else if(typeof define === 'function' && define.amd)
-		define([], factory);
-	else if(typeof exports === 'object')
-		exports["flamegraph"] = factory();
-	else
-		root["flamegraph"] = root["flamegraph"] || {}, root["flamegraph"]["tooltip"] = factory();
-})(self, function() {
-return /******/ (() => { // webpackBootstrap
-/******/ 	"use strict";
-/******/ 	// The require scope
-/******/ 	var __webpack_require__ = {};
-/******/ 	
-/************************************************************************/
-/******/ 	/* webpack/runtime/define property getters */
-/******/ 	(() => {
-/******/ 		// define getter functions for harmony exports
-/******/ 		__webpack_require__.d = (exports, definition) => {
-/******/ 			for(var key in definition) {
-/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
-/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
-/******/ 				}
-/******/ 			}
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
-/******/ 	(() => {
-/******/ 		__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-/******/ 	})();
-/******/ 	
-/******/ 	/* webpack/runtime/make namespace object */
-/******/ 	(() => {
-/******/ 		// define __esModule on exports
-/******/ 		__webpack_require__.r = (exports) => {
-/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
-/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-/******/ 			}
-/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
-/******/ 		};
-/******/ 	})();
-/******/ 	
-/************************************************************************/
-var __webpack_exports__ = {};
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, {
-  "defaultFlamegraphTooltip": () => (/* binding */ defaultFlamegraphTooltip)
-});
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selector.js
-function none() {}
-
-/* harmony default export */ function selector(selector) {
-  return selector == null ? none : function() {
-    return this.querySelector(selector);
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/select.js
-
-
-
-/* harmony default export */ function selection_select(select) {
-  if (typeof select !== "function") select = selector(select);
-
-  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select.call(node, node.__data__, i, group))) {
-        if ("__data__" in node) subnode.__data__ = node.__data__;
-        subgroup[i] = subnode;
-      }
-    }
-  }
-
-  return new Selection(subgroups, this._parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/array.js
-// Given something array like (or null), returns something that is strictly an
-// array. This is used to ensure that array-like objects passed to d3.selectAll
-// or selection.selectAll are converted into proper arrays when creating a
-// selection; we don’t ever want to create a selection backed by a live
-// HTMLCollection or NodeList. However, note that selection.selectAll will use a
-// static NodeList as a group, since it safely derived from querySelectorAll.
-function array(x) {
-  return x == null ? [] : Array.isArray(x) ? x : Array.from(x);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selectorAll.js
-function empty() {
-  return [];
-}
-
-/* harmony default export */ function selectorAll(selector) {
-  return selector == null ? empty : function() {
-    return this.querySelectorAll(selector);
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectAll.js
-
-
-
-
-function arrayAll(select) {
-  return function() {
-    return array(select.apply(this, arguments));
-  };
-}
-
-/* harmony default export */ function selectAll(select) {
-  if (typeof select === "function") select = arrayAll(select);
-  else select = selectorAll(select);
-
-  for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        subgroups.push(select.call(node, node.__data__, i, group));
-        parents.push(node);
-      }
-    }
-  }
-
-  return new Selection(subgroups, parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/matcher.js
-/* harmony default export */ function matcher(selector) {
-  return function() {
-    return this.matches(selector);
-  };
-}
-
-function childMatcher(selector) {
-  return function(node) {
-    return node.matches(selector);
-  };
-}
-
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChild.js
-
-
-var find = Array.prototype.find;
-
-function childFind(match) {
-  return function() {
-    return find.call(this.children, match);
-  };
-}
-
-function childFirst() {
-  return this.firstElementChild;
-}
-
-/* harmony default export */ function selectChild(match) {
-  return this.select(match == null ? childFirst
-      : childFind(typeof match === "function" ? match : childMatcher(match)));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChildren.js
-
-
-var filter = Array.prototype.filter;
-
-function children() {
-  return Array.from(this.children);
-}
-
-function childrenFilter(match) {
-  return function() {
-    return filter.call(this.children, match);
-  };
-}
-
-/* harmony default export */ function selectChildren(match) {
-  return this.selectAll(match == null ? children
-      : childrenFilter(typeof match === "function" ? match : childMatcher(match)));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/filter.js
-
-
-
-/* harmony default export */ function selection_filter(match) {
-  if (typeof match !== "function") match = matcher(match);
-
-  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
-        subgroup.push(node);
-      }
-    }
-  }
-
-  return new Selection(subgroups, this._parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sparse.js
-/* harmony default export */ function sparse(update) {
-  return new Array(update.length);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/enter.js
-
-
-
-/* harmony default export */ function enter() {
-  return new Selection(this._enter || this._groups.map(sparse), this._parents);
-}
-
-function EnterNode(parent, datum) {
-  this.ownerDocument = parent.ownerDocument;
-  this.namespaceURI = parent.namespaceURI;
-  this._next = null;
-  this._parent = parent;
-  this.__data__ = datum;
-}
-
-EnterNode.prototype = {
-  constructor: EnterNode,
-  appendChild: function(child) { return this._parent.insertBefore(child, this._next); },
-  insertBefore: function(child, next) { return this._parent.insertBefore(child, next); },
-  querySelector: function(selector) { return this._parent.querySelector(selector); },
-  querySelectorAll: function(selector) { return this._parent.querySelectorAll(selector); }
-};
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/constant.js
-/* harmony default export */ function src_constant(x) {
-  return function() {
-    return x;
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/data.js
-
-
-
-
-function bindIndex(parent, group, enter, update, exit, data) {
-  var i = 0,
-      node,
-      groupLength = group.length,
-      dataLength = data.length;
-
-  // Put any non-null nodes that fit into update.
-  // Put any null nodes into enter.
-  // Put any remaining data into enter.
-  for (; i < dataLength; ++i) {
-    if (node = group[i]) {
-      node.__data__ = data[i];
-      update[i] = node;
-    } else {
-      enter[i] = new EnterNode(parent, data[i]);
-    }
-  }
-
-  // Put any non-null nodes that don’t fit into exit.
-  for (; i < groupLength; ++i) {
-    if (node = group[i]) {
-      exit[i] = node;
-    }
-  }
-}
-
-function bindKey(parent, group, enter, update, exit, data, key) {
-  var i,
-      node,
-      nodeByKeyValue = new Map,
-      groupLength = group.length,
-      dataLength = data.length,
-      keyValues = new Array(groupLength),
-      keyValue;
-
-  // Compute the key for each node.
-  // If multiple nodes have the same key, the duplicates are added to exit.
-  for (i = 0; i < groupLength; ++i) {
-    if (node = group[i]) {
-      keyValues[i] = keyValue = key.call(node, node.__data__, i, group) + "";
-      if (nodeByKeyValue.has(keyValue)) {
-        exit[i] = node;
-      } else {
-        nodeByKeyValue.set(keyValue, node);
-      }
-    }
-  }
-
-  // Compute the key for each datum.
-  // If there a node associated with this key, join and add it to update.
-  // If there is not (or the key is a duplicate), add it to enter.
-  for (i = 0; i < dataLength; ++i) {
-    keyValue = key.call(parent, data[i], i, data) + "";
-    if (node = nodeByKeyValue.get(keyValue)) {
-      update[i] = node;
-      node.__data__ = data[i];
-      nodeByKeyValue.delete(keyValue);
-    } else {
-      enter[i] = new EnterNode(parent, data[i]);
-    }
-  }
-
-  // Add any remaining nodes that were not bound to data to exit.
-  for (i = 0; i < groupLength; ++i) {
-    if ((node = group[i]) && (nodeByKeyValue.get(keyValues[i]) === node)) {
-      exit[i] = node;
-    }
-  }
-}
-
-function datum(node) {
-  return node.__data__;
-}
-
-/* harmony default export */ function data(value, key) {
-  if (!arguments.length) return Array.from(this, datum);
-
-  var bind = key ? bindKey : bindIndex,
-      parents = this._parents,
-      groups = this._groups;
-
-  if (typeof value !== "function") value = src_constant(value);
-
-  for (var m = groups.length, update = new Array(m), enter = new Array(m), exit = new Array(m), j = 0; j < m; ++j) {
-    var parent = parents[j],
-        group = groups[j],
-        groupLength = group.length,
-        data = arraylike(value.call(parent, parent && parent.__data__, j, parents)),
-        dataLength = data.length,
-        enterGroup = enter[j] = new Array(dataLength),
-        updateGroup = update[j] = new Array(dataLength),
-        exitGroup = exit[j] = new Array(groupLength);
-
-    bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
-
-    // Now connect the enter nodes to their following update node, such that
-    // appendChild can insert the materialized enter node before this node,
-    // rather than at the end of the parent node.
-    for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
-      if (previous = enterGroup[i0]) {
-        if (i0 >= i1) i1 = i0 + 1;
-        while (!(next = updateGroup[i1]) && ++i1 < dataLength);
-        previous._next = next || null;
-      }
-    }
-  }
-
-  update = new Selection(update, parents);
-  update._enter = enter;
-  update._exit = exit;
-  return update;
-}
-
-// Given some data, this returns an array-like view of it: an object that
-// exposes a length property and allows numeric indexing. Note that unlike
-// selectAll, this isn’t worried about “live” collections because the resulting
-// array will only be used briefly while data is being bound. (It is possible to
-// cause the data to change while iterating by using a key function, but please
-// don’t; we’d rather avoid a gratuitous copy.)
-function arraylike(data) {
-  return typeof data === "object" && "length" in data
-    ? data // Array, TypedArray, NodeList, array-like
-    : Array.from(data); // Map, Set, iterable, string, or anything else
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/exit.js
-
-
-
-/* harmony default export */ function exit() {
-  return new Selection(this._exit || this._groups.map(sparse), this._parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/join.js
-/* harmony default export */ function join(onenter, onupdate, onexit) {
-  var enter = this.enter(), update = this, exit = this.exit();
-  if (typeof onenter === "function") {
-    enter = onenter(enter);
-    if (enter) enter = enter.selection();
-  } else {
-    enter = enter.append(onenter + "");
-  }
-  if (onupdate != null) {
-    update = onupdate(update);
-    if (update) update = update.selection();
-  }
-  if (onexit == null) exit.remove(); else onexit(exit);
-  return enter && update ? enter.merge(update).order() : update;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/merge.js
-
-
-/* harmony default export */ function merge(context) {
-  var selection = context.selection ? context.selection() : context;
-
-  for (var groups0 = this._groups, groups1 = selection._groups, m0 = groups0.length, m1 = groups1.length, m = Math.min(m0, m1), merges = new Array(m0), j = 0; j < m; ++j) {
-    for (var group0 = groups0[j], group1 = groups1[j], n = group0.length, merge = merges[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group0[i] || group1[i]) {
-        merge[i] = node;
-      }
-    }
-  }
-
-  for (; j < m0; ++j) {
-    merges[j] = groups0[j];
-  }
-
-  return new Selection(merges, this._parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/order.js
-/* harmony default export */ function order() {
-
-  for (var groups = this._groups, j = -1, m = groups.length; ++j < m;) {
-    for (var group = groups[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
-      if (node = group[i]) {
-        if (next && node.compareDocumentPosition(next) ^ 4) next.parentNode.insertBefore(node, next);
-        next = node;
-      }
-    }
-  }
-
-  return this;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sort.js
-
-
-/* harmony default export */ function sort(compare) {
-  if (!compare) compare = ascending;
-
-  function compareNode(a, b) {
-    return a && b ? compare(a.__data__, b.__data__) : !a - !b;
-  }
-
-  for (var groups = this._groups, m = groups.length, sortgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        sortgroup[i] = node;
-      }
-    }
-    sortgroup.sort(compareNode);
-  }
-
-  return new Selection(sortgroups, this._parents).order();
-}
-
-function ascending(a, b) {
-  return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/call.js
-/* harmony default export */ function call() {
-  var callback = arguments[0];
-  arguments[0] = this;
-  callback.apply(null, arguments);
-  return this;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/nodes.js
-/* harmony default export */ function nodes() {
-  return Array.from(this);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/node.js
-/* harmony default export */ function node() {
-
-  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
-      var node = group[i];
-      if (node) return node;
-    }
-  }
-
-  return null;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/size.js
-/* harmony default export */ function size() {
-  let size = 0;
-  for (const node of this) ++size; // eslint-disable-line no-unused-vars
-  return size;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/empty.js
-/* harmony default export */ function selection_empty() {
-  return !this.node();
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/each.js
-/* harmony default export */ function each(callback) {
-
-  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) callback.call(node, node.__data__, i, group);
-    }
-  }
-
-  return this;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/namespaces.js
-var xhtml = "http://www.w3.org/1999/xhtml";
-
-/* harmony default export */ const namespaces = ({
-  svg: "http://www.w3.org/2000/svg",
-  xhtml: xhtml,
-  xlink: "http://www.w3.org/1999/xlink",
-  xml: "http://www.w3.org/XML/1998/namespace",
-  xmlns: "http://www.w3.org/2000/xmlns/"
-});
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/namespace.js
-
-
-/* harmony default export */ function namespace(name) {
-  var prefix = name += "", i = prefix.indexOf(":");
-  if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1);
-  return namespaces.hasOwnProperty(prefix) ? {space: namespaces[prefix], local: name} : name; // eslint-disable-line no-prototype-builtins
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/attr.js
-
-
-function attrRemove(name) {
-  return function() {
-    this.removeAttribute(name);
-  };
-}
-
-function attrRemoveNS(fullname) {
-  return function() {
-    this.removeAttributeNS(fullname.space, fullname.local);
-  };
-}
-
-function attrConstant(name, value) {
-  return function() {
-    this.setAttribute(name, value);
-  };
-}
-
-function attrConstantNS(fullname, value) {
-  return function() {
-    this.setAttributeNS(fullname.space, fullname.local, value);
-  };
-}
-
-function attrFunction(name, value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    if (v == null) this.removeAttribute(name);
-    else this.setAttribute(name, v);
-  };
-}
-
-function attrFunctionNS(fullname, value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    if (v == null) this.removeAttributeNS(fullname.space, fullname.local);
-    else this.setAttributeNS(fullname.space, fullname.local, v);
-  };
-}
-
-/* harmony default export */ function attr(name, value) {
-  var fullname = namespace(name);
-
-  if (arguments.length < 2) {
-    var node = this.node();
-    return fullname.local
-        ? node.getAttributeNS(fullname.space, fullname.local)
-        : node.getAttribute(fullname);
-  }
-
-  return this.each((value == null
-      ? (fullname.local ? attrRemoveNS : attrRemove) : (typeof value === "function"
-      ? (fullname.local ? attrFunctionNS : attrFunction)
-      : (fullname.local ? attrConstantNS : attrConstant)))(fullname, value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/window.js
-/* harmony default export */ function src_window(node) {
-  return (node.ownerDocument && node.ownerDocument.defaultView) // node is a Node
-      || (node.document && node) // node is a Window
-      || node.defaultView; // node is a Document
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/style.js
-
-
-function styleRemove(name) {
-  return function() {
-    this.style.removeProperty(name);
-  };
-}
-
-function styleConstant(name, value, priority) {
-  return function() {
-    this.style.setProperty(name, value, priority);
-  };
-}
-
-function styleFunction(name, value, priority) {
-  return function() {
-    var v = value.apply(this, arguments);
-    if (v == null) this.style.removeProperty(name);
-    else this.style.setProperty(name, v, priority);
-  };
-}
-
-/* harmony default export */ function style(name, value, priority) {
-  return arguments.length > 1
-      ? this.each((value == null
-            ? styleRemove : typeof value === "function"
-            ? styleFunction
-            : styleConstant)(name, value, priority == null ? "" : priority))
-      : styleValue(this.node(), name);
-}
-
-function styleValue(node, name) {
-  return node.style.getPropertyValue(name)
-      || src_window(node).getComputedStyle(node, null).getPropertyValue(name);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/property.js
-function propertyRemove(name) {
-  return function() {
-    delete this[name];
-  };
-}
-
-function propertyConstant(name, value) {
-  return function() {
-    this[name] = value;
-  };
-}
-
-function propertyFunction(name, value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    if (v == null) delete this[name];
-    else this[name] = v;
-  };
-}
-
-/* harmony default export */ function property(name, value) {
-  return arguments.length > 1
-      ? this.each((value == null
-          ? propertyRemove : typeof value === "function"
-          ? propertyFunction
-          : propertyConstant)(name, value))
-      : this.node()[name];
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/classed.js
-function classArray(string) {
-  return string.trim().split(/^|\s+/);
-}
-
-function classList(node) {
-  return node.classList || new ClassList(node);
-}
-
-function ClassList(node) {
-  this._node = node;
-  this._names = classArray(node.getAttribute("class") || "");
-}
-
-ClassList.prototype = {
-  add: function(name) {
-    var i = this._names.indexOf(name);
-    if (i < 0) {
-      this._names.push(name);
-      this._node.setAttribute("class", this._names.join(" "));
-    }
-  },
-  remove: function(name) {
-    var i = this._names.indexOf(name);
-    if (i >= 0) {
-      this._names.splice(i, 1);
-      this._node.setAttribute("class", this._names.join(" "));
-    }
-  },
-  contains: function(name) {
-    return this._names.indexOf(name) >= 0;
-  }
-};
-
-function classedAdd(node, names) {
-  var list = classList(node), i = -1, n = names.length;
-  while (++i < n) list.add(names[i]);
-}
-
-function classedRemove(node, names) {
-  var list = classList(node), i = -1, n = names.length;
-  while (++i < n) list.remove(names[i]);
-}
-
-function classedTrue(names) {
-  return function() {
-    classedAdd(this, names);
-  };
-}
-
-function classedFalse(names) {
-  return function() {
-    classedRemove(this, names);
-  };
-}
-
-function classedFunction(names, value) {
-  return function() {
-    (value.apply(this, arguments) ? classedAdd : classedRemove)(this, names);
-  };
-}
-
-/* harmony default export */ function classed(name, value) {
-  var names = classArray(name + "");
-
-  if (arguments.length < 2) {
-    var list = classList(this.node()), i = -1, n = names.length;
-    while (++i < n) if (!list.contains(names[i])) return false;
-    return true;
-  }
-
-  return this.each((typeof value === "function"
-      ? classedFunction : value
-      ? classedTrue
-      : classedFalse)(names, value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/text.js
-function textRemove() {
-  this.textContent = "";
-}
-
-function textConstant(value) {
-  return function() {
-    this.textContent = value;
-  };
-}
-
-function textFunction(value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    this.textContent = v == null ? "" : v;
-  };
-}
-
-/* harmony default export */ function selection_text(value) {
-  return arguments.length
-      ? this.each(value == null
-          ? textRemove : (typeof value === "function"
-          ? textFunction
-          : textConstant)(value))
-      : this.node().textContent;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/html.js
-function htmlRemove() {
-  this.innerHTML = "";
-}
-
-function htmlConstant(value) {
-  return function() {
-    this.innerHTML = value;
-  };
-}
-
-function htmlFunction(value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    this.innerHTML = v == null ? "" : v;
-  };
-}
-
-/* harmony default export */ function html(value) {
-  return arguments.length
-      ? this.each(value == null
-          ? htmlRemove : (typeof value === "function"
-          ? htmlFunction
-          : htmlConstant)(value))
-      : this.node().innerHTML;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/raise.js
-function raise() {
-  if (this.nextSibling) this.parentNode.appendChild(this);
-}
-
-/* harmony default export */ function selection_raise() {
-  return this.each(raise);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/lower.js
-function lower() {
-  if (this.previousSibling) this.parentNode.insertBefore(this, this.parentNode.firstChild);
-}
-
-/* harmony default export */ function selection_lower() {
-  return this.each(lower);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/creator.js
-
-
-
-function creatorInherit(name) {
-  return function() {
-    var document = this.ownerDocument,
-        uri = this.namespaceURI;
-    return uri === xhtml && document.documentElement.namespaceURI === xhtml
-        ? document.createElement(name)
-        : document.createElementNS(uri, name);
-  };
-}
-
-function creatorFixed(fullname) {
-  return function() {
-    return this.ownerDocument.createElementNS(fullname.space, fullname.local);
-  };
-}
-
-/* harmony default export */ function creator(name) {
-  var fullname = namespace(name);
-  return (fullname.local
-      ? creatorFixed
-      : creatorInherit)(fullname);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/append.js
-
-
-/* harmony default export */ function append(name) {
-  var create = typeof name === "function" ? name : creator(name);
-  return this.select(function() {
-    return this.appendChild(create.apply(this, arguments));
-  });
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/insert.js
-
-
-
-function constantNull() {
-  return null;
-}
-
-/* harmony default export */ function insert(name, before) {
-  var create = typeof name === "function" ? name : creator(name),
-      select = before == null ? constantNull : typeof before === "function" ? before : selector(before);
-  return this.select(function() {
-    return this.insertBefore(create.apply(this, arguments), select.apply(this, arguments) || null);
-  });
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/remove.js
-function remove() {
-  var parent = this.parentNode;
-  if (parent) parent.removeChild(this);
-}
-
-/* harmony default export */ function selection_remove() {
-  return this.each(remove);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/clone.js
-function selection_cloneShallow() {
-  var clone = this.cloneNode(false), parent = this.parentNode;
-  return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
-}
-
-function selection_cloneDeep() {
-  var clone = this.cloneNode(true), parent = this.parentNode;
-  return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
-}
-
-/* harmony default export */ function clone(deep) {
-  return this.select(deep ? selection_cloneDeep : selection_cloneShallow);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/datum.js
-/* harmony default export */ function selection_datum(value) {
-  return arguments.length
-      ? this.property("__data__", value)
-      : this.node().__data__;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/on.js
-function contextListener(listener) {
-  return function(event) {
-    listener.call(this, event, this.__data__);
-  };
-}
-
-function parseTypenames(typenames) {
-  return typenames.trim().split(/^|\s+/).map(function(t) {
-    var name = "", i = t.indexOf(".");
-    if (i >= 0) name = t.slice(i + 1), t = t.slice(0, i);
-    return {type: t, name: name};
-  });
-}
-
-function onRemove(typename) {
-  return function() {
-    var on = this.__on;
-    if (!on) return;
-    for (var j = 0, i = -1, m = on.length, o; j < m; ++j) {
-      if (o = on[j], (!typename.type || o.type === typename.type) && o.name === typename.name) {
-        this.removeEventListener(o.type, o.listener, o.options);
-      } else {
-        on[++i] = o;
-      }
-    }
-    if (++i) on.length = i;
-    else delete this.__on;
-  };
-}
-
-function onAdd(typename, value, options) {
-  return function() {
-    var on = this.__on, o, listener = contextListener(value);
-    if (on) for (var j = 0, m = on.length; j < m; ++j) {
-      if ((o = on[j]).type === typename.type && o.name === typename.name) {
-        this.removeEventListener(o.type, o.listener, o.options);
-        this.addEventListener(o.type, o.listener = listener, o.options = options);
-        o.value = value;
-        return;
-      }
-    }
-    this.addEventListener(typename.type, listener, options);
-    o = {type: typename.type, name: typename.name, value: value, listener: listener, options: options};
-    if (!on) this.__on = [o];
-    else on.push(o);
-  };
-}
-
-/* harmony default export */ function on(typename, value, options) {
-  var typenames = parseTypenames(typename + ""), i, n = typenames.length, t;
-
-  if (arguments.length < 2) {
-    var on = this.node().__on;
-    if (on) for (var j = 0, m = on.length, o; j < m; ++j) {
-      for (i = 0, o = on[j]; i < n; ++i) {
-        if ((t = typenames[i]).type === o.type && t.name === o.name) {
-          return o.value;
-        }
-      }
-    }
-    return;
-  }
-
-  on = value ? onAdd : onRemove;
-  for (i = 0; i < n; ++i) this.each(on(typenames[i], value, options));
-  return this;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/dispatch.js
-
-
-function dispatchEvent(node, type, params) {
-  var window = src_window(node),
-      event = window.CustomEvent;
-
-  if (typeof event === "function") {
-    event = new event(type, params);
-  } else {
-    event = window.document.createEvent("Event");
-    if (params) event.initEvent(type, params.bubbles, params.cancelable), event.detail = params.detail;
-    else event.initEvent(type, false, false);
-  }
-
-  node.dispatchEvent(event);
-}
-
-function dispatchConstant(type, params) {
-  return function() {
-    return dispatchEvent(this, type, params);
-  };
-}
-
-function dispatchFunction(type, params) {
-  return function() {
-    return dispatchEvent(this, type, params.apply(this, arguments));
-  };
-}
-
-/* harmony default export */ function dispatch(type, params) {
-  return this.each((typeof params === "function"
-      ? dispatchFunction
-      : dispatchConstant)(type, params));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/iterator.js
-/* harmony default export */ function* iterator() {
-  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-      if (node = group[i]) yield node;
-    }
-  }
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/index.js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var root = [null];
-
-function Selection(groups, parents) {
-  this._groups = groups;
-  this._parents = parents;
-}
-
-function selection() {
-  return new Selection([[document.documentElement]], root);
-}
-
-function selection_selection() {
-  return this;
-}
-
-Selection.prototype = selection.prototype = {
-  constructor: Selection,
-  select: selection_select,
-  selectAll: selectAll,
-  selectChild: selectChild,
-  selectChildren: selectChildren,
-  filter: selection_filter,
-  data: data,
-  enter: enter,
-  exit: exit,
-  join: join,
-  merge: merge,
-  selection: selection_selection,
-  order: order,
-  sort: sort,
-  call: call,
-  nodes: nodes,
-  node: node,
-  size: size,
-  empty: selection_empty,
-  each: each,
-  attr: attr,
-  style: style,
-  property: property,
-  classed: classed,
-  text: selection_text,
-  html: html,
-  raise: selection_raise,
-  lower: selection_lower,
-  append: append,
-  insert: insert,
-  remove: selection_remove,
-  clone: clone,
-  datum: selection_datum,
-  on: on,
-  dispatch: dispatch,
-  [Symbol.iterator]: iterator
-};
-
-/* harmony default export */ const src_selection = (selection);
-
-;// CONCATENATED MODULE: ../node_modules/d3-selection/src/select.js
-
-
-/* harmony default export */ function src_select(selector) {
-  return typeof selector === "string"
-      ? new Selection([[document.querySelector(selector)]], [document.documentElement])
-      : new Selection([[selector]], root);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-dispatch/src/dispatch.js
-var noop = {value: () => {}};
-
-function dispatch_dispatch() {
-  for (var i = 0, n = arguments.length, _ = {}, t; i < n; ++i) {
-    if (!(t = arguments[i] + "") || (t in _) || /[\s.]/.test(t)) throw new Error("illegal type: " + t);
-    _[t] = [];
-  }
-  return new Dispatch(_);
-}
-
-function Dispatch(_) {
-  this._ = _;
-}
-
-function dispatch_parseTypenames(typenames, types) {
-  return typenames.trim().split(/^|\s+/).map(function(t) {
-    var name = "", i = t.indexOf(".");
-    if (i >= 0) name = t.slice(i + 1), t = t.slice(0, i);
-    if (t && !types.hasOwnProperty(t)) throw new Error("unknown type: " + t);
-    return {type: t, name: name};
-  });
-}
-
-Dispatch.prototype = dispatch_dispatch.prototype = {
-  constructor: Dispatch,
-  on: function(typename, callback) {
-    var _ = this._,
-        T = dispatch_parseTypenames(typename + "", _),
-        t,
-        i = -1,
-        n = T.length;
-
-    // If no callback was specified, return the callback of the given type and name.
-    if (arguments.length < 2) {
-      while (++i < n) if ((t = (typename = T[i]).type) && (t = get(_[t], typename.name))) return t;
-      return;
-    }
-
-    // If a type was specified, set the callback for the given type and name.
-    // Otherwise, if a null callback was specified, remove callbacks of the given name.
-    if (callback != null && typeof callback !== "function") throw new Error("invalid callback: " + callback);
-    while (++i < n) {
-      if (t = (typename = T[i]).type) _[t] = set(_[t], typename.name, callback);
-      else if (callback == null) for (t in _) _[t] = set(_[t], typename.name, null);
-    }
-
-    return this;
-  },
-  copy: function() {
-    var copy = {}, _ = this._;
-    for (var t in _) copy[t] = _[t].slice();
-    return new Dispatch(copy);
-  },
-  call: function(type, that) {
-    if ((n = arguments.length - 2) > 0) for (var args = new Array(n), i = 0, n, t; i < n; ++i) args[i] = arguments[i + 2];
-    if (!this._.hasOwnProperty(type)) throw new Error("unknown type: " + type);
-    for (t = this._[type], i = 0, n = t.length; i < n; ++i) t[i].value.apply(that, args);
-  },
-  apply: function(type, that, args) {
-    if (!this._.hasOwnProperty(type)) throw new Error("unknown type: " + type);
-    for (var t = this._[type], i = 0, n = t.length; i < n; ++i) t[i].value.apply(that, args);
-  }
-};
-
-function get(type, name) {
-  for (var i = 0, n = type.length, c; i < n; ++i) {
-    if ((c = type[i]).name === name) {
-      return c.value;
-    }
-  }
-}
-
-function set(type, name, callback) {
-  for (var i = 0, n = type.length; i < n; ++i) {
-    if (type[i].name === name) {
-      type[i] = noop, type = type.slice(0, i).concat(type.slice(i + 1));
-      break;
-    }
-  }
-  if (callback != null) type.push({name: name, value: callback});
-  return type;
-}
-
-/* harmony default export */ const src_dispatch = (dispatch_dispatch);
-
-;// CONCATENATED MODULE: ../node_modules/d3-timer/src/timer.js
-var timer_frame = 0, // is an animation frame pending?
-    timeout = 0, // is a timeout pending?
-    interval = 0, // are any timers active?
-    pokeDelay = 1000, // how frequently we check for clock skew
-    taskHead,
-    taskTail,
-    clockLast = 0,
-    clockNow = 0,
-    clockSkew = 0,
-    clock = typeof performance === "object" && performance.now ? performance : Date,
-    setFrame = typeof window === "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(f) { setTimeout(f, 17); };
-
-function now() {
-  return clockNow || (setFrame(clearNow), clockNow = clock.now() + clockSkew);
-}
-
-function clearNow() {
-  clockNow = 0;
-}
-
-function Timer() {
-  this._call =
-  this._time =
-  this._next = null;
-}
-
-Timer.prototype = timer.prototype = {
-  constructor: Timer,
-  restart: function(callback, delay, time) {
-    if (typeof callback !== "function") throw new TypeError("callback is not a function");
-    time = (time == null ? now() : +time) + (delay == null ? 0 : +delay);
-    if (!this._next && taskTail !== this) {
-      if (taskTail) taskTail._next = this;
-      else taskHead = this;
-      taskTail = this;
-    }
-    this._call = callback;
-    this._time = time;
-    sleep();
-  },
-  stop: function() {
-    if (this._call) {
-      this._call = null;
-      this._time = Infinity;
-      sleep();
-    }
-  }
-};
-
-function timer(callback, delay, time) {
-  var t = new Timer;
-  t.restart(callback, delay, time);
-  return t;
-}
-
-function timerFlush() {
-  now(); // Get the current time, if not already set.
-  ++timer_frame; // Pretend we’ve set an alarm, if we haven’t already.
-  var t = taskHead, e;
-  while (t) {
-    if ((e = clockNow - t._time) >= 0) t._call.call(undefined, e);
-    t = t._next;
-  }
-  --timer_frame;
-}
-
-function wake() {
-  clockNow = (clockLast = clock.now()) + clockSkew;
-  timer_frame = timeout = 0;
-  try {
-    timerFlush();
-  } finally {
-    timer_frame = 0;
-    nap();
-    clockNow = 0;
-  }
-}
-
-function poke() {
-  var now = clock.now(), delay = now - clockLast;
-  if (delay > pokeDelay) clockSkew -= delay, clockLast = now;
-}
-
-function nap() {
-  var t0, t1 = taskHead, t2, time = Infinity;
-  while (t1) {
-    if (t1._call) {
-      if (time > t1._time) time = t1._time;
-      t0 = t1, t1 = t1._next;
-    } else {
-      t2 = t1._next, t1._next = null;
-      t1 = t0 ? t0._next = t2 : taskHead = t2;
-    }
-  }
-  taskTail = t0;
-  sleep(time);
-}
-
-function sleep(time) {
-  if (timer_frame) return; // Soonest alarm already set, or will be.
-  if (timeout) timeout = clearTimeout(timeout);
-  var delay = time - clockNow; // Strictly less than if we recomputed clockNow.
-  if (delay > 24) {
-    if (time < Infinity) timeout = setTimeout(wake, time - clock.now() - clockSkew);
-    if (interval) interval = clearInterval(interval);
-  } else {
-    if (!interval) clockLast = clock.now(), interval = setInterval(poke, pokeDelay);
-    timer_frame = 1, setFrame(wake);
-  }
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-timer/src/timeout.js
-
-
-/* harmony default export */ function src_timeout(callback, delay, time) {
-  var t = new Timer;
-  delay = delay == null ? 0 : +delay;
-  t.restart(elapsed => {
-    t.stop();
-    callback(elapsed + delay);
-  }, delay, time);
-  return t;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/schedule.js
-
-
-
-var emptyOn = src_dispatch("start", "end", "cancel", "interrupt");
-var emptyTween = [];
-
-var CREATED = 0;
-var SCHEDULED = 1;
-var STARTING = 2;
-var STARTED = 3;
-var RUNNING = 4;
-var ENDING = 5;
-var ENDED = 6;
-
-/* harmony default export */ function schedule(node, name, id, index, group, timing) {
-  var schedules = node.__transition;
-  if (!schedules) node.__transition = {};
-  else if (id in schedules) return;
-  create(node, id, {
-    name: name,
-    index: index, // For context during callback.
-    group: group, // For context during callback.
-    on: emptyOn,
-    tween: emptyTween,
-    time: timing.time,
-    delay: timing.delay,
-    duration: timing.duration,
-    ease: timing.ease,
-    timer: null,
-    state: CREATED
-  });
-}
-
-function init(node, id) {
-  var schedule = schedule_get(node, id);
-  if (schedule.state > CREATED) throw new Error("too late; already scheduled");
-  return schedule;
-}
-
-function schedule_set(node, id) {
-  var schedule = schedule_get(node, id);
-  if (schedule.state > STARTED) throw new Error("too late; already running");
-  return schedule;
-}
-
-function schedule_get(node, id) {
-  var schedule = node.__transition;
-  if (!schedule || !(schedule = schedule[id])) throw new Error("transition not found");
-  return schedule;
-}
-
-function create(node, id, self) {
-  var schedules = node.__transition,
-      tween;
-
-  // Initialize the self timer when the transition is created.
-  // Note the actual delay is not known until the first callback!
-  schedules[id] = self;
-  self.timer = timer(schedule, 0, self.time);
-
-  function schedule(elapsed) {
-    self.state = SCHEDULED;
-    self.timer.restart(start, self.delay, self.time);
-
-    // If the elapsed delay is less than our first sleep, start immediately.
-    if (self.delay <= elapsed) start(elapsed - self.delay);
-  }
-
-  function start(elapsed) {
-    var i, j, n, o;
-
-    // If the state is not SCHEDULED, then we previously errored on start.
-    if (self.state !== SCHEDULED) return stop();
-
-    for (i in schedules) {
-      o = schedules[i];
-      if (o.name !== self.name) continue;
-
-      // While this element already has a starting transition during this frame,
-      // defer starting an interrupting transition until that transition has a
-      // chance to tick (and possibly end); see d3/d3-transition#54!
-      if (o.state === STARTED) return src_timeout(start);
-
-      // Interrupt the active transition, if any.
-      if (o.state === RUNNING) {
-        o.state = ENDED;
-        o.timer.stop();
-        o.on.call("interrupt", node, node.__data__, o.index, o.group);
-        delete schedules[i];
-      }
-
-      // Cancel any pre-empted transitions.
-      else if (+i < id) {
-        o.state = ENDED;
-        o.timer.stop();
-        o.on.call("cancel", node, node.__data__, o.index, o.group);
-        delete schedules[i];
-      }
-    }
-
-    // Defer the first tick to end of the current frame; see d3/d3#1576.
-    // Note the transition may be canceled after start and before the first tick!
-    // Note this must be scheduled before the start event; see d3/d3-transition#16!
-    // Assuming this is successful, subsequent callbacks go straight to tick.
-    src_timeout(function() {
-      if (self.state === STARTED) {
-        self.state = RUNNING;
-        self.timer.restart(tick, self.delay, self.time);
-        tick(elapsed);
-      }
-    });
-
-    // Dispatch the start event.
-    // Note this must be done before the tween are initialized.
-    self.state = STARTING;
-    self.on.call("start", node, node.__data__, self.index, self.group);
-    if (self.state !== STARTING) return; // interrupted
-    self.state = STARTED;
-
-    // Initialize the tween, deleting null tween.
-    tween = new Array(n = self.tween.length);
-    for (i = 0, j = -1; i < n; ++i) {
-      if (o = self.tween[i].value.call(node, node.__data__, self.index, self.group)) {
-        tween[++j] = o;
-      }
-    }
-    tween.length = j + 1;
-  }
-
-  function tick(elapsed) {
-    var t = elapsed < self.duration ? self.ease.call(null, elapsed / self.duration) : (self.timer.restart(stop), self.state = ENDING, 1),
-        i = -1,
-        n = tween.length;
-
-    while (++i < n) {
-      tween[i].call(node, t);
-    }
-
-    // Dispatch the end event.
-    if (self.state === ENDING) {
-      self.on.call("end", node, node.__data__, self.index, self.group);
-      stop();
-    }
-  }
-
-  function stop() {
-    self.state = ENDED;
-    self.timer.stop();
-    delete schedules[id];
-    for (var i in schedules) return; // eslint-disable-line no-unused-vars
-    delete node.__transition;
-  }
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/interrupt.js
-
-
-/* harmony default export */ function interrupt(node, name) {
-  var schedules = node.__transition,
-      schedule,
-      active,
-      empty = true,
-      i;
-
-  if (!schedules) return;
-
-  name = name == null ? null : name + "";
-
-  for (i in schedules) {
-    if ((schedule = schedules[i]).name !== name) { empty = false; continue; }
-    active = schedule.state > STARTING && schedule.state < ENDING;
-    schedule.state = ENDED;
-    schedule.timer.stop();
-    schedule.on.call(active ? "interrupt" : "cancel", node, node.__data__, schedule.index, schedule.group);
-    delete schedules[i];
-  }
-
-  if (empty) delete node.__transition;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/interrupt.js
-
-
-/* harmony default export */ function selection_interrupt(name) {
-  return this.each(function() {
-    interrupt(this, name);
-  });
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/number.js
-/* harmony default export */ function number(a, b) {
-  return a = +a, b = +b, function(t) {
-    return a * (1 - t) + b * t;
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/decompose.js
-var degrees = 180 / Math.PI;
-
-var identity = {
-  translateX: 0,
-  translateY: 0,
-  rotate: 0,
-  skewX: 0,
-  scaleX: 1,
-  scaleY: 1
-};
-
-/* harmony default export */ function decompose(a, b, c, d, e, f) {
-  var scaleX, scaleY, skewX;
-  if (scaleX = Math.sqrt(a * a + b * b)) a /= scaleX, b /= scaleX;
-  if (skewX = a * c + b * d) c -= a * skewX, d -= b * skewX;
-  if (scaleY = Math.sqrt(c * c + d * d)) c /= scaleY, d /= scaleY, skewX /= scaleY;
-  if (a * d < b * c) a = -a, b = -b, skewX = -skewX, scaleX = -scaleX;
-  return {
-    translateX: e,
-    translateY: f,
-    rotate: Math.atan2(b, a) * degrees,
-    skewX: Math.atan(skewX) * degrees,
-    scaleX: scaleX,
-    scaleY: scaleY
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/parse.js
-
-
-var svgNode;
-
-/* eslint-disable no-undef */
-function parseCss(value) {
-  const m = new (typeof DOMMatrix === "function" ? DOMMatrix : WebKitCSSMatrix)(value + "");
-  return m.isIdentity ? identity : decompose(m.a, m.b, m.c, m.d, m.e, m.f);
-}
-
-function parseSvg(value) {
-  if (value == null) return identity;
-  if (!svgNode) svgNode = document.createElementNS("http://www.w3.org/2000/svg", "g");
-  svgNode.setAttribute("transform", value);
-  if (!(value = svgNode.transform.baseVal.consolidate())) return identity;
-  value = value.matrix;
-  return decompose(value.a, value.b, value.c, value.d, value.e, value.f);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/index.js
-
-
-
-function interpolateTransform(parse, pxComma, pxParen, degParen) {
-
-  function pop(s) {
-    return s.length ? s.pop() + " " : "";
-  }
-
-  function translate(xa, ya, xb, yb, s, q) {
-    if (xa !== xb || ya !== yb) {
-      var i = s.push("translate(", null, pxComma, null, pxParen);
-      q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
-    } else if (xb || yb) {
-      s.push("translate(" + xb + pxComma + yb + pxParen);
-    }
-  }
-
-  function rotate(a, b, s, q) {
-    if (a !== b) {
-      if (a - b > 180) b += 360; else if (b - a > 180) a += 360; // shortest path
-      q.push({i: s.push(pop(s) + "rotate(", null, degParen) - 2, x: number(a, b)});
-    } else if (b) {
-      s.push(pop(s) + "rotate(" + b + degParen);
-    }
-  }
-
-  function skewX(a, b, s, q) {
-    if (a !== b) {
-      q.push({i: s.push(pop(s) + "skewX(", null, degParen) - 2, x: number(a, b)});
-    } else if (b) {
-      s.push(pop(s) + "skewX(" + b + degParen);
-    }
-  }
-
-  function scale(xa, ya, xb, yb, s, q) {
-    if (xa !== xb || ya !== yb) {
-      var i = s.push(pop(s) + "scale(", null, ",", null, ")");
-      q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
-    } else if (xb !== 1 || yb !== 1) {
-      s.push(pop(s) + "scale(" + xb + "," + yb + ")");
-    }
-  }
-
-  return function(a, b) {
-    var s = [], // string constants and placeholders
-        q = []; // number interpolators
-    a = parse(a), b = parse(b);
-    translate(a.translateX, a.translateY, b.translateX, b.translateY, s, q);
-    rotate(a.rotate, b.rotate, s, q);
-    skewX(a.skewX, b.skewX, s, q);
-    scale(a.scaleX, a.scaleY, b.scaleX, b.scaleY, s, q);
-    a = b = null; // gc
-    return function(t) {
-      var i = -1, n = q.length, o;
-      while (++i < n) s[(o = q[i]).i] = o.x(t);
-      return s.join("");
-    };
-  };
-}
-
-var interpolateTransformCss = interpolateTransform(parseCss, "px, ", "px)", "deg)");
-var interpolateTransformSvg = interpolateTransform(parseSvg, ", ", ")", ")");
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/tween.js
-
-
-function tweenRemove(id, name) {
-  var tween0, tween1;
-  return function() {
-    var schedule = schedule_set(this, id),
-        tween = schedule.tween;
-
-    // If this node shared tween with the previous node,
-    // just assign the updated shared tween and we’re done!
-    // Otherwise, copy-on-write.
-    if (tween !== tween0) {
-      tween1 = tween0 = tween;
-      for (var i = 0, n = tween1.length; i < n; ++i) {
-        if (tween1[i].name === name) {
-          tween1 = tween1.slice();
-          tween1.splice(i, 1);
-          break;
-        }
-      }
-    }
-
-    schedule.tween = tween1;
-  };
-}
-
-function tweenFunction(id, name, value) {
-  var tween0, tween1;
-  if (typeof value !== "function") throw new Error;
-  return function() {
-    var schedule = schedule_set(this, id),
-        tween = schedule.tween;
-
-    // If this node shared tween with the previous node,
-    // just assign the updated shared tween and we’re done!
-    // Otherwise, copy-on-write.
-    if (tween !== tween0) {
-      tween1 = (tween0 = tween).slice();
-      for (var t = {name: name, value: value}, i = 0, n = tween1.length; i < n; ++i) {
-        if (tween1[i].name === name) {
-          tween1[i] = t;
-          break;
-        }
-      }
-      if (i === n) tween1.push(t);
-    }
-
-    schedule.tween = tween1;
-  };
-}
-
-/* harmony default export */ function tween(name, value) {
-  var id = this._id;
-
-  name += "";
-
-  if (arguments.length < 2) {
-    var tween = schedule_get(this.node(), id).tween;
-    for (var i = 0, n = tween.length, t; i < n; ++i) {
-      if ((t = tween[i]).name === name) {
-        return t.value;
-      }
-    }
-    return null;
-  }
-
-  return this.each((value == null ? tweenRemove : tweenFunction)(id, name, value));
-}
-
-function tweenValue(transition, name, value) {
-  var id = transition._id;
-
-  transition.each(function() {
-    var schedule = schedule_set(this, id);
-    (schedule.value || (schedule.value = {}))[name] = value.apply(this, arguments);
-  });
-
-  return function(node) {
-    return schedule_get(node, id).value[name];
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-color/src/define.js
-/* harmony default export */ function src_define(constructor, factory, prototype) {
-  constructor.prototype = factory.prototype = prototype;
-  prototype.constructor = constructor;
-}
-
-function extend(parent, definition) {
-  var prototype = Object.create(parent.prototype);
-  for (var key in definition) prototype[key] = definition[key];
-  return prototype;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-color/src/color.js
-
-
-function Color() {}
-
-var darker = 0.7;
-var brighter = 1 / darker;
-
-var reI = "\\s*([+-]?\\d+)\\s*",
-    reN = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",
-    reP = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",
-    reHex = /^#([0-9a-f]{3,8})$/,
-    reRgbInteger = new RegExp("^rgb\\(" + [reI, reI, reI] + "\\)$"),
-    reRgbPercent = new RegExp("^rgb\\(" + [reP, reP, reP] + "\\)$"),
-    reRgbaInteger = new RegExp("^rgba\\(" + [reI, reI, reI, reN] + "\\)$"),
-    reRgbaPercent = new RegExp("^rgba\\(" + [reP, reP, reP, reN] + "\\)$"),
-    reHslPercent = new RegExp("^hsl\\(" + [reN, reP, reP] + "\\)$"),
-    reHslaPercent = new RegExp("^hsla\\(" + [reN, reP, reP, reN] + "\\)$");
-
-var named = {
-  aliceblue: 0xf0f8ff,
-  antiquewhite: 0xfaebd7,
-  aqua: 0x00ffff,
-  aquamarine: 0x7fffd4,
-  azure: 0xf0ffff,
-  beige: 0xf5f5dc,
-  bisque: 0xffe4c4,
-  black: 0x000000,
-  blanchedalmond: 0xffebcd,
-  blue: 0x0000ff,
-  blueviolet: 0x8a2be2,
-  brown: 0xa52a2a,
-  burlywood: 0xdeb887,
-  cadetblue: 0x5f9ea0,
-  chartreuse: 0x7fff00,
-  chocolate: 0xd2691e,
-  coral: 0xff7f50,
-  cornflowerblue: 0x6495ed,
-  cornsilk: 0xfff8dc,
-  crimson: 0xdc143c,
-  cyan: 0x00ffff,
-  darkblue: 0x00008b,
-  darkcyan: 0x008b8b,
-  darkgoldenrod: 0xb8860b,
-  darkgray: 0xa9a9a9,
-  darkgreen: 0x006400,
-  darkgrey: 0xa9a9a9,
-  darkkhaki: 0xbdb76b,
-  darkmagenta: 0x8b008b,
-  darkolivegreen: 0x556b2f,
-  darkorange: 0xff8c00,
-  darkorchid: 0x9932cc,
-  darkred: 0x8b0000,
-  darksalmon: 0xe9967a,
-  darkseagreen: 0x8fbc8f,
-  darkslateblue: 0x483d8b,
-  darkslategray: 0x2f4f4f,
-  darkslategrey: 0x2f4f4f,
-  darkturquoise: 0x00ced1,
-  darkviolet: 0x9400d3,
-  deeppink: 0xff1493,
-  deepskyblue: 0x00bfff,
-  dimgray: 0x696969,
-  dimgrey: 0x696969,
-  dodgerblue: 0x1e90ff,
-  firebrick: 0xb22222,
-  floralwhite: 0xfffaf0,
-  forestgreen: 0x228b22,
-  fuchsia: 0xff00ff,
-  gainsboro: 0xdcdcdc,
-  ghostwhite: 0xf8f8ff,
-  gold: 0xffd700,
-  goldenrod: 0xdaa520,
-  gray: 0x808080,
-  green: 0x008000,
-  greenyellow: 0xadff2f,
-  grey: 0x808080,
-  honeydew: 0xf0fff0,
-  hotpink: 0xff69b4,
-  indianred: 0xcd5c5c,
-  indigo: 0x4b0082,
-  ivory: 0xfffff0,
-  khaki: 0xf0e68c,
-  lavender: 0xe6e6fa,
-  lavenderblush: 0xfff0f5,
-  lawngreen: 0x7cfc00,
-  lemonchiffon: 0xfffacd,
-  lightblue: 0xadd8e6,
-  lightcoral: 0xf08080,
-  lightcyan: 0xe0ffff,
-  lightgoldenrodyellow: 0xfafad2,
-  lightgray: 0xd3d3d3,
-  lightgreen: 0x90ee90,
-  lightgrey: 0xd3d3d3,
-  lightpink: 0xffb6c1,
-  lightsalmon: 0xffa07a,
-  lightseagreen: 0x20b2aa,
-  lightskyblue: 0x87cefa,
-  lightslategray: 0x778899,
-  lightslategrey: 0x778899,
-  lightsteelblue: 0xb0c4de,
-  lightyellow: 0xffffe0,
-  lime: 0x00ff00,
-  limegreen: 0x32cd32,
-  linen: 0xfaf0e6,
-  magenta: 0xff00ff,
-  maroon: 0x800000,
-  mediumaquamarine: 0x66cdaa,
-  mediumblue: 0x0000cd,
-  mediumorchid: 0xba55d3,
-  mediumpurple: 0x9370db,
-  mediumseagreen: 0x3cb371,
-  mediumslateblue: 0x7b68ee,
-  mediumspringgreen: 0x00fa9a,
-  mediumturquoise: 0x48d1cc,
-  mediumvioletred: 0xc71585,
-  midnightblue: 0x191970,
-  mintcream: 0xf5fffa,
-  mistyrose: 0xffe4e1,
-  moccasin: 0xffe4b5,
-  navajowhite: 0xffdead,
-  navy: 0x000080,
-  oldlace: 0xfdf5e6,
-  olive: 0x808000,
-  olivedrab: 0x6b8e23,
-  orange: 0xffa500,
-  orangered: 0xff4500,
-  orchid: 0xda70d6,
-  palegoldenrod: 0xeee8aa,
-  palegreen: 0x98fb98,
-  paleturquoise: 0xafeeee,
-  palevioletred: 0xdb7093,
-  papayawhip: 0xffefd5,
-  peachpuff: 0xffdab9,
-  peru: 0xcd853f,
-  pink: 0xffc0cb,
-  plum: 0xdda0dd,
-  powderblue: 0xb0e0e6,
-  purple: 0x800080,
-  rebeccapurple: 0x663399,
-  red: 0xff0000,
-  rosybrown: 0xbc8f8f,
-  royalblue: 0x4169e1,
-  saddlebrown: 0x8b4513,
-  salmon: 0xfa8072,
-  sandybrown: 0xf4a460,
-  seagreen: 0x2e8b57,
-  seashell: 0xfff5ee,
-  sienna: 0xa0522d,
-  silver: 0xc0c0c0,
-  skyblue: 0x87ceeb,
-  slateblue: 0x6a5acd,
-  slategray: 0x708090,
-  slategrey: 0x708090,
-  snow: 0xfffafa,
-  springgreen: 0x00ff7f,
-  steelblue: 0x4682b4,
-  tan: 0xd2b48c,
-  teal: 0x008080,
-  thistle: 0xd8bfd8,
-  tomato: 0xff6347,
-  turquoise: 0x40e0d0,
-  violet: 0xee82ee,
-  wheat: 0xf5deb3,
-  white: 0xffffff,
-  whitesmoke: 0xf5f5f5,
-  yellow: 0xffff00,
-  yellowgreen: 0x9acd32
-};
-
-src_define(Color, color, {
-  copy: function(channels) {
-    return Object.assign(new this.constructor, this, channels);
-  },
-  displayable: function() {
-    return this.rgb().displayable();
-  },
-  hex: color_formatHex, // Deprecated! Use color.formatHex.
-  formatHex: color_formatHex,
-  formatHsl: color_formatHsl,
-  formatRgb: color_formatRgb,
-  toString: color_formatRgb
-});
-
-function color_formatHex() {
-  return this.rgb().formatHex();
-}
-
-function color_formatHsl() {
-  return hslConvert(this).formatHsl();
-}
-
-function color_formatRgb() {
-  return this.rgb().formatRgb();
-}
-
-function color(format) {
-  var m, l;
-  format = (format + "").trim().toLowerCase();
-  return (m = reHex.exec(format)) ? (l = m[1].length, m = parseInt(m[1], 16), l === 6 ? rgbn(m) // #ff0000
-      : l === 3 ? new Rgb((m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), ((m & 0xf) << 4) | (m & 0xf), 1) // #f00
-      : l === 8 ? rgba(m >> 24 & 0xff, m >> 16 & 0xff, m >> 8 & 0xff, (m & 0xff) / 0xff) // #ff000000
-      : l === 4 ? rgba((m >> 12 & 0xf) | (m >> 8 & 0xf0), (m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), (((m & 0xf) << 4) | (m & 0xf)) / 0xff) // #f000
-      : null) // invalid hex
-      : (m = reRgbInteger.exec(format)) ? new Rgb(m[1], m[2], m[3], 1) // rgb(255, 0, 0)
-      : (m = reRgbPercent.exec(format)) ? new Rgb(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, 1) // rgb(100%, 0%, 0%)
-      : (m = reRgbaInteger.exec(format)) ? rgba(m[1], m[2], m[3], m[4]) // rgba(255, 0, 0, 1)
-      : (m = reRgbaPercent.exec(format)) ? rgba(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, m[4]) // rgb(100%, 0%, 0%, 1)
-      : (m = reHslPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, 1) // hsl(120, 50%, 50%)
-      : (m = reHslaPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, m[4]) // hsla(120, 50%, 50%, 1)
-      : named.hasOwnProperty(format) ? rgbn(named[format]) // eslint-disable-line no-prototype-builtins
-      : format === "transparent" ? new Rgb(NaN, NaN, NaN, 0)
-      : null;
-}
-
-function rgbn(n) {
-  return new Rgb(n >> 16 & 0xff, n >> 8 & 0xff, n & 0xff, 1);
-}
-
-function rgba(r, g, b, a) {
-  if (a <= 0) r = g = b = NaN;
-  return new Rgb(r, g, b, a);
-}
-
-function rgbConvert(o) {
-  if (!(o instanceof Color)) o = color(o);
-  if (!o) return new Rgb;
-  o = o.rgb();
-  return new Rgb(o.r, o.g, o.b, o.opacity);
-}
-
-function color_rgb(r, g, b, opacity) {
-  return arguments.length === 1 ? rgbConvert(r) : new Rgb(r, g, b, opacity == null ? 1 : opacity);
-}
-
-function Rgb(r, g, b, opacity) {
-  this.r = +r;
-  this.g = +g;
-  this.b = +b;
-  this.opacity = +opacity;
-}
-
-src_define(Rgb, color_rgb, extend(Color, {
-  brighter: function(k) {
-    k = k == null ? brighter : Math.pow(brighter, k);
-    return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
-  },
-  darker: function(k) {
-    k = k == null ? darker : Math.pow(darker, k);
-    return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
-  },
-  rgb: function() {
-    return this;
-  },
-  displayable: function() {
-    return (-0.5 <= this.r && this.r < 255.5)
-        && (-0.5 <= this.g && this.g < 255.5)
-        && (-0.5 <= this.b && this.b < 255.5)
-        && (0 <= this.opacity && this.opacity <= 1);
-  },
-  hex: rgb_formatHex, // Deprecated! Use color.formatHex.
-  formatHex: rgb_formatHex,
-  formatRgb: rgb_formatRgb,
-  toString: rgb_formatRgb
-}));
-
-function rgb_formatHex() {
-  return "#" + hex(this.r) + hex(this.g) + hex(this.b);
-}
-
-function rgb_formatRgb() {
-  var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
-  return (a === 1 ? "rgb(" : "rgba(")
-      + Math.max(0, Math.min(255, Math.round(this.r) || 0)) + ", "
-      + Math.max(0, Math.min(255, Math.round(this.g) || 0)) + ", "
-      + Math.max(0, Math.min(255, Math.round(this.b) || 0))
-      + (a === 1 ? ")" : ", " + a + ")");
-}
-
-function hex(value) {
-  value = Math.max(0, Math.min(255, Math.round(value) || 0));
-  return (value < 16 ? "0" : "") + value.toString(16);
-}
-
-function hsla(h, s, l, a) {
-  if (a <= 0) h = s = l = NaN;
-  else if (l <= 0 || l >= 1) h = s = NaN;
-  else if (s <= 0) h = NaN;
-  return new Hsl(h, s, l, a);
-}
-
-function hslConvert(o) {
-  if (o instanceof Hsl) return new Hsl(o.h, o.s, o.l, o.opacity);
-  if (!(o instanceof Color)) o = color(o);
-  if (!o) return new Hsl;
-  if (o instanceof Hsl) return o;
-  o = o.rgb();
-  var r = o.r / 255,
-      g = o.g / 255,
-      b = o.b / 255,
-      min = Math.min(r, g, b),
-      max = Math.max(r, g, b),
-      h = NaN,
-      s = max - min,
-      l = (max + min) / 2;
-  if (s) {
-    if (r === max) h = (g - b) / s + (g < b) * 6;
-    else if (g === max) h = (b - r) / s + 2;
-    else h = (r - g) / s + 4;
-    s /= l < 0.5 ? max + min : 2 - max - min;
-    h *= 60;
-  } else {
-    s = l > 0 && l < 1 ? 0 : h;
-  }
-  return new Hsl(h, s, l, o.opacity);
-}
-
-function hsl(h, s, l, opacity) {
-  return arguments.length === 1 ? hslConvert(h) : new Hsl(h, s, l, opacity == null ? 1 : opacity);
-}
-
-function Hsl(h, s, l, opacity) {
-  this.h = +h;
-  this.s = +s;
-  this.l = +l;
-  this.opacity = +opacity;
-}
-
-src_define(Hsl, hsl, extend(Color, {
-  brighter: function(k) {
-    k = k == null ? brighter : Math.pow(brighter, k);
-    return new Hsl(this.h, this.s, this.l * k, this.opacity);
-  },
-  darker: function(k) {
-    k = k == null ? darker : Math.pow(darker, k);
-    return new Hsl(this.h, this.s, this.l * k, this.opacity);
-  },
-  rgb: function() {
-    var h = this.h % 360 + (this.h < 0) * 360,
-        s = isNaN(h) || isNaN(this.s) ? 0 : this.s,
-        l = this.l,
-        m2 = l + (l < 0.5 ? l : 1 - l) * s,
-        m1 = 2 * l - m2;
-    return new Rgb(
-      hsl2rgb(h >= 240 ? h - 240 : h + 120, m1, m2),
-      hsl2rgb(h, m1, m2),
-      hsl2rgb(h < 120 ? h + 240 : h - 120, m1, m2),
-      this.opacity
-    );
-  },
-  displayable: function() {
-    return (0 <= this.s && this.s <= 1 || isNaN(this.s))
-        && (0 <= this.l && this.l <= 1)
-        && (0 <= this.opacity && this.opacity <= 1);
-  },
-  formatHsl: function() {
-    var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
-    return (a === 1 ? "hsl(" : "hsla(")
-        + (this.h || 0) + ", "
-        + (this.s || 0) * 100 + "%, "
-        + (this.l || 0) * 100 + "%"
-        + (a === 1 ? ")" : ", " + a + ")");
-  }
-}));
-
-/* From FvD 13.37, CSS Color Module Level 3 */
-function hsl2rgb(h, m1, m2) {
-  return (h < 60 ? m1 + (m2 - m1) * h / 60
-      : h < 180 ? m2
-      : h < 240 ? m1 + (m2 - m1) * (240 - h) / 60
-      : m1) * 255;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basis.js
-function basis(t1, v0, v1, v2, v3) {
-  var t2 = t1 * t1, t3 = t2 * t1;
-  return ((1 - 3 * t1 + 3 * t2 - t3) * v0
-      + (4 - 6 * t2 + 3 * t3) * v1
-      + (1 + 3 * t1 + 3 * t2 - 3 * t3) * v2
-      + t3 * v3) / 6;
-}
-
-/* harmony default export */ function src_basis(values) {
-  var n = values.length - 1;
-  return function(t) {
-    var i = t <= 0 ? (t = 0) : t >= 1 ? (t = 1, n - 1) : Math.floor(t * n),
-        v1 = values[i],
-        v2 = values[i + 1],
-        v0 = i > 0 ? values[i - 1] : 2 * v1 - v2,
-        v3 = i < n - 1 ? values[i + 2] : 2 * v2 - v1;
-    return basis((t - i / n) * n, v0, v1, v2, v3);
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basisClosed.js
-
-
-/* harmony default export */ function basisClosed(values) {
-  var n = values.length;
-  return function(t) {
-    var i = Math.floor(((t %= 1) < 0 ? ++t : t) * n),
-        v0 = values[(i + n - 1) % n],
-        v1 = values[i % n],
-        v2 = values[(i + 1) % n],
-        v3 = values[(i + 2) % n];
-    return basis((t - i / n) * n, v0, v1, v2, v3);
-  };
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/constant.js
-/* harmony default export */ const d3_interpolate_src_constant = (x => () => x);
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/color.js
-
-
-function linear(a, d) {
-  return function(t) {
-    return a + t * d;
-  };
-}
-
-function exponential(a, b, y) {
-  return a = Math.pow(a, y), b = Math.pow(b, y) - a, y = 1 / y, function(t) {
-    return Math.pow(a + t * b, y);
-  };
-}
-
-function hue(a, b) {
-  var d = b - a;
-  return d ? linear(a, d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d) : constant(isNaN(a) ? b : a);
-}
-
-function gamma(y) {
-  return (y = +y) === 1 ? nogamma : function(a, b) {
-    return b - a ? exponential(a, b, y) : d3_interpolate_src_constant(isNaN(a) ? b : a);
-  };
-}
-
-function nogamma(a, b) {
-  var d = b - a;
-  return d ? linear(a, d) : d3_interpolate_src_constant(isNaN(a) ? b : a);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/rgb.js
-
-
-
-
-
-/* harmony default export */ const rgb = ((function rgbGamma(y) {
-  var color = gamma(y);
-
-  function rgb(start, end) {
-    var r = color((start = color_rgb(start)).r, (end = color_rgb(end)).r),
-        g = color(start.g, end.g),
-        b = color(start.b, end.b),
-        opacity = nogamma(start.opacity, end.opacity);
-    return function(t) {
-      start.r = r(t);
-      start.g = g(t);
-      start.b = b(t);
-      start.opacity = opacity(t);
-      return start + "";
-    };
-  }
-
-  rgb.gamma = rgbGamma;
-
-  return rgb;
-})(1));
-
-function rgbSpline(spline) {
-  return function(colors) {
-    var n = colors.length,
-        r = new Array(n),
-        g = new Array(n),
-        b = new Array(n),
-        i, color;
-    for (i = 0; i < n; ++i) {
-      color = color_rgb(colors[i]);
-      r[i] = color.r || 0;
-      g[i] = color.g || 0;
-      b[i] = color.b || 0;
-    }
-    r = spline(r);
-    g = spline(g);
-    b = spline(b);
-    color.opacity = 1;
-    return function(t) {
-      color.r = r(t);
-      color.g = g(t);
-      color.b = b(t);
-      return color + "";
-    };
-  };
-}
-
-var rgbBasis = rgbSpline(src_basis);
-var rgbBasisClosed = rgbSpline(basisClosed);
-
-;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/string.js
-
-
-var reA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
-    reB = new RegExp(reA.source, "g");
-
-function zero(b) {
-  return function() {
-    return b;
-  };
-}
-
-function one(b) {
-  return function(t) {
-    return b(t) + "";
-  };
-}
-
-/* harmony default export */ function string(a, b) {
-  var bi = reA.lastIndex = reB.lastIndex = 0, // scan index for next number in b
-      am, // current match in a
-      bm, // current match in b
-      bs, // string preceding current number in b, if any
-      i = -1, // index in s
-      s = [], // string constants and placeholders
-      q = []; // number interpolators
-
-  // Coerce inputs to strings.
-  a = a + "", b = b + "";
-
-  // Interpolate pairs of numbers in a & b.
-  while ((am = reA.exec(a))
-      && (bm = reB.exec(b))) {
-    if ((bs = bm.index) > bi) { // a string precedes the next number in b
-      bs = b.slice(bi, bs);
-      if (s[i]) s[i] += bs; // coalesce with previous string
-      else s[++i] = bs;
-    }
-    if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
-      if (s[i]) s[i] += bm; // coalesce with previous string
-      else s[++i] = bm;
-    } else { // interpolate non-matching numbers
-      s[++i] = null;
-      q.push({i: i, x: number(am, bm)});
-    }
-    bi = reB.lastIndex;
-  }
-
-  // Add remains of b.
-  if (bi < b.length) {
-    bs = b.slice(bi);
-    if (s[i]) s[i] += bs; // coalesce with previous string
-    else s[++i] = bs;
-  }
-
-  // Special optimization for only a single match.
-  // Otherwise, interpolate each of the numbers and rejoin the string.
-  return s.length < 2 ? (q[0]
-      ? one(q[0].x)
-      : zero(b))
-      : (b = q.length, function(t) {
-          for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
-          return s.join("");
-        });
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/interpolate.js
-
-
-
-/* harmony default export */ function interpolate(a, b) {
-  var c;
-  return (typeof b === "number" ? number
-      : b instanceof color ? rgb
-      : (c = color(b)) ? (b = c, rgb)
-      : string)(a, b);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attr.js
-
-
-
-
-
-function attr_attrRemove(name) {
-  return function() {
-    this.removeAttribute(name);
-  };
-}
-
-function attr_attrRemoveNS(fullname) {
-  return function() {
-    this.removeAttributeNS(fullname.space, fullname.local);
-  };
-}
-
-function attr_attrConstant(name, interpolate, value1) {
-  var string00,
-      string1 = value1 + "",
-      interpolate0;
-  return function() {
-    var string0 = this.getAttribute(name);
-    return string0 === string1 ? null
-        : string0 === string00 ? interpolate0
-        : interpolate0 = interpolate(string00 = string0, value1);
-  };
-}
-
-function attr_attrConstantNS(fullname, interpolate, value1) {
-  var string00,
-      string1 = value1 + "",
-      interpolate0;
-  return function() {
-    var string0 = this.getAttributeNS(fullname.space, fullname.local);
-    return string0 === string1 ? null
-        : string0 === string00 ? interpolate0
-        : interpolate0 = interpolate(string00 = string0, value1);
-  };
-}
-
-function attr_attrFunction(name, interpolate, value) {
-  var string00,
-      string10,
-      interpolate0;
-  return function() {
-    var string0, value1 = value(this), string1;
-    if (value1 == null) return void this.removeAttribute(name);
-    string0 = this.getAttribute(name);
-    string1 = value1 + "";
-    return string0 === string1 ? null
-        : string0 === string00 && string1 === string10 ? interpolate0
-        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
-  };
-}
-
-function attr_attrFunctionNS(fullname, interpolate, value) {
-  var string00,
-      string10,
-      interpolate0;
-  return function() {
-    var string0, value1 = value(this), string1;
-    if (value1 == null) return void this.removeAttributeNS(fullname.space, fullname.local);
-    string0 = this.getAttributeNS(fullname.space, fullname.local);
-    string1 = value1 + "";
-    return string0 === string1 ? null
-        : string0 === string00 && string1 === string10 ? interpolate0
-        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
-  };
-}
-
-/* harmony default export */ function transition_attr(name, value) {
-  var fullname = namespace(name), i = fullname === "transform" ? interpolateTransformSvg : interpolate;
-  return this.attrTween(name, typeof value === "function"
-      ? (fullname.local ? attr_attrFunctionNS : attr_attrFunction)(fullname, i, tweenValue(this, "attr." + name, value))
-      : value == null ? (fullname.local ? attr_attrRemoveNS : attr_attrRemove)(fullname)
-      : (fullname.local ? attr_attrConstantNS : attr_attrConstant)(fullname, i, value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attrTween.js
-
-
-function attrInterpolate(name, i) {
-  return function(t) {
-    this.setAttribute(name, i.call(this, t));
-  };
-}
-
-function attrInterpolateNS(fullname, i) {
-  return function(t) {
-    this.setAttributeNS(fullname.space, fullname.local, i.call(this, t));
-  };
-}
-
-function attrTweenNS(fullname, value) {
-  var t0, i0;
-  function tween() {
-    var i = value.apply(this, arguments);
-    if (i !== i0) t0 = (i0 = i) && attrInterpolateNS(fullname, i);
-    return t0;
-  }
-  tween._value = value;
-  return tween;
-}
-
-function attrTween(name, value) {
-  var t0, i0;
-  function tween() {
-    var i = value.apply(this, arguments);
-    if (i !== i0) t0 = (i0 = i) && attrInterpolate(name, i);
-    return t0;
-  }
-  tween._value = value;
-  return tween;
-}
-
-/* harmony default export */ function transition_attrTween(name, value) {
-  var key = "attr." + name;
-  if (arguments.length < 2) return (key = this.tween(key)) && key._value;
-  if (value == null) return this.tween(key, null);
-  if (typeof value !== "function") throw new Error;
-  var fullname = namespace(name);
-  return this.tween(key, (fullname.local ? attrTweenNS : attrTween)(fullname, value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/delay.js
-
-
-function delayFunction(id, value) {
-  return function() {
-    init(this, id).delay = +value.apply(this, arguments);
-  };
-}
-
-function delayConstant(id, value) {
-  return value = +value, function() {
-    init(this, id).delay = value;
-  };
-}
-
-/* harmony default export */ function delay(value) {
-  var id = this._id;
-
-  return arguments.length
-      ? this.each((typeof value === "function"
-          ? delayFunction
-          : delayConstant)(id, value))
-      : schedule_get(this.node(), id).delay;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/duration.js
-
-
-function durationFunction(id, value) {
-  return function() {
-    schedule_set(this, id).duration = +value.apply(this, arguments);
-  };
-}
-
-function durationConstant(id, value) {
-  return value = +value, function() {
-    schedule_set(this, id).duration = value;
-  };
-}
-
-/* harmony default export */ function duration(value) {
-  var id = this._id;
-
-  return arguments.length
-      ? this.each((typeof value === "function"
-          ? durationFunction
-          : durationConstant)(id, value))
-      : schedule_get(this.node(), id).duration;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/ease.js
-
-
-function easeConstant(id, value) {
-  if (typeof value !== "function") throw new Error;
-  return function() {
-    schedule_set(this, id).ease = value;
-  };
-}
-
-/* harmony default export */ function ease(value) {
-  var id = this._id;
-
-  return arguments.length
-      ? this.each(easeConstant(id, value))
-      : schedule_get(this.node(), id).ease;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/easeVarying.js
-
-
-function easeVarying(id, value) {
-  return function() {
-    var v = value.apply(this, arguments);
-    if (typeof v !== "function") throw new Error;
-    schedule_set(this, id).ease = v;
-  };
-}
-
-/* harmony default export */ function transition_easeVarying(value) {
-  if (typeof value !== "function") throw new Error;
-  return this.each(easeVarying(this._id, value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/filter.js
-
-
-
-/* harmony default export */ function transition_filter(match) {
-  if (typeof match !== "function") match = matcher(match);
-
-  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
-      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
-        subgroup.push(node);
-      }
-    }
-  }
-
-  return new Transition(subgroups, this._parents, this._name, this._id);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/merge.js
-
-
-/* harmony default export */ function transition_merge(transition) {
-  if (transition._id !== this._id) throw new Error;
-
-  for (var groups0 = this._groups, groups1 = transition._groups, m0 = groups0.length, m1 = groups1.length, m = Math.min(m0, m1), merges = new Array(m0), j = 0; j < m; ++j) {
-    for (var group0 = groups0[j], group1 = groups1[j], n = group0.length, merge = merges[j] = new Array(n), node, i = 0; i < n; ++i) {
-      if (node = group0[i] || group1[i]) {
-        merge[i] = node;
-      }
-    }
-  }
-
-  for (; j < m0; ++j) {
-    merges[j] = groups0[j];
-  }
-
-  return new Transition(merges, this._parents, this._name, this._id);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/on.js
-
-
-function start(name) {
-  return (name + "").trim().split(/^|\s+/).every(function(t) {
-    var i = t.indexOf(".");
-    if (i >= 0) t = t.slice(0, i);
-    return !t || t === "start";
-  });
-}
-
-function onFunction(id, name, listener) {
-  var on0, on1, sit = start(name) ? init : schedule_set;
-  return function() {
-    var schedule = sit(this, id),
-        on = schedule.on;
-
-    // If this node shared a dispatch with the previous node,
-    // just assign the updated shared dispatch and we’re done!
-    // Otherwise, copy-on-write.
-    if (on !== on0) (on1 = (on0 = on).copy()).on(name, listener);
-
-    schedule.on = on1;
-  };
-}
-
-/* harmony default export */ function transition_on(name, listener) {
-  var id = this._id;
-
-  return arguments.length < 2
-      ? schedule_get(this.node(), id).on.on(name)
-      : this.each(onFunction(id, name, listener));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/remove.js
-function removeFunction(id) {
-  return function() {
-    var parent = this.parentNode;
-    for (var i in this.__transition) if (+i !== id) return;
-    if (parent) parent.removeChild(this);
-  };
-}
-
-/* harmony default export */ function transition_remove() {
-  return this.on("end.remove", removeFunction(this._id));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/select.js
-
-
-
-
-/* harmony default export */ function transition_select(select) {
-  var name = this._name,
-      id = this._id;
-
-  if (typeof select !== "function") select = selector(select);
-
-  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
-      if ((node = group[i]) && (subnode = select.call(node, node.__data__, i, group))) {
-        if ("__data__" in node) subnode.__data__ = node.__data__;
-        subgroup[i] = subnode;
-        schedule(subgroup[i], name, id, i, subgroup, schedule_get(node, id));
-      }
-    }
-  }
-
-  return new Transition(subgroups, this._parents, name, id);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selectAll.js
-
-
-
-
-/* harmony default export */ function transition_selectAll(select) {
-  var name = this._name,
-      id = this._id;
-
-  if (typeof select !== "function") select = selectorAll(select);
-
-  for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        for (var children = select.call(node, node.__data__, i, group), child, inherit = schedule_get(node, id), k = 0, l = children.length; k < l; ++k) {
-          if (child = children[k]) {
-            schedule(child, name, id, k, children, inherit);
-          }
-        }
-        subgroups.push(children);
-        parents.push(node);
-      }
-    }
-  }
-
-  return new Transition(subgroups, parents, name, id);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selection.js
-
-
-var selection_Selection = src_selection.prototype.constructor;
-
-/* harmony default export */ function transition_selection() {
-  return new selection_Selection(this._groups, this._parents);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/style.js
-
-
-
-
-
-
-function styleNull(name, interpolate) {
-  var string00,
-      string10,
-      interpolate0;
-  return function() {
-    var string0 = styleValue(this, name),
-        string1 = (this.style.removeProperty(name), styleValue(this, name));
-    return string0 === string1 ? null
-        : string0 === string00 && string1 === string10 ? interpolate0
-        : interpolate0 = interpolate(string00 = string0, string10 = string1);
-  };
-}
-
-function style_styleRemove(name) {
-  return function() {
-    this.style.removeProperty(name);
-  };
-}
-
-function style_styleConstant(name, interpolate, value1) {
-  var string00,
-      string1 = value1 + "",
-      interpolate0;
-  return function() {
-    var string0 = styleValue(this, name);
-    return string0 === string1 ? null
-        : string0 === string00 ? interpolate0
-        : interpolate0 = interpolate(string00 = string0, value1);
-  };
-}
-
-function style_styleFunction(name, interpolate, value) {
-  var string00,
-      string10,
-      interpolate0;
-  return function() {
-    var string0 = styleValue(this, name),
-        value1 = value(this),
-        string1 = value1 + "";
-    if (value1 == null) string1 = value1 = (this.style.removeProperty(name), styleValue(this, name));
-    return string0 === string1 ? null
-        : string0 === string00 && string1 === string10 ? interpolate0
-        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
-  };
-}
-
-function styleMaybeRemove(id, name) {
-  var on0, on1, listener0, key = "style." + name, event = "end." + key, remove;
-  return function() {
-    var schedule = schedule_set(this, id),
-        on = schedule.on,
-        listener = schedule.value[key] == null ? remove || (remove = style_styleRemove(name)) : undefined;
-
-    // If this node shared a dispatch with the previous node,
-    // just assign the updated shared dispatch and we’re done!
-    // Otherwise, copy-on-write.
-    if (on !== on0 || listener0 !== listener) (on1 = (on0 = on).copy()).on(event, listener0 = listener);
-
-    schedule.on = on1;
-  };
-}
-
-/* harmony default export */ function transition_style(name, value, priority) {
-  var i = (name += "") === "transform" ? interpolateTransformCss : interpolate;
-  return value == null ? this
-      .styleTween(name, styleNull(name, i))
-      .on("end.style." + name, style_styleRemove(name))
-    : typeof value === "function" ? this
-      .styleTween(name, style_styleFunction(name, i, tweenValue(this, "style." + name, value)))
-      .each(styleMaybeRemove(this._id, name))
-    : this
-      .styleTween(name, style_styleConstant(name, i, value), priority)
-      .on("end.style." + name, null);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/styleTween.js
-function styleInterpolate(name, i, priority) {
-  return function(t) {
-    this.style.setProperty(name, i.call(this, t), priority);
-  };
-}
-
-function styleTween(name, value, priority) {
-  var t, i0;
-  function tween() {
-    var i = value.apply(this, arguments);
-    if (i !== i0) t = (i0 = i) && styleInterpolate(name, i, priority);
-    return t;
-  }
-  tween._value = value;
-  return tween;
-}
-
-/* harmony default export */ function transition_styleTween(name, value, priority) {
-  var key = "style." + (name += "");
-  if (arguments.length < 2) return (key = this.tween(key)) && key._value;
-  if (value == null) return this.tween(key, null);
-  if (typeof value !== "function") throw new Error;
-  return this.tween(key, styleTween(name, value, priority == null ? "" : priority));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/text.js
-
-
-function text_textConstant(value) {
-  return function() {
-    this.textContent = value;
-  };
-}
-
-function text_textFunction(value) {
-  return function() {
-    var value1 = value(this);
-    this.textContent = value1 == null ? "" : value1;
-  };
-}
-
-/* harmony default export */ function transition_text(value) {
-  return this.tween("text", typeof value === "function"
-      ? text_textFunction(tweenValue(this, "text", value))
-      : text_textConstant(value == null ? "" : value + ""));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/textTween.js
-function textInterpolate(i) {
-  return function(t) {
-    this.textContent = i.call(this, t);
-  };
-}
-
-function textTween(value) {
-  var t0, i0;
-  function tween() {
-    var i = value.apply(this, arguments);
-    if (i !== i0) t0 = (i0 = i) && textInterpolate(i);
-    return t0;
-  }
-  tween._value = value;
-  return tween;
-}
-
-/* harmony default export */ function transition_textTween(value) {
-  var key = "text";
-  if (arguments.length < 1) return (key = this.tween(key)) && key._value;
-  if (value == null) return this.tween(key, null);
-  if (typeof value !== "function") throw new Error;
-  return this.tween(key, textTween(value));
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/transition.js
-
-
-
-/* harmony default export */ function transition() {
-  var name = this._name,
-      id0 = this._id,
-      id1 = newId();
-
-  for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        var inherit = schedule_get(node, id0);
-        schedule(node, name, id1, i, group, {
-          time: inherit.time + inherit.delay + inherit.duration,
-          delay: 0,
-          duration: inherit.duration,
-          ease: inherit.ease
-        });
-      }
-    }
-  }
-
-  return new Transition(groups, this._parents, name, id1);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/end.js
-
-
-/* harmony default export */ function end() {
-  var on0, on1, that = this, id = that._id, size = that.size();
-  return new Promise(function(resolve, reject) {
-    var cancel = {value: reject},
-        end = {value: function() { if (--size === 0) resolve(); }};
-
-    that.each(function() {
-      var schedule = schedule_set(this, id),
-          on = schedule.on;
-
-      // If this node shared a dispatch with the previous node,
-      // just assign the updated shared dispatch and we’re done!
-      // Otherwise, copy-on-write.
-      if (on !== on0) {
-        on1 = (on0 = on).copy();
-        on1._.cancel.push(cancel);
-        on1._.interrupt.push(cancel);
-        on1._.end.push(end);
-      }
-
-      schedule.on = on1;
-    });
-
-    // The selection was empty, resolve end immediately
-    if (size === 0) resolve();
-  });
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/index.js
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-var id = 0;
-
-function Transition(groups, parents, name, id) {
-  this._groups = groups;
-  this._parents = parents;
-  this._name = name;
-  this._id = id;
-}
-
-function transition_transition(name) {
-  return src_selection().transition(name);
-}
-
-function newId() {
-  return ++id;
-}
-
-var selection_prototype = src_selection.prototype;
-
-Transition.prototype = transition_transition.prototype = {
-  constructor: Transition,
-  select: transition_select,
-  selectAll: transition_selectAll,
-  selectChild: selection_prototype.selectChild,
-  selectChildren: selection_prototype.selectChildren,
-  filter: transition_filter,
-  merge: transition_merge,
-  selection: transition_selection,
-  transition: transition,
-  call: selection_prototype.call,
-  nodes: selection_prototype.nodes,
-  node: selection_prototype.node,
-  size: selection_prototype.size,
-  empty: selection_prototype.empty,
-  each: selection_prototype.each,
-  on: transition_on,
-  attr: transition_attr,
-  attrTween: transition_attrTween,
-  style: transition_style,
-  styleTween: transition_styleTween,
-  text: transition_text,
-  textTween: transition_textTween,
-  remove: transition_remove,
-  tween: tween,
-  delay: delay,
-  duration: duration,
-  ease: ease,
-  easeVarying: transition_easeVarying,
-  end: end,
-  [Symbol.iterator]: selection_prototype[Symbol.iterator]
-};
-
-;// CONCATENATED MODULE: ../node_modules/d3-ease/src/cubic.js
-function cubicIn(t) {
-  return t * t * t;
-}
-
-function cubicOut(t) {
-  return --t * t * t + 1;
-}
-
-function cubicInOut(t) {
-  return ((t *= 2) <= 1 ? t * t * t : (t -= 2) * t * t + 2) / 2;
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/transition.js
-
-
-
-
-
-var defaultTiming = {
-  time: null, // Set on use.
-  delay: 0,
-  duration: 250,
-  ease: cubicInOut
-};
-
-function inherit(node, id) {
-  var timing;
-  while (!(timing = node.__transition) || !(timing = timing[id])) {
-    if (!(node = node.parentNode)) {
-      throw new Error(`transition ${id} not found`);
-    }
-  }
-  return timing;
-}
-
-/* harmony default export */ function selection_transition(name) {
-  var id,
-      timing;
-
-  if (name instanceof Transition) {
-    id = name._id, name = name._name;
-  } else {
-    id = newId(), (timing = defaultTiming).time = now(), name = name == null ? null : name + "";
-  }
-
-  for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-      if (node = group[i]) {
-        schedule(node, name, id, i, group, timing || inherit(node, id));
-      }
-    }
-  }
-
-  return new Transition(groups, this._parents, name, id);
-}
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/index.js
-
-
-
-
-src_selection.prototype.interrupt = selection_interrupt;
-src_selection.prototype.transition = selection_transition;
-
-;// CONCATENATED MODULE: ../node_modules/d3-transition/src/index.js
-
-
-
-
-
-;// CONCATENATED MODULE: ./tooltip.js
-/* global event */
-
-
-
-
-
-
-function defaultLabel (d) {
-    return d.data.name
-}
-
-function defaultFlamegraphTooltip () {
-    var rootElement = src_select('body')
-    var tooltip = null
-    // Function to get HTML content from data.
-    var html = defaultLabel
-    // Function to get text content from data.
-    var text = defaultLabel
-    // Whether to use d3's .html() to set content, otherwise use .text().
-    var contentIsHTML = false
-
-    function tip () {
-        tooltip = rootElement
-            .append('div')
-            .style('display', 'none')
-            .style('position', 'absolute')
-            .style('opacity', 0)
-            .style('pointer-events', 'none')
-            .attr('class', 'd3-flame-graph-tip')
-    }
-
-    tip.show = function (d) {
-        tooltip
-            .style('display', 'block')
-            .style('left', event.pageX + 5 + 'px')
-            .style('top', event.pageY + 5 + 'px')
-            .transition()
-            .duration(200)
-            .style('opacity', 1)
-            .style('pointer-events', 'all')
-
-        if (contentIsHTML) {
-            tooltip.html(html(d))
-        } else {
-            tooltip.text(text(d))
-        }
-
-        return tip
-    }
-
-    tip.hide = function () {
-        tooltip
-            .style('display', 'none')
-            .transition()
-            .duration(200)
-            .style('opacity', 0)
-            .style('pointer-events', 'none')
-
-        return tip
-    }
-
-    /**
-     * Gets/sets a function converting the d3 data into the tooltip's textContent.
-     *
-     * Cannot be combined with tip.html().
-     */
-    tip.text = function (_) {
-        if (!arguments.length) return text
-        text = _
-        contentIsHTML = false
-        return tip
-    }
-
-    /**
-     * Gets/sets a function converting the d3 data into the tooltip's innerHTML.
-     *
-     * Cannot be combined with tip.text().
-     *
-     * @deprecated prefer tip.text().
-     */
-    tip.html = function (_) {
-        if (!arguments.length) return html
-        html = _
-        contentIsHTML = true
-        return tip
-    }
-
-    tip.destroy = function () {
-        tooltip.remove()
-    }
-
-    return tip
-}
-
-/******/ 	return __webpack_exports__;
-/******/ })()
-;
-});
\ No newline at end of file
diff --git a/development/charts/flamegraph/lib/d3-flamegraph.css b/development/charts/flamegraph/lib/d3-flamegraph.css
deleted file mode 100644
index fa6f345ff7a9..000000000000
--- a/development/charts/flamegraph/lib/d3-flamegraph.css
+++ /dev/null
@@ -1,46 +0,0 @@
-.d3-flame-graph rect {
-  stroke: #EEEEEE;
-  fill-opacity: .8;
-}
-
-.d3-flame-graph rect:hover {
-  stroke: #474747;
-  stroke-width: 0.5;
-  cursor: pointer;
-}
-
-.d3-flame-graph-label {
-  pointer-events: none;
-  white-space: nowrap;
-  text-overflow: ellipsis;
-  overflow: hidden;
-  font-size: 12px;
-  font-family: Verdana;
-  margin-left: 4px;
-  margin-right: 4px;
-  line-height: 1.5;
-  padding: 0 0 0;
-  font-weight: 400;
-  color: black;
-  text-align: left;
-}
-
-.d3-flame-graph .fade {
-  opacity: 0.6 !important;
-}
-
-.d3-flame-graph .title {
-  font-size: 20px;
-  font-family: Verdana;
-}
-
-.d3-flame-graph-tip {
-    background-color: black;
-    border: none;
-    border-radius: 3px;
-    padding: 5px 10px 5px 10px;
-    min-width: 250px;
-    text-align: left;
-    color: white;
-    z-index: 10;
-}
\ No newline at end of file
diff --git a/development/charts/flamegraph/lib/d3-flamegraph.js b/development/charts/flamegraph/lib/d3-flamegraph.js
deleted file mode 100644
index eabb2c44972c..000000000000
--- a/development/charts/flamegraph/lib/d3-flamegraph.js
+++ /dev/null
@@ -1,5719 +0,0 @@
-(function webpackUniversalModuleDefinition(root, factory) {
-  if (typeof exports === 'object' && typeof module === 'object')
-    module.exports = factory();
-  else if (typeof define === 'function' && define.amd) define([], factory);
-  else if (typeof exports === 'object') exports['flamegraph'] = factory();
-  else root['flamegraph'] = factory();
-})(self, function () {
-  return /******/ (() => {
-    // webpackBootstrap
-    /******/ 'use strict'; // The require scope
-    /******/ /******/ var __webpack_require__ = {}; /* webpack/runtime/define property getters */
-    /******/
-    /************************************************************************/
-    /******/ /******/ (() => {
-      /******/ // define getter functions for harmony exports
-      /******/ __webpack_require__.d = (exports, definition) => {
-        /******/ for (var key in definition) {
-          /******/ if (
-            __webpack_require__.o(definition, key) &&
-            !__webpack_require__.o(exports, key)
-          ) {
-            /******/ Object.defineProperty(exports, key, {
-              enumerable: true,
-              get: definition[key],
-            });
-            /******/
-          }
-          /******/
-        }
-        /******/
-      };
-      /******/
-    })(); /* webpack/runtime/hasOwnProperty shorthand */
-    /******/
-    /******/ /******/ (() => {
-      /******/ __webpack_require__.o = (obj, prop) =>
-        Object.prototype.hasOwnProperty.call(obj, prop);
-      /******/
-    })();
-    /******/
-    /************************************************************************/
-    var __webpack_exports__ = {};
-
-    // EXPORTS
-    __webpack_require__.d(__webpack_exports__, {
-      default: () => /* binding */ flamegraph,
-    }); // CONCATENATED MODULE: ../node_modules/d3-selection/src/selector.js
-
-    function none() {}
-
-    /* harmony default export */ function selector(selector) {
-      return selector == null
-        ? none
-        : function () {
-            return this.querySelector(selector);
-          };
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/select.js
-
-    /* harmony default export */ function selection_select(select) {
-      if (typeof select !== 'function') select = selector(select);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group = groups[j],
-            n = group.length,
-            subgroup = (subgroups[j] = new Array(n)),
-            node,
-            subnode,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if (
-            (node = group[i]) &&
-            (subnode = select.call(node, node.__data__, i, group))
-          ) {
-            if ('__data__' in node) subnode.__data__ = node.__data__;
-            subgroup[i] = subnode;
-          }
-        }
-      }
-
-      return new Selection(subgroups, this._parents);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/array.js
-
-    // Given something array like (or null), returns something that is strictly an
-    // array. This is used to ensure that array-like objects passed to d3.selectAll
-    // or selection.selectAll are converted into proper arrays when creating a
-    // selection; we don’t ever want to create a selection backed by a live
-    // HTMLCollection or NodeList. However, note that selection.selectAll will use a
-    // static NodeList as a group, since it safely derived from querySelectorAll.
-    function array(x) {
-      return x == null ? [] : Array.isArray(x) ? x : Array.from(x);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selectorAll.js
-
-    function empty() {
-      return [];
-    }
-
-    /* harmony default export */ function selectorAll(selector) {
-      return selector == null
-        ? empty
-        : function () {
-            return this.querySelectorAll(selector);
-          };
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectAll.js
-
-    function arrayAll(select) {
-      return function () {
-        return array(select.apply(this, arguments));
-      };
-    }
-
-    /* harmony default export */ function selectAll(select) {
-      if (typeof select === 'function') select = arrayAll(select);
-      else select = selectorAll(select);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = [],
-          parents = [],
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-          if ((node = group[i])) {
-            subgroups.push(select.call(node, node.__data__, i, group));
-            parents.push(node);
-          }
-        }
-      }
-
-      return new Selection(subgroups, parents);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/matcher.js
-
-    /* harmony default export */ function matcher(selector) {
-      return function () {
-        return this.matches(selector);
-      };
-    }
-
-    function childMatcher(selector) {
-      return function (node) {
-        return node.matches(selector);
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChild.js
-
-    var find = Array.prototype.find;
-
-    function childFind(match) {
-      return function () {
-        return find.call(this.children, match);
-      };
-    }
-
-    function childFirst() {
-      return this.firstElementChild;
-    }
-
-    /* harmony default export */ function selectChild(match) {
-      return this.select(
-        match == null
-          ? childFirst
-          : childFind(
-              typeof match === 'function' ? match : childMatcher(match),
-            ),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChildren.js
-
-    var filter = Array.prototype.filter;
-
-    function children() {
-      return Array.from(this.children);
-    }
-
-    function childrenFilter(match) {
-      return function () {
-        return filter.call(this.children, match);
-      };
-    }
-
-    /* harmony default export */ function selectChildren(match) {
-      return this.selectAll(
-        match == null
-          ? children
-          : childrenFilter(
-              typeof match === 'function' ? match : childMatcher(match),
-            ),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/filter.js
-
-    /* harmony default export */ function selection_filter(match) {
-      if (typeof match !== 'function') match = matcher(match);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group = groups[j],
-            n = group.length,
-            subgroup = (subgroups[j] = []),
-            node,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
-            subgroup.push(node);
-          }
-        }
-      }
-
-      return new Selection(subgroups, this._parents);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sparse.js
-
-    /* harmony default export */ function sparse(update) {
-      return new Array(update.length);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/enter.js
-
-    /* harmony default export */ function enter() {
-      return new Selection(
-        this._enter || this._groups.map(sparse),
-        this._parents,
-      );
-    }
-
-    function EnterNode(parent, datum) {
-      this.ownerDocument = parent.ownerDocument;
-      this.namespaceURI = parent.namespaceURI;
-      this._next = null;
-      this._parent = parent;
-      this.__data__ = datum;
-    }
-
-    EnterNode.prototype = {
-      constructor: EnterNode,
-      appendChild: function (child) {
-        return this._parent.insertBefore(child, this._next);
-      },
-      insertBefore: function (child, next) {
-        return this._parent.insertBefore(child, next);
-      },
-      querySelector: function (selector) {
-        return this._parent.querySelector(selector);
-      },
-      querySelectorAll: function (selector) {
-        return this._parent.querySelectorAll(selector);
-      },
-    }; // CONCATENATED MODULE: ../node_modules/d3-selection/src/constant.js
-
-    /* harmony default export */ function src_constant(x) {
-      return function () {
-        return x;
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/data.js
-
-    function bindIndex(parent, group, enter, update, exit, data) {
-      var i = 0,
-        node,
-        groupLength = group.length,
-        dataLength = data.length;
-
-      // Put any non-null nodes that fit into update.
-      // Put any null nodes into enter.
-      // Put any remaining data into enter.
-      for (; i < dataLength; ++i) {
-        if ((node = group[i])) {
-          node.__data__ = data[i];
-          update[i] = node;
-        } else {
-          enter[i] = new EnterNode(parent, data[i]);
-        }
-      }
-
-      // Put any non-null nodes that don’t fit into exit.
-      for (; i < groupLength; ++i) {
-        if ((node = group[i])) {
-          exit[i] = node;
-        }
-      }
-    }
-
-    function bindKey(parent, group, enter, update, exit, data, key) {
-      var i,
-        node,
-        nodeByKeyValue = new Map(),
-        groupLength = group.length,
-        dataLength = data.length,
-        keyValues = new Array(groupLength),
-        keyValue;
-
-      // Compute the key for each node.
-      // If multiple nodes have the same key, the duplicates are added to exit.
-      for (i = 0; i < groupLength; ++i) {
-        if ((node = group[i])) {
-          keyValues[i] = keyValue =
-            key.call(node, node.__data__, i, group) + '';
-          if (nodeByKeyValue.has(keyValue)) {
-            exit[i] = node;
-          } else {
-            nodeByKeyValue.set(keyValue, node);
-          }
-        }
-      }
-
-      // Compute the key for each datum.
-      // If there a node associated with this key, join and add it to update.
-      // If there is not (or the key is a duplicate), add it to enter.
-      for (i = 0; i < dataLength; ++i) {
-        keyValue = key.call(parent, data[i], i, data) + '';
-        if ((node = nodeByKeyValue.get(keyValue))) {
-          update[i] = node;
-          node.__data__ = data[i];
-          nodeByKeyValue.delete(keyValue);
-        } else {
-          enter[i] = new EnterNode(parent, data[i]);
-        }
-      }
-
-      // Add any remaining nodes that were not bound to data to exit.
-      for (i = 0; i < groupLength; ++i) {
-        if ((node = group[i]) && nodeByKeyValue.get(keyValues[i]) === node) {
-          exit[i] = node;
-        }
-      }
-    }
-
-    function datum(node) {
-      return node.__data__;
-    }
-
-    /* harmony default export */ function data(value, key) {
-      if (!arguments.length) return Array.from(this, datum);
-
-      var bind = key ? bindKey : bindIndex,
-        parents = this._parents,
-        groups = this._groups;
-
-      if (typeof value !== 'function') value = src_constant(value);
-
-      for (
-        var m = groups.length,
-          update = new Array(m),
-          enter = new Array(m),
-          exit = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        var parent = parents[j],
-          group = groups[j],
-          groupLength = group.length,
-          data = arraylike(
-            value.call(parent, parent && parent.__data__, j, parents),
-          ),
-          dataLength = data.length,
-          enterGroup = (enter[j] = new Array(dataLength)),
-          updateGroup = (update[j] = new Array(dataLength)),
-          exitGroup = (exit[j] = new Array(groupLength));
-
-        bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
-
-        // Now connect the enter nodes to their following update node, such that
-        // appendChild can insert the materialized enter node before this node,
-        // rather than at the end of the parent node.
-        for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
-          if ((previous = enterGroup[i0])) {
-            if (i0 >= i1) i1 = i0 + 1;
-            while (!(next = updateGroup[i1]) && ++i1 < dataLength);
-            previous._next = next || null;
-          }
-        }
-      }
-
-      update = new Selection(update, parents);
-      update._enter = enter;
-      update._exit = exit;
-      return update;
-    }
-
-    // Given some data, this returns an array-like view of it: an object that
-    // exposes a length property and allows numeric indexing. Note that unlike
-    // selectAll, this isn’t worried about “live” collections because the resulting
-    // array will only be used briefly while data is being bound. (It is possible to
-    // cause the data to change while iterating by using a key function, but please
-    // don’t; we’d rather avoid a gratuitous copy.)
-    function arraylike(data) {
-      return typeof data === 'object' && 'length' in data
-        ? data // Array, TypedArray, NodeList, array-like
-        : Array.from(data); // Map, Set, iterable, string, or anything else
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/exit.js
-
-    /* harmony default export */ function exit() {
-      return new Selection(
-        this._exit || this._groups.map(sparse),
-        this._parents,
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/join.js
-
-    /* harmony default export */ function join(onenter, onupdate, onexit) {
-      var enter = this.enter(),
-        update = this,
-        exit = this.exit();
-      if (typeof onenter === 'function') {
-        enter = onenter(enter);
-        if (enter) enter = enter.selection();
-      } else {
-        enter = enter.append(onenter + '');
-      }
-      if (onupdate != null) {
-        update = onupdate(update);
-        if (update) update = update.selection();
-      }
-      if (onexit == null) exit.remove();
-      else onexit(exit);
-      return enter && update ? enter.merge(update).order() : update;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/merge.js
-
-    /* harmony default export */ function merge(context) {
-      var selection = context.selection ? context.selection() : context;
-
-      for (
-        var groups0 = this._groups,
-          groups1 = selection._groups,
-          m0 = groups0.length,
-          m1 = groups1.length,
-          m = Math.min(m0, m1),
-          merges = new Array(m0),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group0 = groups0[j],
-            group1 = groups1[j],
-            n = group0.length,
-            merge = (merges[j] = new Array(n)),
-            node,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if ((node = group0[i] || group1[i])) {
-            merge[i] = node;
-          }
-        }
-      }
-
-      for (; j < m0; ++j) {
-        merges[j] = groups0[j];
-      }
-
-      return new Selection(merges, this._parents);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/order.js
-
-    /* harmony default export */ function order() {
-      for (var groups = this._groups, j = -1, m = groups.length; ++j < m; ) {
-        for (
-          var group = groups[j], i = group.length - 1, next = group[i], node;
-          --i >= 0;
-
-        ) {
-          if ((node = group[i])) {
-            if (next && node.compareDocumentPosition(next) ^ 4)
-              next.parentNode.insertBefore(node, next);
-            next = node;
-          }
-        }
-      }
-
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sort.js
-
-    /* harmony default export */ function sort(compare) {
-      if (!compare) compare = ascending;
-
-      function compareNode(a, b) {
-        return a && b ? compare(a.__data__, b.__data__) : !a - !b;
-      }
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          sortgroups = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group = groups[j],
-            n = group.length,
-            sortgroup = (sortgroups[j] = new Array(n)),
-            node,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if ((node = group[i])) {
-            sortgroup[i] = node;
-          }
-        }
-        sortgroup.sort(compareNode);
-      }
-
-      return new Selection(sortgroups, this._parents).order();
-    }
-
-    function ascending(a, b) {
-      return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/call.js
-
-    /* harmony default export */ function call() {
-      var callback = arguments[0];
-      arguments[0] = this;
-      callback.apply(null, arguments);
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/nodes.js
-
-    /* harmony default export */ function nodes() {
-      return Array.from(this);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/node.js
-
-    /* harmony default export */ function node() {
-      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-        for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
-          var node = group[i];
-          if (node) return node;
-        }
-      }
-
-      return null;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/size.js
-
-    /* harmony default export */ function size() {
-      let size = 0;
-      for (const node of this) ++size; // eslint-disable-line no-unused-vars
-      return size;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/empty.js
-
-    /* harmony default export */ function selection_empty() {
-      return !this.node();
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/each.js
-
-    /* harmony default export */ function each(callback) {
-      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-        for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-          if ((node = group[i])) callback.call(node, node.__data__, i, group);
-        }
-      }
-
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/namespaces.js
-
-    var xhtml = 'http://www.w3.org/1999/xhtml';
-
-    /* harmony default export */ const namespaces = {
-      svg: 'http://www.w3.org/2000/svg',
-      xhtml: xhtml,
-      xlink: 'http://www.w3.org/1999/xlink',
-      xml: 'http://www.w3.org/XML/1998/namespace',
-      xmlns: 'http://www.w3.org/2000/xmlns/',
-    }; // CONCATENATED MODULE: ../node_modules/d3-selection/src/namespace.js
-
-    /* harmony default export */ function namespace(name) {
-      var prefix = (name += ''),
-        i = prefix.indexOf(':');
-      if (i >= 0 && (prefix = name.slice(0, i)) !== 'xmlns')
-        name = name.slice(i + 1);
-      return namespaces.hasOwnProperty(prefix)
-        ? { space: namespaces[prefix], local: name }
-        : name; // eslint-disable-line no-prototype-builtins
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/attr.js
-
-    function attrRemove(name) {
-      return function () {
-        this.removeAttribute(name);
-      };
-    }
-
-    function attrRemoveNS(fullname) {
-      return function () {
-        this.removeAttributeNS(fullname.space, fullname.local);
-      };
-    }
-
-    function attrConstant(name, value) {
-      return function () {
-        this.setAttribute(name, value);
-      };
-    }
-
-    function attrConstantNS(fullname, value) {
-      return function () {
-        this.setAttributeNS(fullname.space, fullname.local, value);
-      };
-    }
-
-    function attrFunction(name, value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        if (v == null) this.removeAttribute(name);
-        else this.setAttribute(name, v);
-      };
-    }
-
-    function attrFunctionNS(fullname, value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        if (v == null) this.removeAttributeNS(fullname.space, fullname.local);
-        else this.setAttributeNS(fullname.space, fullname.local, v);
-      };
-    }
-
-    /* harmony default export */ function attr(name, value) {
-      var fullname = namespace(name);
-
-      if (arguments.length < 2) {
-        var node = this.node();
-        return fullname.local
-          ? node.getAttributeNS(fullname.space, fullname.local)
-          : node.getAttribute(fullname);
-      }
-
-      return this.each(
-        (value == null
-          ? fullname.local
-            ? attrRemoveNS
-            : attrRemove
-          : typeof value === 'function'
-          ? fullname.local
-            ? attrFunctionNS
-            : attrFunction
-          : fullname.local
-          ? attrConstantNS
-          : attrConstant)(fullname, value),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/window.js
-
-    /* harmony default export */ function src_window(node) {
-      return (
-        (node.ownerDocument && node.ownerDocument.defaultView) || // node is a Node
-        (node.document && node) || // node is a Window
-        node.defaultView
-      ); // node is a Document
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/style.js
-
-    function styleRemove(name) {
-      return function () {
-        this.style.removeProperty(name);
-      };
-    }
-
-    function styleConstant(name, value, priority) {
-      return function () {
-        this.style.setProperty(name, value, priority);
-      };
-    }
-
-    function styleFunction(name, value, priority) {
-      return function () {
-        var v = value.apply(this, arguments);
-        if (v == null) this.style.removeProperty(name);
-        else this.style.setProperty(name, v, priority);
-      };
-    }
-
-    /* harmony default export */ function style(name, value, priority) {
-      return arguments.length > 1
-        ? this.each(
-            (value == null
-              ? styleRemove
-              : typeof value === 'function'
-              ? styleFunction
-              : styleConstant)(name, value, priority == null ? '' : priority),
-          )
-        : styleValue(this.node(), name);
-    }
-
-    function styleValue(node, name) {
-      return (
-        node.style.getPropertyValue(name) ||
-        src_window(node).getComputedStyle(node, null).getPropertyValue(name)
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/property.js
-
-    function propertyRemove(name) {
-      return function () {
-        delete this[name];
-      };
-    }
-
-    function propertyConstant(name, value) {
-      return function () {
-        this[name] = value;
-      };
-    }
-
-    function propertyFunction(name, value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        if (v == null) delete this[name];
-        else this[name] = v;
-      };
-    }
-
-    /* harmony default export */ function property(name, value) {
-      return arguments.length > 1
-        ? this.each(
-            (value == null
-              ? propertyRemove
-              : typeof value === 'function'
-              ? propertyFunction
-              : propertyConstant)(name, value),
-          )
-        : this.node()[name];
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/classed.js
-
-    function classArray(string) {
-      return string.trim().split(/^|\s+/);
-    }
-
-    function classList(node) {
-      return node.classList || new ClassList(node);
-    }
-
-    function ClassList(node) {
-      this._node = node;
-      this._names = classArray(node.getAttribute('class') || '');
-    }
-
-    ClassList.prototype = {
-      add: function (name) {
-        var i = this._names.indexOf(name);
-        if (i < 0) {
-          this._names.push(name);
-          this._node.setAttribute('class', this._names.join(' '));
-        }
-      },
-      remove: function (name) {
-        var i = this._names.indexOf(name);
-        if (i >= 0) {
-          this._names.splice(i, 1);
-          this._node.setAttribute('class', this._names.join(' '));
-        }
-      },
-      contains: function (name) {
-        return this._names.indexOf(name) >= 0;
-      },
-    };
-
-    function classedAdd(node, names) {
-      var list = classList(node),
-        i = -1,
-        n = names.length;
-      while (++i < n) list.add(names[i]);
-    }
-
-    function classedRemove(node, names) {
-      var list = classList(node),
-        i = -1,
-        n = names.length;
-      while (++i < n) list.remove(names[i]);
-    }
-
-    function classedTrue(names) {
-      return function () {
-        classedAdd(this, names);
-      };
-    }
-
-    function classedFalse(names) {
-      return function () {
-        classedRemove(this, names);
-      };
-    }
-
-    function classedFunction(names, value) {
-      return function () {
-        (value.apply(this, arguments) ? classedAdd : classedRemove)(
-          this,
-          names,
-        );
-      };
-    }
-
-    /* harmony default export */ function classed(name, value) {
-      var names = classArray(name + '');
-
-      if (arguments.length < 2) {
-        var list = classList(this.node()),
-          i = -1,
-          n = names.length;
-        while (++i < n) if (!list.contains(names[i])) return false;
-        return true;
-      }
-
-      return this.each(
-        (typeof value === 'function'
-          ? classedFunction
-          : value
-          ? classedTrue
-          : classedFalse)(names, value),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/text.js
-
-    function textRemove() {
-      this.textContent = '';
-    }
-
-    function textConstant(value) {
-      return function () {
-        this.textContent = value;
-      };
-    }
-
-    function textFunction(value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        this.textContent = v == null ? '' : v;
-      };
-    }
-
-    /* harmony default export */ function selection_text(value) {
-      return arguments.length
-        ? this.each(
-            value == null
-              ? textRemove
-              : (typeof value === 'function' ? textFunction : textConstant)(
-                  value,
-                ),
-          )
-        : this.node().textContent;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/html.js
-
-    function htmlRemove() {
-      this.innerHTML = '';
-    }
-
-    function htmlConstant(value) {
-      return function () {
-        this.innerHTML = value;
-      };
-    }
-
-    function htmlFunction(value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        this.innerHTML = v == null ? '' : v;
-      };
-    }
-
-    /* harmony default export */ function html(value) {
-      return arguments.length
-        ? this.each(
-            value == null
-              ? htmlRemove
-              : (typeof value === 'function' ? htmlFunction : htmlConstant)(
-                  value,
-                ),
-          )
-        : this.node().innerHTML;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/raise.js
-
-    function raise() {
-      if (this.nextSibling) this.parentNode.appendChild(this);
-    }
-
-    /* harmony default export */ function selection_raise() {
-      return this.each(raise);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/lower.js
-
-    function lower() {
-      if (this.previousSibling)
-        this.parentNode.insertBefore(this, this.parentNode.firstChild);
-    }
-
-    /* harmony default export */ function selection_lower() {
-      return this.each(lower);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/creator.js
-
-    function creatorInherit(name) {
-      return function () {
-        var document = this.ownerDocument,
-          uri = this.namespaceURI;
-        return uri === xhtml && document.documentElement.namespaceURI === xhtml
-          ? document.createElement(name)
-          : document.createElementNS(uri, name);
-      };
-    }
-
-    function creatorFixed(fullname) {
-      return function () {
-        return this.ownerDocument.createElementNS(
-          fullname.space,
-          fullname.local,
-        );
-      };
-    }
-
-    /* harmony default export */ function creator(name) {
-      var fullname = namespace(name);
-      return (fullname.local ? creatorFixed : creatorInherit)(fullname);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/append.js
-
-    /* harmony default export */ function append(name) {
-      var create = typeof name === 'function' ? name : creator(name);
-      return this.select(function () {
-        return this.appendChild(create.apply(this, arguments));
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/insert.js
-
-    function constantNull() {
-      return null;
-    }
-
-    /* harmony default export */ function insert(name, before) {
-      var create = typeof name === 'function' ? name : creator(name),
-        select =
-          before == null
-            ? constantNull
-            : typeof before === 'function'
-            ? before
-            : selector(before);
-      return this.select(function () {
-        return this.insertBefore(
-          create.apply(this, arguments),
-          select.apply(this, arguments) || null,
-        );
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/remove.js
-
-    function remove() {
-      var parent = this.parentNode;
-      if (parent) parent.removeChild(this);
-    }
-
-    /* harmony default export */ function selection_remove() {
-      return this.each(remove);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/clone.js
-
-    function selection_cloneShallow() {
-      var clone = this.cloneNode(false),
-        parent = this.parentNode;
-      return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
-    }
-
-    function selection_cloneDeep() {
-      var clone = this.cloneNode(true),
-        parent = this.parentNode;
-      return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
-    }
-
-    /* harmony default export */ function clone(deep) {
-      return this.select(deep ? selection_cloneDeep : selection_cloneShallow);
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/datum.js
-
-    /* harmony default export */ function selection_datum(value) {
-      return arguments.length
-        ? this.property('__data__', value)
-        : this.node().__data__;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/on.js
-
-    function contextListener(listener) {
-      return function (event) {
-        listener.call(this, event, this.__data__);
-      };
-    }
-
-    function parseTypenames(typenames) {
-      return typenames
-        .trim()
-        .split(/^|\s+/)
-        .map(function (t) {
-          var name = '',
-            i = t.indexOf('.');
-          if (i >= 0) (name = t.slice(i + 1)), (t = t.slice(0, i));
-          return { type: t, name: name };
-        });
-    }
-
-    function onRemove(typename) {
-      return function () {
-        var on = this.__on;
-        if (!on) return;
-        for (var j = 0, i = -1, m = on.length, o; j < m; ++j) {
-          if (
-            ((o = on[j]),
-            (!typename.type || o.type === typename.type) &&
-              o.name === typename.name)
-          ) {
-            this.removeEventListener(o.type, o.listener, o.options);
-          } else {
-            on[++i] = o;
-          }
-        }
-        if (++i) on.length = i;
-        else delete this.__on;
-      };
-    }
-
-    function onAdd(typename, value, options) {
-      return function () {
-        var on = this.__on,
-          o,
-          listener = contextListener(value);
-        if (on)
-          for (var j = 0, m = on.length; j < m; ++j) {
-            if (
-              (o = on[j]).type === typename.type &&
-              o.name === typename.name
-            ) {
-              this.removeEventListener(o.type, o.listener, o.options);
-              this.addEventListener(
-                o.type,
-                (o.listener = listener),
-                (o.options = options),
-              );
-              o.value = value;
-              return;
-            }
-          }
-        this.addEventListener(typename.type, listener, options);
-        o = {
-          type: typename.type,
-          name: typename.name,
-          value: value,
-          listener: listener,
-          options: options,
-        };
-        if (!on) this.__on = [o];
-        else on.push(o);
-      };
-    }
-
-    /* harmony default export */ function on(typename, value, options) {
-      var typenames = parseTypenames(typename + ''),
-        i,
-        n = typenames.length,
-        t;
-
-      if (arguments.length < 2) {
-        var on = this.node().__on;
-        if (on)
-          for (var j = 0, m = on.length, o; j < m; ++j) {
-            for (i = 0, o = on[j]; i < n; ++i) {
-              if ((t = typenames[i]).type === o.type && t.name === o.name) {
-                return o.value;
-              }
-            }
-          }
-        return;
-      }
-
-      on = value ? onAdd : onRemove;
-      for (i = 0; i < n; ++i) this.each(on(typenames[i], value, options));
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/dispatch.js
-
-    function dispatchEvent(node, type, params) {
-      var window = src_window(node),
-        event = window.CustomEvent;
-
-      if (typeof event === 'function') {
-        event = new event(type, params);
-      } else {
-        event = window.document.createEvent('Event');
-        if (params)
-          event.initEvent(type, params.bubbles, params.cancelable),
-            (event.detail = params.detail);
-        else event.initEvent(type, false, false);
-      }
-
-      node.dispatchEvent(event);
-    }
-
-    function dispatchConstant(type, params) {
-      return function () {
-        return dispatchEvent(this, type, params);
-      };
-    }
-
-    function dispatchFunction(type, params) {
-      return function () {
-        return dispatchEvent(this, type, params.apply(this, arguments));
-      };
-    }
-
-    /* harmony default export */ function dispatch(type, params) {
-      return this.each(
-        (typeof params === 'function' ? dispatchFunction : dispatchConstant)(
-          type,
-          params,
-        ),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/iterator.js
-
-    /* harmony default export */ function* iterator() {
-      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
-        for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
-          if ((node = group[i])) yield node;
-        }
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/index.js
-
-    var root = [null];
-
-    function Selection(groups, parents) {
-      this._groups = groups;
-      this._parents = parents;
-    }
-
-    function selection() {
-      return new Selection([[document.documentElement]], root);
-    }
-
-    function selection_selection() {
-      return this;
-    }
-
-    Selection.prototype = selection.prototype = {
-      constructor: Selection,
-      select: selection_select,
-      selectAll: selectAll,
-      selectChild: selectChild,
-      selectChildren: selectChildren,
-      filter: selection_filter,
-      data: data,
-      enter: enter,
-      exit: exit,
-      join: join,
-      merge: merge,
-      selection: selection_selection,
-      order: order,
-      sort: sort,
-      call: call,
-      nodes: nodes,
-      node: node,
-      size: size,
-      empty: selection_empty,
-      each: each,
-      attr: attr,
-      style: style,
-      property: property,
-      classed: classed,
-      text: selection_text,
-      html: html,
-      raise: selection_raise,
-      lower: selection_lower,
-      append: append,
-      insert: insert,
-      remove: selection_remove,
-      clone: clone,
-      datum: selection_datum,
-      on: on,
-      dispatch: dispatch,
-      [Symbol.iterator]: iterator,
-    };
-
-    /* harmony default export */ const src_selection = selection; // CONCATENATED MODULE: ../node_modules/d3-selection/src/select.js
-
-    /* harmony default export */ function src_select(selector) {
-      return typeof selector === 'string'
-        ? new Selection(
-            [[document.querySelector(selector)]],
-            [document.documentElement],
-          )
-        : new Selection([[selector]], root);
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatDecimal.js
-
-    /* harmony default export */ function formatDecimal(x) {
-      return Math.abs((x = Math.round(x))) >= 1e21
-        ? x.toLocaleString('en').replace(/,/g, '')
-        : x.toString(10);
-    }
-
-    // Computes the decimal coefficient and exponent of the specified number x with
-    // significant digits p, where x is positive and p is in [1, 21] or undefined.
-    // For example, formatDecimalParts(1.23) returns ["123", 0].
-    function formatDecimalParts(x, p) {
-      if (
-        (i = (x = p ? x.toExponential(p - 1) : x.toExponential()).indexOf(
-          'e',
-        )) < 0
-      )
-        return null; // NaN, ±Infinity
-      var i,
-        coefficient = x.slice(0, i);
-
-      // The string returned by toExponential either has the form \d\.\d+e[-+]\d+
-      // (e.g., 1.2e+3) or the form \de[-+]\d+ (e.g., 1e+3).
-      return [
-        coefficient.length > 1
-          ? coefficient[0] + coefficient.slice(2)
-          : coefficient,
-        +x.slice(i + 1),
-      ];
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/exponent.js
-
-    /* harmony default export */ function exponent(x) {
-      return (x = formatDecimalParts(Math.abs(x))), x ? x[1] : NaN;
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatGroup.js
-
-    /* harmony default export */ function formatGroup(grouping, thousands) {
-      return function (value, width) {
-        var i = value.length,
-          t = [],
-          j = 0,
-          g = grouping[0],
-          length = 0;
-
-        while (i > 0 && g > 0) {
-          if (length + g + 1 > width) g = Math.max(1, width - length);
-          t.push(value.substring((i -= g), i + g));
-          if ((length += g + 1) > width) break;
-          g = grouping[(j = (j + 1) % grouping.length)];
-        }
-
-        return t.reverse().join(thousands);
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatNumerals.js
-
-    /* harmony default export */ function formatNumerals(numerals) {
-      return function (value) {
-        return value.replace(/[0-9]/g, function (i) {
-          return numerals[+i];
-        });
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatSpecifier.js
-
-    // [[fill]align][sign][symbol][0][width][,][.precision][~][type]
-    var re = /^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;
-
-    function formatSpecifier(specifier) {
-      if (!(match = re.exec(specifier)))
-        throw new Error('invalid format: ' + specifier);
-      var match;
-      return new FormatSpecifier({
-        fill: match[1],
-        align: match[2],
-        sign: match[3],
-        symbol: match[4],
-        zero: match[5],
-        width: match[6],
-        comma: match[7],
-        precision: match[8] && match[8].slice(1),
-        trim: match[9],
-        type: match[10],
-      });
-    }
-
-    formatSpecifier.prototype = FormatSpecifier.prototype; // instanceof
-
-    function FormatSpecifier(specifier) {
-      this.fill = specifier.fill === undefined ? ' ' : specifier.fill + '';
-      this.align = specifier.align === undefined ? '>' : specifier.align + '';
-      this.sign = specifier.sign === undefined ? '-' : specifier.sign + '';
-      this.symbol = specifier.symbol === undefined ? '' : specifier.symbol + '';
-      this.zero = !!specifier.zero;
-      this.width = specifier.width === undefined ? undefined : +specifier.width;
-      this.comma = !!specifier.comma;
-      this.precision =
-        specifier.precision === undefined ? undefined : +specifier.precision;
-      this.trim = !!specifier.trim;
-      this.type = specifier.type === undefined ? '' : specifier.type + '';
-    }
-
-    FormatSpecifier.prototype.toString = function () {
-      return (
-        this.fill +
-        this.align +
-        this.sign +
-        this.symbol +
-        (this.zero ? '0' : '') +
-        (this.width === undefined ? '' : Math.max(1, this.width | 0)) +
-        (this.comma ? ',' : '') +
-        (this.precision === undefined
-          ? ''
-          : '.' + Math.max(0, this.precision | 0)) +
-        (this.trim ? '~' : '') +
-        this.type
-      );
-    }; // CONCATENATED MODULE: ../node_modules/d3-format/src/formatTrim.js
-
-    // Trims insignificant zeros, e.g., replaces 1.2000k with 1.2k.
-    /* harmony default export */ function formatTrim(s) {
-      out: for (var n = s.length, i = 1, i0 = -1, i1; i < n; ++i) {
-        switch (s[i]) {
-          case '.':
-            i0 = i1 = i;
-            break;
-          case '0':
-            if (i0 === 0) i0 = i;
-            i1 = i;
-            break;
-          default:
-            if (!+s[i]) break out;
-            if (i0 > 0) i0 = 0;
-            break;
-        }
-      }
-      return i0 > 0 ? s.slice(0, i0) + s.slice(i1 + 1) : s;
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatPrefixAuto.js
-
-    var prefixExponent;
-
-    /* harmony default export */ function formatPrefixAuto(x, p) {
-      var d = formatDecimalParts(x, p);
-      if (!d) return x + '';
-      var coefficient = d[0],
-        exponent = d[1],
-        i =
-          exponent -
-          (prefixExponent =
-            Math.max(-8, Math.min(8, Math.floor(exponent / 3))) * 3) +
-          1,
-        n = coefficient.length;
-      return i === n
-        ? coefficient
-        : i > n
-        ? coefficient + new Array(i - n + 1).join('0')
-        : i > 0
-        ? coefficient.slice(0, i) + '.' + coefficient.slice(i)
-        : '0.' +
-          new Array(1 - i).join('0') +
-          formatDecimalParts(x, Math.max(0, p + i - 1))[0]; // less than 1y!
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatRounded.js
-
-    /* harmony default export */ function formatRounded(x, p) {
-      var d = formatDecimalParts(x, p);
-      if (!d) return x + '';
-      var coefficient = d[0],
-        exponent = d[1];
-      return exponent < 0
-        ? '0.' + new Array(-exponent).join('0') + coefficient
-        : coefficient.length > exponent + 1
-        ? coefficient.slice(0, exponent + 1) +
-          '.' +
-          coefficient.slice(exponent + 1)
-        : coefficient + new Array(exponent - coefficient.length + 2).join('0');
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatTypes.js
-
-    /* harmony default export */ const formatTypes = {
-      '%': (x, p) => (x * 100).toFixed(p),
-      b: (x) => Math.round(x).toString(2),
-      c: (x) => x + '',
-      d: formatDecimal,
-      e: (x, p) => x.toExponential(p),
-      f: (x, p) => x.toFixed(p),
-      g: (x, p) => x.toPrecision(p),
-      o: (x) => Math.round(x).toString(8),
-      p: (x, p) => formatRounded(x * 100, p),
-      r: formatRounded,
-      s: formatPrefixAuto,
-      X: (x) => Math.round(x).toString(16).toUpperCase(),
-      x: (x) => Math.round(x).toString(16),
-    }; // CONCATENATED MODULE: ../node_modules/d3-format/src/identity.js
-
-    /* harmony default export */ function identity(x) {
-      return x;
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/locale.js
-
-    var map = Array.prototype.map,
-      prefixes = [
-        'y',
-        'z',
-        'a',
-        'f',
-        'p',
-        'n',
-        'µ',
-        'm',
-        '',
-        'k',
-        'M',
-        'G',
-        'T',
-        'P',
-        'E',
-        'Z',
-        'Y',
-      ];
-
-    /* harmony default export */ function locale(locale) {
-      var group =
-          locale.grouping === undefined || locale.thousands === undefined
-            ? identity
-            : formatGroup(
-                map.call(locale.grouping, Number),
-                locale.thousands + '',
-              ),
-        currencyPrefix =
-          locale.currency === undefined ? '' : locale.currency[0] + '',
-        currencySuffix =
-          locale.currency === undefined ? '' : locale.currency[1] + '',
-        decimal = locale.decimal === undefined ? '.' : locale.decimal + '',
-        numerals =
-          locale.numerals === undefined
-            ? identity
-            : formatNumerals(map.call(locale.numerals, String)),
-        percent = locale.percent === undefined ? '%' : locale.percent + '',
-        minus = locale.minus === undefined ? '−' : locale.minus + '',
-        nan = locale.nan === undefined ? 'NaN' : locale.nan + '';
-
-      function newFormat(specifier) {
-        specifier = formatSpecifier(specifier);
-
-        var fill = specifier.fill,
-          align = specifier.align,
-          sign = specifier.sign,
-          symbol = specifier.symbol,
-          zero = specifier.zero,
-          width = specifier.width,
-          comma = specifier.comma,
-          precision = specifier.precision,
-          trim = specifier.trim,
-          type = specifier.type;
-
-        // The "n" type is an alias for ",g".
-        if (type === 'n') (comma = true), (type = 'g');
-        // The "" type, and any invalid type, is an alias for ".12~g".
-        else if (!formatTypes[type])
-          precision === undefined && (precision = 12),
-            (trim = true),
-            (type = 'g');
-
-        // If zero fill is specified, padding goes after sign and before digits.
-        if (zero || (fill === '0' && align === '='))
-          (zero = true), (fill = '0'), (align = '=');
-
-        // Compute the prefix and suffix.
-        // For SI-prefix, the suffix is lazily computed.
-        var prefix =
-            symbol === '$'
-              ? currencyPrefix
-              : symbol === '#' && /[boxX]/.test(type)
-              ? '0' + type.toLowerCase()
-              : '',
-          suffix =
-            symbol === '$' ? currencySuffix : /[%p]/.test(type) ? percent : '';
-
-        // What format function should we use?
-        // Is this an integer type?
-        // Can this type generate exponential notation?
-        var formatType = formatTypes[type],
-          maybeSuffix = /[defgprs%]/.test(type);
-
-        // Set the default precision if not specified,
-        // or clamp the specified precision to the supported range.
-        // For significant precision, it must be in [1, 21].
-        // For fixed precision, it must be in [0, 20].
-        precision =
-          precision === undefined
-            ? 6
-            : /[gprs]/.test(type)
-            ? Math.max(1, Math.min(21, precision))
-            : Math.max(0, Math.min(20, precision));
-
-        function format(value) {
-          var valuePrefix = prefix,
-            valueSuffix = suffix,
-            i,
-            n,
-            c;
-
-          if (type === 'c') {
-            valueSuffix = formatType(value) + valueSuffix;
-            value = '';
-          } else {
-            value = +value;
-
-            // Determine the sign. -0 is not less than 0, but 1 / -0 is!
-            var valueNegative = value < 0 || 1 / value < 0;
-
-            // Perform the initial formatting.
-            value = isNaN(value) ? nan : formatType(Math.abs(value), precision);
-
-            // Trim insignificant zeros.
-            if (trim) value = formatTrim(value);
-
-            // If a negative value rounds to zero after formatting, and no explicit positive sign is requested, hide the sign.
-            if (valueNegative && +value === 0 && sign !== '+')
-              valueNegative = false;
-
-            // Compute the prefix and suffix.
-            valuePrefix =
-              (valueNegative
-                ? sign === '('
-                  ? sign
-                  : minus
-                : sign === '-' || sign === '('
-                ? ''
-                : sign) + valuePrefix;
-            valueSuffix =
-              (type === 's' ? prefixes[8 + prefixExponent / 3] : '') +
-              valueSuffix +
-              (valueNegative && sign === '(' ? ')' : '');
-
-            // Break the formatted value into the integer “value” part that can be
-            // grouped, and fractional or exponential “suffix” part that is not.
-            if (maybeSuffix) {
-              (i = -1), (n = value.length);
-              while (++i < n) {
-                if (((c = value.charCodeAt(i)), 48 > c || c > 57)) {
-                  valueSuffix =
-                    (c === 46 ? decimal + value.slice(i + 1) : value.slice(i)) +
-                    valueSuffix;
-                  value = value.slice(0, i);
-                  break;
-                }
-              }
-            }
-          }
-
-          // If the fill character is not "0", grouping is applied before padding.
-          if (comma && !zero) value = group(value, Infinity);
-
-          // Compute the padding.
-          var length = valuePrefix.length + value.length + valueSuffix.length,
-            padding =
-              length < width ? new Array(width - length + 1).join(fill) : '';
-
-          // If the fill character is "0", grouping is applied after padding.
-          if (comma && zero)
-            (value = group(
-              padding + value,
-              padding.length ? width - valueSuffix.length : Infinity,
-            )),
-              (padding = '');
-
-          // Reconstruct the final output based on the desired alignment.
-          switch (align) {
-            case '<':
-              value = valuePrefix + value + valueSuffix + padding;
-              break;
-            case '=':
-              value = valuePrefix + padding + value + valueSuffix;
-              break;
-            case '^':
-              value =
-                padding.slice(0, (length = padding.length >> 1)) +
-                valuePrefix +
-                value +
-                valueSuffix +
-                padding.slice(length);
-              break;
-            default:
-              value = padding + valuePrefix + value + valueSuffix;
-              break;
-          }
-
-          return numerals(value);
-        }
-
-        format.toString = function () {
-          return specifier + '';
-        };
-
-        return format;
-      }
-
-      function formatPrefix(specifier, value) {
-        var f = newFormat(
-            ((specifier = formatSpecifier(specifier)),
-            (specifier.type = 'f'),
-            specifier),
-          ),
-          e = Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3,
-          k = Math.pow(10, -e),
-          prefix = prefixes[8 + e / 3];
-        return function (value) {
-          return f(k * value) + prefix;
-        };
-      }
-
-      return {
-        format: newFormat,
-        formatPrefix: formatPrefix,
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/defaultLocale.js
-
-    var defaultLocale_locale;
-    var format;
-    var formatPrefix;
-
-    defaultLocale({
-      thousands: ',',
-      grouping: [3],
-      currency: ['$', ''],
-    });
-
-    function defaultLocale(definition) {
-      defaultLocale_locale = locale(definition);
-      format = defaultLocale_locale.format;
-      formatPrefix = defaultLocale_locale.formatPrefix;
-      return defaultLocale_locale;
-    } // CONCATENATED MODULE: ../node_modules/d3-array/src/ascending.js
-
-    function ascending_ascending(a, b) {
-      return a == null || b == null
-        ? NaN
-        : a < b
-        ? -1
-        : a > b
-        ? 1
-        : a >= b
-        ? 0
-        : NaN;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/treemap/round.js
-
-    /* harmony default export */ function treemap_round(node) {
-      node.x0 = Math.round(node.x0);
-      node.y0 = Math.round(node.y0);
-      node.x1 = Math.round(node.x1);
-      node.y1 = Math.round(node.y1);
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/treemap/dice.js
-
-    /* harmony default export */ function dice(parent, x0, y0, x1, y1) {
-      var nodes = parent.children,
-        node,
-        i = -1,
-        n = nodes.length,
-        k = parent.value && (x1 - x0) / parent.value;
-
-      while (++i < n) {
-        (node = nodes[i]), (node.y0 = y0), (node.y1 = y1);
-        (node.x0 = x0), (node.x1 = x0 += node.value * k);
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/partition.js
-
-    /* harmony default export */ function partition() {
-      var dx = 1,
-        dy = 1,
-        padding = 0,
-        round = false;
-
-      function partition(root) {
-        var n = root.height + 1;
-        root.x0 = root.y0 = padding;
-        root.x1 = dx;
-        root.y1 = dy / n;
-        root.eachBefore(positionNode(dy, n));
-        if (round) root.eachBefore(treemap_round);
-        return root;
-      }
-
-      function positionNode(dy, n) {
-        return function (node) {
-          if (node.children) {
-            dice(
-              node,
-              node.x0,
-              (dy * (node.depth + 1)) / n,
-              node.x1,
-              (dy * (node.depth + 2)) / n,
-            );
-          }
-          var x0 = node.x0,
-            y0 = node.y0,
-            x1 = node.x1 - padding,
-            y1 = node.y1 - padding;
-          if (x1 < x0) x0 = x1 = (x0 + x1) / 2;
-          if (y1 < y0) y0 = y1 = (y0 + y1) / 2;
-          node.x0 = x0;
-          node.y0 = y0;
-          node.x1 = x1;
-          node.y1 = y1;
-        };
-      }
-
-      partition.round = function (x) {
-        return arguments.length ? ((round = !!x), partition) : round;
-      };
-
-      partition.size = function (x) {
-        return arguments.length
-          ? ((dx = +x[0]), (dy = +x[1]), partition)
-          : [dx, dy];
-      };
-
-      partition.padding = function (x) {
-        return arguments.length ? ((padding = +x), partition) : padding;
-      };
-
-      return partition;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/count.js
-
-    function count(node) {
-      var sum = 0,
-        children = node.children,
-        i = children && children.length;
-      if (!i) sum = 1;
-      else while (--i >= 0) sum += children[i].value;
-      node.value = sum;
-    }
-
-    /* harmony default export */ function hierarchy_count() {
-      return this.eachAfter(count);
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/each.js
-
-    /* harmony default export */ function hierarchy_each(callback, that) {
-      let index = -1;
-      for (const node of this) {
-        callback.call(that, node, ++index, this);
-      }
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/eachBefore.js
-
-    /* harmony default export */ function eachBefore(callback, that) {
-      var node = this,
-        nodes = [node],
-        children,
-        i,
-        index = -1;
-      while ((node = nodes.pop())) {
-        callback.call(that, node, ++index, this);
-        if ((children = node.children)) {
-          for (i = children.length - 1; i >= 0; --i) {
-            nodes.push(children[i]);
-          }
-        }
-      }
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/eachAfter.js
-
-    /* harmony default export */ function eachAfter(callback, that) {
-      var node = this,
-        nodes = [node],
-        next = [],
-        children,
-        i,
-        n,
-        index = -1;
-      while ((node = nodes.pop())) {
-        next.push(node);
-        if ((children = node.children)) {
-          for (i = 0, n = children.length; i < n; ++i) {
-            nodes.push(children[i]);
-          }
-        }
-      }
-      while ((node = next.pop())) {
-        callback.call(that, node, ++index, this);
-      }
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/find.js
-
-    /* harmony default export */ function hierarchy_find(callback, that) {
-      let index = -1;
-      for (const node of this) {
-        if (callback.call(that, node, ++index, this)) {
-          return node;
-        }
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/sum.js
-
-    /* harmony default export */ function sum(value) {
-      return this.eachAfter(function (node) {
-        var sum = +value(node.data) || 0,
-          children = node.children,
-          i = children && children.length;
-        while (--i >= 0) sum += children[i].value;
-        node.value = sum;
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/sort.js
-
-    /* harmony default export */ function hierarchy_sort(compare) {
-      return this.eachBefore(function (node) {
-        if (node.children) {
-          node.children.sort(compare);
-        }
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/path.js
-
-    /* harmony default export */ function path(end) {
-      var start = this,
-        ancestor = leastCommonAncestor(start, end),
-        nodes = [start];
-      while (start !== ancestor) {
-        start = start.parent;
-        nodes.push(start);
-      }
-      var k = nodes.length;
-      while (end !== ancestor) {
-        nodes.splice(k, 0, end);
-        end = end.parent;
-      }
-      return nodes;
-    }
-
-    function leastCommonAncestor(a, b) {
-      if (a === b) return a;
-      var aNodes = a.ancestors(),
-        bNodes = b.ancestors(),
-        c = null;
-      a = aNodes.pop();
-      b = bNodes.pop();
-      while (a === b) {
-        c = a;
-        a = aNodes.pop();
-        b = bNodes.pop();
-      }
-      return c;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/ancestors.js
-
-    /* harmony default export */ function ancestors() {
-      var node = this,
-        nodes = [node];
-      while ((node = node.parent)) {
-        nodes.push(node);
-      }
-      return nodes;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/descendants.js
-
-    /* harmony default export */ function descendants() {
-      return Array.from(this);
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/leaves.js
-
-    /* harmony default export */ function leaves() {
-      var leaves = [];
-      this.eachBefore(function (node) {
-        if (!node.children) {
-          leaves.push(node);
-        }
-      });
-      return leaves;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/links.js
-
-    /* harmony default export */ function links() {
-      var root = this,
-        links = [];
-      root.each(function (node) {
-        if (node !== root) {
-          // Don’t include the root’s parent, if any.
-          links.push({ source: node.parent, target: node });
-        }
-      });
-      return links;
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/iterator.js
-
-    /* harmony default export */ function* hierarchy_iterator() {
-      var node = this,
-        current,
-        next = [node],
-        children,
-        i,
-        n;
-      do {
-        (current = next.reverse()), (next = []);
-        while ((node = current.pop())) {
-          yield node;
-          if ((children = node.children)) {
-            for (i = 0, n = children.length; i < n; ++i) {
-              next.push(children[i]);
-            }
-          }
-        }
-      } while (next.length);
-    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/index.js
-
-    function hierarchy(data, children) {
-      if (data instanceof Map) {
-        data = [undefined, data];
-        if (children === undefined) children = mapChildren;
-      } else if (children === undefined) {
-        children = objectChildren;
-      }
-
-      var root = new Node(data),
-        node,
-        nodes = [root],
-        child,
-        childs,
-        i,
-        n;
-
-      while ((node = nodes.pop())) {
-        if (
-          (childs = children(node.data)) &&
-          (n = (childs = Array.from(childs)).length)
-        ) {
-          node.children = childs;
-          for (i = n - 1; i >= 0; --i) {
-            nodes.push((child = childs[i] = new Node(childs[i])));
-            child.parent = node;
-            child.depth = node.depth + 1;
-          }
-        }
-      }
-
-      return root.eachBefore(computeHeight);
-    }
-
-    function node_copy() {
-      return hierarchy(this).eachBefore(copyData);
-    }
-
-    function objectChildren(d) {
-      return d.children;
-    }
-
-    function mapChildren(d) {
-      return Array.isArray(d) ? d[1] : null;
-    }
-
-    function copyData(node) {
-      if (node.data.value !== undefined) node.value = node.data.value;
-      node.data = node.data.data;
-    }
-
-    function computeHeight(node) {
-      var height = 0;
-      do node.height = height;
-      while ((node = node.parent) && node.height < ++height);
-    }
-
-    function Node(data) {
-      this.data = data;
-      this.depth = this.height = 0;
-      this.parent = null;
-    }
-
-    Node.prototype = hierarchy.prototype = {
-      constructor: Node,
-      count: hierarchy_count,
-      each: hierarchy_each,
-      eachAfter: eachAfter,
-      eachBefore: eachBefore,
-      find: hierarchy_find,
-      sum: sum,
-      sort: hierarchy_sort,
-      path: path,
-      ancestors: ancestors,
-      descendants: descendants,
-      leaves: leaves,
-      links: links,
-      copy: node_copy,
-      [Symbol.iterator]: hierarchy_iterator,
-    }; // CONCATENATED MODULE: ../node_modules/d3-array/src/ticks.js
-
-    var e10 = Math.sqrt(50),
-      e5 = Math.sqrt(10),
-      e2 = Math.sqrt(2);
-
-    function ticks(start, stop, count) {
-      var reverse,
-        i = -1,
-        n,
-        ticks,
-        step;
-
-      (stop = +stop), (start = +start), (count = +count);
-      if (start === stop && count > 0) return [start];
-      if ((reverse = stop < start)) (n = start), (start = stop), (stop = n);
-      if ((step = tickIncrement(start, stop, count)) === 0 || !isFinite(step))
-        return [];
-
-      if (step > 0) {
-        let r0 = Math.round(start / step),
-          r1 = Math.round(stop / step);
-        if (r0 * step < start) ++r0;
-        if (r1 * step > stop) --r1;
-        ticks = new Array((n = r1 - r0 + 1));
-        while (++i < n) ticks[i] = (r0 + i) * step;
-      } else {
-        step = -step;
-        let r0 = Math.round(start * step),
-          r1 = Math.round(stop * step);
-        if (r0 / step < start) ++r0;
-        if (r1 / step > stop) --r1;
-        ticks = new Array((n = r1 - r0 + 1));
-        while (++i < n) ticks[i] = (r0 + i) / step;
-      }
-
-      if (reverse) ticks.reverse();
-
-      return ticks;
-    }
-
-    function tickIncrement(start, stop, count) {
-      var step = (stop - start) / Math.max(0, count),
-        power = Math.floor(Math.log(step) / Math.LN10),
-        error = step / Math.pow(10, power);
-      return power >= 0
-        ? (error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1) *
-            Math.pow(10, power)
-        : -Math.pow(10, -power) /
-            (error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1);
-    }
-
-    function tickStep(start, stop, count) {
-      var step0 = Math.abs(stop - start) / Math.max(0, count),
-        step1 = Math.pow(10, Math.floor(Math.log(step0) / Math.LN10)),
-        error = step0 / step1;
-      if (error >= e10) step1 *= 10;
-      else if (error >= e5) step1 *= 5;
-      else if (error >= e2) step1 *= 2;
-      return stop < start ? -step1 : step1;
-    } // CONCATENATED MODULE: ../node_modules/d3-array/src/bisector.js
-
-    function bisector(f) {
-      let delta = f;
-      let compare1 = f;
-      let compare2 = f;
-
-      if (f.length !== 2) {
-        delta = (d, x) => f(d) - x;
-        compare1 = ascending_ascending;
-        compare2 = (d, x) => ascending_ascending(f(d), x);
-      }
-
-      function left(a, x, lo = 0, hi = a.length) {
-        if (lo < hi) {
-          if (compare1(x, x) !== 0) return hi;
-          do {
-            const mid = (lo + hi) >>> 1;
-            if (compare2(a[mid], x) < 0) lo = mid + 1;
-            else hi = mid;
-          } while (lo < hi);
-        }
-        return lo;
-      }
-
-      function right(a, x, lo = 0, hi = a.length) {
-        if (lo < hi) {
-          if (compare1(x, x) !== 0) return hi;
-          do {
-            const mid = (lo + hi) >>> 1;
-            if (compare2(a[mid], x) <= 0) lo = mid + 1;
-            else hi = mid;
-          } while (lo < hi);
-        }
-        return lo;
-      }
-
-      function center(a, x, lo = 0, hi = a.length) {
-        const i = left(a, x, lo, hi - 1);
-        return i > lo && delta(a[i - 1], x) > -delta(a[i], x) ? i - 1 : i;
-      }
-
-      return { left, center, right };
-    } // CONCATENATED MODULE: ../node_modules/d3-array/src/number.js
-
-    function number(x) {
-      return x === null ? NaN : +x;
-    }
-
-    function* numbers(values, valueof) {
-      if (valueof === undefined) {
-        for (let value of values) {
-          if (value != null && (value = +value) >= value) {
-            yield value;
-          }
-        }
-      } else {
-        let index = -1;
-        for (let value of values) {
-          if (
-            (value = valueof(value, ++index, values)) != null &&
-            (value = +value) >= value
-          ) {
-            yield value;
-          }
-        }
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-array/src/bisect.js
-
-    const ascendingBisect = bisector(ascending_ascending);
-    const bisectRight = ascendingBisect.right;
-    const bisectLeft = ascendingBisect.left;
-    const bisectCenter = bisector(number).center;
-    /* harmony default export */ const bisect = bisectRight; // CONCATENATED MODULE: ../node_modules/d3-color/src/define.js
-
-    /* harmony default export */ function src_define(
-      constructor,
-      factory,
-      prototype,
-    ) {
-      constructor.prototype = factory.prototype = prototype;
-      prototype.constructor = constructor;
-    }
-
-    function extend(parent, definition) {
-      var prototype = Object.create(parent.prototype);
-      for (var key in definition) prototype[key] = definition[key];
-      return prototype;
-    } // CONCATENATED MODULE: ../node_modules/d3-color/src/color.js
-
-    function Color() {}
-
-    var darker = 0.7;
-    var brighter = 1 / darker;
-
-    var reI = '\\s*([+-]?\\d+)\\s*',
-      reN = '\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*',
-      reP = '\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*',
-      reHex = /^#([0-9a-f]{3,8})$/,
-      reRgbInteger = new RegExp('^rgb\\(' + [reI, reI, reI] + '\\)$'),
-      reRgbPercent = new RegExp('^rgb\\(' + [reP, reP, reP] + '\\)$'),
-      reRgbaInteger = new RegExp('^rgba\\(' + [reI, reI, reI, reN] + '\\)$'),
-      reRgbaPercent = new RegExp('^rgba\\(' + [reP, reP, reP, reN] + '\\)$'),
-      reHslPercent = new RegExp('^hsl\\(' + [reN, reP, reP] + '\\)$'),
-      reHslaPercent = new RegExp('^hsla\\(' + [reN, reP, reP, reN] + '\\)$');
-
-    var named = {
-      aliceblue: 0xf0f8ff,
-      antiquewhite: 0xfaebd7,
-      aqua: 0x00ffff,
-      aquamarine: 0x7fffd4,
-      azure: 0xf0ffff,
-      beige: 0xf5f5dc,
-      bisque: 0xffe4c4,
-      black: 0x000000,
-      blanchedalmond: 0xffebcd,
-      blue: 0x0000ff,
-      blueviolet: 0x8a2be2,
-      brown: 0xa52a2a,
-      burlywood: 0xdeb887,
-      cadetblue: 0x5f9ea0,
-      chartreuse: 0x7fff00,
-      chocolate: 0xd2691e,
-      coral: 0xff7f50,
-      cornflowerblue: 0x6495ed,
-      cornsilk: 0xfff8dc,
-      crimson: 0xdc143c,
-      cyan: 0x00ffff,
-      darkblue: 0x00008b,
-      darkcyan: 0x008b8b,
-      darkgoldenrod: 0xb8860b,
-      darkgray: 0xa9a9a9,
-      darkgreen: 0x006400,
-      darkgrey: 0xa9a9a9,
-      darkkhaki: 0xbdb76b,
-      darkmagenta: 0x8b008b,
-      darkolivegreen: 0x556b2f,
-      darkorange: 0xff8c00,
-      darkorchid: 0x9932cc,
-      darkred: 0x8b0000,
-      darksalmon: 0xe9967a,
-      darkseagreen: 0x8fbc8f,
-      darkslateblue: 0x483d8b,
-      darkslategray: 0x2f4f4f,
-      darkslategrey: 0x2f4f4f,
-      darkturquoise: 0x00ced1,
-      darkviolet: 0x9400d3,
-      deeppink: 0xff1493,
-      deepskyblue: 0x00bfff,
-      dimgray: 0x696969,
-      dimgrey: 0x696969,
-      dodgerblue: 0x1e90ff,
-      firebrick: 0xb22222,
-      floralwhite: 0xfffaf0,
-      forestgreen: 0x228b22,
-      fuchsia: 0xff00ff,
-      gainsboro: 0xdcdcdc,
-      ghostwhite: 0xf8f8ff,
-      gold: 0xffd700,
-      goldenrod: 0xdaa520,
-      gray: 0x808080,
-      green: 0x008000,
-      greenyellow: 0xadff2f,
-      grey: 0x808080,
-      honeydew: 0xf0fff0,
-      hotpink: 0xff69b4,
-      indianred: 0xcd5c5c,
-      indigo: 0x4b0082,
-      ivory: 0xfffff0,
-      khaki: 0xf0e68c,
-      lavender: 0xe6e6fa,
-      lavenderblush: 0xfff0f5,
-      lawngreen: 0x7cfc00,
-      lemonchiffon: 0xfffacd,
-      lightblue: 0xadd8e6,
-      lightcoral: 0xf08080,
-      lightcyan: 0xe0ffff,
-      lightgoldenrodyellow: 0xfafad2,
-      lightgray: 0xd3d3d3,
-      lightgreen: 0x90ee90,
-      lightgrey: 0xd3d3d3,
-      lightpink: 0xffb6c1,
-      lightsalmon: 0xffa07a,
-      lightseagreen: 0x20b2aa,
-      lightskyblue: 0x87cefa,
-      lightslategray: 0x778899,
-      lightslategrey: 0x778899,
-      lightsteelblue: 0xb0c4de,
-      lightyellow: 0xffffe0,
-      lime: 0x00ff00,
-      limegreen: 0x32cd32,
-      linen: 0xfaf0e6,
-      magenta: 0xff00ff,
-      maroon: 0x800000,
-      mediumaquamarine: 0x66cdaa,
-      mediumblue: 0x0000cd,
-      mediumorchid: 0xba55d3,
-      mediumpurple: 0x9370db,
-      mediumseagreen: 0x3cb371,
-      mediumslateblue: 0x7b68ee,
-      mediumspringgreen: 0x00fa9a,
-      mediumturquoise: 0x48d1cc,
-      mediumvioletred: 0xc71585,
-      midnightblue: 0x191970,
-      mintcream: 0xf5fffa,
-      mistyrose: 0xffe4e1,
-      moccasin: 0xffe4b5,
-      navajowhite: 0xffdead,
-      navy: 0x000080,
-      oldlace: 0xfdf5e6,
-      olive: 0x808000,
-      olivedrab: 0x6b8e23,
-      orange: 0xffa500,
-      orangered: 0xff4500,
-      orchid: 0xda70d6,
-      palegoldenrod: 0xeee8aa,
-      palegreen: 0x98fb98,
-      paleturquoise: 0xafeeee,
-      palevioletred: 0xdb7093,
-      papayawhip: 0xffefd5,
-      peachpuff: 0xffdab9,
-      peru: 0xcd853f,
-      pink: 0xffc0cb,
-      plum: 0xdda0dd,
-      powderblue: 0xb0e0e6,
-      purple: 0x800080,
-      rebeccapurple: 0x663399,
-      red: 0xff0000,
-      rosybrown: 0xbc8f8f,
-      royalblue: 0x4169e1,
-      saddlebrown: 0x8b4513,
-      salmon: 0xfa8072,
-      sandybrown: 0xf4a460,
-      seagreen: 0x2e8b57,
-      seashell: 0xfff5ee,
-      sienna: 0xa0522d,
-      silver: 0xc0c0c0,
-      skyblue: 0x87ceeb,
-      slateblue: 0x6a5acd,
-      slategray: 0x708090,
-      slategrey: 0x708090,
-      snow: 0xfffafa,
-      springgreen: 0x00ff7f,
-      steelblue: 0x4682b4,
-      tan: 0xd2b48c,
-      teal: 0x008080,
-      thistle: 0xd8bfd8,
-      tomato: 0xff6347,
-      turquoise: 0x40e0d0,
-      violet: 0xee82ee,
-      wheat: 0xf5deb3,
-      white: 0xffffff,
-      whitesmoke: 0xf5f5f5,
-      yellow: 0xffff00,
-      yellowgreen: 0x9acd32,
-    };
-
-    src_define(Color, color, {
-      copy: function (channels) {
-        return Object.assign(new this.constructor(), this, channels);
-      },
-      displayable: function () {
-        return this.rgb().displayable();
-      },
-      hex: color_formatHex, // Deprecated! Use color.formatHex.
-      formatHex: color_formatHex,
-      formatHsl: color_formatHsl,
-      formatRgb: color_formatRgb,
-      toString: color_formatRgb,
-    });
-
-    function color_formatHex() {
-      return this.rgb().formatHex();
-    }
-
-    function color_formatHsl() {
-      return hslConvert(this).formatHsl();
-    }
-
-    function color_formatRgb() {
-      return this.rgb().formatRgb();
-    }
-
-    function color(format) {
-      var m, l;
-      format = (format + '').trim().toLowerCase();
-      return (m = reHex.exec(format))
-        ? ((l = m[1].length),
-          (m = parseInt(m[1], 16)),
-          l === 6
-            ? rgbn(m) // #ff0000
-            : l === 3
-            ? new Rgb(
-                ((m >> 8) & 0xf) | ((m >> 4) & 0xf0),
-                ((m >> 4) & 0xf) | (m & 0xf0),
-                ((m & 0xf) << 4) | (m & 0xf),
-                1,
-              ) // #f00
-            : l === 8
-            ? rgba(
-                (m >> 24) & 0xff,
-                (m >> 16) & 0xff,
-                (m >> 8) & 0xff,
-                (m & 0xff) / 0xff,
-              ) // #ff000000
-            : l === 4
-            ? rgba(
-                ((m >> 12) & 0xf) | ((m >> 8) & 0xf0),
-                ((m >> 8) & 0xf) | ((m >> 4) & 0xf0),
-                ((m >> 4) & 0xf) | (m & 0xf0),
-                (((m & 0xf) << 4) | (m & 0xf)) / 0xff,
-              ) // #f000
-            : null) // invalid hex
-        : (m = reRgbInteger.exec(format))
-        ? new Rgb(m[1], m[2], m[3], 1) // rgb(255, 0, 0)
-        : (m = reRgbPercent.exec(format))
-        ? new Rgb((m[1] * 255) / 100, (m[2] * 255) / 100, (m[3] * 255) / 100, 1) // rgb(100%, 0%, 0%)
-        : (m = reRgbaInteger.exec(format))
-        ? rgba(m[1], m[2], m[3], m[4]) // rgba(255, 0, 0, 1)
-        : (m = reRgbaPercent.exec(format))
-        ? rgba((m[1] * 255) / 100, (m[2] * 255) / 100, (m[3] * 255) / 100, m[4]) // rgb(100%, 0%, 0%, 1)
-        : (m = reHslPercent.exec(format))
-        ? hsla(m[1], m[2] / 100, m[3] / 100, 1) // hsl(120, 50%, 50%)
-        : (m = reHslaPercent.exec(format))
-        ? hsla(m[1], m[2] / 100, m[3] / 100, m[4]) // hsla(120, 50%, 50%, 1)
-        : named.hasOwnProperty(format)
-        ? rgbn(named[format]) // eslint-disable-line no-prototype-builtins
-        : format === 'transparent'
-        ? new Rgb(NaN, NaN, NaN, 0)
-        : null;
-    }
-
-    function rgbn(n) {
-      return new Rgb((n >> 16) & 0xff, (n >> 8) & 0xff, n & 0xff, 1);
-    }
-
-    function rgba(r, g, b, a) {
-      if (a <= 0) r = g = b = NaN;
-      return new Rgb(r, g, b, a);
-    }
-
-    function rgbConvert(o) {
-      if (!(o instanceof Color)) o = color(o);
-      if (!o) return new Rgb();
-      o = o.rgb();
-      return new Rgb(o.r, o.g, o.b, o.opacity);
-    }
-
-    function color_rgb(r, g, b, opacity) {
-      return arguments.length === 1
-        ? rgbConvert(r)
-        : new Rgb(r, g, b, opacity == null ? 1 : opacity);
-    }
-
-    function Rgb(r, g, b, opacity) {
-      this.r = +r;
-      this.g = +g;
-      this.b = +b;
-      this.opacity = +opacity;
-    }
-
-    src_define(
-      Rgb,
-      color_rgb,
-      extend(Color, {
-        brighter: function (k) {
-          k = k == null ? brighter : Math.pow(brighter, k);
-          return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
-        },
-        darker: function (k) {
-          k = k == null ? darker : Math.pow(darker, k);
-          return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
-        },
-        rgb: function () {
-          return this;
-        },
-        displayable: function () {
-          return (
-            -0.5 <= this.r &&
-            this.r < 255.5 &&
-            -0.5 <= this.g &&
-            this.g < 255.5 &&
-            -0.5 <= this.b &&
-            this.b < 255.5 &&
-            0 <= this.opacity &&
-            this.opacity <= 1
-          );
-        },
-        hex: rgb_formatHex, // Deprecated! Use color.formatHex.
-        formatHex: rgb_formatHex,
-        formatRgb: rgb_formatRgb,
-        toString: rgb_formatRgb,
-      }),
-    );
-
-    function rgb_formatHex() {
-      return '#' + hex(this.r) + hex(this.g) + hex(this.b);
-    }
-
-    function rgb_formatRgb() {
-      var a = this.opacity;
-      a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
-      return (
-        (a === 1 ? 'rgb(' : 'rgba(') +
-        Math.max(0, Math.min(255, Math.round(this.r) || 0)) +
-        ', ' +
-        Math.max(0, Math.min(255, Math.round(this.g) || 0)) +
-        ', ' +
-        Math.max(0, Math.min(255, Math.round(this.b) || 0)) +
-        (a === 1 ? ')' : ', ' + a + ')')
-      );
-    }
-
-    function hex(value) {
-      value = Math.max(0, Math.min(255, Math.round(value) || 0));
-      return (value < 16 ? '0' : '') + value.toString(16);
-    }
-
-    function hsla(h, s, l, a) {
-      if (a <= 0) h = s = l = NaN;
-      else if (l <= 0 || l >= 1) h = s = NaN;
-      else if (s <= 0) h = NaN;
-      return new Hsl(h, s, l, a);
-    }
-
-    function hslConvert(o) {
-      if (o instanceof Hsl) return new Hsl(o.h, o.s, o.l, o.opacity);
-      if (!(o instanceof Color)) o = color(o);
-      if (!o) return new Hsl();
-      if (o instanceof Hsl) return o;
-      o = o.rgb();
-      var r = o.r / 255,
-        g = o.g / 255,
-        b = o.b / 255,
-        min = Math.min(r, g, b),
-        max = Math.max(r, g, b),
-        h = NaN,
-        s = max - min,
-        l = (max + min) / 2;
-      if (s) {
-        if (r === max) h = (g - b) / s + (g < b) * 6;
-        else if (g === max) h = (b - r) / s + 2;
-        else h = (r - g) / s + 4;
-        s /= l < 0.5 ? max + min : 2 - max - min;
-        h *= 60;
-      } else {
-        s = l > 0 && l < 1 ? 0 : h;
-      }
-      return new Hsl(h, s, l, o.opacity);
-    }
-
-    function hsl(h, s, l, opacity) {
-      return arguments.length === 1
-        ? hslConvert(h)
-        : new Hsl(h, s, l, opacity == null ? 1 : opacity);
-    }
-
-    function Hsl(h, s, l, opacity) {
-      this.h = +h;
-      this.s = +s;
-      this.l = +l;
-      this.opacity = +opacity;
-    }
-
-    src_define(
-      Hsl,
-      hsl,
-      extend(Color, {
-        brighter: function (k) {
-          k = k == null ? brighter : Math.pow(brighter, k);
-          return new Hsl(this.h, this.s, this.l * k, this.opacity);
-        },
-        darker: function (k) {
-          k = k == null ? darker : Math.pow(darker, k);
-          return new Hsl(this.h, this.s, this.l * k, this.opacity);
-        },
-        rgb: function () {
-          var h = (this.h % 360) + (this.h < 0) * 360,
-            s = isNaN(h) || isNaN(this.s) ? 0 : this.s,
-            l = this.l,
-            m2 = l + (l < 0.5 ? l : 1 - l) * s,
-            m1 = 2 * l - m2;
-          return new Rgb(
-            hsl2rgb(h >= 240 ? h - 240 : h + 120, m1, m2),
-            hsl2rgb(h, m1, m2),
-            hsl2rgb(h < 120 ? h + 240 : h - 120, m1, m2),
-            this.opacity,
-          );
-        },
-        displayable: function () {
-          return (
-            ((0 <= this.s && this.s <= 1) || isNaN(this.s)) &&
-            0 <= this.l &&
-            this.l <= 1 &&
-            0 <= this.opacity &&
-            this.opacity <= 1
-          );
-        },
-        formatHsl: function () {
-          var a = this.opacity;
-          a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
-          return (
-            (a === 1 ? 'hsl(' : 'hsla(') +
-            (this.h || 0) +
-            ', ' +
-            (this.s || 0) * 100 +
-            '%, ' +
-            (this.l || 0) * 100 +
-            '%' +
-            (a === 1 ? ')' : ', ' + a + ')')
-          );
-        },
-      }),
-    );
-
-    /* From FvD 13.37, CSS Color Module Level 3 */
-    function hsl2rgb(h, m1, m2) {
-      return (
-        (h < 60
-          ? m1 + ((m2 - m1) * h) / 60
-          : h < 180
-          ? m2
-          : h < 240
-          ? m1 + ((m2 - m1) * (240 - h)) / 60
-          : m1) * 255
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basis.js
-
-    function basis(t1, v0, v1, v2, v3) {
-      var t2 = t1 * t1,
-        t3 = t2 * t1;
-      return (
-        ((1 - 3 * t1 + 3 * t2 - t3) * v0 +
-          (4 - 6 * t2 + 3 * t3) * v1 +
-          (1 + 3 * t1 + 3 * t2 - 3 * t3) * v2 +
-          t3 * v3) /
-        6
-      );
-    }
-
-    /* harmony default export */ function src_basis(values) {
-      var n = values.length - 1;
-      return function (t) {
-        var i =
-            t <= 0 ? (t = 0) : t >= 1 ? ((t = 1), n - 1) : Math.floor(t * n),
-          v1 = values[i],
-          v2 = values[i + 1],
-          v0 = i > 0 ? values[i - 1] : 2 * v1 - v2,
-          v3 = i < n - 1 ? values[i + 2] : 2 * v2 - v1;
-        return basis((t - i / n) * n, v0, v1, v2, v3);
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basisClosed.js
-
-    /* harmony default export */ function basisClosed(values) {
-      var n = values.length;
-      return function (t) {
-        var i = Math.floor(((t %= 1) < 0 ? ++t : t) * n),
-          v0 = values[(i + n - 1) % n],
-          v1 = values[i % n],
-          v2 = values[(i + 1) % n],
-          v3 = values[(i + 2) % n];
-        return basis((t - i / n) * n, v0, v1, v2, v3);
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/constant.js
-
-    /* harmony default export */ const d3_interpolate_src_constant = (
-      x,
-    ) => () => x; // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/color.js
-
-    function linear(a, d) {
-      return function (t) {
-        return a + t * d;
-      };
-    }
-
-    function exponential(a, b, y) {
-      return (
-        (a = Math.pow(a, y)),
-        (b = Math.pow(b, y) - a),
-        (y = 1 / y),
-        function (t) {
-          return Math.pow(a + t * b, y);
-        }
-      );
-    }
-
-    function hue(a, b) {
-      var d = b - a;
-      return d
-        ? linear(a, d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d)
-        : constant(isNaN(a) ? b : a);
-    }
-
-    function gamma(y) {
-      return (y = +y) === 1
-        ? nogamma
-        : function (a, b) {
-            return b - a
-              ? exponential(a, b, y)
-              : d3_interpolate_src_constant(isNaN(a) ? b : a);
-          };
-    }
-
-    function nogamma(a, b) {
-      var d = b - a;
-      return d ? linear(a, d) : d3_interpolate_src_constant(isNaN(a) ? b : a);
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/rgb.js
-
-    /* harmony default export */ const rgb = (function rgbGamma(y) {
-      var color = gamma(y);
-
-      function rgb(start, end) {
-        var r = color((start = color_rgb(start)).r, (end = color_rgb(end)).r),
-          g = color(start.g, end.g),
-          b = color(start.b, end.b),
-          opacity = nogamma(start.opacity, end.opacity);
-        return function (t) {
-          start.r = r(t);
-          start.g = g(t);
-          start.b = b(t);
-          start.opacity = opacity(t);
-          return start + '';
-        };
-      }
-
-      rgb.gamma = rgbGamma;
-
-      return rgb;
-    })(1);
-
-    function rgbSpline(spline) {
-      return function (colors) {
-        var n = colors.length,
-          r = new Array(n),
-          g = new Array(n),
-          b = new Array(n),
-          i,
-          color;
-        for (i = 0; i < n; ++i) {
-          color = color_rgb(colors[i]);
-          r[i] = color.r || 0;
-          g[i] = color.g || 0;
-          b[i] = color.b || 0;
-        }
-        r = spline(r);
-        g = spline(g);
-        b = spline(b);
-        color.opacity = 1;
-        return function (t) {
-          color.r = r(t);
-          color.g = g(t);
-          color.b = b(t);
-          return color + '';
-        };
-      };
-    }
-
-    var rgbBasis = rgbSpline(src_basis);
-    var rgbBasisClosed = rgbSpline(basisClosed); // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/array.js
-
-    /* harmony default export */ function src_array(a, b) {
-      return (isNumberArray(b) ? numberArray : genericArray)(a, b);
-    }
-
-    function genericArray(a, b) {
-      var nb = b ? b.length : 0,
-        na = a ? Math.min(nb, a.length) : 0,
-        x = new Array(na),
-        c = new Array(nb),
-        i;
-
-      for (i = 0; i < na; ++i) x[i] = value(a[i], b[i]);
-      for (; i < nb; ++i) c[i] = b[i];
-
-      return function (t) {
-        for (i = 0; i < na; ++i) c[i] = x[i](t);
-        return c;
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/date.js
-
-    /* harmony default export */ function date(a, b) {
-      var d = new Date();
-      return (
-        (a = +a),
-        (b = +b),
-        function (t) {
-          return d.setTime(a * (1 - t) + b * t), d;
-        }
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/number.js
-
-    /* harmony default export */ function src_number(a, b) {
-      return (
-        (a = +a),
-        (b = +b),
-        function (t) {
-          return a * (1 - t) + b * t;
-        }
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/object.js
-
-    /* harmony default export */ function object(a, b) {
-      var i = {},
-        c = {},
-        k;
-
-      if (a === null || typeof a !== 'object') a = {};
-      if (b === null || typeof b !== 'object') b = {};
-
-      for (k in b) {
-        if (k in a) {
-          i[k] = value(a[k], b[k]);
-        } else {
-          c[k] = b[k];
-        }
-      }
-
-      return function (t) {
-        for (k in i) c[k] = i[k](t);
-        return c;
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/string.js
-
-    var reA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
-      reB = new RegExp(reA.source, 'g');
-
-    function zero(b) {
-      return function () {
-        return b;
-      };
-    }
-
-    function one(b) {
-      return function (t) {
-        return b(t) + '';
-      };
-    }
-
-    /* harmony default export */ function string(a, b) {
-      var bi = (reA.lastIndex = reB.lastIndex = 0), // scan index for next number in b
-        am, // current match in a
-        bm, // current match in b
-        bs, // string preceding current number in b, if any
-        i = -1, // index in s
-        s = [], // string constants and placeholders
-        q = []; // number interpolators
-
-      // Coerce inputs to strings.
-      (a = a + ''), (b = b + '');
-
-      // Interpolate pairs of numbers in a & b.
-      while ((am = reA.exec(a)) && (bm = reB.exec(b))) {
-        if ((bs = bm.index) > bi) {
-          // a string precedes the next number in b
-          bs = b.slice(bi, bs);
-          if (s[i]) s[i] += bs;
-          // coalesce with previous string
-          else s[++i] = bs;
-        }
-        if ((am = am[0]) === (bm = bm[0])) {
-          // numbers in a & b match
-          if (s[i]) s[i] += bm;
-          // coalesce with previous string
-          else s[++i] = bm;
-        } else {
-          // interpolate non-matching numbers
-          s[++i] = null;
-          q.push({ i: i, x: src_number(am, bm) });
-        }
-        bi = reB.lastIndex;
-      }
-
-      // Add remains of b.
-      if (bi < b.length) {
-        bs = b.slice(bi);
-        if (s[i]) s[i] += bs;
-        // coalesce with previous string
-        else s[++i] = bs;
-      }
-
-      // Special optimization for only a single match.
-      // Otherwise, interpolate each of the numbers and rejoin the string.
-      return s.length < 2
-        ? q[0]
-          ? one(q[0].x)
-          : zero(b)
-        : ((b = q.length),
-          function (t) {
-            for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
-            return s.join('');
-          });
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/numberArray.js
-
-    /* harmony default export */ function src_numberArray(a, b) {
-      if (!b) b = [];
-      var n = a ? Math.min(b.length, a.length) : 0,
-        c = b.slice(),
-        i;
-      return function (t) {
-        for (i = 0; i < n; ++i) c[i] = a[i] * (1 - t) + b[i] * t;
-        return c;
-      };
-    }
-
-    function numberArray_isNumberArray(x) {
-      return ArrayBuffer.isView(x) && !(x instanceof DataView);
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/value.js
-
-    /* harmony default export */ function value(a, b) {
-      var t = typeof b,
-        c;
-      return b == null || t === 'boolean'
-        ? d3_interpolate_src_constant(b)
-        : (t === 'number'
-            ? src_number
-            : t === 'string'
-            ? (c = color(b))
-              ? ((b = c), rgb)
-              : string
-            : b instanceof color
-            ? rgb
-            : b instanceof Date
-            ? date
-            : numberArray_isNumberArray(b)
-            ? src_numberArray
-            : Array.isArray(b)
-            ? genericArray
-            : (typeof b.valueOf !== 'function' &&
-                typeof b.toString !== 'function') ||
-              isNaN(b)
-            ? object
-            : src_number)(a, b);
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/round.js
-
-    /* harmony default export */ function round(a, b) {
-      return (
-        (a = +a),
-        (b = +b),
-        function (t) {
-          return Math.round(a * (1 - t) + b * t);
-        }
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/constant.js
-
-    function constants(x) {
-      return function () {
-        return x;
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/number.js
-
-    function number_number(x) {
-      return +x;
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/continuous.js
-
-    var unit = [0, 1];
-
-    function continuous_identity(x) {
-      return x;
-    }
-
-    function normalize(a, b) {
-      return (b -= a = +a)
-        ? function (x) {
-            return (x - a) / b;
-          }
-        : constants(isNaN(b) ? NaN : 0.5);
-    }
-
-    function clamper(a, b) {
-      var t;
-      if (a > b) (t = a), (a = b), (b = t);
-      return function (x) {
-        return Math.max(a, Math.min(b, x));
-      };
-    }
-
-    // normalize(a, b)(x) takes a domain value x in [a,b] and returns the corresponding parameter t in [0,1].
-    // interpolate(a, b)(t) takes a parameter t in [0,1] and returns the corresponding range value x in [a,b].
-    function bimap(domain, range, interpolate) {
-      var d0 = domain[0],
-        d1 = domain[1],
-        r0 = range[0],
-        r1 = range[1];
-      if (d1 < d0) (d0 = normalize(d1, d0)), (r0 = interpolate(r1, r0));
-      else (d0 = normalize(d0, d1)), (r0 = interpolate(r0, r1));
-      return function (x) {
-        return r0(d0(x));
-      };
-    }
-
-    function polymap(domain, range, interpolate) {
-      var j = Math.min(domain.length, range.length) - 1,
-        d = new Array(j),
-        r = new Array(j),
-        i = -1;
-
-      // Reverse descending domains.
-      if (domain[j] < domain[0]) {
-        domain = domain.slice().reverse();
-        range = range.slice().reverse();
-      }
-
-      while (++i < j) {
-        d[i] = normalize(domain[i], domain[i + 1]);
-        r[i] = interpolate(range[i], range[i + 1]);
-      }
-
-      return function (x) {
-        var i = bisect(domain, x, 1, j) - 1;
-        return r[i](d[i](x));
-      };
-    }
-
-    function copy(source, target) {
-      return target
-        .domain(source.domain())
-        .range(source.range())
-        .interpolate(source.interpolate())
-        .clamp(source.clamp())
-        .unknown(source.unknown());
-    }
-
-    function transformer() {
-      var domain = unit,
-        range = unit,
-        interpolate = value,
-        transform,
-        untransform,
-        unknown,
-        clamp = continuous_identity,
-        piecewise,
-        output,
-        input;
-
-      function rescale() {
-        var n = Math.min(domain.length, range.length);
-        if (clamp !== continuous_identity)
-          clamp = clamper(domain[0], domain[n - 1]);
-        piecewise = n > 2 ? polymap : bimap;
-        output = input = null;
-        return scale;
-      }
-
-      function scale(x) {
-        return x == null || isNaN((x = +x))
-          ? unknown
-          : (
-              output ||
-              (output = piecewise(domain.map(transform), range, interpolate))
-            )(transform(clamp(x)));
-      }
-
-      scale.invert = function (y) {
-        return clamp(
-          untransform(
-            (
-              input ||
-              (input = piecewise(range, domain.map(transform), src_number))
-            )(y),
-          ),
-        );
-      };
-
-      scale.domain = function (_) {
-        return arguments.length
-          ? ((domain = Array.from(_, number_number)), rescale())
-          : domain.slice();
-      };
-
-      scale.range = function (_) {
-        return arguments.length
-          ? ((range = Array.from(_)), rescale())
-          : range.slice();
-      };
-
-      scale.rangeRound = function (_) {
-        return (range = Array.from(_)), (interpolate = round), rescale();
-      };
-
-      scale.clamp = function (_) {
-        return arguments.length
-          ? ((clamp = _ ? true : continuous_identity), rescale())
-          : clamp !== continuous_identity;
-      };
-
-      scale.interpolate = function (_) {
-        return arguments.length ? ((interpolate = _), rescale()) : interpolate;
-      };
-
-      scale.unknown = function (_) {
-        return arguments.length ? ((unknown = _), scale) : unknown;
-      };
-
-      return function (t, u) {
-        (transform = t), (untransform = u);
-        return rescale();
-      };
-    }
-
-    function continuous() {
-      return transformer()(continuous_identity, continuous_identity);
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/init.js
-
-    function initRange(domain, range) {
-      switch (arguments.length) {
-        case 0:
-          break;
-        case 1:
-          this.range(domain);
-          break;
-        default:
-          this.range(range).domain(domain);
-          break;
-      }
-      return this;
-    }
-
-    function initInterpolator(domain, interpolator) {
-      switch (arguments.length) {
-        case 0:
-          break;
-        case 1: {
-          if (typeof domain === 'function') this.interpolator(domain);
-          else this.range(domain);
-          break;
-        }
-        default: {
-          this.domain(domain);
-          if (typeof interpolator === 'function')
-            this.interpolator(interpolator);
-          else this.range(interpolator);
-          break;
-        }
-      }
-      return this;
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionPrefix.js
-
-    /* harmony default export */ function precisionPrefix(step, value) {
-      return Math.max(
-        0,
-        Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3 -
-          exponent(Math.abs(step)),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionRound.js
-
-    /* harmony default export */ function precisionRound(step, max) {
-      (step = Math.abs(step)), (max = Math.abs(max) - step);
-      return Math.max(0, exponent(max) - exponent(step)) + 1;
-    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionFixed.js
-
-    /* harmony default export */ function precisionFixed(step) {
-      return Math.max(0, -exponent(Math.abs(step)));
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/tickFormat.js
-
-    function tickFormat(start, stop, count, specifier) {
-      var step = tickStep(start, stop, count),
-        precision;
-      specifier = formatSpecifier(specifier == null ? ',f' : specifier);
-      switch (specifier.type) {
-        case 's': {
-          var value = Math.max(Math.abs(start), Math.abs(stop));
-          if (
-            specifier.precision == null &&
-            !isNaN((precision = precisionPrefix(step, value)))
-          )
-            specifier.precision = precision;
-          return formatPrefix(specifier, value);
-        }
-        case '':
-        case 'e':
-        case 'g':
-        case 'p':
-        case 'r': {
-          if (
-            specifier.precision == null &&
-            !isNaN(
-              (precision = precisionRound(
-                step,
-                Math.max(Math.abs(start), Math.abs(stop)),
-              )),
-            )
-          )
-            specifier.precision = precision - (specifier.type === 'e');
-          break;
-        }
-        case 'f':
-        case '%': {
-          if (
-            specifier.precision == null &&
-            !isNaN((precision = precisionFixed(step)))
-          )
-            specifier.precision = precision - (specifier.type === '%') * 2;
-          break;
-        }
-      }
-      return format(specifier);
-    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/linear.js
-
-    function linearish(scale) {
-      var domain = scale.domain;
-
-      scale.ticks = function (count) {
-        var d = domain();
-        return ticks(d[0], d[d.length - 1], count == null ? 10 : count);
-      };
-
-      scale.tickFormat = function (count, specifier) {
-        var d = domain();
-        return tickFormat(
-          d[0],
-          d[d.length - 1],
-          count == null ? 10 : count,
-          specifier,
-        );
-      };
-
-      scale.nice = function (count) {
-        if (count == null) count = 10;
-
-        var d = domain();
-        var i0 = 0;
-        var i1 = d.length - 1;
-        var start = d[i0];
-        var stop = d[i1];
-        var prestep;
-        var step;
-        var maxIter = 10;
-
-        if (stop < start) {
-          (step = start), (start = stop), (stop = step);
-          (step = i0), (i0 = i1), (i1 = step);
-        }
-
-        while (maxIter-- > 0) {
-          step = tickIncrement(start, stop, count);
-          if (step === prestep) {
-            d[i0] = start;
-            d[i1] = stop;
-            return domain(d);
-          } else if (step > 0) {
-            start = Math.floor(start / step) * step;
-            stop = Math.ceil(stop / step) * step;
-          } else if (step < 0) {
-            start = Math.ceil(start * step) / step;
-            stop = Math.floor(stop * step) / step;
-          } else {
-            break;
-          }
-          prestep = step;
-        }
-
-        return scale;
-      };
-
-      return scale;
-    }
-
-    function linear_linear() {
-      var scale = continuous();
-
-      scale.copy = function () {
-        return copy(scale, linear_linear());
-      };
-
-      initRange.apply(scale, arguments);
-
-      return linearish(scale);
-    } // CONCATENATED MODULE: ../node_modules/d3-ease/src/cubic.js
-
-    function cubicIn(t) {
-      return t * t * t;
-    }
-
-    function cubicOut(t) {
-      return --t * t * t + 1;
-    }
-
-    function cubicInOut(t) {
-      return ((t *= 2) <= 1 ? t * t * t : (t -= 2) * t * t + 2) / 2;
-    } // CONCATENATED MODULE: ../node_modules/d3-dispatch/src/dispatch.js
-
-    var noop = { value: () => {} };
-
-    function dispatch_dispatch() {
-      for (var i = 0, n = arguments.length, _ = {}, t; i < n; ++i) {
-        if (!(t = arguments[i] + '') || t in _ || /[\s.]/.test(t))
-          throw new Error('illegal type: ' + t);
-        _[t] = [];
-      }
-      return new Dispatch(_);
-    }
-
-    function Dispatch(_) {
-      this._ = _;
-    }
-
-    function dispatch_parseTypenames(typenames, types) {
-      return typenames
-        .trim()
-        .split(/^|\s+/)
-        .map(function (t) {
-          var name = '',
-            i = t.indexOf('.');
-          if (i >= 0) (name = t.slice(i + 1)), (t = t.slice(0, i));
-          if (t && !types.hasOwnProperty(t))
-            throw new Error('unknown type: ' + t);
-          return { type: t, name: name };
-        });
-    }
-
-    Dispatch.prototype = dispatch_dispatch.prototype = {
-      constructor: Dispatch,
-      on: function (typename, callback) {
-        var _ = this._,
-          T = dispatch_parseTypenames(typename + '', _),
-          t,
-          i = -1,
-          n = T.length;
-
-        // If no callback was specified, return the callback of the given type and name.
-        if (arguments.length < 2) {
-          while (++i < n)
-            if ((t = (typename = T[i]).type) && (t = get(_[t], typename.name)))
-              return t;
-          return;
-        }
-
-        // If a type was specified, set the callback for the given type and name.
-        // Otherwise, if a null callback was specified, remove callbacks of the given name.
-        if (callback != null && typeof callback !== 'function')
-          throw new Error('invalid callback: ' + callback);
-        while (++i < n) {
-          if ((t = (typename = T[i]).type))
-            _[t] = set(_[t], typename.name, callback);
-          else if (callback == null)
-            for (t in _) _[t] = set(_[t], typename.name, null);
-        }
-
-        return this;
-      },
-      copy: function () {
-        var copy = {},
-          _ = this._;
-        for (var t in _) copy[t] = _[t].slice();
-        return new Dispatch(copy);
-      },
-      call: function (type, that) {
-        if ((n = arguments.length - 2) > 0)
-          for (var args = new Array(n), i = 0, n, t; i < n; ++i)
-            args[i] = arguments[i + 2];
-        if (!this._.hasOwnProperty(type))
-          throw new Error('unknown type: ' + type);
-        for (t = this._[type], i = 0, n = t.length; i < n; ++i)
-          t[i].value.apply(that, args);
-      },
-      apply: function (type, that, args) {
-        if (!this._.hasOwnProperty(type))
-          throw new Error('unknown type: ' + type);
-        for (var t = this._[type], i = 0, n = t.length; i < n; ++i)
-          t[i].value.apply(that, args);
-      },
-    };
-
-    function get(type, name) {
-      for (var i = 0, n = type.length, c; i < n; ++i) {
-        if ((c = type[i]).name === name) {
-          return c.value;
-        }
-      }
-    }
-
-    function set(type, name, callback) {
-      for (var i = 0, n = type.length; i < n; ++i) {
-        if (type[i].name === name) {
-          (type[i] = noop), (type = type.slice(0, i).concat(type.slice(i + 1)));
-          break;
-        }
-      }
-      if (callback != null) type.push({ name: name, value: callback });
-      return type;
-    }
-
-    /* harmony default export */ const src_dispatch = dispatch_dispatch; // CONCATENATED MODULE: ../node_modules/d3-timer/src/timer.js
-
-    var timer_frame = 0, // is an animation frame pending?
-      timeout = 0, // is a timeout pending?
-      interval = 0, // are any timers active?
-      pokeDelay = 1000, // how frequently we check for clock skew
-      taskHead,
-      taskTail,
-      clockLast = 0,
-      clockNow = 0,
-      clockSkew = 0,
-      clock =
-        typeof performance === 'object' && performance.now ? performance : Date,
-      setFrame =
-        typeof window === 'object' && window.requestAnimationFrame
-          ? window.requestAnimationFrame.bind(window)
-          : function (f) {
-              setTimeout(f, 17);
-            };
-
-    function now() {
-      return (
-        clockNow || (setFrame(clearNow), (clockNow = clock.now() + clockSkew))
-      );
-    }
-
-    function clearNow() {
-      clockNow = 0;
-    }
-
-    function Timer() {
-      this._call = this._time = this._next = null;
-    }
-
-    Timer.prototype = timer.prototype = {
-      constructor: Timer,
-      restart: function (callback, delay, time) {
-        if (typeof callback !== 'function')
-          throw new TypeError('callback is not a function');
-        time = (time == null ? now() : +time) + (delay == null ? 0 : +delay);
-        if (!this._next && taskTail !== this) {
-          if (taskTail) taskTail._next = this;
-          else taskHead = this;
-          taskTail = this;
-        }
-        this._call = callback;
-        this._time = time;
-        sleep();
-      },
-      stop: function () {
-        if (this._call) {
-          this._call = null;
-          this._time = Infinity;
-          sleep();
-        }
-      },
-    };
-
-    function timer(callback, delay, time) {
-      var t = new Timer();
-      t.restart(callback, delay, time);
-      return t;
-    }
-
-    function timerFlush() {
-      now(); // Get the current time, if not already set.
-      ++timer_frame; // Pretend we’ve set an alarm, if we haven’t already.
-      var t = taskHead,
-        e;
-      while (t) {
-        if ((e = clockNow - t._time) >= 0) t._call.call(undefined, e);
-        t = t._next;
-      }
-      --timer_frame;
-    }
-
-    function wake() {
-      clockNow = (clockLast = clock.now()) + clockSkew;
-      timer_frame = timeout = 0;
-      try {
-        timerFlush();
-      } finally {
-        timer_frame = 0;
-        nap();
-        clockNow = 0;
-      }
-    }
-
-    function poke() {
-      var now = clock.now(),
-        delay = now - clockLast;
-      if (delay > pokeDelay) (clockSkew -= delay), (clockLast = now);
-    }
-
-    function nap() {
-      var t0,
-        t1 = taskHead,
-        t2,
-        time = Infinity;
-      while (t1) {
-        if (t1._call) {
-          if (time > t1._time) time = t1._time;
-          (t0 = t1), (t1 = t1._next);
-        } else {
-          (t2 = t1._next), (t1._next = null);
-          t1 = t0 ? (t0._next = t2) : (taskHead = t2);
-        }
-      }
-      taskTail = t0;
-      sleep(time);
-    }
-
-    function sleep(time) {
-      if (timer_frame) return; // Soonest alarm already set, or will be.
-      if (timeout) timeout = clearTimeout(timeout);
-      var delay = time - clockNow; // Strictly less than if we recomputed clockNow.
-      if (delay > 24) {
-        if (time < Infinity)
-          timeout = setTimeout(wake, time - clock.now() - clockSkew);
-        if (interval) interval = clearInterval(interval);
-      } else {
-        if (!interval)
-          (clockLast = clock.now()), (interval = setInterval(poke, pokeDelay));
-        (timer_frame = 1), setFrame(wake);
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-timer/src/timeout.js
-
-    /* harmony default export */ function src_timeout(callback, delay, time) {
-      var t = new Timer();
-      delay = delay == null ? 0 : +delay;
-      t.restart(
-        (elapsed) => {
-          t.stop();
-          callback(elapsed + delay);
-        },
-        delay,
-        time,
-      );
-      return t;
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/schedule.js
-
-    var emptyOn = src_dispatch('start', 'end', 'cancel', 'interrupt');
-    var emptyTween = [];
-
-    var CREATED = 0;
-    var SCHEDULED = 1;
-    var STARTING = 2;
-    var STARTED = 3;
-    var RUNNING = 4;
-    var ENDING = 5;
-    var ENDED = 6;
-
-    /* harmony default export */ function schedule(
-      node,
-      name,
-      id,
-      index,
-      group,
-      timing,
-    ) {
-      var schedules = node.__transition;
-      if (!schedules) node.__transition = {};
-      else if (id in schedules) return;
-      create(node, id, {
-        name: name,
-        index: index, // For context during callback.
-        group: group, // For context during callback.
-        on: emptyOn,
-        tween: emptyTween,
-        time: timing.time,
-        delay: timing.delay,
-        duration: timing.duration,
-        ease: timing.ease,
-        timer: null,
-        state: CREATED,
-      });
-    }
-
-    function init(node, id) {
-      var schedule = schedule_get(node, id);
-      if (schedule.state > CREATED)
-        throw new Error('too late; already scheduled');
-      return schedule;
-    }
-
-    function schedule_set(node, id) {
-      var schedule = schedule_get(node, id);
-      if (schedule.state > STARTED)
-        throw new Error('too late; already running');
-      return schedule;
-    }
-
-    function schedule_get(node, id) {
-      var schedule = node.__transition;
-      if (!schedule || !(schedule = schedule[id]))
-        throw new Error('transition not found');
-      return schedule;
-    }
-
-    function create(node, id, self) {
-      var schedules = node.__transition,
-        tween;
-
-      // Initialize the self timer when the transition is created.
-      // Note the actual delay is not known until the first callback!
-      schedules[id] = self;
-      self.timer = timer(schedule, 0, self.time);
-
-      function schedule(elapsed) {
-        self.state = SCHEDULED;
-        self.timer.restart(start, self.delay, self.time);
-
-        // If the elapsed delay is less than our first sleep, start immediately.
-        if (self.delay <= elapsed) start(elapsed - self.delay);
-      }
-
-      function start(elapsed) {
-        var i, j, n, o;
-
-        // If the state is not SCHEDULED, then we previously errored on start.
-        if (self.state !== SCHEDULED) return stop();
-
-        for (i in schedules) {
-          o = schedules[i];
-          if (o.name !== self.name) continue;
-
-          // While this element already has a starting transition during this frame,
-          // defer starting an interrupting transition until that transition has a
-          // chance to tick (and possibly end); see d3/d3-transition#54!
-          if (o.state === STARTED) return src_timeout(start);
-
-          // Interrupt the active transition, if any.
-          if (o.state === RUNNING) {
-            o.state = ENDED;
-            o.timer.stop();
-            o.on.call('interrupt', node, node.__data__, o.index, o.group);
-            delete schedules[i];
-          }
-
-          // Cancel any pre-empted transitions.
-          else if (+i < id) {
-            o.state = ENDED;
-            o.timer.stop();
-            o.on.call('cancel', node, node.__data__, o.index, o.group);
-            delete schedules[i];
-          }
-        }
-
-        // Defer the first tick to end of the current frame; see d3/d3#1576.
-        // Note the transition may be canceled after start and before the first tick!
-        // Note this must be scheduled before the start event; see d3/d3-transition#16!
-        // Assuming this is successful, subsequent callbacks go straight to tick.
-        src_timeout(function () {
-          if (self.state === STARTED) {
-            self.state = RUNNING;
-            self.timer.restart(tick, self.delay, self.time);
-            tick(elapsed);
-          }
-        });
-
-        // Dispatch the start event.
-        // Note this must be done before the tween are initialized.
-        self.state = STARTING;
-        self.on.call('start', node, node.__data__, self.index, self.group);
-        if (self.state !== STARTING) return; // interrupted
-        self.state = STARTED;
-
-        // Initialize the tween, deleting null tween.
-        tween = new Array((n = self.tween.length));
-        for (i = 0, j = -1; i < n; ++i) {
-          if (
-            (o = self.tween[i].value.call(
-              node,
-              node.__data__,
-              self.index,
-              self.group,
-            ))
-          ) {
-            tween[++j] = o;
-          }
-        }
-        tween.length = j + 1;
-      }
-
-      function tick(elapsed) {
-        var t =
-            elapsed < self.duration
-              ? self.ease.call(null, elapsed / self.duration)
-              : (self.timer.restart(stop), (self.state = ENDING), 1),
-          i = -1,
-          n = tween.length;
-
-        while (++i < n) {
-          tween[i].call(node, t);
-        }
-
-        // Dispatch the end event.
-        if (self.state === ENDING) {
-          self.on.call('end', node, node.__data__, self.index, self.group);
-          stop();
-        }
-      }
-
-      function stop() {
-        self.state = ENDED;
-        self.timer.stop();
-        delete schedules[id];
-        for (var i in schedules) return; // eslint-disable-line no-unused-vars
-        delete node.__transition;
-      }
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/interrupt.js
-
-    /* harmony default export */ function interrupt(node, name) {
-      var schedules = node.__transition,
-        schedule,
-        active,
-        empty = true,
-        i;
-
-      if (!schedules) return;
-
-      name = name == null ? null : name + '';
-
-      for (i in schedules) {
-        if ((schedule = schedules[i]).name !== name) {
-          empty = false;
-          continue;
-        }
-        active = schedule.state > STARTING && schedule.state < ENDING;
-        schedule.state = ENDED;
-        schedule.timer.stop();
-        schedule.on.call(
-          active ? 'interrupt' : 'cancel',
-          node,
-          node.__data__,
-          schedule.index,
-          schedule.group,
-        );
-        delete schedules[i];
-      }
-
-      if (empty) delete node.__transition;
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/interrupt.js
-
-    /* harmony default export */ function selection_interrupt(name) {
-      return this.each(function () {
-        interrupt(this, name);
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/decompose.js
-
-    var degrees = 180 / Math.PI;
-
-    var decompose_identity = {
-      translateX: 0,
-      translateY: 0,
-      rotate: 0,
-      skewX: 0,
-      scaleX: 1,
-      scaleY: 1,
-    };
-
-    /* harmony default export */ function decompose(a, b, c, d, e, f) {
-      var scaleX, scaleY, skewX;
-      if ((scaleX = Math.sqrt(a * a + b * b))) (a /= scaleX), (b /= scaleX);
-      if ((skewX = a * c + b * d)) (c -= a * skewX), (d -= b * skewX);
-      if ((scaleY = Math.sqrt(c * c + d * d)))
-        (c /= scaleY), (d /= scaleY), (skewX /= scaleY);
-      if (a * d < b * c)
-        (a = -a), (b = -b), (skewX = -skewX), (scaleX = -scaleX);
-      return {
-        translateX: e,
-        translateY: f,
-        rotate: Math.atan2(b, a) * degrees,
-        skewX: Math.atan(skewX) * degrees,
-        scaleX: scaleX,
-        scaleY: scaleY,
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/parse.js
-
-    var svgNode;
-
-    /* eslint-disable no-undef */
-    function parseCss(value) {
-      const m = new (typeof DOMMatrix === 'function'
-        ? DOMMatrix
-        : WebKitCSSMatrix)(value + '');
-      return m.isIdentity
-        ? decompose_identity
-        : decompose(m.a, m.b, m.c, m.d, m.e, m.f);
-    }
-
-    function parseSvg(value) {
-      if (value == null) return decompose_identity;
-      if (!svgNode)
-        svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'g');
-      svgNode.setAttribute('transform', value);
-      if (!(value = svgNode.transform.baseVal.consolidate()))
-        return decompose_identity;
-      value = value.matrix;
-      return decompose(value.a, value.b, value.c, value.d, value.e, value.f);
-    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/index.js
-
-    function interpolateTransform(parse, pxComma, pxParen, degParen) {
-      function pop(s) {
-        return s.length ? s.pop() + ' ' : '';
-      }
-
-      function translate(xa, ya, xb, yb, s, q) {
-        if (xa !== xb || ya !== yb) {
-          var i = s.push('translate(', null, pxComma, null, pxParen);
-          q.push(
-            { i: i - 4, x: src_number(xa, xb) },
-            { i: i - 2, x: src_number(ya, yb) },
-          );
-        } else if (xb || yb) {
-          s.push('translate(' + xb + pxComma + yb + pxParen);
-        }
-      }
-
-      function rotate(a, b, s, q) {
-        if (a !== b) {
-          if (a - b > 180) b += 360;
-          else if (b - a > 180) a += 360; // shortest path
-          q.push({
-            i: s.push(pop(s) + 'rotate(', null, degParen) - 2,
-            x: src_number(a, b),
-          });
-        } else if (b) {
-          s.push(pop(s) + 'rotate(' + b + degParen);
-        }
-      }
-
-      function skewX(a, b, s, q) {
-        if (a !== b) {
-          q.push({
-            i: s.push(pop(s) + 'skewX(', null, degParen) - 2,
-            x: src_number(a, b),
-          });
-        } else if (b) {
-          s.push(pop(s) + 'skewX(' + b + degParen);
-        }
-      }
-
-      function scale(xa, ya, xb, yb, s, q) {
-        if (xa !== xb || ya !== yb) {
-          var i = s.push(pop(s) + 'scale(', null, ',', null, ')');
-          q.push(
-            { i: i - 4, x: src_number(xa, xb) },
-            { i: i - 2, x: src_number(ya, yb) },
-          );
-        } else if (xb !== 1 || yb !== 1) {
-          s.push(pop(s) + 'scale(' + xb + ',' + yb + ')');
-        }
-      }
-
-      return function (a, b) {
-        var s = [], // string constants and placeholders
-          q = []; // number interpolators
-        (a = parse(a)), (b = parse(b));
-        translate(a.translateX, a.translateY, b.translateX, b.translateY, s, q);
-        rotate(a.rotate, b.rotate, s, q);
-        skewX(a.skewX, b.skewX, s, q);
-        scale(a.scaleX, a.scaleY, b.scaleX, b.scaleY, s, q);
-        a = b = null; // gc
-        return function (t) {
-          var i = -1,
-            n = q.length,
-            o;
-          while (++i < n) s[(o = q[i]).i] = o.x(t);
-          return s.join('');
-        };
-      };
-    }
-
-    var interpolateTransformCss = interpolateTransform(
-      parseCss,
-      'px, ',
-      'px)',
-      'deg)',
-    );
-    var interpolateTransformSvg = interpolateTransform(
-      parseSvg,
-      ', ',
-      ')',
-      ')',
-    ); // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/tween.js
-
-    function tweenRemove(id, name) {
-      var tween0, tween1;
-      return function () {
-        var schedule = schedule_set(this, id),
-          tween = schedule.tween;
-
-        // If this node shared tween with the previous node,
-        // just assign the updated shared tween and we’re done!
-        // Otherwise, copy-on-write.
-        if (tween !== tween0) {
-          tween1 = tween0 = tween;
-          for (var i = 0, n = tween1.length; i < n; ++i) {
-            if (tween1[i].name === name) {
-              tween1 = tween1.slice();
-              tween1.splice(i, 1);
-              break;
-            }
-          }
-        }
-
-        schedule.tween = tween1;
-      };
-    }
-
-    function tweenFunction(id, name, value) {
-      var tween0, tween1;
-      if (typeof value !== 'function') throw new Error();
-      return function () {
-        var schedule = schedule_set(this, id),
-          tween = schedule.tween;
-
-        // If this node shared tween with the previous node,
-        // just assign the updated shared tween and we’re done!
-        // Otherwise, copy-on-write.
-        if (tween !== tween0) {
-          tween1 = (tween0 = tween).slice();
-          for (
-            var t = { name: name, value: value }, i = 0, n = tween1.length;
-            i < n;
-            ++i
-          ) {
-            if (tween1[i].name === name) {
-              tween1[i] = t;
-              break;
-            }
-          }
-          if (i === n) tween1.push(t);
-        }
-
-        schedule.tween = tween1;
-      };
-    }
-
-    /* harmony default export */ function tween(name, value) {
-      var id = this._id;
-
-      name += '';
-
-      if (arguments.length < 2) {
-        var tween = schedule_get(this.node(), id).tween;
-        for (var i = 0, n = tween.length, t; i < n; ++i) {
-          if ((t = tween[i]).name === name) {
-            return t.value;
-          }
-        }
-        return null;
-      }
-
-      return this.each(
-        (value == null ? tweenRemove : tweenFunction)(id, name, value),
-      );
-    }
-
-    function tweenValue(transition, name, value) {
-      var id = transition._id;
-
-      transition.each(function () {
-        var schedule = schedule_set(this, id);
-        (schedule.value || (schedule.value = {}))[name] = value.apply(
-          this,
-          arguments,
-        );
-      });
-
-      return function (node) {
-        return schedule_get(node, id).value[name];
-      };
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/interpolate.js
-
-    /* harmony default export */ function interpolate(a, b) {
-      var c;
-      return (typeof b === 'number'
-        ? src_number
-        : b instanceof color
-        ? rgb
-        : (c = color(b))
-        ? ((b = c), rgb)
-        : string)(a, b);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attr.js
-
-    function attr_attrRemove(name) {
-      return function () {
-        this.removeAttribute(name);
-      };
-    }
-
-    function attr_attrRemoveNS(fullname) {
-      return function () {
-        this.removeAttributeNS(fullname.space, fullname.local);
-      };
-    }
-
-    function attr_attrConstant(name, interpolate, value1) {
-      var string00,
-        string1 = value1 + '',
-        interpolate0;
-      return function () {
-        var string0 = this.getAttribute(name);
-        return string0 === string1
-          ? null
-          : string0 === string00
-          ? interpolate0
-          : (interpolate0 = interpolate((string00 = string0), value1));
-      };
-    }
-
-    function attr_attrConstantNS(fullname, interpolate, value1) {
-      var string00,
-        string1 = value1 + '',
-        interpolate0;
-      return function () {
-        var string0 = this.getAttributeNS(fullname.space, fullname.local);
-        return string0 === string1
-          ? null
-          : string0 === string00
-          ? interpolate0
-          : (interpolate0 = interpolate((string00 = string0), value1));
-      };
-    }
-
-    function attr_attrFunction(name, interpolate, value) {
-      var string00, string10, interpolate0;
-      return function () {
-        var string0,
-          value1 = value(this),
-          string1;
-        if (value1 == null) return void this.removeAttribute(name);
-        string0 = this.getAttribute(name);
-        string1 = value1 + '';
-        return string0 === string1
-          ? null
-          : string0 === string00 && string1 === string10
-          ? interpolate0
-          : ((string10 = string1),
-            (interpolate0 = interpolate((string00 = string0), value1)));
-      };
-    }
-
-    function attr_attrFunctionNS(fullname, interpolate, value) {
-      var string00, string10, interpolate0;
-      return function () {
-        var string0,
-          value1 = value(this),
-          string1;
-        if (value1 == null)
-          return void this.removeAttributeNS(fullname.space, fullname.local);
-        string0 = this.getAttributeNS(fullname.space, fullname.local);
-        string1 = value1 + '';
-        return string0 === string1
-          ? null
-          : string0 === string00 && string1 === string10
-          ? interpolate0
-          : ((string10 = string1),
-            (interpolate0 = interpolate((string00 = string0), value1)));
-      };
-    }
-
-    /* harmony default export */ function transition_attr(name, value) {
-      var fullname = namespace(name),
-        i = fullname === 'transform' ? interpolateTransformSvg : interpolate;
-      return this.attrTween(
-        name,
-        typeof value === 'function'
-          ? (fullname.local ? attr_attrFunctionNS : attr_attrFunction)(
-              fullname,
-              i,
-              tweenValue(this, 'attr.' + name, value),
-            )
-          : value == null
-          ? (fullname.local ? attr_attrRemoveNS : attr_attrRemove)(fullname)
-          : (fullname.local ? attr_attrConstantNS : attr_attrConstant)(
-              fullname,
-              i,
-              value,
-            ),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attrTween.js
-
-    function attrInterpolate(name, i) {
-      return function (t) {
-        this.setAttribute(name, i.call(this, t));
-      };
-    }
-
-    function attrInterpolateNS(fullname, i) {
-      return function (t) {
-        this.setAttributeNS(fullname.space, fullname.local, i.call(this, t));
-      };
-    }
-
-    function attrTweenNS(fullname, value) {
-      var t0, i0;
-      function tween() {
-        var i = value.apply(this, arguments);
-        if (i !== i0) t0 = (i0 = i) && attrInterpolateNS(fullname, i);
-        return t0;
-      }
-      tween._value = value;
-      return tween;
-    }
-
-    function attrTween(name, value) {
-      var t0, i0;
-      function tween() {
-        var i = value.apply(this, arguments);
-        if (i !== i0) t0 = (i0 = i) && attrInterpolate(name, i);
-        return t0;
-      }
-      tween._value = value;
-      return tween;
-    }
-
-    /* harmony default export */ function transition_attrTween(name, value) {
-      var key = 'attr.' + name;
-      if (arguments.length < 2) return (key = this.tween(key)) && key._value;
-      if (value == null) return this.tween(key, null);
-      if (typeof value !== 'function') throw new Error();
-      var fullname = namespace(name);
-      return this.tween(
-        key,
-        (fullname.local ? attrTweenNS : attrTween)(fullname, value),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/delay.js
-
-    function delayFunction(id, value) {
-      return function () {
-        init(this, id).delay = +value.apply(this, arguments);
-      };
-    }
-
-    function delayConstant(id, value) {
-      return (
-        (value = +value),
-        function () {
-          init(this, id).delay = value;
-        }
-      );
-    }
-
-    /* harmony default export */ function delay(value) {
-      var id = this._id;
-
-      return arguments.length
-        ? this.each(
-            (typeof value === 'function' ? delayFunction : delayConstant)(
-              id,
-              value,
-            ),
-          )
-        : schedule_get(this.node(), id).delay;
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/duration.js
-
-    function durationFunction(id, value) {
-      return function () {
-        schedule_set(this, id).duration = +value.apply(this, arguments);
-      };
-    }
-
-    function durationConstant(id, value) {
-      return (
-        (value = +value),
-        function () {
-          schedule_set(this, id).duration = value;
-        }
-      );
-    }
-
-    /* harmony default export */ function duration(value) {
-      var id = this._id;
-
-      return arguments.length
-        ? this.each(
-            (typeof value === 'function' ? durationFunction : durationConstant)(
-              id,
-              value,
-            ),
-          )
-        : schedule_get(this.node(), id).duration;
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/ease.js
-
-    function easeConstant(id, value) {
-      if (typeof value !== 'function') throw new Error();
-      return function () {
-        schedule_set(this, id).ease = value;
-      };
-    }
-
-    /* harmony default export */ function ease(value) {
-      var id = this._id;
-
-      return arguments.length
-        ? this.each(easeConstant(id, value))
-        : schedule_get(this.node(), id).ease;
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/easeVarying.js
-
-    function easeVarying(id, value) {
-      return function () {
-        var v = value.apply(this, arguments);
-        if (typeof v !== 'function') throw new Error();
-        schedule_set(this, id).ease = v;
-      };
-    }
-
-    /* harmony default export */ function transition_easeVarying(value) {
-      if (typeof value !== 'function') throw new Error();
-      return this.each(easeVarying(this._id, value));
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/filter.js
-
-    /* harmony default export */ function transition_filter(match) {
-      if (typeof match !== 'function') match = matcher(match);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group = groups[j],
-            n = group.length,
-            subgroup = (subgroups[j] = []),
-            node,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
-            subgroup.push(node);
-          }
-        }
-      }
-
-      return new Transition(subgroups, this._parents, this._name, this._id);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/merge.js
-
-    /* harmony default export */ function transition_merge(transition) {
-      if (transition._id !== this._id) throw new Error();
-
-      for (
-        var groups0 = this._groups,
-          groups1 = transition._groups,
-          m0 = groups0.length,
-          m1 = groups1.length,
-          m = Math.min(m0, m1),
-          merges = new Array(m0),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group0 = groups0[j],
-            group1 = groups1[j],
-            n = group0.length,
-            merge = (merges[j] = new Array(n)),
-            node,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if ((node = group0[i] || group1[i])) {
-            merge[i] = node;
-          }
-        }
-      }
-
-      for (; j < m0; ++j) {
-        merges[j] = groups0[j];
-      }
-
-      return new Transition(merges, this._parents, this._name, this._id);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/on.js
-
-    function start(name) {
-      return (name + '')
-        .trim()
-        .split(/^|\s+/)
-        .every(function (t) {
-          var i = t.indexOf('.');
-          if (i >= 0) t = t.slice(0, i);
-          return !t || t === 'start';
-        });
-    }
-
-    function onFunction(id, name, listener) {
-      var on0,
-        on1,
-        sit = start(name) ? init : schedule_set;
-      return function () {
-        var schedule = sit(this, id),
-          on = schedule.on;
-
-        // If this node shared a dispatch with the previous node,
-        // just assign the updated shared dispatch and we’re done!
-        // Otherwise, copy-on-write.
-        if (on !== on0) (on1 = (on0 = on).copy()).on(name, listener);
-
-        schedule.on = on1;
-      };
-    }
-
-    /* harmony default export */ function transition_on(name, listener) {
-      var id = this._id;
-
-      return arguments.length < 2
-        ? schedule_get(this.node(), id).on.on(name)
-        : this.each(onFunction(id, name, listener));
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/remove.js
-
-    function removeFunction(id) {
-      return function () {
-        var parent = this.parentNode;
-        for (var i in this.__transition) if (+i !== id) return;
-        if (parent) parent.removeChild(this);
-      };
-    }
-
-    /* harmony default export */ function transition_remove() {
-      return this.on('end.remove', removeFunction(this._id));
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/select.js
-
-    /* harmony default export */ function transition_select(select) {
-      var name = this._name,
-        id = this._id;
-
-      if (typeof select !== 'function') select = selector(select);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = new Array(m),
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (
-          var group = groups[j],
-            n = group.length,
-            subgroup = (subgroups[j] = new Array(n)),
-            node,
-            subnode,
-            i = 0;
-          i < n;
-          ++i
-        ) {
-          if (
-            (node = group[i]) &&
-            (subnode = select.call(node, node.__data__, i, group))
-          ) {
-            if ('__data__' in node) subnode.__data__ = node.__data__;
-            subgroup[i] = subnode;
-            schedule(
-              subgroup[i],
-              name,
-              id,
-              i,
-              subgroup,
-              schedule_get(node, id),
-            );
-          }
-        }
-      }
-
-      return new Transition(subgroups, this._parents, name, id);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selectAll.js
-
-    /* harmony default export */ function transition_selectAll(select) {
-      var name = this._name,
-        id = this._id;
-
-      if (typeof select !== 'function') select = selectorAll(select);
-
-      for (
-        var groups = this._groups,
-          m = groups.length,
-          subgroups = [],
-          parents = [],
-          j = 0;
-        j < m;
-        ++j
-      ) {
-        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-          if ((node = group[i])) {
-            for (
-              var children = select.call(node, node.__data__, i, group),
-                child,
-                inherit = schedule_get(node, id),
-                k = 0,
-                l = children.length;
-              k < l;
-              ++k
-            ) {
-              if ((child = children[k])) {
-                schedule(child, name, id, k, children, inherit);
-              }
-            }
-            subgroups.push(children);
-            parents.push(node);
-          }
-        }
-      }
-
-      return new Transition(subgroups, parents, name, id);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selection.js
-
-    var selection_Selection = src_selection.prototype.constructor;
-
-    /* harmony default export */ function transition_selection() {
-      return new selection_Selection(this._groups, this._parents);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/style.js
-
-    function styleNull(name, interpolate) {
-      var string00, string10, interpolate0;
-      return function () {
-        var string0 = styleValue(this, name),
-          string1 = (this.style.removeProperty(name), styleValue(this, name));
-        return string0 === string1
-          ? null
-          : string0 === string00 && string1 === string10
-          ? interpolate0
-          : (interpolate0 = interpolate(
-              (string00 = string0),
-              (string10 = string1),
-            ));
-      };
-    }
-
-    function style_styleRemove(name) {
-      return function () {
-        this.style.removeProperty(name);
-      };
-    }
-
-    function style_styleConstant(name, interpolate, value1) {
-      var string00,
-        string1 = value1 + '',
-        interpolate0;
-      return function () {
-        var string0 = styleValue(this, name);
-        return string0 === string1
-          ? null
-          : string0 === string00
-          ? interpolate0
-          : (interpolate0 = interpolate((string00 = string0), value1));
-      };
-    }
-
-    function style_styleFunction(name, interpolate, value) {
-      var string00, string10, interpolate0;
-      return function () {
-        var string0 = styleValue(this, name),
-          value1 = value(this),
-          string1 = value1 + '';
-        if (value1 == null)
-          string1 = value1 =
-            (this.style.removeProperty(name), styleValue(this, name));
-        return string0 === string1
-          ? null
-          : string0 === string00 && string1 === string10
-          ? interpolate0
-          : ((string10 = string1),
-            (interpolate0 = interpolate((string00 = string0), value1)));
-      };
-    }
-
-    function styleMaybeRemove(id, name) {
-      var on0,
-        on1,
-        listener0,
-        key = 'style.' + name,
-        event = 'end.' + key,
-        remove;
-      return function () {
-        var schedule = schedule_set(this, id),
-          on = schedule.on,
-          listener =
-            schedule.value[key] == null
-              ? remove || (remove = style_styleRemove(name))
-              : undefined;
-
-        // If this node shared a dispatch with the previous node,
-        // just assign the updated shared dispatch and we’re done!
-        // Otherwise, copy-on-write.
-        if (on !== on0 || listener0 !== listener)
-          (on1 = (on0 = on).copy()).on(event, (listener0 = listener));
-
-        schedule.on = on1;
-      };
-    }
-
-    /* harmony default export */ function transition_style(
-      name,
-      value,
-      priority,
-    ) {
-      var i =
-        (name += '') === 'transform' ? interpolateTransformCss : interpolate;
-      return value == null
-        ? this.styleTween(name, styleNull(name, i)).on(
-            'end.style.' + name,
-            style_styleRemove(name),
-          )
-        : typeof value === 'function'
-        ? this.styleTween(
-            name,
-            style_styleFunction(
-              name,
-              i,
-              tweenValue(this, 'style.' + name, value),
-            ),
-          ).each(styleMaybeRemove(this._id, name))
-        : this.styleTween(
-            name,
-            style_styleConstant(name, i, value),
-            priority,
-          ).on('end.style.' + name, null);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/styleTween.js
-
-    function styleInterpolate(name, i, priority) {
-      return function (t) {
-        this.style.setProperty(name, i.call(this, t), priority);
-      };
-    }
-
-    function styleTween(name, value, priority) {
-      var t, i0;
-      function tween() {
-        var i = value.apply(this, arguments);
-        if (i !== i0) t = (i0 = i) && styleInterpolate(name, i, priority);
-        return t;
-      }
-      tween._value = value;
-      return tween;
-    }
-
-    /* harmony default export */ function transition_styleTween(
-      name,
-      value,
-      priority,
-    ) {
-      var key = 'style.' + (name += '');
-      if (arguments.length < 2) return (key = this.tween(key)) && key._value;
-      if (value == null) return this.tween(key, null);
-      if (typeof value !== 'function') throw new Error();
-      return this.tween(
-        key,
-        styleTween(name, value, priority == null ? '' : priority),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/text.js
-
-    function text_textConstant(value) {
-      return function () {
-        this.textContent = value;
-      };
-    }
-
-    function text_textFunction(value) {
-      return function () {
-        var value1 = value(this);
-        this.textContent = value1 == null ? '' : value1;
-      };
-    }
-
-    /* harmony default export */ function transition_text(value) {
-      return this.tween(
-        'text',
-        typeof value === 'function'
-          ? text_textFunction(tweenValue(this, 'text', value))
-          : text_textConstant(value == null ? '' : value + ''),
-      );
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/textTween.js
-
-    function textInterpolate(i) {
-      return function (t) {
-        this.textContent = i.call(this, t);
-      };
-    }
-
-    function textTween(value) {
-      var t0, i0;
-      function tween() {
-        var i = value.apply(this, arguments);
-        if (i !== i0) t0 = (i0 = i) && textInterpolate(i);
-        return t0;
-      }
-      tween._value = value;
-      return tween;
-    }
-
-    /* harmony default export */ function transition_textTween(value) {
-      var key = 'text';
-      if (arguments.length < 1) return (key = this.tween(key)) && key._value;
-      if (value == null) return this.tween(key, null);
-      if (typeof value !== 'function') throw new Error();
-      return this.tween(key, textTween(value));
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/transition.js
-
-    /* harmony default export */ function transition() {
-      var name = this._name,
-        id0 = this._id,
-        id1 = newId();
-
-      for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-          if ((node = group[i])) {
-            var inherit = schedule_get(node, id0);
-            schedule(node, name, id1, i, group, {
-              time: inherit.time + inherit.delay + inherit.duration,
-              delay: 0,
-              duration: inherit.duration,
-              ease: inherit.ease,
-            });
-          }
-        }
-      }
-
-      return new Transition(groups, this._parents, name, id1);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/end.js
-
-    /* harmony default export */ function end() {
-      var on0,
-        on1,
-        that = this,
-        id = that._id,
-        size = that.size();
-      return new Promise(function (resolve, reject) {
-        var cancel = { value: reject },
-          end = {
-            value: function () {
-              if (--size === 0) resolve();
-            },
-          };
-
-        that.each(function () {
-          var schedule = schedule_set(this, id),
-            on = schedule.on;
-
-          // If this node shared a dispatch with the previous node,
-          // just assign the updated shared dispatch and we’re done!
-          // Otherwise, copy-on-write.
-          if (on !== on0) {
-            on1 = (on0 = on).copy();
-            on1._.cancel.push(cancel);
-            on1._.interrupt.push(cancel);
-            on1._.end.push(end);
-          }
-
-          schedule.on = on1;
-        });
-
-        // The selection was empty, resolve end immediately
-        if (size === 0) resolve();
-      });
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/index.js
-
-    var id = 0;
-
-    function Transition(groups, parents, name, id) {
-      this._groups = groups;
-      this._parents = parents;
-      this._name = name;
-      this._id = id;
-    }
-
-    function transition_transition(name) {
-      return src_selection().transition(name);
-    }
-
-    function newId() {
-      return ++id;
-    }
-
-    var selection_prototype = src_selection.prototype;
-
-    Transition.prototype = transition_transition.prototype = {
-      constructor: Transition,
-      select: transition_select,
-      selectAll: transition_selectAll,
-      selectChild: selection_prototype.selectChild,
-      selectChildren: selection_prototype.selectChildren,
-      filter: transition_filter,
-      merge: transition_merge,
-      selection: transition_selection,
-      transition: transition,
-      call: selection_prototype.call,
-      nodes: selection_prototype.nodes,
-      node: selection_prototype.node,
-      size: selection_prototype.size,
-      empty: selection_prototype.empty,
-      each: selection_prototype.each,
-      on: transition_on,
-      attr: transition_attr,
-      attrTween: transition_attrTween,
-      style: transition_style,
-      styleTween: transition_styleTween,
-      text: transition_text,
-      textTween: transition_textTween,
-      remove: transition_remove,
-      tween: tween,
-      delay: delay,
-      duration: duration,
-      ease: ease,
-      easeVarying: transition_easeVarying,
-      end: end,
-      [Symbol.iterator]: selection_prototype[Symbol.iterator],
-    }; // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/transition.js
-
-    var defaultTiming = {
-      time: null, // Set on use.
-      delay: 0,
-      duration: 250,
-      ease: cubicInOut,
-    };
-
-    function inherit(node, id) {
-      var timing;
-      while (!(timing = node.__transition) || !(timing = timing[id])) {
-        if (!(node = node.parentNode)) {
-          throw new Error(`transition ${id} not found`);
-        }
-      }
-      return timing;
-    }
-
-    /* harmony default export */ function selection_transition(name) {
-      var id, timing;
-
-      if (name instanceof Transition) {
-        (id = name._id), (name = name._name);
-      } else {
-        (id = newId()),
-          ((timing = defaultTiming).time = now()),
-          (name = name == null ? null : name + '');
-      }
-
-      for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
-        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
-          if ((node = group[i])) {
-            schedule(node, name, id, i, group, timing || inherit(node, id));
-          }
-        }
-      }
-
-      return new Transition(groups, this._parents, name, id);
-    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/index.js
-
-    src_selection.prototype.interrupt = selection_interrupt;
-    src_selection.prototype.transition = selection_transition; // CONCATENATED MODULE: ../node_modules/d3-transition/src/index.js // CONCATENATED MODULE: ./colorUtils.js
-
-    function generateHash(name) {
-      // Return a vector (0.0->1.0) that is a hash of the input string.
-      // The hash is computed to favor early characters over later ones, so
-      // that strings with similar starts have similar vectors. Only the first
-      // 6 characters are considered.
-      const MAX_CHAR = 6;
-
-      let hash = 0;
-      let maxHash = 0;
-      let weight = 1;
-      const mod = 10;
-
-      if (name) {
-        for (let i = 0; i < name.length; i++) {
-          if (i > MAX_CHAR) {
-            break;
-          }
-          hash += weight * (name.charCodeAt(i) % mod);
-          maxHash += weight * (mod - 1);
-          weight *= 0.7;
-        }
-        if (maxHash > 0) {
-          hash = hash / maxHash;
-        }
-      }
-      return hash;
-    }
-
-    function generateColorVector(name) {
-      let vector = 0;
-      if (name) {
-        const nameArr = name.split('`');
-        if (nameArr.length > 1) {
-          name = nameArr[nameArr.length - 1]; // drop module name if present
-        }
-        name = name.split('(')[0]; // drop extra info
-        vector = generateHash(name);
-      }
-      return vector;
-    } // CONCATENATED MODULE: ./colorScheme.js
-
-    function calculateColor(hue, vector) {
-      let r;
-      let g;
-      let b;
-
-      if (hue === 'red') {
-        r = 200 + Math.round(55 * vector);
-        g = 50 + Math.round(80 * vector);
-        b = g;
-      } else if (hue === 'orange') {
-        r = 190 + Math.round(65 * vector);
-        g = 90 + Math.round(65 * vector);
-        b = 0;
-      } else if (hue === 'yellow') {
-        r = 175 + Math.round(55 * vector);
-        g = r;
-        b = 50 + Math.round(20 * vector);
-      } else if (hue === 'green') {
-        r = 50 + Math.round(60 * vector);
-        g = 200 + Math.round(55 * vector);
-        b = r;
-      } else if (hue === 'pastelgreen') {
-        // rgb(163,195,72) - rgb(238,244,221)
-        r = 163 + Math.round(75 * vector);
-        g = 195 + Math.round(49 * vector);
-        b = 72 + Math.round(149 * vector);
-      } else if (hue === 'blue') {
-        // rgb(91,156,221) - rgb(217,232,247)
-        r = 91 + Math.round(126 * vector);
-        g = 156 + Math.round(76 * vector);
-        b = 221 + Math.round(26 * vector);
-      } else if (hue === 'aqua') {
-        r = 50 + Math.round(60 * vector);
-        g = 165 + Math.round(55 * vector);
-        b = g;
-      } else if (hue === 'cold') {
-        r = 0 + Math.round(55 * (1 - vector));
-        g = 0 + Math.round(230 * (1 - vector));
-        b = 200 + Math.round(55 * vector);
-      } else {
-        // original warm palette
-        r = 200 + Math.round(55 * vector);
-        g = 0 + Math.round(230 * (1 - vector));
-        b = 0 + Math.round(55 * (1 - vector));
-      }
-
-      return 'rgb(' + r + ',' + g + ',' + b + ')';
-    } // CONCATENATED MODULE: ./flamegraph.js
-
-    /* harmony default export */ function flamegraph() {
-      let w = 960; // graph width
-      let h = null; // graph height
-      let c = 18; // cell height
-      let selection = null; // selection
-      let tooltip = null; // tooltip
-      let title = ''; // graph title
-      let transitionDuration = 750;
-      let transitionEase = cubicInOut; // tooltip offset
-      let sort = false;
-      let inverted = false; // invert the graph direction
-      let clickHandler = null;
-      let hoverHandler = null;
-      let minFrameSize = 0;
-      let detailsElement = null;
-      let searchDetails = null;
-      let selfValue = false;
-      let resetHeightOnZoom = false;
-      let scrollOnZoom = false;
-      let minHeight = null;
-      let computeDelta = false;
-      let colorHue = null;
-
-      let getName = function (d) {
-        return d.data.n || d.data.name;
-      };
-
-      let getValue = function (d) {
-        if ('v' in d) {
-          return d.v;
-        } else {
-          return d.value;
-        }
-      };
-
-      let getChildren = function (d) {
-        return d.c || d.children;
-      };
-
-      let getLibtype = function (d) {
-        return d.data.l || d.data.libtype;
-      };
-
-      let getDelta = function (d) {
-        if ('d' in d.data) {
-          return d.data.d;
-        } else {
-          return d.data.delta;
-        }
-      };
-
-      let searchHandler = function (searchResults, searchSum, totalValue) {
-        searchDetails = () => {
-          if (detailsElement) {
-            detailsElement.textContent =
-              'search: ' +
-              searchSum +
-              ' of ' +
-              totalValue +
-              ' total time ( ' +
-              format('.3f')(100 * (searchSum / totalValue), 3) +
-              '%)';
-          }
-        };
-        searchDetails();
-      };
-      const originalSearchHandler = searchHandler;
-
-      let searchMatch = (d, term, ignoreCase = false) => {
-        if (!term) {
-          return false;
-        }
-        let label = getName(d);
-        if (ignoreCase) {
-          term = term.toLowerCase();
-          label = label.toLowerCase();
-        }
-        const re = new RegExp(term);
-        return typeof label !== 'undefined' && label && label.match(re);
-      };
-      const originalSearchMatch = searchMatch;
-
-      let detailsHandler = function (d) {
-        if (detailsElement) {
-          if (d) {
-            detailsElement.textContent = d;
-          } else {
-            if (typeof searchDetails === 'function') {
-              searchDetails();
-            } else {
-              detailsElement.textContent = '';
-            }
-          }
-        }
-      };
-      const originalDetailsHandler = detailsHandler;
-
-      let labelHandler = function (d) {
-        return (
-          getName(d) +
-          ' (' +
-          format('.3f')(100 * (d.x1 - d.x0), 3) +
-          '%, ' +
-          getValue(d) +
-          ' ms)'
-        );
-      };
-
-      let colorMapper = function (d) {
-        return d.highlight ? '#E600E6' : colorHash(getName(d), getLibtype(d));
-      };
-      const originalColorMapper = colorMapper;
-
-      function colorHash(name, libtype) {
-        // Return a color for the given name and library type. The library type
-        // selects the hue, and the name is hashed to a color in that hue.
-
-        // default when libtype is not in use
-        let hue = colorHue || 'warm';
-
-        if (!colorHue && !(typeof libtype === 'undefined' || libtype === '')) {
-          // Select hue. Order is important.
-          hue = 'red';
-          if (typeof name !== 'undefined' && name && name.match(/::/)) {
-            hue = 'yellow';
-          }
-          if (libtype === 'kernel') {
-            hue = 'orange';
-          } else if (libtype === 'jit') {
-            hue = 'green';
-          } else if (libtype === 'inlined') {
-            hue = 'aqua';
-          }
-        }
-
-        const vector = generateColorVector(name);
-        return calculateColor(hue, vector);
-      }
-
-      function show(d) {
-        d.data.fade = false;
-        d.data.hide = false;
-        if (d.children) {
-          d.children.forEach(show);
-        }
-      }
-
-      function hideSiblings(node) {
-        let child = node;
-        let parent = child.parent;
-        let children, i, sibling;
-        while (parent) {
-          children = parent.children;
-          i = children.length;
-          while (i--) {
-            sibling = children[i];
-            if (sibling !== child) {
-              sibling.data.hide = true;
-            }
-          }
-          child = parent;
-          parent = child.parent;
-        }
-      }
-
-      function fadeAncestors(d) {
-        if (d.parent) {
-          d.parent.data.fade = true;
-          fadeAncestors(d.parent);
-        }
-      }
-
-      function zoom(d) {
-        if (tooltip) tooltip.hide();
-        hideSiblings(d);
-        show(d);
-        fadeAncestors(d);
-        update();
-        if (scrollOnZoom) {
-          const chartOffset = src_select(this).select('svg')._groups[0][0]
-            .parentNode.offsetTop;
-          const maxFrames = (window.innerHeight - chartOffset) / c;
-          const frameOffset = (d.height - maxFrames + 10) * c;
-          window.scrollTo({
-            top: chartOffset + frameOffset,
-            left: 0,
-            behavior: 'smooth',
-          });
-        }
-        if (typeof clickHandler === 'function') {
-          clickHandler(d);
-        }
-      }
-
-      function searchTree(d, term) {
-        const results = [];
-        let sum = 0;
-
-        function searchInner(d, foundParent) {
-          let found = false;
-
-          if (searchMatch(d, term)) {
-            d.highlight = true;
-            found = true;
-            if (!foundParent) {
-              sum += getValue(d);
-            }
-            results.push(d);
-          } else {
-            d.highlight = false;
-          }
-
-          if (getChildren(d)) {
-            getChildren(d).forEach(function (child) {
-              searchInner(child, foundParent || found);
-            });
-          }
-        }
-        searchInner(d, false);
-
-        return [results, sum];
-      }
-
-      function findTree(d, id) {
-        if (d.id === id) {
-          return d;
-        } else {
-          const children = getChildren(d);
-          if (children) {
-            for (let i = 0; i < children.length; i++) {
-              const found = findTree(children[i], id);
-              if (found) {
-                return found;
-              }
-            }
-          }
-        }
-      }
-
-      function clear(d) {
-        d.highlight = false;
-        if (getChildren(d)) {
-          getChildren(d).forEach(function (child) {
-            clear(child);
-          });
-        }
-      }
-
-      function doSort(a, b) {
-        if (typeof sort === 'function') {
-          return sort(a, b);
-        } else if (sort) {
-          return ascending_ascending(getName(a), getName(b));
-        }
-      }
-
-      const p = partition();
-
-      function filterNodes(root) {
-        let nodeList = root.descendants();
-        if (minFrameSize > 0) {
-          const kx = w / (root.x1 - root.x0);
-          nodeList = nodeList.filter(function (el) {
-            return (el.x1 - el.x0) * kx > minFrameSize;
-          });
-        }
-        return nodeList;
-      }
-
-      function update() {
-        selection.each(function (root) {
-          const x = linear_linear().range([0, w]);
-          const y = linear_linear().range([0, c]);
-
-          reappraiseNode(root);
-
-          if (sort) root.sort(doSort);
-
-          p(root);
-
-          const kx = w / (root.x1 - root.x0);
-          function width(d) {
-            return (d.x1 - d.x0) * kx;
-          }
-
-          const descendants = filterNodes(root);
-          const svg = src_select(this).select('svg');
-          svg.attr('width', w);
-
-          let g = svg.selectAll('g').data(descendants, function (d) {
-            return d.id;
-          });
-
-          // if height is not set: set height on first update, after nodes were filtered by minFrameSize
-          if (!h || resetHeightOnZoom) {
-            const maxDepth = Math.max.apply(
-              null,
-              descendants.map(function (n) {
-                return n.depth;
-              }),
-            );
-
-            h = (maxDepth + 3) * c;
-            if (h < minHeight) h = minHeight;
-
-            svg.attr('height', h);
-          }
-
-          g.transition()
-            .duration(transitionDuration)
-            .ease(transitionEase)
-            .attr('transform', function (d) {
-              return (
-                'translate(' +
-                x(d.x0) +
-                ',' +
-                (inverted ? y(d.depth) : h - y(d.depth) - c) +
-                ')'
-              );
-            });
-
-          g.select('rect')
-            .transition()
-            .duration(transitionDuration)
-            .ease(transitionEase)
-            .attr('width', width);
-
-          const node = g
-            .enter()
-            .append('svg:g')
-            .attr('transform', function (d) {
-              return (
-                'translate(' +
-                x(d.x0) +
-                ',' +
-                (inverted ? y(d.depth) : h - y(d.depth) - c) +
-                ')'
-              );
-            });
-
-          node
-            .append('svg:rect')
-            .transition()
-            .delay(transitionDuration / 2)
-            .attr('width', width);
-
-          if (!tooltip) {
-            node.append('svg:title');
-          }
-
-          node.append('foreignObject').append('xhtml:div');
-
-          // Now we have to re-select to see the new elements (why?).
-          g = svg.selectAll('g').data(descendants, function (d) {
-            return d.id;
-          });
-
-          g.attr('width', width)
-            .attr('height', function (d) {
-              return c;
-            })
-            .attr('name', function (d) {
-              return getName(d);
-            })
-            .attr('class', function (d) {
-              return d.data.fade ? 'frame fade' : 'frame';
-            });
-
-          g.select('rect')
-            .attr('height', function (d) {
-              return c;
-            })
-            .attr('fill', function (d) {
-              return colorMapper(d);
-            });
-
-          if (!tooltip) {
-            g.select('title').text(labelHandler);
-          }
-
-          g.select('foreignObject')
-            .attr('width', width)
-            .attr('height', function (d) {
-              return c;
-            })
-            .select('div')
-            .attr('class', 'd3-flame-graph-label')
-            .style('display', function (d) {
-              return width(d) < 35 ? 'none' : 'block';
-            })
-            .transition()
-            .delay(transitionDuration)
-            .text(getName);
-
-          g.on('click', (_, d) => {
-            zoom(d);
-          });
-
-          g.exit().remove();
-
-          g.on('mouseover', function (_, d) {
-            if (tooltip) tooltip.show(d, this);
-            detailsHandler(labelHandler(d));
-            if (typeof hoverHandler === 'function') {
-              hoverHandler(d);
-            }
-          }).on('mouseout', function () {
-            if (tooltip) tooltip.hide();
-            detailsHandler(null);
-          });
-        });
-      }
-
-      function merge(data, samples) {
-        samples.forEach(function (sample) {
-          const node = data.find(function (element) {
-            return element.name === sample.name;
-          });
-
-          if (node) {
-            node.value += sample.value;
-            if (sample.children) {
-              if (!node.children) {
-                node.children = [];
-              }
-              merge(node.children, sample.children);
-            }
-          } else {
-            data.push(sample);
-          }
-        });
-      }
-
-      function forEachNode(node, f) {
-        f(node);
-        let children = node.children;
-        if (children) {
-          const stack = [children];
-          let count, child, grandChildren;
-          while (stack.length) {
-            children = stack.pop();
-            count = children.length;
-            while (count--) {
-              child = children[count];
-              f(child);
-              grandChildren = child.children;
-              if (grandChildren) {
-                stack.push(grandChildren);
-              }
-            }
-          }
-        }
-      }
-
-      function adoptNode(node) {
-        let id = 0;
-        forEachNode(node, function (n) {
-          n.id = id++;
-        });
-      }
-
-      function reappraiseNode(root) {
-        let node,
-          children,
-          grandChildren,
-          childrenValue,
-          i,
-          j,
-          child,
-          childValue;
-        const stack = [];
-        const included = [];
-        const excluded = [];
-        const compoundValue = !selfValue;
-        let item = root.data;
-        if (item.hide) {
-          root.value = 0;
-          children = root.children;
-          if (children) {
-            excluded.push(children);
-          }
-        } else {
-          root.value = item.fade ? 0 : getValue(item);
-          stack.push(root);
-        }
-        // First DFS pass:
-        // 1. Update node.value with node's self value
-        // 2. Populate excluded list with children under hidden nodes
-        // 3. Populate included list with children under visible nodes
-        while ((node = stack.pop())) {
-          children = node.children;
-          if (children && (i = children.length)) {
-            childrenValue = 0;
-            while (i--) {
-              child = children[i];
-              item = child.data;
-              if (item.hide) {
-                child.value = 0;
-                grandChildren = child.children;
-                if (grandChildren) {
-                  excluded.push(grandChildren);
-                }
-                continue;
-              }
-              if (item.fade) {
-                child.value = 0;
-              } else {
-                childValue = getValue(item);
-                child.value = childValue;
-                childrenValue += childValue;
-              }
-              stack.push(child);
-            }
-            // Here second part of `&&` is actually checking for `node.data.fade`. However,
-            // checking for node.value is faster and presents more oportunities for JS optimizer.
-            if (compoundValue && node.value) {
-              node.value -= childrenValue;
-            }
-            included.push(children);
-          }
-        }
-        // Postorder traversal to compute compound value of each visible node.
-        i = included.length;
-        while (i--) {
-          children = included[i];
-          childrenValue = 0;
-          j = children.length;
-          while (j--) {
-            childrenValue += children[j].value;
-          }
-          children[0].parent.value += childrenValue;
-        }
-        // Continue DFS to set value of all hidden nodes to 0.
-        while (excluded.length) {
-          children = excluded.pop();
-          j = children.length;
-          while (j--) {
-            child = children[j];
-            child.value = 0;
-            grandChildren = child.children;
-            if (grandChildren) {
-              excluded.push(grandChildren);
-            }
-          }
-        }
-      }
-
-      function processData() {
-        selection.datum((data) => {
-          if (data.constructor.name !== 'Node') {
-            // creating a root hierarchical structure
-            const root = hierarchy(data, getChildren);
-
-            // augumenting nodes with ids
-            adoptNode(root);
-
-            // calculate actual value
-            reappraiseNode(root);
-
-            // store value for later use
-            root.originalValue = root.value;
-
-            // computing deltas for differentials
-            if (computeDelta) {
-              root.eachAfter((node) => {
-                let sum = getDelta(node);
-                const children = node.children;
-                let i = children && children.length;
-                while (--i >= 0) sum += children[i].delta;
-                node.delta = sum;
-              });
-            }
-
-            // setting the bound data for the selection
-            return root;
-          }
-        });
-      }
-
-      function chart(s) {
-        if (!arguments.length) {
-          return chart;
-        }
-
-        // saving the selection on `.call`
-        selection = s;
-
-        // processing raw data to be used in the chart
-        processData();
-
-        // create chart svg
-        selection.each(function (data) {
-          if (src_select(this).select('svg').size() === 0) {
-            const svg = src_select(this)
-              .append('svg:svg')
-              .attr('width', w)
-              .attr('class', 'partition d3-flame-graph');
-
-            if (h) {
-              if (h < minHeight) h = minHeight;
-              svg.attr('height', h);
-            }
-
-            svg
-              .append('svg:text')
-              .attr('class', 'title')
-              .attr('text-anchor', 'middle')
-              .attr('y', '25')
-              .attr('x', w / 2)
-              .attr('fill', '#808080')
-              .text(title);
-
-            if (tooltip) svg.call(tooltip);
-          }
-        });
-
-        // first draw
-        update();
-      }
-
-      chart.height = function (_) {
-        if (!arguments.length) {
-          return h;
-        }
-        h = _;
-        return chart;
-      };
-
-      chart.minHeight = function (_) {
-        if (!arguments.length) {
-          return minHeight;
-        }
-        minHeight = _;
-        return chart;
-      };
-
-      chart.width = function (_) {
-        if (!arguments.length) {
-          return w;
-        }
-        w = _;
-        return chart;
-      };
-
-      chart.cellHeight = function (_) {
-        if (!arguments.length) {
-          return c;
-        }
-        c = _;
-        return chart;
-      };
-
-      chart.tooltip = function (_) {
-        if (!arguments.length) {
-          return tooltip;
-        }
-        if (typeof _ === 'function') {
-          tooltip = _;
-        }
-        return chart;
-      };
-
-      chart.title = function (_) {
-        if (!arguments.length) {
-          return title;
-        }
-        title = _;
-        return chart;
-      };
-
-      chart.transitionDuration = function (_) {
-        if (!arguments.length) {
-          return transitionDuration;
-        }
-        transitionDuration = _;
-        return chart;
-      };
-
-      chart.transitionEase = function (_) {
-        if (!arguments.length) {
-          return transitionEase;
-        }
-        transitionEase = _;
-        return chart;
-      };
-
-      chart.sort = function (_) {
-        if (!arguments.length) {
-          return sort;
-        }
-        sort = _;
-        return chart;
-      };
-
-      chart.inverted = function (_) {
-        if (!arguments.length) {
-          return inverted;
-        }
-        inverted = _;
-        return chart;
-      };
-
-      chart.computeDelta = function (_) {
-        if (!arguments.length) {
-          return computeDelta;
-        }
-        computeDelta = _;
-        return chart;
-      };
-
-      chart.setLabelHandler = function (_) {
-        if (!arguments.length) {
-          return labelHandler;
-        }
-        labelHandler = _;
-        return chart;
-      };
-      // Kept for backwards compatibility.
-      chart.label = chart.setLabelHandler;
-
-      chart.search = function (term) {
-        const searchResults = [];
-        let searchSum = 0;
-        let totalValue = 0;
-        selection.each(function (data) {
-          const res = searchTree(data, term);
-          searchResults.push(...res[0]);
-          searchSum += res[1];
-          totalValue += data.originalValue;
-        });
-        searchHandler(searchResults, searchSum, totalValue);
-        update();
-      };
-
-      chart.findById = function (id) {
-        if (typeof id === 'undefined' || id === null) {
-          return null;
-        }
-        let found = null;
-        selection.each(function (data) {
-          if (found === null) {
-            found = findTree(data, id);
-          }
-        });
-        return found;
-      };
-
-      chart.clear = function () {
-        detailsHandler(null);
-        selection.each(function (root) {
-          clear(root);
-          update();
-        });
-      };
-
-      chart.zoomTo = function (d) {
-        zoom(d);
-      };
-
-      chart.resetZoom = function () {
-        selection.each(function (root) {
-          zoom(root); // zoom to root
-        });
-      };
-
-      chart.onClick = function (_) {
-        if (!arguments.length) {
-          return clickHandler;
-        }
-        clickHandler = _;
-        return chart;
-      };
-
-      chart.onHover = function (_) {
-        if (!arguments.length) {
-          return hoverHandler;
-        }
-        hoverHandler = _;
-        return chart;
-      };
-
-      chart.merge = function (data) {
-        if (!selection) {
-          return chart;
-        }
-
-        // TODO: Fix merge with zoom
-        // Merging a zoomed chart doesn't work properly, so
-        //  clearing zoom before merge.
-        // To apply zoom on merge, we would need to set hide
-        //  and fade on new data according to current data.
-        // New ids are generated for the whole data structure,
-        //  so previous ids might not be the same. For merge to
-        //  work with zoom, previous ids should be maintained.
-        this.resetZoom();
-
-        // Clear search details
-        // Merge requires a new search, updating data and
-        //  the details handler with search results.
-        // Since we don't store the search term, can't
-        //  perform search again.
-        searchDetails = null;
-        detailsHandler(null);
-
-        selection.datum((root) => {
-          merge([root.data], [data]);
-          return root.data;
-        });
-        processData();
-        update();
-        return chart;
-      };
-
-      chart.update = function (data) {
-        if (!selection) {
-          return chart;
-        }
-        if (data) {
-          selection.datum(data);
-          processData();
-        }
-        update();
-        return chart;
-      };
-
-      chart.destroy = function () {
-        if (!selection) {
-          return chart;
-        }
-        if (tooltip) {
-          tooltip.hide();
-          if (typeof tooltip.destroy === 'function') {
-            tooltip.destroy();
-          }
-        }
-        selection.selectAll('svg').remove();
-        return chart;
-      };
-
-      chart.setColorMapper = function (_) {
-        if (!arguments.length) {
-          colorMapper = originalColorMapper;
-          return chart;
-        }
-        colorMapper = (d) => {
-          const originalColor = originalColorMapper(d);
-          return _(d, originalColor);
-        };
-        return chart;
-      };
-      // Kept for backwards compatibility.
-      chart.color = chart.setColorMapper;
-
-      chart.setColorHue = function (_) {
-        if (!arguments.length) {
-          colorHue = null;
-          return chart;
-        }
-        colorHue = _;
-        return chart;
-      };
-
-      chart.minFrameSize = function (_) {
-        if (!arguments.length) {
-          return minFrameSize;
-        }
-        minFrameSize = _;
-        return chart;
-      };
-
-      chart.setDetailsElement = function (_) {
-        if (!arguments.length) {
-          return detailsElement;
-        }
-        detailsElement = _;
-        return chart;
-      };
-      // Kept for backwards compatibility.
-      chart.details = chart.setDetailsElement;
-
-      chart.selfValue = function (_) {
-        if (!arguments.length) {
-          return selfValue;
-        }
-        selfValue = _;
-        return chart;
-      };
-
-      chart.resetHeightOnZoom = function (_) {
-        if (!arguments.length) {
-          return resetHeightOnZoom;
-        }
-        resetHeightOnZoom = _;
-        return chart;
-      };
-
-      chart.scrollOnZoom = function (_) {
-        if (!arguments.length) {
-          return scrollOnZoom;
-        }
-        scrollOnZoom = _;
-        return chart;
-      };
-
-      chart.getName = function (_) {
-        if (!arguments.length) {
-          return getName;
-        }
-        getName = _;
-        return chart;
-      };
-
-      chart.getValue = function (_) {
-        if (!arguments.length) {
-          return getValue;
-        }
-        getValue = _;
-        return chart;
-      };
-
-      chart.getChildren = function (_) {
-        if (!arguments.length) {
-          return getChildren;
-        }
-        getChildren = _;
-        return chart;
-      };
-
-      chart.getLibtype = function (_) {
-        if (!arguments.length) {
-          return getLibtype;
-        }
-        getLibtype = _;
-        return chart;
-      };
-
-      chart.getDelta = function (_) {
-        if (!arguments.length) {
-          return getDelta;
-        }
-        getDelta = _;
-        return chart;
-      };
-
-      chart.setSearchHandler = function (_) {
-        if (!arguments.length) {
-          searchHandler = originalSearchHandler;
-          return chart;
-        }
-        searchHandler = _;
-        return chart;
-      };
-
-      chart.setDetailsHandler = function (_) {
-        if (!arguments.length) {
-          detailsHandler = originalDetailsHandler;
-          return chart;
-        }
-        detailsHandler = _;
-        return chart;
-      };
-
-      chart.setSearchMatch = function (_) {
-        if (!arguments.length) {
-          searchMatch = originalSearchMatch;
-          return chart;
-        }
-        searchMatch = _;
-        return chart;
-      };
-
-      return chart;
-    }
-
-    __webpack_exports__ = __webpack_exports__['default'];
-    /******/ return __webpack_exports__;
-    /******/
-  })();
-});
diff --git a/development/charts/table/index.html b/development/charts/table/index.html
deleted file mode 100644
index ec11ecfde5c3..000000000000
--- a/development/charts/table/index.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<html>
-  <head>
-    <script type="text/javascript" src="./jquery.min.js"></script>
-    <style>
-      table {
-        border: 1px solid black;
-        border-collapse: collapse;
-      }
-      tr {
-        border: 1px solid black;
-      }
-    </style>
-    <script>
-      $(function () {
-        var loadTime = [];
-
-        $.getJSON('stats.json', function (data) {
-          $.each(data.children, function (index, datum) {
-            if (datum.name) {
-              var tblRow =
-                '<tr>' +
-                '<td>' +
-                index +
-                '</td>' +
-                '<td>' +
-                datum.name +
-                '</td>' +
-                '<td>' +
-                datum.value +
-                '</td>' +
-                '</tr>';
-              $(tblRow).appendTo('#loaddata tbody');
-            }
-          });
-          $(
-            '<tr>' +
-              '<td>' +
-              'Total' +
-              '</td>' +
-              '<td>' +
-              '--' +
-              '</td>' +
-              '<td>' +
-              data.value +
-              '</td>' +
-              '</tr>',
-          ).appendTo('#loaddata tbody');
-        });
-      });
-    </script>
-  </head>
-
-  <body>
-    <div class="wrapper">
-      <div class="profile">
-        <table id="loaddata">
-          <thead>
-            <th>S.No</th>
-            <th>Name</th>
-            <th>TotalTime</th>
-          </thead>
-          <tbody></tbody>
-        </table>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/development/charts/table/jquery.min.js b/development/charts/table/jquery.min.js
deleted file mode 100644
index 8cdc80eb85d8..000000000000
--- a/development/charts/table/jquery.min.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.6.2
- * http://jquery.com/
- *
- * Copyright 2011, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2011, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Jun 30 14:16:56 2011 -0400
- */
-(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
-shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
-)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index cc762602b4e6..9310a92d83ec 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -94,14 +94,6 @@ async function start() {
   // links to bundle browser builds
   const depVizUrl = `${BUILD_LINK_BASE}/build-artifacts/build-viz/index.html`;
   const depVizLink = `<a href="${depVizUrl}">Build System</a>`;
-  const moduleInitStatsBackgroundUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/initialisation/background/index.html`;
-  const moduleInitStatsBackgroundLink = `<a href="${moduleInitStatsBackgroundUrl}">Background Module Init Stats</a>`;
-  const moduleInitStatsUIUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/initialisation/ui/index.html`;
-  const moduleInitStatsUILink = `<a href="${moduleInitStatsUIUrl}">UI Init Stats</a>`;
-  const moduleLoadStatsUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/load_time/index.html`;
-  const moduleLoadStatsLink = `<a href="${moduleLoadStatsUrl}">Module Load Stats</a>`;
-  const bundleSizeStatsUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/bundle_size.json`;
-  const bundleSizeStatsLink = `<a href="${bundleSizeStatsUrl}">Bundle Size Stats</a>`;
 
   // link to artifacts
   const allArtifactsUrl = `https://circleci.com/gh/MetaMask/metamask-extension/${CIRCLE_BUILD_NUM}#artifacts/containers/0`;
@@ -111,10 +103,6 @@ async function start() {
     `builds (beta): ${betaBuildLinks}`,
     `builds (flask): ${flaskBuildLinks}`,
     `build viz: ${depVizLink}`,
-    `mv3: ${moduleInitStatsBackgroundLink}`,
-    `mv3: ${moduleInitStatsUILink}`,
-    `mv3: ${moduleLoadStatsLink}`,
-    `mv3: ${bundleSizeStatsLink}`,
     `code coverage: ${coverageLink}`,
     `storybook: ${storybookLink}`,
     `<a href="${allArtifactsUrl}">all artifacts</a>`,
diff --git a/development/sourcemap-validator.js b/development/sourcemap-validator.js
index 0531a03ced19..01861e229a83 100644
--- a/development/sourcemap-validator.js
+++ b/development/sourcemap-validator.js
@@ -24,6 +24,7 @@ async function start() {
     `common-0.js`,
     `background-0.js`,
     `ui-0.js`,
+    'phishing-detect.js',
     // `contentscript.js`, skipped because the validator is erroneously sampling the inlined `inpage.js` script
     `inpage.js`,
   ];
diff --git a/docs/trezor-emulator.md b/docs/trezor-emulator.md
index fd459b92b583..bd77bb808c29 100644
--- a/docs/trezor-emulator.md
+++ b/docs/trezor-emulator.md
@@ -1,6 +1,6 @@
 # Using the TREZOR simulator
 
-You can install the TREZOR emulator and use it with MetaMask.
+You can install the TREZOR emulator and use it with Metamask.
 Here is how:
 
 ## 1 - Install the TREZOR Bridge
diff --git a/jest.config.js b/jest.config.js
index ad12bb85b657..d64ca0864cfb 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,7 +1,6 @@
 module.exports = {
   collectCoverageFrom: [
     '<rootDir>/app/scripts/controllers/permissions/**/*.js',
-    '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.js',
     '<rootDir>/shared/**/*.js',
     '<rootDir>/ui/**/*.js',
   ],
@@ -12,8 +11,8 @@ module.exports = {
     global: {
       branches: 44,
       functions: 42,
-      lines: 52,
-      statements: 52,
+      lines: 48,
+      statements: 48,
     },
     './app/scripts/controllers/permissions/**/*.js': {
       branches: 100,
@@ -21,12 +20,6 @@ module.exports = {
       lines: 100,
       statements: 100,
     },
-    './app/scripts/lib/createRPCMethodTrackingMiddleware.js': {
-      branches: 95.65,
-      functions: 100,
-      lines: 100,
-      statements: 100,
-    },
   },
   // TODO: enable resetMocks
   // resetMocks: true,
@@ -41,7 +34,6 @@ module.exports = {
     '<rootDir>/app/scripts/platforms/*.test.js',
     '<rootDir>app/scripts/controllers/network/**/*.test.js',
     '<rootDir>/app/scripts/controllers/permissions/**/*.test.js',
-    '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js',
   ],
   testTimeout: 2500,
   transform: {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index e371f4fbad7c..6d45be3e37bb 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "@storybook/api>regenerator-runtime": true
+        "addons-linter>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,6 +3168,43 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/post-message-stream": {
+      "globals": {
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
+        "@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3182,77 +3219,184 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
-        "browserify>buffer": true
+        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
+        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>pbkdf2": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
+      "packages": {
+        "3box>ethers>elliptic": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "crypto": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
+    "@metamask/smart-transactions-controller>@metamask/controllers": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true,
+        "Headers": true,
+        "URL": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
         "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controllers>abort-controller": true,
+        "@metamask/controllers>async-mutex": true,
+        "@metamask/controllers>eth-phishing-detect": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/controllers>multiformats": true,
+        "@metamask/controllers>web3-provider-engine": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
+        "@storybook/api>fast-deep-equal": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "deep-freeze-strict": true,
+        "eth-ens-namehash": true,
+        "eth-json-rpc-infura": true,
+        "eth-keyring-controller": true,
+        "eth-query": true,
+        "eth-rpc-errors": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "ethers": true,
+        "ethjs>ethjs-unit": true,
+        "immer": true,
+        "json-rpc-engine": true,
+        "jsonschema": true,
+        "punycode": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true,
+        "web3": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
       "globals": {
-        "crypto": true
+        "clearInterval": true,
+        "setInterval": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-provider-http": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "ethjs-query>babel-runtime": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-util": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
       "packages": {
-        "@storybook/api>fast-deep-equal": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true
+        "console": true
       },
       "packages": {
-        "@metamask/controllers": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "ethjs-query>babel-runtime": true,
+        "ethjs-query>ethjs-format": true,
+        "ethjs-query>ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
+        "@truffle/codec>utf8": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-util": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-wallet>aes-js": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3277,6 +3421,7 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
+        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3290,12 +3435,10 @@
       },
       "packages": {
         "@metamask/controllers": true,
+        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3313,19 +3456,6 @@
         "semver": true
       }
     },
-    "@metamask/snap-controllers>@metamask/browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto.getRandomValues": true,
-        "crypto.subtle.decrypt": true,
-        "crypto.subtle.deriveKey": true,
-        "crypto.subtle.encrypt": true,
-        "crypto.subtle.importKey": true
-      },
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3335,71 +3465,12 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
+        "readable-stream": true,
         "watchify>xtend": true
       }
     },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream": {
-      "globals": {
-        "WorkerGlobalScope": true,
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3506,38 +3577,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "readable-stream": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3603,7 +3644,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3625,6 +3666,12 @@
         "define": true
       }
     },
+    "@ngraveio/bc-ur>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3735,11 +3782,6 @@
         "localforage": true
       }
     },
-    "@storybook/api>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4059,10 +4101,9 @@
         "setTimeout": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
+    "addons-linter>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
       }
     },
     "analytics-node": {
@@ -4253,7 +4294,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4284,7 +4325,7 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4736,37 +4777,63 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>bip39": true,
         "eth-keyring-controller>browser-passworder": true,
+        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "loglevel": true
       }
     },
-    "eth-keyring-controller>@metamask/bip39": {
+    "eth-keyring-controller>bip39": {
+      "globals": {
+        "console.log": true
+      },
       "packages": {
-        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
+        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
+        "ethereumjs-wallet>randombytes": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "eth-keyring-controller>bip39>unorm": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring": {
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
+    "eth-keyring-controller>eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-trezor-keyring>@metamask/eth-sig-util": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4775,27 +4842,12 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5166,7 +5218,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5763,6 +5815,73 @@
         "browserify>process": true
       }
     },
+    "ethjs-ens": {
+      "packages": {
+        "ethereum-ens-network-map": true,
+        "ethjs-ens>eth-ens-namehash": true,
+        "ethjs-ens>ethjs-contract": true,
+        "ethjs-ens>ethjs-query": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
+        "ethjs-ens>eth-ens-namehash>js-sha3": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>idna-uts46": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-contract": {
+      "packages": {
+        "ethjs-contract>ethjs-abi": true,
+        "ethjs-ens>ethjs-contract>ethjs-filter": true,
+        "ethjs-ens>ethjs-contract>js-sha3": true,
+        "ethjs>ethjs-util": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format": true,
+        "ethjs-ens>ethjs-query>ethjs-rpc": true
+      }
+    },
+    "ethjs-ens>ethjs-query>ethjs-format": {
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true,
+        "ethjs>number-to-bn": true
+      }
+    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5776,7 +5895,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "@storybook/api>regenerator-runtime": true,
+        "addons-linter>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6174,13 +6293,10 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
-        "addEventListener": true,
-        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
-        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index e371f4fbad7c..6d45be3e37bb 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "@storybook/api>regenerator-runtime": true
+        "addons-linter>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,6 +3168,43 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/post-message-stream": {
+      "globals": {
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
+        "@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3182,77 +3219,184 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
-        "browserify>buffer": true
+        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
+        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>pbkdf2": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
+      "packages": {
+        "3box>ethers>elliptic": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "crypto": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
+    "@metamask/smart-transactions-controller>@metamask/controllers": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true,
+        "Headers": true,
+        "URL": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
         "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controllers>abort-controller": true,
+        "@metamask/controllers>async-mutex": true,
+        "@metamask/controllers>eth-phishing-detect": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/controllers>multiformats": true,
+        "@metamask/controllers>web3-provider-engine": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
+        "@storybook/api>fast-deep-equal": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "deep-freeze-strict": true,
+        "eth-ens-namehash": true,
+        "eth-json-rpc-infura": true,
+        "eth-keyring-controller": true,
+        "eth-query": true,
+        "eth-rpc-errors": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "ethers": true,
+        "ethjs>ethjs-unit": true,
+        "immer": true,
+        "json-rpc-engine": true,
+        "jsonschema": true,
+        "punycode": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true,
+        "web3": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
       "globals": {
-        "crypto": true
+        "clearInterval": true,
+        "setInterval": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-provider-http": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "ethjs-query>babel-runtime": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-util": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
       "packages": {
-        "@storybook/api>fast-deep-equal": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true
+        "console": true
       },
       "packages": {
-        "@metamask/controllers": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "ethjs-query>babel-runtime": true,
+        "ethjs-query>ethjs-format": true,
+        "ethjs-query>ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
+        "@truffle/codec>utf8": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-util": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-wallet>aes-js": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3277,6 +3421,7 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
+        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3290,12 +3435,10 @@
       },
       "packages": {
         "@metamask/controllers": true,
+        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3313,19 +3456,6 @@
         "semver": true
       }
     },
-    "@metamask/snap-controllers>@metamask/browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto.getRandomValues": true,
-        "crypto.subtle.decrypt": true,
-        "crypto.subtle.deriveKey": true,
-        "crypto.subtle.encrypt": true,
-        "crypto.subtle.importKey": true
-      },
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3335,71 +3465,12 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
+        "readable-stream": true,
         "watchify>xtend": true
       }
     },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream": {
-      "globals": {
-        "WorkerGlobalScope": true,
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3506,38 +3577,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "readable-stream": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3603,7 +3644,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3625,6 +3666,12 @@
         "define": true
       }
     },
+    "@ngraveio/bc-ur>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3735,11 +3782,6 @@
         "localforage": true
       }
     },
-    "@storybook/api>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4059,10 +4101,9 @@
         "setTimeout": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
+    "addons-linter>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
       }
     },
     "analytics-node": {
@@ -4253,7 +4294,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4284,7 +4325,7 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4736,37 +4777,63 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>bip39": true,
         "eth-keyring-controller>browser-passworder": true,
+        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "loglevel": true
       }
     },
-    "eth-keyring-controller>@metamask/bip39": {
+    "eth-keyring-controller>bip39": {
+      "globals": {
+        "console.log": true
+      },
       "packages": {
-        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
+        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
+        "ethereumjs-wallet>randombytes": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "eth-keyring-controller>bip39>unorm": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring": {
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
+    "eth-keyring-controller>eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-trezor-keyring>@metamask/eth-sig-util": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4775,27 +4842,12 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5166,7 +5218,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5763,6 +5815,73 @@
         "browserify>process": true
       }
     },
+    "ethjs-ens": {
+      "packages": {
+        "ethereum-ens-network-map": true,
+        "ethjs-ens>eth-ens-namehash": true,
+        "ethjs-ens>ethjs-contract": true,
+        "ethjs-ens>ethjs-query": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
+        "ethjs-ens>eth-ens-namehash>js-sha3": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>idna-uts46": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-contract": {
+      "packages": {
+        "ethjs-contract>ethjs-abi": true,
+        "ethjs-ens>ethjs-contract>ethjs-filter": true,
+        "ethjs-ens>ethjs-contract>js-sha3": true,
+        "ethjs>ethjs-util": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format": true,
+        "ethjs-ens>ethjs-query>ethjs-rpc": true
+      }
+    },
+    "ethjs-ens>ethjs-query>ethjs-format": {
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true,
+        "ethjs>number-to-bn": true
+      }
+    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5776,7 +5895,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "@storybook/api>regenerator-runtime": true,
+        "addons-linter>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6174,13 +6293,10 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
-        "addEventListener": true,
-        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
-        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index e371f4fbad7c..6d45be3e37bb 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "@storybook/api>regenerator-runtime": true
+        "addons-linter>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,6 +3168,43 @@
         "watchify>xtend": true
       }
     },
+    "@metamask/post-message-stream": {
+      "globals": {
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
+        "@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/post-message-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3182,77 +3219,184 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
-        "browserify>buffer": true
+        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
+        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "browserify>insert-module-globals>is-buffer": true,
+        "ethereumjs-util>ethereum-cryptography>keccak": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
+      "packages": {
+        "browserify>buffer": true,
+        "browserify>crypto-browserify>pbkdf2": true,
+        "ethereumjs-util>create-hash": true,
+        "ethereumjs-wallet>randombytes": true
+      }
+    },
+    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
+      "packages": {
+        "3box>ethers>elliptic": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "crypto": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
+        "setTimeout": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
+    "@metamask/smart-transactions-controller>@metamask/controllers": {
       "globals": {
-        "TextEncoder": true,
-        "crypto": true,
+        "Headers": true,
+        "URL": true,
+        "clearInterval": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true,
         "setTimeout": true
+      },
+      "packages": {
+        "@ethereumjs/common": true,
+        "@ethereumjs/tx": true,
+        "@metamask/contract-metadata": true,
+        "@metamask/controllers>abort-controller": true,
+        "@metamask/controllers>async-mutex": true,
+        "@metamask/controllers>eth-phishing-detect": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/controllers>multiformats": true,
+        "@metamask/controllers>web3-provider-engine": true,
+        "@metamask/metamask-eth-abis": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
+        "@storybook/api>fast-deep-equal": true,
+        "browserify>buffer": true,
+        "browserify>events": true,
+        "deep-freeze-strict": true,
+        "eth-ens-namehash": true,
+        "eth-json-rpc-infura": true,
+        "eth-keyring-controller": true,
+        "eth-query": true,
+        "eth-rpc-errors": true,
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "ethers": true,
+        "ethjs>ethjs-unit": true,
+        "immer": true,
+        "json-rpc-engine": true,
+        "jsonschema": true,
+        "punycode": true,
+        "single-call-balance-checker-abi": true,
+        "uuid": true,
+        "web3": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
       "globals": {
-        "crypto": true
+        "clearInterval": true,
+        "setInterval": true
       },
       "packages": {
-        "browserify>browser-resolve": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-provider-http": true,
+        "ethjs>ethjs-unit": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
-      "globals": {
-        "TextDecoder": true,
-        "TextEncoder": true
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
-        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "ethjs-query>babel-runtime": true,
+        "ethjs>ethjs-filter": true,
+        "ethjs>ethjs-util": true,
+        "promise-to-callback": true
       }
     },
-    "@metamask/rpc-methods>@metamask/utils": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
       "packages": {
-        "@storybook/api>fast-deep-equal": true
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
+        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
+        "browserify>buffer": true,
+        "ethjs>number-to-bn": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true
+        "console": true
       },
       "packages": {
-        "@metamask/controllers": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "ethjs-query>babel-runtime": true,
+        "ethjs-query>ethjs-format": true,
+        "ethjs-query>ethjs-rpc": true,
+        "promise-to-callback": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
+      "packages": {
+        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
+        "@truffle/codec>utf8": true,
+        "browserify>buffer": true,
+        "browserify>crypto-browserify": true,
+        "ethereumjs-util": true,
+        "ethereumjs-util>ethereum-cryptography": true,
+        "ethereumjs-wallet>aes-js": true,
+        "ethereumjs-wallet>bs58check": true,
+        "ethereumjs-wallet>randombytes": true,
+        "ethers>@ethersproject/json-wallets>scrypt-js": true
+      }
+    },
+    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
+      "globals": {
+        "crypto": true,
+        "msCrypto": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3277,6 +3421,7 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
+        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3290,12 +3435,10 @@
       },
       "packages": {
         "@metamask/controllers": true,
+        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3313,19 +3456,6 @@
         "semver": true
       }
     },
-    "@metamask/snap-controllers>@metamask/browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto.getRandomValues": true,
-        "crypto.subtle.decrypt": true,
-        "crypto.subtle.deriveKey": true,
-        "crypto.subtle.encrypt": true,
-        "crypto.subtle.importKey": true
-      },
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3335,71 +3465,12 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
+        "readable-stream": true,
         "watchify>xtend": true
       }
     },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream": {
-      "globals": {
-        "WorkerGlobalScope": true,
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/rpc-methods>@metamask/utils": true,
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3506,38 +3577,8 @@
         "setTimeout": true
       },
       "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
-        "json-rpc-engine>@metamask/safe-event-emitter": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+        "json-rpc-engine>@metamask/safe-event-emitter": true,
+        "readable-stream": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3603,7 +3644,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3625,6 +3666,12 @@
         "define": true
       }
     },
+    "@ngraveio/bc-ur>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3735,11 +3782,6 @@
         "localforage": true
       }
     },
-    "@storybook/api>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
-      }
-    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4059,10 +4101,9 @@
         "setTimeout": true
       }
     },
-    "addons-linter>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
+    "addons-linter>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
       }
     },
     "analytics-node": {
@@ -4253,7 +4294,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4284,7 +4325,7 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4736,37 +4777,63 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
+        "eth-keyring-controller>bip39": true,
         "eth-keyring-controller>browser-passworder": true,
+        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true
+        "eth-sig-util": true,
+        "ethereumjs-util": true,
+        "loglevel": true
       }
     },
-    "eth-keyring-controller>@metamask/bip39": {
+    "eth-keyring-controller>bip39": {
+      "globals": {
+        "console.log": true
+      },
       "packages": {
-        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
+        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
+        "ethereumjs-wallet>randombytes": true,
+        "ethereumjs-wallet>safe-buffer": true
+      }
+    },
+    "eth-keyring-controller>bip39>unorm": {
+      "globals": {
+        "define": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring": {
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
+    "eth-keyring-controller>eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>@metamask/bip39": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-trezor-keyring>@metamask/eth-sig-util": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4775,27 +4842,12 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
-      }
-    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5166,7 +5218,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "addons-linter>sha.js": true,
+        "@ngraveio/bc-ur>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5763,6 +5815,73 @@
         "browserify>process": true
       }
     },
+    "ethjs-ens": {
+      "packages": {
+        "ethereum-ens-network-map": true,
+        "ethjs-ens>eth-ens-namehash": true,
+        "ethjs-ens>ethjs-contract": true,
+        "ethjs-ens>ethjs-query": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash": {
+      "globals": {
+        "name": "write"
+      },
+      "packages": {
+        "browserify>buffer": true,
+        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
+        "ethjs-ens>eth-ens-namehash>js-sha3": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>idna-uts46": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "browserify>punycode": true
+      }
+    },
+    "ethjs-ens>eth-ens-namehash>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-contract": {
+      "packages": {
+        "ethjs-contract>ethjs-abi": true,
+        "ethjs-ens>ethjs-contract>ethjs-filter": true,
+        "ethjs-ens>ethjs-contract>js-sha3": true,
+        "ethjs>ethjs-util": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>ethjs-filter": {
+      "globals": {
+        "clearInterval": true,
+        "setInterval": true
+      }
+    },
+    "ethjs-ens>ethjs-contract>js-sha3": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "ethjs-ens>ethjs-query": {
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format": true,
+        "ethjs-ens>ethjs-query>ethjs-rpc": true
+      }
+    },
+    "ethjs-ens>ethjs-query>ethjs-format": {
+      "packages": {
+        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
+        "ethjs>ethjs-util": true,
+        "ethjs>ethjs-util>strip-hex-prefix": true,
+        "ethjs>number-to-bn": true
+      }
+    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5776,7 +5895,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "@storybook/api>regenerator-runtime": true,
+        "addons-linter>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6174,13 +6293,10 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
-        "addEventListener": true,
-        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
-        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/policy-override.json b/lavamoat/browserify/policy-override.json
index 96504e814ac1..212074b38854 100644
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@@ -31,13 +31,6 @@
         "clearTimeout": true
       }
     },
-    "react-dnd-html5-backend": {
-      "globals": {
-        "clearTimeout": true,
-        "addEventListener": true,
-        "removeEventListener": true
-      }
-    },
     "ethers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
diff --git a/lavamoat/build-system/policy-override.json b/lavamoat/build-system/policy-override.json
index 8bdcb6a60973..b0f3f75a7b89 100644
--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@@ -101,36 +101,6 @@
       "globals": {
         "globalThis": true
       }
-    },
-    "yargs": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path": true,
-        "util": true
-      },
-      "globals": {
-        "console": true,
-        "Error": true,
-        "process": true
-      }
-    },
-    "yargs>y18n": {
-      "builtin": {
-        "fs": true,
-        "path": true,
-        "util": true
-      }
-    },
-    "yargs>yargs-parser": {
-      "builtin": {
-        "fs": true,
-        "path": true,
-        "util": true
-      },
-      "globals": {
-        "process": true
-      }
     }
   }
 }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index 8096a980da7e..f35cc95e6a81 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -534,9 +534,9 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-optimise-call-expression": true,
-        "@babel/preset-env>@babel/plugin-transform-classes>globals": true,
         "depcheck>@babel/traverse>@babel/helper-function-name": true,
-        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true
+        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true,
+        "depcheck>@babel/traverse>globals": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
@@ -1134,6 +1134,21 @@
         "typescript": true
       }
     },
+    "addons-linter>probe-image-size>next-tick": {
+      "globals": {
+        "MutationObserver": true,
+        "WebKitMutationObserver": true,
+        "document": true,
+        "process": true,
+        "setImmediate": true,
+        "setTimeout": true
+      }
+    },
+    "addons-linter>upath": {
+      "builtin": {
+        "path": true
+      }
+    },
     "babelify": {
       "builtin": {
         "path.extname": true,
@@ -1978,6 +1993,57 @@
         "string.prototype.matchall>es-abstract": true
       }
     },
+    "enzyme>cheerio>dom-serializer": {
+      "packages": {
+        "enzyme>cheerio>entities": true,
+        "enzyme>cheerio>htmlparser2>domelementtype": true
+      }
+    },
+    "enzyme>cheerio>htmlparser2": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "string_decoder.StringDecoder": true
+      },
+      "packages": {
+        "enzyme>cheerio>entities": true,
+        "enzyme>cheerio>htmlparser2>domelementtype": true,
+        "enzyme>cheerio>htmlparser2>domhandler": true,
+        "enzyme>cheerio>htmlparser2>domutils": true,
+        "enzyme>cheerio>htmlparser2>readable-stream": true,
+        "pumpify>inherits": true
+      }
+    },
+    "enzyme>cheerio>htmlparser2>domhandler": {
+      "packages": {
+        "enzyme>cheerio>htmlparser2>domelementtype": true
+      }
+    },
+    "enzyme>cheerio>htmlparser2>domutils": {
+      "packages": {
+        "enzyme>cheerio>dom-serializer": true,
+        "enzyme>cheerio>htmlparser2>domelementtype": true
+      }
+    },
+    "enzyme>cheerio>htmlparser2>readable-stream": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.env.READABLE_STREAM": true,
+        "process.nextTick": true,
+        "process.stderr": true,
+        "process.stdout": true
+      },
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
     "enzyme>has": {
       "packages": {
         "mocha>object.assign>function-bind": true
@@ -2067,10 +2133,10 @@
         "eslint>is-glob": true,
         "eslint>json-stable-stringify-without-jsonify": true,
         "eslint>levn": true,
-        "eslint>minimatch": true,
         "eslint>natural-compare": true,
         "eslint>regexpp": true,
-        "lodash": true
+        "lodash": true,
+        "mocha>minimatch": true
       }
     },
     "eslint-config-prettier": {
@@ -2147,7 +2213,7 @@
         "eslint-plugin-import>read-pkg-up": true,
         "eslint-plugin-import>tsconfig-paths": true,
         "eslint-plugin-react>array-includes": true,
-        "eslint>minimatch": true,
+        "mocha>minimatch": true,
         "typescript": true
       }
     },
@@ -2364,7 +2430,7 @@
       "packages": {
         "eslint-plugin-import>tsconfig-paths>json5": true,
         "eslint-plugin-import>tsconfig-paths>strip-bom": true,
-        "rc>minimist": true
+        "minimist": true
       }
     },
     "eslint-plugin-import>tsconfig-paths>json5": {
@@ -2461,8 +2527,8 @@
         "eslint-plugin-node>eslint-plugin-es": true,
         "eslint-plugin-node>semver": true,
         "eslint>eslint-utils": true,
-        "eslint>minimatch": true,
-        "globby>ignore": true
+        "globby>ignore": true,
+        "mocha>minimatch": true
       }
     },
     "eslint-plugin-node>eslint-plugin-es": {
@@ -2509,8 +2575,8 @@
         "eslint-plugin-react>doctrine": true,
         "eslint-plugin-react>jsx-ast-utils": true,
         "eslint-plugin-react>resolve": true,
-        "eslint>minimatch": true,
         "lavamoat>object.fromentries": true,
+        "mocha>minimatch": true,
         "prop-types": true,
         "string.prototype.matchall": true
       }
@@ -2629,11 +2695,11 @@
         "eslint-plugin-react-hooks": true,
         "eslint>@eslint/eslintrc>globals": true,
         "eslint>@eslint/eslintrc>ignore": true,
+        "eslint>@eslint/eslintrc>strip-json-comments": true,
         "eslint>ajv": true,
         "eslint>debug": true,
         "eslint>espree": true,
-        "eslint>minimatch": true,
-        "eslint>strip-json-comments": true,
+        "mocha>minimatch": true,
         "nyc>js-yaml": true
       }
     },
@@ -2691,24 +2757,24 @@
       },
       "packages": {
         "eslint>eslint-scope>esrecurse": true,
-        "eslint>eslint-scope>estraverse": true
+        "jsdom>escodegen>estraverse": true
       }
     },
     "eslint>eslint-scope>esrecurse": {
       "packages": {
-        "eslint>esquery>estraverse": true
+        "eslint>eslint-scope>esrecurse>estraverse": true
       }
     },
     "eslint>eslint-utils": {
       "packages": {
-        "eslint>eslint-utils>eslint-visitor-keys": true
+        "@babel/eslint-parser>eslint-visitor-keys": true
       }
     },
     "eslint>espree": {
       "packages": {
+        "@babel/eslint-parser>eslint-visitor-keys": true,
         "eslint>espree>acorn": true,
-        "eslint>espree>acorn-jsx": true,
-        "eslint>espree>eslint-visitor-keys": true
+        "eslint>espree>acorn-jsx": true
       }
     },
     "eslint>espree>acorn": {
@@ -2753,7 +2819,21 @@
       },
       "packages": {
         "eslint>file-entry-cache>flat-cache>flatted": true,
-        "nyc>rimraf": true
+        "eslint>file-entry-cache>flat-cache>rimraf": true
+      }
+    },
+    "eslint>file-entry-cache>flat-cache>rimraf": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "nyc>glob": true
       }
     },
     "eslint>glob-parent": {
@@ -2812,17 +2892,6 @@
         "eslint>levn>prelude-ls": true
       }
     },
-    "eslint>minimatch": {
-      "builtin": {
-        "path": true
-      },
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "mocha>minimatch>brace-expansion": true
-      }
-    },
     "eslint>strip-ansi": {
       "packages": {
         "eslint>strip-ansi>ansi-regex": true
@@ -3535,7 +3604,7 @@
       "packages": {
         "gulp-rtlcss>rtlcss>@choojs/findup": true,
         "gulp-rtlcss>rtlcss>postcss": true,
-        "gulp-rtlcss>rtlcss>strip-json-comments": true
+        "rc>strip-json-comments": true
       }
     },
     "gulp-rtlcss>rtlcss>@choojs/findup": {
@@ -3789,10 +3858,10 @@
         "setTimeout": true
       },
       "packages": {
+        "addons-linter>probe-image-size>next-tick": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>is-promise": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": true,
-        "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": true,
         "resolve-url-loader>es6-iterator>d": true,
         "resolve-url-loader>es6-iterator>es5-ext": true
@@ -3809,16 +3878,6 @@
         "resolve-url-loader>es6-iterator>es5-ext": true
       }
     },
-    "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": {
-      "globals": {
-        "MutationObserver": true,
-        "WebKitMutationObserver": true,
-        "document": true,
-        "process": true,
-        "setImmediate": true,
-        "setTimeout": true
-      }
-    },
     "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": {
       "packages": {
         "resolve-url-loader>es6-iterator>es5-ext": true
@@ -4087,6 +4146,7 @@
         "setTimeout": true
       },
       "packages": {
+        "addons-linter>upath": true,
         "gulp-watch>chokidar>anymatch": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>chokidar>braces": true,
@@ -4094,7 +4154,6 @@
         "gulp-watch>chokidar>is-glob": true,
         "gulp-watch>chokidar>normalize-path": true,
         "gulp-watch>chokidar>readdirp": true,
-        "gulp-watch>chokidar>upath": true,
         "gulp-watch>glob-parent": true,
         "gulp-watch>path-is-absolute": true,
         "pumpify>inherits": true
@@ -4392,11 +4451,6 @@
         "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
       }
     },
-    "gulp-watch>chokidar>upath": {
-      "builtin": {
-        "path": true
-      }
-    },
     "gulp-watch>fancy-log": {
       "globals": {
         "console": true,
@@ -4733,6 +4787,7 @@
         "setTimeout": true
       },
       "packages": {
+        "addons-linter>upath": true,
         "eslint>is-glob": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>path-is-absolute": true,
@@ -4742,7 +4797,6 @@
         "gulp>glob-watcher>chokidar>is-binary-path": true,
         "gulp>glob-watcher>chokidar>normalize-path": true,
         "gulp>glob-watcher>chokidar>readdirp": true,
-        "gulp>glob-watcher>chokidar>upath": true,
         "pumpify>inherits": true
       }
     },
@@ -4825,11 +4879,6 @@
         "readable-stream": true
       }
     },
-    "gulp>glob-watcher>chokidar>upath": {
-      "builtin": {
-        "path": true
-      }
-    },
     "gulp>glob-watcher>just-debounce": {
       "globals": {
         "clearTimeout": true,
@@ -5587,6 +5636,17 @@
         "fs.accessSync": true
       }
     },
+    "mocha>minimatch": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console.error": true
+      },
+      "packages": {
+        "mocha>minimatch>brace-expansion": true
+      }
+    },
     "mocha>minimatch>brace-expansion": {
       "packages": {
         "mocha>minimatch>brace-expansion>concat-map": true,
@@ -5670,8 +5730,8 @@
         "process.platform": true
       },
       "packages": {
-        "eslint>minimatch": true,
         "gulp-watch>path-is-absolute": true,
+        "mocha>minimatch": true,
         "nyc>glob>fs.realpath": true,
         "nyc>glob>inflight": true,
         "pump>once": true,
@@ -5726,20 +5786,6 @@
         "path.resolve": true
       }
     },
-    "nyc>rimraf": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "nyc>glob": true
-      }
-    },
     "nyc>signal-exit": {
       "builtin": {
         "assert.equal": true,
@@ -5856,9 +5902,9 @@
         "process.platform": true
       },
       "packages": {
+        "minimist": true,
         "rc>deep-extend": true,
         "rc>ini": true,
-        "rc>minimist": true,
         "rc>strip-json-comments": true
       }
     },
@@ -6638,61 +6684,10 @@
         "__dirname": true
       },
       "packages": {
-        "stylelint>postcss-html>htmlparser2": true,
+        "enzyme>cheerio>htmlparser2": true,
         "stylelint>postcss-syntax": true
       }
     },
-    "stylelint>postcss-html>htmlparser2": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "string_decoder.StringDecoder": true
-      },
-      "packages": {
-        "pumpify>inherits": true,
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>domhandler": true,
-        "stylelint>postcss-html>htmlparser2>domutils": true,
-        "stylelint>postcss-html>htmlparser2>entities": true,
-        "stylelint>postcss-html>htmlparser2>readable-stream": true
-      }
-    },
-    "stylelint>postcss-html>htmlparser2>domhandler": {
-      "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true
-      }
-    },
-    "stylelint>postcss-html>htmlparser2>domutils": {
-      "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": true
-      }
-    },
-    "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": {
-      "packages": {
-        "stylelint>postcss-html>htmlparser2>domelementtype": true,
-        "stylelint>postcss-html>htmlparser2>entities": true
-      }
-    },
-    "stylelint>postcss-html>htmlparser2>readable-stream": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.env.READABLE_STREAM": true,
-        "process.nextTick": true,
-        "process.stderr": true,
-        "process.stdout": true
-      },
-      "packages": {
-        "@storybook/api>util-deprecate": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true
-      }
-    },
     "stylelint>postcss-less": {
       "packages": {
         "stylelint>postcss": true
@@ -7618,82 +7613,12 @@
         "enzyme>rst-selector-parser>nearley>randexp>ret": true
       }
     },
-    "yargs": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path": true,
-        "util": true
-      },
-      "globals": {
-        "Error": true,
-        "console": true,
-        "process": true
-      },
-      "packages": {
-        "yargs>cliui": true,
-        "yargs>escalade": true,
-        "yargs>get-caller-file": true,
-        "yargs>require-directory": true,
-        "yargs>string-width": true,
-        "yargs>y18n": true,
-        "yargs>yargs-parser": true
-      }
-    },
-    "yargs>cliui": {
-      "packages": {
-        "eslint>strip-ansi": true,
-        "yargs>cliui>wrap-ansi": true,
-        "yargs>string-width": true
-      }
-    },
-    "yargs>cliui>wrap-ansi": {
-      "packages": {
-        "chalk>ansi-styles": true,
-        "eslint>strip-ansi": true,
-        "yargs>string-width": true
-      }
-    },
-    "yargs>escalade": {
-      "builtin": {
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.resolve": true
-      }
-    },
-    "yargs>require-directory": {
-      "builtin": {
-        "fs.readdirSync": true,
-        "fs.statSync": true,
-        "path.dirname": true,
-        "path.join": true,
-        "path.resolve": true
-      }
-    },
     "yargs>string-width": {
       "packages": {
         "eslint>strip-ansi": true,
         "yargs>string-width>emoji-regex": true,
         "yargs>string-width>is-fullwidth-code-point": true
       }
-    },
-    "yargs>y18n": {
-      "builtin": {
-        "fs": true,
-        "path": true,
-        "util": true
-      }
-    },
-    "yargs>yargs-parser": {
-      "builtin": {
-        "fs": true,
-        "path": true,
-        "util": true
-      },
-      "globals": {
-        "process": true
-      }
     }
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 2bce1be6329b..123d50c377d2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.18.0",
+  "version": "10.14.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -11,17 +11,14 @@
     "setup:postinstall": "yarn patch-package && yarn allow-scripts",
     "start": "yarn build:dev dev --apply-lavamoat=false",
     "start:lavamoat": "yarn build:dev dev --apply-lavamoat=true",
-    "start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false",
     "dist": "yarn build prod",
     "build": "yarn lavamoat:build",
     "build:dev": "node development/build/index.js",
     "start:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build testDev",
     "benchmark:chrome": "SELENIUM_BROWSER=chrome node test/e2e/benchmark.js",
-    "mv3:stats:chrome": "SELENIUM_BROWSER=chrome ENABLE_MV3=true node test/e2e/mv3-perf-stats/index.js",
     "benchmark:firefox": "SELENIUM_BROWSER=firefox node test/e2e/benchmark.js",
     "build:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test",
     "build:test:flask": "yarn build test --build-type flask",
-    "build:test:mv3": "ENABLE_MV3=true 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'",
@@ -81,9 +78,9 @@
     "**/cross-fetch": "^3.1.5",
     "**/configstore/dot-prop": "^5.1.1",
     "**/ethers/elliptic": "^6.5.4",
-    "**/knex/minimist": "^1.2.6",
-    "**/optimist/minimist": "^1.2.6",
-    "**/socketcluster/minimist": "^1.2.6",
+    "**/knex/minimist": "^1.2.5",
+    "**/optimist/minimist": "^1.2.5",
+    "**/socketcluster/minimist": "^1.2.5",
     "**/redux/symbol-observable": "^2.0.3",
     "**/redux-devtools-instrument/symbol-observable": "^2.0.3",
     "**/rxjs/symbol-observable": "^2.0.3",
@@ -118,9 +115,9 @@
     "@keystonehq/metamask-airgapped-keyring": "0.2.1",
     "@material-ui/core": "^4.11.0",
     "@metamask/contract-metadata": "^1.31.0",
-    "@metamask/controllers": "^30.0.2",
-    "@metamask/design-tokens": "^1.8.0",
-    "@metamask/eth-ledger-bridge-keyring": "^0.13.0",
+    "@metamask/controllers": "^28.0.0",
+    "@metamask/design-tokens": "^1.5.1",
+    "@metamask/eth-ledger-bridge-keyring": "^0.12.0",
     "@metamask/eth-token-tracker": "^4.0.0",
     "@metamask/etherscan-link": "^2.1.0",
     "@metamask/jazzicon": "^2.0.0",
@@ -128,11 +125,11 @@
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/obs-store": "^5.0.0",
     "@metamask/post-message-stream": "^4.0.0",
-    "@metamask/providers": "^9.0.0",
-    "@metamask/rpc-methods": "^0.18.1",
+    "@metamask/providers": "^8.1.1",
+    "@metamask/rpc-methods": "^0.12.0",
     "@metamask/slip44": "^2.1.0",
-    "@metamask/smart-transactions-controller": "^2.1.0",
-    "@metamask/snap-controllers": "^0.18.1",
+    "@metamask/smart-transactions-controller": "^1.10.0",
+    "@metamask/snap-controllers": "^0.12.0",
     "@ngraveio/bc-ur": "^1.1.6",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
@@ -159,7 +156,7 @@
     "eth-json-rpc-filters": "^4.2.1",
     "eth-json-rpc-infura": "^5.1.0",
     "eth-json-rpc-middleware": "^8.0.0",
-    "eth-keyring-controller": "^7.0.2",
+    "eth-keyring-controller": "^6.2.0",
     "eth-lattice-keyring": "^0.7.3",
     "eth-method-registry": "^2.0.0",
     "eth-query": "^2.1.2",
@@ -170,9 +167,10 @@
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^7.0.10",
     "ethereumjs-wallet": "^0.6.4",
-    "ethers": "^5.6.4",
+    "ethers": "^5.0.8",
     "ethjs": "^0.4.0",
     "ethjs-contract": "^0.2.3",
+    "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.4",
     "extension-port-stream": "^2.0.0",
     "fast-json-patch": "^2.2.1",
@@ -252,8 +250,7 @@
     "@metamask/eslint-config-nodejs": "^9.0.0",
     "@metamask/eslint-config-typescript": "^9.0.1",
     "@metamask/forwarder": "^1.1.0",
-    "@metamask/phishing-warning": "^1.2.1",
-    "@metamask/test-dapp": "^5.1.1",
+    "@metamask/test-dapp": "^5.0.0",
     "@sentry/cli": "^1.58.0",
     "@storybook/addon-a11y": "^6.3.12",
     "@storybook/addon-actions": "^6.3.12",
@@ -276,14 +273,14 @@
     "@types/react": "^16.9.53",
     "@typescript-eslint/eslint-plugin": "^4.20.0",
     "@typescript-eslint/parser": "^4.20.0",
-    "addons-linter": "^5.2.0",
+    "addons-linter": "1.14.0",
     "babelify": "^10.0.0",
     "bify-module-groups": "^2.0.0",
     "brfs": "^2.0.2",
     "browser-util-inspect": "^0.2.0",
     "browserify": "^16.5.1",
     "chalk": "^3.0.0",
-    "chromedriver": "^103.0.0",
+    "chromedriver": "^101.0.0",
     "concurrently": "^5.2.0",
     "copy-webpack-plugin": "^6.0.3",
     "cross-spawn": "^7.0.3",
@@ -336,6 +333,7 @@
     "lavamoat-viz": "^6.0.9",
     "lockfile-lint": "^4.0.0",
     "loose-envify": "^1.4.0",
+    "minimist": "^1.2.5",
     "mocha": "^7.2.0",
     "mockttp": "^2.6.0",
     "nock": "^9.0.14",
@@ -356,7 +354,7 @@
     "resolve-url-loader": "^3.1.2",
     "sass": "^1.32.4",
     "sass-loader": "^10.1.1",
-    "selenium-webdriver": "^4.3.1",
+    "selenium-webdriver": "^4.1.0",
     "semver": "^7.3.5",
     "serve-handler": "^6.1.2",
     "sinon": "^9.0.0",
@@ -382,7 +380,7 @@
     "yarn-deduplicate": "^3.1.0"
   },
   "engines": {
-    "node": "^16.0.0",
+    "node": "^14.15.1",
     "yarn": "^1.16.0"
   },
   "lavamoat": {
diff --git a/patches/@lavamoat+lavapack+3.1.0.patch b/patches/@lavamoat+lavapack+3.1.0.patch
deleted file mode 100644
index bdce11c01ddb..000000000000
--- a/patches/@lavamoat+lavapack+3.1.0.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/node_modules/@lavamoat/lavapack/src/pack.js b/node_modules/@lavamoat/lavapack/src/pack.js
-index eb41a0a..3f891ea 100644
---- a/node_modules/@lavamoat/lavapack/src/pack.js
-+++ b/node_modules/@lavamoat/lavapack/src/pack.js
-@@ -203,7 +203,9 @@ function createPacker({
-     const jsonSerializeableData = {
-       // id,
-       package: packageName,
--      file,
-+      // Omit this absolute filename from bundle so that builds are reproducible between environments
-+      // TODO: update lavapack with an option to omit this, and/or make this filepath relative to the current working directory
-+      // file,
-       // deps,
-       // source: sourceMeta.code
-     }
diff --git a/patches/abort-controller+3.0.0.patch b/patches/abort-controller+3.0.0.patch
index c9a7f43aa470..2210446d2100 100644
--- a/patches/abort-controller+3.0.0.patch
+++ b/patches/abort-controller+3.0.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/abort-controller/browser.js b/node_modules/abort-controller/browser.js
-index b0c5ec3..b61071b 100644
+index b0c5ec3..c8c8018 100644
 --- a/node_modules/abort-controller/browser.js
 +++ b/node_modules/abort-controller/browser.js
 @@ -2,12 +2,7 @@
@@ -13,7 +13,6 @@ index b0c5ec3..b61071b 100644
 +const { AbortController } = globalThis;
  /*eslint-enable @mysticatea/prettier */
  
--module.exports = AbortController
+ module.exports = AbortController
 -module.exports.AbortSignal = AbortSignal
 -module.exports.default = AbortController
-+module.exports = { AbortController }
diff --git a/patches/bip39+2.5.0.patch b/patches/bip39+2.5.0.patch
new file mode 100644
index 000000000000..2976f3bb2711
--- /dev/null
+++ b/patches/bip39+2.5.0.patch
@@ -0,0 +1,99 @@
+diff --git a/node_modules/bip39/index.js b/node_modules/bip39/index.js
+index aa0f29f..bee8008 100644
+--- a/node_modules/bip39/index.js
++++ b/node_modules/bip39/index.js
+@@ -48,7 +48,9 @@ function salt (password) {
+ }
+ 
+ function mnemonicToSeed (mnemonic, password) {
+-  var mnemonicBuffer = Buffer.from(unorm.nfkd(mnemonic), 'utf8')
++  var mnemonicBuffer = typeof mnemonic === 'string'
++    ? Buffer.from(unorm.nfkd(mnemonic), 'utf8')
++    : mnemonic
+   var saltBuffer = Buffer.from(salt(unorm.nfkd(password)), 'utf8')
+ 
+   return pbkdf2(mnemonicBuffer, saltBuffer, 2048, 64, 'sha512')
+@@ -61,12 +63,28 @@ function mnemonicToSeedHex (mnemonic, password) {
+ function mnemonicToEntropy (mnemonic, wordlist) {
+   wordlist = wordlist || DEFAULT_WORDLIST
+ 
+-  var words = unorm.nfkd(mnemonic).split(' ')
++  var mnemonicAsBuffer = typeof mnemonic === 'string'
++    ? Buffer.from(unorm.nfkd(mnemonic), 'utf8')
++    : mnemonic
++
++  var words = [];
++  var currentWord = [];
++  for (const byte of mnemonicAsBuffer.values()) {
++    // split at space or \u3000 (ideographic space, for Japanese wordlists)
++    if (byte === 0x20 || byte === 0x3000) {
++      words.push(Buffer.from(currentWord));
++      currentWord = [];
++    } else {
++      currentWord.push(byte);
++    }
++  }
++  words.push(Buffer.from(currentWord));
++
+   if (words.length % 3 !== 0) throw new Error(INVALID_MNEMONIC)
+ 
+   // convert word indices to 11 bit binary strings
+   var bits = words.map(function (word) {
+-    var index = wordlist.indexOf(word)
++    var index = wordlist.indexOf(word.toString('utf8'))
+     if (index === -1) throw new Error(INVALID_MNEMONIC)
+ 
+     return lpad(index.toString(2), '0', 11)
+@@ -104,12 +122,41 @@ function entropyToMnemonic (entropy, wordlist) {
+ 
+   var bits = entropyBits + checksumBits
+   var chunks = bits.match(/(.{1,11})/g)
+-  var words = chunks.map(function (binary) {
++  var wordsAsBuffers = chunks.map(function (binary) {
+     var index = binaryToByte(binary)
+-    return wordlist[index]
++    return Buffer.from(wordlist[index], 'utf8')
+   })
+ 
+-  return wordlist === JAPANESE_WORDLIST ? words.join('\u3000') : words.join(' ')
++  var bufferSize = wordsAsBuffers.reduce(function (bufferSize, wordAsBuffer, i) {
++    var shouldAddSeparator = i < wordsAsBuffers.length - 1
++    return (
++      bufferSize +
++      wordAsBuffer.length +
++      (shouldAddSeparator ? 1 : 0)
++    )
++  }, 0)
++  var separator = wordlist === JAPANESE_WORDLIST ? '\u3000' : ' '
++  var result = wordsAsBuffers.reduce(function (result, wordAsBuffer, i) {
++    var shouldAddSeparator = i < wordsAsBuffers.length - 1
++    result.workingBuffer.set(wordAsBuffer, result.offset)
++    if (shouldAddSeparator) {
++      result.workingBuffer.write(
++        separator,
++        result.offset + wordAsBuffer.length,
++        separator.length,
++        'utf8'
++      )
++    }
++    return {
++      workingBuffer: result.workingBuffer,
++      offset: (
++        result.offset +
++        wordAsBuffer.length +
++        (shouldAddSeparator ? 1 : 0)
++      )
++    }
++  }, { workingBuffer: Buffer.alloc(bufferSize), offset: 0 })
++  return result.workingBuffer;
+ }
+ 
+ function generateMnemonic (strength, rng, wordlist) {
+@@ -124,6 +171,7 @@ function validateMnemonic (mnemonic, wordlist) {
+   try {
+     mnemonicToEntropy(mnemonic, wordlist)
+   } catch (e) {
++    console.log('could not validate mnemonic', e)
+     return false
+   }
+ 
diff --git a/patches/eth-hd-keyring+3.6.0.patch b/patches/eth-hd-keyring+3.6.0.patch
new file mode 100644
index 000000000000..211cb89dd200
--- /dev/null
+++ b/patches/eth-hd-keyring+3.6.0.patch
@@ -0,0 +1,43 @@
+diff --git a/node_modules/eth-hd-keyring/index.js b/node_modules/eth-hd-keyring/index.js
+index 19d1d7f..350d6b8 100644
+--- a/node_modules/eth-hd-keyring/index.js
++++ b/node_modules/eth-hd-keyring/index.js
+@@ -17,8 +17,11 @@ class HdKeyring extends SimpleKeyring {
+   }
+ 
+   serialize () {
++    const mnemonicAsBuffer = typeof this.mnemonic === 'string'
++      ? Buffer.from(this.mnemonic, 'utf8')
++      : this.mnemonic
+     return Promise.resolve({
+-      mnemonic: this.mnemonic,
++      mnemonic: Array.from(mnemonicAsBuffer.values()),
+       numberOfAccounts: this.wallets.length,
+       hdPath: this.hdPath,
+     })
+@@ -69,9 +72,22 @@ class HdKeyring extends SimpleKeyring {
+ 
+   /* PRIVATE METHODS */
+ 
+-  _initFromMnemonic (mnemonic) {
+-    this.mnemonic = mnemonic
+-    const seed = bip39.mnemonicToSeed(mnemonic)
++  /**
++   * Sets appropriate properties for the keyring based on the given
++   * BIP39-compliant mnemonic.
++   *
++   * @param {string|Array<number>|Buffer} mnemonic - A seed phrase represented
++   * as a string, an array of UTF-8 bytes, or a Buffer.
++   */
++  _initFromMnemonic(mnemonic) {
++    if (typeof mnemonic === 'string') {
++      this.mnemonic = Buffer.from(mnemonic, 'utf8')
++    } else if (Array.isArray(mnemonic)) {
++      this.mnemonic = Buffer.from(mnemonic)
++    } else {
++      this.mnemonic = mnemonic
++    }
++    const seed = bip39.mnemonicToSeed(this.mnemonic)
+     this.hdWallet = hdkey.fromMasterSeed(seed)
+     this.root = this.hdWallet.derivePath(this.hdPath)
+   }
diff --git a/patches/eth-keyring-controller+6.2.1.patch b/patches/eth-keyring-controller+6.2.1.patch
new file mode 100644
index 000000000000..aec0c716821d
--- /dev/null
+++ b/patches/eth-keyring-controller+6.2.1.patch
@@ -0,0 +1,37 @@
+diff --git a/node_modules/eth-keyring-controller/index.js b/node_modules/eth-keyring-controller/index.js
+index 250ab98..38615aa 100644
+--- a/node_modules/eth-keyring-controller/index.js
++++ b/node_modules/eth-keyring-controller/index.js
+@@ -84,15 +84,20 @@ class KeyringController extends EventEmitter {
+    *
+    * @emits KeyringController#unlock
+    * @param {string} password - The password to encrypt the vault with
+-   * @param {string} seed - The BIP44-compliant seed phrase.
++   * @param {string|Array<number>} seedPhrase - The BIP39-compliant seed phrase,
++   * either as a string or an array of UTF-8 bytes that represent the string.
+    * @returns {Promise<Object>} A Promise that resolves to the state.
+    */
+-  createNewVaultAndRestore (password, seed) {
++  createNewVaultAndRestore(password, seedPhrase) {
++    const seedPhraseAsBuffer = typeof seedPhrase === 'string'
++      ? Buffer.from(seedPhrase, 'utf8')
++      : Buffer.from(seedPhrase)
++
+     if (typeof password !== 'string') {
+       return Promise.reject(new Error('Password must be text.'))
+     }
+ 
+-    if (!bip39.validateMnemonic(seed)) {
++    if (!bip39.validateMnemonic(seedPhraseAsBuffer)) {
+       return Promise.reject(new Error('Seed phrase is invalid.'))
+     }
+ 
+@@ -101,7 +106,7 @@ class KeyringController extends EventEmitter {
+     return this.persistAllKeyrings(password)
+       .then(() => {
+         return this.addNewKeyring('HD Key Tree', {
+-          mnemonic: seed,
++          mnemonic: seedPhraseAsBuffer,
+           numberOfAccounts: 1,
+         })
+       })
diff --git a/patches/yargs+17.4.1.patch b/patches/yargs+17.4.1.patch
deleted file mode 100644
index 2daf3489c78e..000000000000
--- a/patches/yargs+17.4.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/node_modules/yargs/build/index.cjs b/node_modules/yargs/build/index.cjs
-index b36980a..8c50028 100644
---- a/node_modules/yargs/build/index.cjs
-+++ b/node_modules/yargs/build/index.cjs
-@@ -1 +1,5 @@
--"use strict";var t=require("assert");class e extends Error{constructor(t){super(t||"yargs error"),this.name="YError",Error.captureStackTrace(this,e)}}let s,i=[];function n(t,o,a,h){s=h;let l={};if(Object.prototype.hasOwnProperty.call(t,"extends")){if("string"!=typeof t.extends)return l;const r=/\.json|\..*rc$/.test(t.extends);let h=null;if(r)h=function(t,e){return s.path.resolve(t,e)}(o,t.extends);else try{h=require.resolve(t.extends)}catch(e){return t}!function(t){if(i.indexOf(t)>-1)throw new e(`Circular extended configurations: '${t}'.`)}(h),i.push(h),l=r?JSON.parse(s.readFileSync(h,"utf8")):require(t.extends),delete t.extends,l=n(l,s.path.dirname(h),a,s)}return i=[],a?r(l,t):Object.assign({},l,t)}function r(t,e){const s={};function i(t){return t&&"object"==typeof t&&!Array.isArray(t)}Object.assign(s,t);for(const n of Object.keys(e))i(e[n])&&i(s[n])?s[n]=r(t[n],e[n]):s[n]=e[n];return s}function o(t){const e=t.replace(/\s{2,}/g," ").split(/\s+(?![^[]*]|[^<]*>)/),s=/\.*[\][<>]/g,i=e.shift();if(!i)throw new Error(`No command found in: ${t}`);const n={cmd:i.replace(s,""),demanded:[],optional:[]};return e.forEach(((t,i)=>{let r=!1;t=t.replace(/\s/g,""),/\.+[\]>]/.test(t)&&i===e.length-1&&(r=!0),/^\[/.test(t)?n.optional.push({cmd:t.replace(s,"").split("|"),variadic:r}):n.demanded.push({cmd:t.replace(s,"").split("|"),variadic:r})})),n}const a=["first","second","third","fourth","fifth","sixth"];function h(t,s,i){try{let n=0;const[r,a,h]="object"==typeof t?[{demanded:[],optional:[]},t,s]:[o(`cmd ${t}`),s,i],f=[].slice.call(a);for(;f.length&&void 0===f[f.length-1];)f.pop();const d=h||f.length;if(d<r.demanded.length)throw new e(`Not enough arguments provided. Expected ${r.demanded.length} but received ${f.length}.`);const u=r.demanded.length+r.optional.length;if(d>u)throw new e(`Too many arguments provided. Expected max ${u} but received ${d}.`);r.demanded.forEach((t=>{const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1})),r.optional.forEach((t=>{if(0===f.length)return;const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1}))}catch(t){console.warn(t.stack)}}function l(t){return Array.isArray(t)?"array":null===t?"null":typeof t}function c(t,s,i){throw new e(`Invalid ${a[i]||"manyith"} argument. Expected ${s.join(" or ")} but received ${t}.`)}function f(t){return!!t&&!!t.then&&"function"==typeof t.then}function d(t,e,s,i){s.assert.notStrictEqual(t,e,i)}function u(t,e){e.assert.strictEqual(typeof t,"string")}function p(t){return Object.keys(t)}function g(t={},e=(()=>!0)){const s={};return p(t).forEach((i=>{e(i,t[i])&&(s[i]=t[i])})),s}function m(){return process.versions.electron&&!process.defaultApp?0:1}function y(){return process.argv[m()]}var b=Object.freeze({__proto__:null,hideBin:function(t){return t.slice(m()+1)},getProcessArgvBin:y});function v(t,e,s,i){if("a"===s&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(t):i?i.value:e.get(t)}function O(t,e,s,i,n){if("m"===i)throw new TypeError("Private method is not writable");if("a"===i&&!n)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===i?n.call(t,s):n?n.value=s:e.set(t,s),s}class w{constructor(t){this.globalMiddleware=[],this.frozens=[],this.yargs=t}addMiddleware(t,e,s=!0,i=!1){if(h("<array|function> [boolean] [boolean] [boolean]",[t,e,s],arguments.length),Array.isArray(t)){for(let i=0;i<t.length;i++){if("function"!=typeof t[i])throw Error("middleware must be a function");const n=t[i];n.applyBeforeValidation=e,n.global=s}Array.prototype.push.apply(this.globalMiddleware,t)}else if("function"==typeof t){const n=t;n.applyBeforeValidation=e,n.global=s,n.mutates=i,this.globalMiddleware.push(t)}return this.yargs}addCoerceMiddleware(t,e){const s=this.yargs.getAliases();return this.globalMiddleware=this.globalMiddleware.filter((t=>{const i=[...s[e]||[],e];return!t.option||!i.includes(t.option)})),t.option=e,this.addMiddleware(t,!0,!0,!0)}getMiddleware(){return this.globalMiddleware}freeze(){this.frozens.push([...this.globalMiddleware])}unfreeze(){const t=this.frozens.pop();void 0!==t&&(this.globalMiddleware=t)}reset(){this.globalMiddleware=this.globalMiddleware.filter((t=>t.global))}}function C(t,e,s,i){return s.reduce(((t,s)=>{if(s.applyBeforeValidation!==i)return t;if(s.mutates){if(s.applied)return t;s.applied=!0}if(f(t))return t.then((t=>Promise.all([t,s(t,e)]))).then((([t,e])=>Object.assign(t,e)));{const i=s(t,e);return f(i)?i.then((e=>Object.assign(t,e))):Object.assign(t,i)}}),t)}function j(t,e,s=(t=>{throw t})){try{const s="function"==typeof t?t():t;return f(s)?s.then((t=>e(t))):e(s)}catch(t){return s(t)}}const _=/(^\*)|(^\$0)/;class M{constructor(t,e,s,i){this.requireCache=new Set,this.handlers={},this.aliasMap={},this.frozens=[],this.shim=i,this.usage=t,this.globalMiddleware=s,this.validation=e}addDirectory(t,e,s,i){"boolean"!=typeof(i=i||{}).recurse&&(i.recurse=!1),Array.isArray(i.extensions)||(i.extensions=["js"]);const n="function"==typeof i.visit?i.visit:t=>t;i.visit=(t,e,s)=>{const i=n(t,e,s);if(i){if(this.requireCache.has(e))return i;this.requireCache.add(e),this.addHandler(i)}return i},this.shim.requireDirectory({require:e,filename:s},t,i)}addHandler(t,e,s,i,n,r){let a=[];const h=function(t){return t?t.map((t=>(t.applyBeforeValidation=!1,t))):[]}(n);if(i=i||(()=>{}),Array.isArray(t))if(function(t){return t.every((t=>"string"==typeof t))}(t))[t,...a]=t;else for(const e of t)this.addHandler(e);else{if(function(t){return"object"==typeof t&&!Array.isArray(t)}(t)){let e=Array.isArray(t.command)||"string"==typeof t.command?t.command:this.moduleName(t);return t.aliases&&(e=[].concat(e).concat(t.aliases)),void this.addHandler(e,this.extractDesc(t),t.builder,t.handler,t.middlewares,t.deprecated)}if(k(s))return void this.addHandler([t].concat(a),e,s.builder,s.handler,s.middlewares,s.deprecated)}if("string"==typeof t){const n=o(t);a=a.map((t=>o(t).cmd));let l=!1;const c=[n.cmd].concat(a).filter((t=>!_.test(t)||(l=!0,!1)));0===c.length&&l&&c.push("$0"),l&&(n.cmd=c[0],a=c.slice(1),t=t.replace(_,n.cmd)),a.forEach((t=>{this.aliasMap[t]=n.cmd})),!1!==e&&this.usage.command(t,e,l,a,r),this.handlers[n.cmd]={original:t,description:e,handler:i,builder:s||{},middlewares:h,deprecated:r,demanded:n.demanded,optional:n.optional},l&&(this.defaultCommand=this.handlers[n.cmd])}}getCommandHandlers(){return this.handlers}getCommands(){return Object.keys(this.handlers).concat(Object.keys(this.aliasMap))}hasDefaultCommand(){return!!this.defaultCommand}runCommand(t,e,s,i,n,r){const o=this.handlers[t]||this.handlers[this.aliasMap[t]]||this.defaultCommand,a=e.getInternalMethods().getContext(),h=a.commands.slice(),l=!t;t&&(a.commands.push(t),a.fullCommands.push(o.original));const c=this.applyBuilderUpdateUsageAndParse(l,o,e,s.aliases,h,i,n,r);return f(c)?c.then((t=>this.applyMiddlewareAndGetResult(l,o,t.innerArgv,a,n,t.aliases,e))):this.applyMiddlewareAndGetResult(l,o,c.innerArgv,a,n,c.aliases,e)}applyBuilderUpdateUsageAndParse(t,e,s,i,n,r,o,a){const h=e.builder;let l=s;if(x(h)){const c=h(s.getInternalMethods().reset(i),a);if(f(c))return c.then((i=>{var a;return l=(a=i)&&"function"==typeof a.getInternalMethods?i:s,this.parseAndUpdateUsage(t,e,l,n,r,o)}))}else(function(t){return"object"==typeof t})(h)&&(l=s.getInternalMethods().reset(i),Object.keys(e.builder).forEach((t=>{l.option(t,h[t])})));return this.parseAndUpdateUsage(t,e,l,n,r,o)}parseAndUpdateUsage(t,e,s,i,n,r){t&&s.getInternalMethods().getUsageInstance().unfreeze(!0),this.shouldUpdateUsage(s)&&s.getInternalMethods().getUsageInstance().usage(this.usageFromParentCommandsCommandHandler(i,e),e.description);const o=s.getInternalMethods().runYargsParserAndExecuteCommands(null,void 0,!0,n,r);return f(o)?o.then((t=>({aliases:s.parsed.aliases,innerArgv:t}))):{aliases:s.parsed.aliases,innerArgv:o}}shouldUpdateUsage(t){return!t.getInternalMethods().getUsageInstance().getUsageDisabled()&&0===t.getInternalMethods().getUsageInstance().getUsage().length}usageFromParentCommandsCommandHandler(t,e){const s=_.test(e.original)?e.original.replace(_,"").trim():e.original,i=t.filter((t=>!_.test(t)));return i.push(s),`$0 ${i.join(" ")}`}applyMiddlewareAndGetResult(t,e,s,i,n,r,o){let a={};if(n)return s;o.getInternalMethods().getHasOutput()||(a=this.populatePositionals(e,s,i,o));const h=this.globalMiddleware.getMiddleware().slice(0).concat(e.middlewares);if(s=C(s,o,h,!0),!o.getInternalMethods().getHasOutput()){const e=o.getInternalMethods().runValidation(r,a,o.parsed.error,t);s=j(s,(t=>(e(t),t)))}if(e.handler&&!o.getInternalMethods().getHasOutput()){o.getInternalMethods().setHasOutput();const i=!!o.getOptions().configuration["populate--"];o.getInternalMethods().postProcess(s,i,!1,!1),s=j(s=C(s,o,h,!1),(t=>{const s=e.handler(t);return f(s)?s.then((()=>t)):t})),t||o.getInternalMethods().getUsageInstance().cacheHelpMessage(),f(s)&&!o.getInternalMethods().hasParseCallback()&&s.catch((t=>{try{o.getInternalMethods().getUsageInstance().fail(null,t)}catch(t){}}))}return t||(i.commands.pop(),i.fullCommands.pop()),s}populatePositionals(t,e,s,i){e._=e._.slice(s.commands.length);const n=t.demanded.slice(0),r=t.optional.slice(0),o={};for(this.validation.positionalCount(n.length,e._.length);n.length;){const t=n.shift();this.populatePositional(t,e,o)}for(;r.length;){const t=r.shift();this.populatePositional(t,e,o)}return e._=s.commands.concat(e._.map((t=>""+t))),this.postProcessPositionals(e,o,this.cmdToParseOptions(t.original),i),o}populatePositional(t,e,s){const i=t.cmd[0];t.variadic?s[i]=e._.splice(0).map(String):e._.length&&(s[i]=[String(e._.shift())])}cmdToParseOptions(t){const e={array:[],default:{},alias:{},demand:{}},s=o(t);return s.demanded.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i,e.demand[s]=!0})),s.optional.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i})),e}postProcessPositionals(t,e,s,i){const n=Object.assign({},i.getOptions());n.default=Object.assign(s.default,n.default);for(const t of Object.keys(s.alias))n.alias[t]=(n.alias[t]||[]).concat(s.alias[t]);n.array=n.array.concat(s.array),n.config={};const r=[];if(Object.keys(e).forEach((t=>{e[t].map((e=>{n.configuration["unknown-options-as-args"]&&(n.key[t]=!0),r.push(`--${t}`),r.push(e)}))})),!r.length)return;const o=Object.assign({},n.configuration,{"populate--":!1}),a=this.shim.Parser.detailed(r,Object.assign({},n,{configuration:o}));if(a.error)i.getInternalMethods().getUsageInstance().fail(a.error.message,a.error);else{const s=Object.keys(e);Object.keys(e).forEach((t=>{s.push(...a.aliases[t])}));const n=i.getOptions().default;Object.keys(a.argv).forEach((i=>{s.includes(i)&&(e[i]||(e[i]=a.argv[i]),!Object.hasOwnProperty.call(n,i)&&Object.hasOwnProperty.call(t,i)&&Object.hasOwnProperty.call(a.argv,i)&&(Array.isArray(t[i])||Array.isArray(a.argv[i]))?t[i]=[].concat(t[i],a.argv[i]):t[i]=a.argv[i])}))}}runDefaultBuilderOn(t){if(!this.defaultCommand)return;if(this.shouldUpdateUsage(t)){const e=_.test(this.defaultCommand.original)?this.defaultCommand.original:this.defaultCommand.original.replace(/^[^[\]<>]*/,"$0 ");t.getInternalMethods().getUsageInstance().usage(e,this.defaultCommand.description)}const e=this.defaultCommand.builder;if(x(e))return e(t,!0);k(e)||Object.keys(e).forEach((s=>{t.option(s,e[s])}))}moduleName(t){const e=function(t){if("undefined"==typeof require)return null;for(let e,s=0,i=Object.keys(require.cache);s<i.length;s++)if(e=require.cache[i[s]],e.exports===t)return e;return null}(t);if(!e)throw new Error(`No command name given for module: ${this.shim.inspect(t)}`);return this.commandFromFilename(e.filename)}commandFromFilename(t){return this.shim.path.basename(t,this.shim.path.extname(t))}extractDesc({describe:t,description:e,desc:s}){for(const i of[t,e,s]){if("string"==typeof i||!1===i)return i;d(i,!0,this.shim)}return!1}freeze(){this.frozens.push({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand})}unfreeze(){const t=this.frozens.pop();d(t,void 0,this.shim),({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand}=t)}reset(){return this.handlers={},this.aliasMap={},this.defaultCommand=void 0,this.requireCache=new Set,this}}function k(t){return"object"==typeof t&&!!t.builder&&"function"==typeof t.handler}function x(t){return"function"==typeof t}function E(t){"undefined"!=typeof process&&[process.stdout,process.stderr].forEach((e=>{const s=e;s._handle&&s.isTTY&&"function"==typeof s._handle.setBlocking&&s._handle.setBlocking(t)}))}function A(t){return"boolean"==typeof t}function P(t,s){const i=s.y18n.__,n={},r=[];n.failFn=function(t){r.push(t)};let o=null,a=null,h=!0;n.showHelpOnFail=function(e=!0,s){const[i,r]="string"==typeof e?[!0,e]:[e,s];return t.getInternalMethods().isGlobalContext()&&(a=r),o=r,h=i,n};let l=!1;n.fail=function(s,i){const c=t.getInternalMethods().getLoggerInstance();if(!r.length){if(t.getExitProcess()&&E(!0),!l){l=!0,h&&(t.showHelp("error"),c.error()),(s||i)&&c.error(s||i);const e=o||a;e&&((s||i)&&c.error(""),c.error(e))}if(i=i||new e(s),t.getExitProcess())return t.exit(1);if(t.getInternalMethods().hasParseCallback())return t.exit(1,i);throw i}for(let t=r.length-1;t>=0;--t){const e=r[t];if(A(e)){if(i)throw i;if(s)throw Error(s)}else e(s,i,n)}};let c=[],f=!1;n.usage=(t,e)=>null===t?(f=!0,c=[],n):(f=!1,c.push([t,e||""]),n),n.getUsage=()=>c,n.getUsageDisabled=()=>f,n.getPositionalGroupName=()=>i("Positionals:");let d=[];n.example=(t,e)=>{d.push([t,e||""])};let u=[];n.command=function(t,e,s,i,n=!1){s&&(u=u.map((t=>(t[2]=!1,t)))),u.push([t,e||"",s,i,n])},n.getCommands=()=>u;let p={};n.describe=function(t,e){Array.isArray(t)?t.forEach((t=>{n.describe(t,e)})):"object"==typeof t?Object.keys(t).forEach((e=>{n.describe(e,t[e])})):p[t]=e},n.getDescriptions=()=>p;let m=[];n.epilog=t=>{m.push(t)};let y,b=!1;function v(){return b||(y=function(){const t=80;return s.process.stdColumns?Math.min(t,s.process.stdColumns):t}(),b=!0),y}n.wrap=t=>{b=!0,y=t};const O="__yargsString__:";function w(t,e,i){let n=0;return Array.isArray(t)||(t=Object.values(t).map((t=>[t]))),t.forEach((t=>{n=Math.max(s.stringWidth(i?`${i} ${I(t[0])}`:I(t[0]))+$(t[0]),n)})),e&&(n=Math.min(n,parseInt((.5*e).toString(),10))),n}let C;function j(e){return t.getOptions().hiddenOptions.indexOf(e)<0||t.parsed.argv[t.getOptions().showHiddenOpt]}function _(t,e){let s=`[${i("default:")} `;if(void 0===t&&!e)return null;if(e)s+=e;else switch(typeof t){case"string":s+=`"${t}"`;break;case"object":s+=JSON.stringify(t);break;default:s+=t}return`${s}]`}n.deferY18nLookup=t=>O+t,n.help=function(){if(C)return C;!function(){const e=t.getDemandedOptions(),s=t.getOptions();(Object.keys(s.alias)||[]).forEach((i=>{s.alias[i].forEach((r=>{p[r]&&n.describe(i,p[r]),r in e&&t.demandOption(i,e[r]),s.boolean.includes(r)&&t.boolean(i),s.count.includes(r)&&t.count(i),s.string.includes(r)&&t.string(i),s.normalize.includes(r)&&t.normalize(i),s.array.includes(r)&&t.array(i),s.number.includes(r)&&t.number(i)}))}))}();const e=t.customScriptName?t.$0:s.path.basename(t.$0),r=t.getDemandedOptions(),o=t.getDemandedCommands(),a=t.getDeprecatedOptions(),h=t.getGroups(),l=t.getOptions();let g=[];g=g.concat(Object.keys(p)),g=g.concat(Object.keys(r)),g=g.concat(Object.keys(o)),g=g.concat(Object.keys(l.default)),g=g.filter(j),g=Object.keys(g.reduce(((t,e)=>("_"!==e&&(t[e]=!0),t)),{}));const y=v(),b=s.cliui({width:y,wrap:!!y});if(!f)if(c.length)c.forEach((t=>{b.div({text:`${t[0].replace(/\$0/g,e)}`}),t[1]&&b.div({text:`${t[1]}`,padding:[1,0,0,0]})})),b.div();else if(u.length){let t=null;t=o._?`${e} <${i("command")}>\n`:`${e} [${i("command")}]\n`,b.div(`${t}`)}if(u.length>1||1===u.length&&!u[0][2]){b.div(i("Commands:"));const s=t.getInternalMethods().getContext(),n=s.commands.length?`${s.commands.join(" ")} `:"";!0===t.getInternalMethods().getParserConfiguration()["sort-commands"]&&(u=u.sort(((t,e)=>t[0].localeCompare(e[0]))));const r=e?`${e} `:"";u.forEach((t=>{const s=`${r}${n}${t[0].replace(/^\$0 ?/,"")}`;b.span({text:s,padding:[0,2,0,2],width:w(u,y,`${e}${n}`)+4},{text:t[1]});const o=[];t[2]&&o.push(`[${i("default")}]`),t[3]&&t[3].length&&o.push(`[${i("aliases:")} ${t[3].join(", ")}]`),t[4]&&("string"==typeof t[4]?o.push(`[${i("deprecated: %s",t[4])}]`):o.push(`[${i("deprecated")}]`)),o.length?b.div({text:o.join(" "),padding:[0,0,0,2],align:"right"}):b.div()})),b.div()}const M=(Object.keys(l.alias)||[]).concat(Object.keys(t.parsed.newAliases)||[]);g=g.filter((e=>!t.parsed.newAliases[e]&&M.every((t=>-1===(l.alias[t]||[]).indexOf(e)))));const k=i("Options:");h[k]||(h[k]=[]),function(t,e,s,i){let n=[],r=null;Object.keys(s).forEach((t=>{n=n.concat(s[t])})),t.forEach((t=>{r=[t].concat(e[t]),r.some((t=>-1!==n.indexOf(t)))||s[i].push(t)}))}(g,l.alias,h,k);const x=t=>/^--/.test(I(t)),E=Object.keys(h).filter((t=>h[t].length>0)).map((t=>({groupName:t,normalizedKeys:h[t].filter(j).map((t=>{if(M.includes(t))return t;for(let e,s=0;void 0!==(e=M[s]);s++)if((l.alias[e]||[]).includes(t))return e;return t}))}))).filter((({normalizedKeys:t})=>t.length>0)).map((({groupName:t,normalizedKeys:e})=>{const s=e.reduce(((e,s)=>(e[s]=[s].concat(l.alias[s]||[]).map((e=>t===n.getPositionalGroupName()?e:(/^[0-9]$/.test(e)?l.boolean.includes(s)?"-":"--":e.length>1?"--":"-")+e)).sort(((t,e)=>x(t)===x(e)?0:x(t)?1:-1)).join(", "),e)),{});return{groupName:t,normalizedKeys:e,switches:s}}));if(E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).some((({normalizedKeys:t,switches:e})=>!t.every((t=>x(e[t])))))&&E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).forEach((({normalizedKeys:t,switches:e})=>{t.forEach((t=>{var s,i;x(e[t])&&(e[t]=(s=e[t],i="-x, ".length,S(s)?{text:s.text,indentation:s.indentation+i}:{text:s,indentation:i}))}))})),E.forEach((({groupName:t,normalizedKeys:e,switches:s})=>{b.div(t),e.forEach((t=>{const e=s[t];let o=p[t]||"",h=null;o.includes(O)&&(o=i(o.substring(O.length))),l.boolean.includes(t)&&(h=`[${i("boolean")}]`),l.count.includes(t)&&(h=`[${i("count")}]`),l.string.includes(t)&&(h=`[${i("string")}]`),l.normalize.includes(t)&&(h=`[${i("string")}]`),l.array.includes(t)&&(h=`[${i("array")}]`),l.number.includes(t)&&(h=`[${i("number")}]`);const c=[t in a?(f=a[t],"string"==typeof f?`[${i("deprecated: %s",f)}]`:`[${i("deprecated")}]`):null,h,t in r?`[${i("required")}]`:null,l.choices&&l.choices[t]?`[${i("choices:")} ${n.stringifiedValues(l.choices[t])}]`:null,_(l.default[t],l.defaultDescription[t])].filter(Boolean).join(" ");var f;b.span({text:I(e),padding:[0,2,0,2+$(e)],width:w(s,y)+4},o),c?b.div({text:c,padding:[0,0,0,2],align:"right"}):b.div()})),b.div()})),d.length&&(b.div(i("Examples:")),d.forEach((t=>{t[0]=t[0].replace(/\$0/g,e)})),d.forEach((t=>{""===t[1]?b.div({text:t[0],padding:[0,2,0,2]}):b.div({text:t[0],padding:[0,2,0,2],width:w(d,y)+4},{text:t[1]})})),b.div()),m.length>0){const t=m.map((t=>t.replace(/\$0/g,e))).join("\n");b.div(`${t}\n`)}return b.toString().replace(/\s*$/,"")},n.cacheHelpMessage=function(){C=this.help()},n.clearCachedHelpMessage=function(){C=void 0},n.hasCachedHelpMessage=function(){return!!C},n.showHelp=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(n.help())},n.functionDescription=t=>["(",t.name?s.Parser.decamelize(t.name,"-"):i("generated-value"),")"].join(""),n.stringifiedValues=function(t,e){let s="";const i=e||", ",n=[].concat(t);return t&&n.length?(n.forEach((t=>{s.length&&(s+=i),s+=JSON.stringify(t)})),s):s};let M=null;n.version=t=>{M=t},n.showVersion=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(M)},n.reset=function(t){return o=null,l=!1,c=[],f=!1,m=[],d=[],u=[],p=g(p,(e=>!t[e])),n};const k=[];return n.freeze=function(){k.push({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p})},n.unfreeze=function(t=!1){const e=k.pop();e&&(t?(p={...e.descriptions,...p},u=[...e.commands,...u],c=[...e.usages,...c],d=[...e.examples,...d],m=[...e.epilogs,...m]):({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p}=e))},n}function S(t){return"object"==typeof t}function $(t){return S(t)?t.indentation:0}function I(t){return S(t)?t.text:t}class N{constructor(t,e,s,i){var n,r,o;this.yargs=t,this.usage=e,this.command=s,this.shim=i,this.completionKey="get-yargs-completions",this.aliases=null,this.customCompletionFunction=null,this.indexAfterLastReset=0,this.zshShell=null!==(o=(null===(n=this.shim.getEnv("SHELL"))||void 0===n?void 0:n.includes("zsh"))||(null===(r=this.shim.getEnv("ZSH_NAME"))||void 0===r?void 0:r.includes("zsh")))&&void 0!==o&&o}defaultCompletion(t,e,s,i){const n=this.command.getCommandHandlers();for(let e=0,s=t.length;e<s;++e)if(n[t[e]]&&n[t[e]].builder){const s=n[t[e]].builder;if(x(s)){this.indexAfterLastReset=e+1;const t=this.yargs.getInternalMethods().reset();return s(t,!0),t.argv}}const r=[];this.commandCompletions(r,t,s),this.optionCompletions(r,t,e,s),this.choicesFromOptionsCompletions(r,t,e,s),this.choicesFromPositionalsCompletions(r,t,e,s),i(null,r)}commandCompletions(t,e,s){const i=this.yargs.getInternalMethods().getContext().commands;s.match(/^-/)||i[i.length-1]===s||this.previousArgHasChoices(e)||this.usage.getCommands().forEach((s=>{const i=o(s[0]).cmd;if(-1===e.indexOf(i))if(this.zshShell){const e=s[1]||"";t.push(i.replace(/:/g,"\\:")+":"+e)}else t.push(i)}))}optionCompletions(t,e,s,i){if((i.match(/^-/)||""===i&&0===t.length)&&!this.previousArgHasChoices(e)){const n=this.yargs.getOptions(),r=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[];Object.keys(n.key).forEach((o=>{const a=!!n.configuration["boolean-negation"]&&n.boolean.includes(o);r.includes(o)||n.hiddenOptions.includes(o)||this.argsContainKey(e,s,o,a)||(this.completeOptionKey(o,t,i),a&&n.default[o]&&this.completeOptionKey(`no-${o}`,t,i))}))}}choicesFromOptionsCompletions(t,e,s,i){if(this.previousArgHasChoices(e)){const s=this.getPreviousArgChoices(e);s&&s.length>0&&t.push(...s.map((t=>t.replace(/:/g,"\\:"))))}}choicesFromPositionalsCompletions(t,e,s,i){if(""===i&&t.length>0&&this.previousArgHasChoices(e))return;const n=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[],r=Math.max(this.indexAfterLastReset,this.yargs.getInternalMethods().getContext().commands.length+1),o=n[s._.length-r-1];if(!o)return;const a=this.yargs.getOptions().choices[o]||[];for(const e of a)e.startsWith(i)&&t.push(e.replace(/:/g,"\\:"))}getPreviousArgChoices(t){if(t.length<1)return;let e=t[t.length-1],s="";if(!e.startsWith("-")&&t.length>1&&(s=e,e=t[t.length-2]),!e.startsWith("-"))return;const i=e.replace(/^-+/,""),n=this.yargs.getOptions(),r=[i,...this.yargs.getAliases()[i]||[]];let o;for(const t of r)if(Object.prototype.hasOwnProperty.call(n.key,t)&&Array.isArray(n.choices[t])){o=n.choices[t];break}return o?o.filter((t=>!s||t.startsWith(s))):void 0}previousArgHasChoices(t){const e=this.getPreviousArgChoices(t);return void 0!==e&&e.length>0}argsContainKey(t,e,s,i){if(-1!==t.indexOf(`--${s}`))return!0;if(i&&-1!==t.indexOf(`--no-${s}`))return!0;if(this.aliases)for(const t of this.aliases[s])if(void 0!==e[t])return!0;return!1}completeOptionKey(t,e,s){const i=this.usage.getDescriptions(),n=!/^--/.test(s)&&(t=>/^[^0-9]$/.test(t))(t)?"-":"--";if(this.zshShell){const s=i[t]||"";e.push(n+`${t.replace(/:/g,"\\:")}:${s.replace("__yargsString__:","")}`)}else e.push(n+t)}customCompletion(t,e,s,i){if(d(this.customCompletionFunction,null,this.shim),this.customCompletionFunction.length<3){const t=this.customCompletionFunction(s,e);return f(t)?t.then((t=>{this.shim.process.nextTick((()=>{i(null,t)}))})).catch((t=>{this.shim.process.nextTick((()=>{i(t,void 0)}))})):i(null,t)}return function(t){return t.length>3}(this.customCompletionFunction)?this.customCompletionFunction(s,e,((n=i)=>this.defaultCompletion(t,e,s,n)),(t=>{i(null,t)})):this.customCompletionFunction(s,e,(t=>{i(null,t)}))}getCompletion(t,e){const s=t.length?t[t.length-1]:"",i=this.yargs.parse(t,!0),n=this.customCompletionFunction?i=>this.customCompletion(t,i,s,e):i=>this.defaultCompletion(t,i,s,e);return f(i)?i.then(n):n(i)}generateCompletionScript(t,e){let s=this.zshShell?'#compdef {{app_name}}\n###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.zshrc\n#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n  local reply\n  local si=$IFS\n  IFS=$\'\n\' reply=($(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" {{app_path}} --get-yargs-completions "${words[@]}"))\n  IFS=$si\n  _describe \'values\' reply\n}\ncompdef _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n':'###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.bashrc\n#    or {{app_path}} {{completion_command}} >> ~/.bash_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n    local cur_word args type_list\n\n    cur_word="${COMP_WORDS[COMP_CWORD]}"\n    args=("${COMP_WORDS[@]}")\n\n    # ask yargs to generate completions.\n    type_list=$({{app_path}} --get-yargs-completions "${args[@]}")\n\n    COMPREPLY=( $(compgen -W "${type_list}" -- ${cur_word}) )\n\n    # if no match was found, fall back to filename completion\n    if [ ${#COMPREPLY[@]} -eq 0 ]; then\n      COMPREPLY=()\n    fi\n\n    return 0\n}\ncomplete -o bashdefault -o default -F _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n';const i=this.shim.path.basename(t);return t.match(/\.js$/)&&(t=`./${t}`),s=s.replace(/{{app_name}}/g,i),s=s.replace(/{{completion_command}}/g,e),s.replace(/{{app_path}}/g,t)}registerFunction(t){this.customCompletionFunction=t}setParsed(t){this.aliases=t.aliases}}function D(t,e){if(0===t.length)return e.length;if(0===e.length)return t.length;const s=[];let i,n;for(i=0;i<=e.length;i++)s[i]=[i];for(n=0;n<=t.length;n++)s[0][n]=n;for(i=1;i<=e.length;i++)for(n=1;n<=t.length;n++)e.charAt(i-1)===t.charAt(n-1)?s[i][n]=s[i-1][n-1]:i>1&&n>1&&e.charAt(i-2)===t.charAt(n-1)&&e.charAt(i-1)===t.charAt(n-2)?s[i][n]=s[i-2][n-2]+1:s[i][n]=Math.min(s[i-1][n-1]+1,Math.min(s[i][n-1]+1,s[i-1][n]+1));return s[e.length][t.length]}const H=["$0","--","_"];var z,q,W,F,U,L,V,G,R,T,K,B,Y,J,Z,X,Q,tt,et,st,it,nt,rt,ot,at,ht,lt,ct,ft,dt,ut,pt,gt,mt;const yt=Symbol("copyDoubleDash"),bt=Symbol("copyDoubleDash"),vt=Symbol("deleteFromParserHintObject"),Ot=Symbol("emitWarning"),wt=Symbol("freeze"),Ct=Symbol("getDollarZero"),jt=Symbol("getParserConfiguration"),_t=Symbol("guessLocale"),Mt=Symbol("guessVersion"),kt=Symbol("parsePositionalNumbers"),xt=Symbol("pkgUp"),Et=Symbol("populateParserHintArray"),At=Symbol("populateParserHintSingleValueDictionary"),Pt=Symbol("populateParserHintArrayDictionary"),St=Symbol("populateParserHintDictionary"),$t=Symbol("sanitizeKey"),It=Symbol("setKey"),Nt=Symbol("unfreeze"),Dt=Symbol("validateAsync"),Ht=Symbol("getCommandInstance"),zt=Symbol("getContext"),qt=Symbol("getHasOutput"),Wt=Symbol("getLoggerInstance"),Ft=Symbol("getParseContext"),Ut=Symbol("getUsageInstance"),Lt=Symbol("getValidationInstance"),Vt=Symbol("hasParseCallback"),Gt=Symbol("isGlobalContext"),Rt=Symbol("postProcess"),Tt=Symbol("rebase"),Kt=Symbol("reset"),Bt=Symbol("runYargsParserAndExecuteCommands"),Yt=Symbol("runValidation"),Jt=Symbol("setHasOutput"),Zt=Symbol("kTrackManuallySetKeys");class Xt{constructor(t=[],e,s,i){this.customScriptName=!1,this.parsed=!1,z.set(this,void 0),q.set(this,void 0),W.set(this,{commands:[],fullCommands:[]}),F.set(this,null),U.set(this,null),L.set(this,"show-hidden"),V.set(this,null),G.set(this,!0),R.set(this,{}),T.set(this,!0),K.set(this,[]),B.set(this,void 0),Y.set(this,{}),J.set(this,!1),Z.set(this,null),X.set(this,!0),Q.set(this,void 0),tt.set(this,""),et.set(this,void 0),st.set(this,void 0),it.set(this,{}),nt.set(this,null),rt.set(this,null),ot.set(this,{}),at.set(this,{}),ht.set(this,void 0),lt.set(this,!1),ct.set(this,void 0),ft.set(this,!1),dt.set(this,!1),ut.set(this,!1),pt.set(this,void 0),gt.set(this,null),mt.set(this,void 0),O(this,ct,i,"f"),O(this,ht,t,"f"),O(this,q,e,"f"),O(this,st,s,"f"),O(this,B,new w(this),"f"),this.$0=this[Ct](),this[Kt](),O(this,z,v(this,z,"f"),"f"),O(this,pt,v(this,pt,"f"),"f"),O(this,mt,v(this,mt,"f"),"f"),O(this,et,v(this,et,"f"),"f"),v(this,et,"f").showHiddenOpt=v(this,L,"f"),O(this,Q,this[bt](),"f")}addHelpOpt(t,e){return h("[string|boolean] [string]",[t,e],arguments.length),v(this,Z,"f")&&(this[vt](v(this,Z,"f")),O(this,Z,null,"f")),!1===t&&void 0===e||(O(this,Z,"string"==typeof t?t:"help","f"),this.boolean(v(this,Z,"f")),this.describe(v(this,Z,"f"),e||v(this,pt,"f").deferY18nLookup("Show help"))),this}help(t,e){return this.addHelpOpt(t,e)}addShowHiddenOpt(t,e){if(h("[string|boolean] [string]",[t,e],arguments.length),!1===t&&void 0===e)return this;const s="string"==typeof t?t:v(this,L,"f");return this.boolean(s),this.describe(s,e||v(this,pt,"f").deferY18nLookup("Show hidden options")),v(this,et,"f").showHiddenOpt=s,this}showHidden(t,e){return this.addShowHiddenOpt(t,e)}alias(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.alias.bind(this),"alias",t,e),this}array(t){return h("<array|string>",[t],arguments.length),this[Et]("array",t),this[Zt](t),this}boolean(t){return h("<array|string>",[t],arguments.length),this[Et]("boolean",t),this[Zt](t),this}check(t,e){return h("<function> [boolean]",[t,e],arguments.length),this.middleware(((e,s)=>j((()=>t(e,s.getOptions())),(s=>(s?("string"==typeof s||s instanceof Error)&&v(this,pt,"f").fail(s.toString(),s):v(this,pt,"f").fail(v(this,ct,"f").y18n.__("Argument check failed: %s",t.toString())),e)),(t=>(v(this,pt,"f").fail(t.message?t.message:t.toString(),t),e)))),!1,e),this}choices(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.choices.bind(this),"choices",t,e),this}coerce(t,s){if(h("<object|string|array> [function]",[t,s],arguments.length),Array.isArray(t)){if(!s)throw new e("coerce callback must be provided");for(const e of t)this.coerce(e,s);return this}if("object"==typeof t){for(const e of Object.keys(t))this.coerce(e,t[e]);return this}if(!s)throw new e("coerce callback must be provided");return v(this,et,"f").key[t]=!0,v(this,B,"f").addCoerceMiddleware(((i,n)=>{let r;return Object.hasOwnProperty.call(i,t)?j((()=>(r=n.getAliases(),s(i[t]))),(e=>{i[t]=e;const s=n.getInternalMethods().getParserConfiguration()["strip-aliased"];if(r[t]&&!0!==s)for(const s of r[t])i[s]=e;return i}),(t=>{throw new e(t.message)})):i}),t),this}conflicts(t,e){return h("<string|object> [string|array]",[t,e],arguments.length),v(this,mt,"f").conflicts(t,e),this}config(t="config",e,s){return h("[object|string] [string|function] [function]",[t,e,s],arguments.length),"object"!=typeof t||Array.isArray(t)?("function"==typeof e&&(s=e,e=void 0),this.describe(t,e||v(this,pt,"f").deferY18nLookup("Path to JSON config file")),(Array.isArray(t)?t:[t]).forEach((t=>{v(this,et,"f").config[t]=s||!0})),this):(t=n(t,v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(t),this)}completion(t,e,s){return h("[string] [string|boolean|function] [function]",[t,e,s],arguments.length),"function"==typeof e&&(s=e,e=void 0),O(this,U,t||v(this,U,"f")||"completion","f"),e||!1===e||(e="generate completion script"),this.command(v(this,U,"f"),e),s&&v(this,F,"f").registerFunction(s),this}command(t,e,s,i,n,r){return h("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]",[t,e,s,i,n,r],arguments.length),v(this,z,"f").addHandler(t,e,s,i,n,r),this}commands(t,e,s,i,n,r){return this.command(t,e,s,i,n,r)}commandDir(t,e){h("<string> [object]",[t,e],arguments.length);const s=v(this,st,"f")||v(this,ct,"f").require;return v(this,z,"f").addDirectory(t,s,v(this,ct,"f").getCallerFile(),e),this}count(t){return h("<array|string>",[t],arguments.length),this[Et]("count",t),this[Zt](t),this}default(t,e,s){return h("<object|string|array> [*] [string]",[t,e,s],arguments.length),s&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]=s),"function"==typeof e&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]||(v(this,et,"f").defaultDescription[t]=v(this,pt,"f").functionDescription(e)),e=e.call()),this[At](this.default.bind(this),"default",t,e),this}defaults(t,e,s){return this.default(t,e,s)}demandCommand(t=1,e,s,i){return h("[number] [number|string] [string|null|undefined] [string|null|undefined]",[t,e,s,i],arguments.length),"number"!=typeof e&&(s=e,e=1/0),this.global("_",!1),v(this,et,"f").demandedCommands._={min:t,max:e,minMsg:s,maxMsg:i},this}demand(t,e,s){return Array.isArray(e)?(e.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})),e=1/0):"number"!=typeof e&&(s=e,e=1/0),"number"==typeof t?(d(s,!0,v(this,ct,"f")),this.demandCommand(t,e,s,s)):Array.isArray(t)?t.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})):"string"==typeof s?this.demandOption(t,s):!0!==s&&void 0!==s||this.demandOption(t),this}demandOption(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[At](this.demandOption.bind(this),"demandedOptions",t,e),this}deprecateOption(t,e){return h("<string> [string|boolean]",[t,e],arguments.length),v(this,et,"f").deprecatedOptions[t]=e,this}describe(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[It](t,!0),v(this,pt,"f").describe(t,e),this}detectLocale(t){return h("<boolean>",[t],arguments.length),O(this,G,t,"f"),this}env(t){return h("[string|boolean]",[t],arguments.length),!1===t?delete v(this,et,"f").envPrefix:v(this,et,"f").envPrefix=t||"",this}epilogue(t){return h("<string>",[t],arguments.length),v(this,pt,"f").epilog(t),this}epilog(t){return this.epilogue(t)}example(t,e){return h("<string|array> [string]",[t,e],arguments.length),Array.isArray(t)?t.forEach((t=>this.example(...t))):v(this,pt,"f").example(t,e),this}exit(t,e){O(this,J,!0,"f"),O(this,V,e,"f"),v(this,T,"f")&&v(this,ct,"f").process.exit(t)}exitProcess(t=!0){return h("[boolean]",[t],arguments.length),O(this,T,t,"f"),this}fail(t){if(h("<function|boolean>",[t],arguments.length),"boolean"==typeof t&&!1!==t)throw new e("Invalid first argument. Expected function or boolean 'false'");return v(this,pt,"f").failFn(t),this}getAliases(){return this.parsed?this.parsed.aliases:{}}async getCompletion(t,e){return h("<array> [function]",[t,e],arguments.length),e?v(this,F,"f").getCompletion(t,e):new Promise(((e,s)=>{v(this,F,"f").getCompletion(t,((t,i)=>{t?s(t):e(i)}))}))}getDemandedOptions(){return h([],0),v(this,et,"f").demandedOptions}getDemandedCommands(){return h([],0),v(this,et,"f").demandedCommands}getDeprecatedOptions(){return h([],0),v(this,et,"f").deprecatedOptions}getDetectLocale(){return v(this,G,"f")}getExitProcess(){return v(this,T,"f")}getGroups(){return Object.assign({},v(this,Y,"f"),v(this,at,"f"))}getHelp(){if(O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const t=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(t))return t.then((()=>v(this,pt,"f").help()))}const t=v(this,z,"f").runDefaultBuilderOn(this);if(f(t))return t.then((()=>v(this,pt,"f").help()))}return Promise.resolve(v(this,pt,"f").help())}getOptions(){return v(this,et,"f")}getStrict(){return v(this,ft,"f")}getStrictCommands(){return v(this,dt,"f")}getStrictOptions(){return v(this,ut,"f")}global(t,e){return h("<string|array> [boolean]",[t,e],arguments.length),t=[].concat(t),!1!==e?v(this,et,"f").local=v(this,et,"f").local.filter((e=>-1===t.indexOf(e))):t.forEach((t=>{v(this,et,"f").local.includes(t)||v(this,et,"f").local.push(t)})),this}group(t,e){h("<string|array> <string>",[t,e],arguments.length);const s=v(this,at,"f")[e]||v(this,Y,"f")[e];v(this,at,"f")[e]&&delete v(this,at,"f")[e];const i={};return v(this,Y,"f")[e]=(s||[]).concat(t).filter((t=>!i[t]&&(i[t]=!0))),this}hide(t){return h("<string>",[t],arguments.length),v(this,et,"f").hiddenOptions.push(t),this}implies(t,e){return h("<string|object> [number|string|array]",[t,e],arguments.length),v(this,mt,"f").implies(t,e),this}locale(t){return h("[string]",[t],arguments.length),t?(O(this,G,!1,"f"),v(this,ct,"f").y18n.setLocale(t),this):(this[_t](),v(this,ct,"f").y18n.getLocale())}middleware(t,e,s){return v(this,B,"f").addMiddleware(t,!!e,s)}nargs(t,e){return h("<string|object|array> [number]",[t,e],arguments.length),this[At](this.nargs.bind(this),"narg",t,e),this}normalize(t){return h("<array|string>",[t],arguments.length),this[Et]("normalize",t),this}number(t){return h("<array|string>",[t],arguments.length),this[Et]("number",t),this[Zt](t),this}option(t,e){if(h("<string|object> [object]",[t,e],arguments.length),"object"==typeof t)Object.keys(t).forEach((e=>{this.options(e,t[e])}));else{"object"!=typeof e&&(e={}),this[Zt](t),!v(this,gt,"f")||"version"!==t&&"version"!==(null==e?void 0:e.alias)||this[Ot](['"version" is a reserved word.',"Please do one of the following:",'- Disable version with `yargs.version(false)` if using "version" as an option',"- Use the built-in `yargs.version` method instead (if applicable)","- Use a different option key","https://yargs.js.org/docs/#api-reference-version"].join("\n"),void 0,"versionWarning"),v(this,et,"f").key[t]=!0,e.alias&&this.alias(t,e.alias);const s=e.deprecate||e.deprecated;s&&this.deprecateOption(t,s);const i=e.demand||e.required||e.require;i&&this.demand(t,i),e.demandOption&&this.demandOption(t,"string"==typeof e.demandOption?e.demandOption:void 0),e.conflicts&&this.conflicts(t,e.conflicts),"default"in e&&this.default(t,e.default),void 0!==e.implies&&this.implies(t,e.implies),void 0!==e.nargs&&this.nargs(t,e.nargs),e.config&&this.config(t,e.configParser),e.normalize&&this.normalize(t),e.choices&&this.choices(t,e.choices),e.coerce&&this.coerce(t,e.coerce),e.group&&this.group(t,e.group),(e.boolean||"boolean"===e.type)&&(this.boolean(t),e.alias&&this.boolean(e.alias)),(e.array||"array"===e.type)&&(this.array(t),e.alias&&this.array(e.alias)),(e.number||"number"===e.type)&&(this.number(t),e.alias&&this.number(e.alias)),(e.string||"string"===e.type)&&(this.string(t),e.alias&&this.string(e.alias)),(e.count||"count"===e.type)&&this.count(t),"boolean"==typeof e.global&&this.global(t,e.global),e.defaultDescription&&(v(this,et,"f").defaultDescription[t]=e.defaultDescription),e.skipValidation&&this.skipValidation(t);const n=e.describe||e.description||e.desc;this.describe(t,n),e.hidden&&this.hide(t),e.requiresArg&&this.requiresArg(t)}return this}options(t,e){return this.option(t,e)}parse(t,e,s){h("[string|array] [function|boolean|object] [function]",[t,e,s],arguments.length),this[wt](),void 0===t&&(t=v(this,ht,"f")),"object"==typeof e&&(O(this,rt,e,"f"),e=s),"function"==typeof e&&(O(this,nt,e,"f"),e=!1),e||O(this,ht,t,"f"),v(this,nt,"f")&&O(this,T,!1,"f");const i=this[Bt](t,!!e),n=this.parsed;return v(this,F,"f").setParsed(this.parsed),f(i)?i.then((t=>(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),t,v(this,tt,"f")),t))).catch((t=>{throw v(this,nt,"f")&&v(this,nt,"f")(t,this.parsed.argv,v(this,tt,"f")),t})).finally((()=>{this[Nt](),this.parsed=n})):(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),i,v(this,tt,"f")),this[Nt](),this.parsed=n,i)}parseAsync(t,e,s){const i=this.parse(t,e,s);return f(i)?i:Promise.resolve(i)}parseSync(t,s,i){const n=this.parse(t,s,i);if(f(n))throw new e(".parseSync() must not be used with asynchronous builders, handlers, or middleware");return n}parserConfiguration(t){return h("<object>",[t],arguments.length),O(this,it,t,"f"),this}pkgConf(t,e){h("<string> [string]",[t,e],arguments.length);let s=null;const i=this[xt](e||v(this,q,"f"));return i[t]&&"object"==typeof i[t]&&(s=n(i[t],e||v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(s)),this}positional(t,e){h("<string> <object>",[t,e],arguments.length);const s=["default","defaultDescription","implies","normalize","choices","conflicts","coerce","type","describe","desc","description","alias"];e=g(e,((t,e)=>!("type"===t&&!["string","number","boolean"].includes(e))&&s.includes(t)));const i=v(this,W,"f").fullCommands[v(this,W,"f").fullCommands.length-1],n=i?v(this,z,"f").cmdToParseOptions(i):{array:[],alias:{},default:{},demand:{}};return p(n).forEach((s=>{const i=n[s];Array.isArray(i)?-1!==i.indexOf(t)&&(e[s]=!0):i[t]&&!(s in e)&&(e[s]=i[t])})),this.group(t,v(this,pt,"f").getPositionalGroupName()),this.option(t,e)}recommendCommands(t=!0){return h("[boolean]",[t],arguments.length),O(this,lt,t,"f"),this}required(t,e,s){return this.demand(t,e,s)}require(t,e,s){return this.demand(t,e,s)}requiresArg(t){return h("<array|string|object> [number]",[t],arguments.length),"string"==typeof t&&v(this,et,"f").narg[t]||this[At](this.requiresArg.bind(this),"narg",t,NaN),this}showCompletionScript(t,e){return h("[string] [string]",[t,e],arguments.length),t=t||this.$0,v(this,Q,"f").log(v(this,F,"f").generateCompletionScript(t,e||v(this,U,"f")||"completion")),this}showHelp(t){if(h("[string|function]",[t],arguments.length),O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const e=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}const e=v(this,z,"f").runDefaultBuilderOn(this);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}return v(this,pt,"f").showHelp(t),this}scriptName(t){return this.customScriptName=!0,this.$0=t,this}showHelpOnFail(t,e){return h("[boolean|string] [string]",[t,e],arguments.length),v(this,pt,"f").showHelpOnFail(t,e),this}showVersion(t){return h("[string|function]",[t],arguments.length),v(this,pt,"f").showVersion(t),this}skipValidation(t){return h("<array|string>",[t],arguments.length),this[Et]("skipValidation",t),this}strict(t){return h("[boolean]",[t],arguments.length),O(this,ft,!1!==t,"f"),this}strictCommands(t){return h("[boolean]",[t],arguments.length),O(this,dt,!1!==t,"f"),this}strictOptions(t){return h("[boolean]",[t],arguments.length),O(this,ut,!1!==t,"f"),this}string(t){return h("<array|string>",[t],arguments.length),this[Et]("string",t),this[Zt](t),this}terminalWidth(){return h([],0),v(this,ct,"f").process.stdColumns}updateLocale(t){return this.updateStrings(t)}updateStrings(t){return h("<object>",[t],arguments.length),O(this,G,!1,"f"),v(this,ct,"f").y18n.updateLocale(t),this}usage(t,s,i,n){if(h("<string|null|undefined> [string|boolean] [function|object] [function]",[t,s,i,n],arguments.length),void 0!==s){if(d(t,null,v(this,ct,"f")),(t||"").match(/^\$0( |$)/))return this.command(t,s,i,n);throw new e(".usage() description must start with $0 if being used as alias for .command()")}return v(this,pt,"f").usage(t),this}version(t,e,s){const i="version";if(h("[boolean|string] [string] [string]",[t,e,s],arguments.length),v(this,gt,"f")&&(this[vt](v(this,gt,"f")),v(this,pt,"f").version(void 0),O(this,gt,null,"f")),0===arguments.length)s=this[Mt](),t=i;else if(1===arguments.length){if(!1===t)return this;s=t,t=i}else 2===arguments.length&&(s=e,e=void 0);return O(this,gt,"string"==typeof t?t:i,"f"),e=e||v(this,pt,"f").deferY18nLookup("Show version number"),v(this,pt,"f").version(s||void 0),this.boolean(v(this,gt,"f")),this.describe(v(this,gt,"f"),e),this}wrap(t){return h("<number|null|undefined>",[t],arguments.length),v(this,pt,"f").wrap(t),this}[(z=new WeakMap,q=new WeakMap,W=new WeakMap,F=new WeakMap,U=new WeakMap,L=new WeakMap,V=new WeakMap,G=new WeakMap,R=new WeakMap,T=new WeakMap,K=new WeakMap,B=new WeakMap,Y=new WeakMap,J=new WeakMap,Z=new WeakMap,X=new WeakMap,Q=new WeakMap,tt=new WeakMap,et=new WeakMap,st=new WeakMap,it=new WeakMap,nt=new WeakMap,rt=new WeakMap,ot=new WeakMap,at=new WeakMap,ht=new WeakMap,lt=new WeakMap,ct=new WeakMap,ft=new WeakMap,dt=new WeakMap,ut=new WeakMap,pt=new WeakMap,gt=new WeakMap,mt=new WeakMap,yt)](t){if(!t._||!t["--"])return t;t._.push.apply(t._,t["--"]);try{delete t["--"]}catch(t){}return t}[bt](){return{log:(...t)=>{this[Vt]()||console.log(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")},error:(...t)=>{this[Vt]()||console.error(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")}}}[vt](t){p(v(this,et,"f")).forEach((e=>{if("configObjects"===e)return;const s=v(this,et,"f")[e];Array.isArray(s)?s.includes(t)&&s.splice(s.indexOf(t),1):"object"==typeof s&&delete s[t]})),delete v(this,pt,"f").getDescriptions()[t]}[Ot](t,e,s){v(this,R,"f")[s]||(v(this,ct,"f").process.emitWarning(t,e),v(this,R,"f")[s]=!0)}[wt](){v(this,K,"f").push({options:v(this,et,"f"),configObjects:v(this,et,"f").configObjects.slice(0),exitProcess:v(this,T,"f"),groups:v(this,Y,"f"),strict:v(this,ft,"f"),strictCommands:v(this,dt,"f"),strictOptions:v(this,ut,"f"),completionCommand:v(this,U,"f"),output:v(this,tt,"f"),exitError:v(this,V,"f"),hasOutput:v(this,J,"f"),parsed:this.parsed,parseFn:v(this,nt,"f"),parseContext:v(this,rt,"f")}),v(this,pt,"f").freeze(),v(this,mt,"f").freeze(),v(this,z,"f").freeze(),v(this,B,"f").freeze()}[Ct](){let t,e="";return t=/\b(node|iojs|electron)(\.exe)?$/.test(v(this,ct,"f").process.argv()[0])?v(this,ct,"f").process.argv().slice(1,2):v(this,ct,"f").process.argv().slice(0,1),e=t.map((t=>{const e=this[Tt](v(this,q,"f"),t);return t.match(/^(\/|([a-zA-Z]:)?\\)/)&&e.length<t.length?e:t})).join(" ").trim(),v(this,ct,"f").getEnv("_")&&v(this,ct,"f").getProcessArgvBin()===v(this,ct,"f").getEnv("_")&&(e=v(this,ct,"f").getEnv("_").replace(`${v(this,ct,"f").path.dirname(v(this,ct,"f").process.execPath())}/`,"")),e}[jt](){return v(this,it,"f")}[_t](){if(!v(this,G,"f"))return;const t=v(this,ct,"f").getEnv("LC_ALL")||v(this,ct,"f").getEnv("LC_MESSAGES")||v(this,ct,"f").getEnv("LANG")||v(this,ct,"f").getEnv("LANGUAGE")||"en_US";this.locale(t.replace(/[.:].*/,""))}[Mt](){return this[xt]().version||"unknown"}[kt](t){const e=t["--"]?t["--"]:t._;for(let t,s=0;void 0!==(t=e[s]);s++)v(this,ct,"f").Parser.looksLikeNumber(t)&&Number.isSafeInteger(Math.floor(parseFloat(`${t}`)))&&(e[s]=Number(t));return t}[xt](t){const e=t||"*";if(v(this,ot,"f")[e])return v(this,ot,"f")[e];let s={};try{let e=t||v(this,ct,"f").mainFilename;!t&&v(this,ct,"f").path.extname(e)&&(e=v(this,ct,"f").path.dirname(e));const i=v(this,ct,"f").findUp(e,((t,e)=>e.includes("package.json")?"package.json":void 0));d(i,void 0,v(this,ct,"f")),s=JSON.parse(v(this,ct,"f").readFileSync(i,"utf8"))}catch(t){}return v(this,ot,"f")[e]=s||{},v(this,ot,"f")[e]}[Et](t,e){(e=[].concat(e)).forEach((e=>{e=this[$t](e),v(this,et,"f")[t].push(e)}))}[At](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=s}))}[Pt](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=(v(this,et,"f")[t][e]||[]).concat(s)}))}[St](t,e,s,i,n){if(Array.isArray(s))s.forEach((e=>{t(e,i)}));else if((t=>"object"==typeof t)(s))for(const e of p(s))t(e,s[e]);else n(e,this[$t](s),i)}[$t](t){return"__proto__"===t?"___proto___":t}[It](t,e){return this[At](this[It].bind(this),"key",t,e),this}[Nt](){var t,e,s,i,n,r,o,a,h,l,c,f;const u=v(this,K,"f").pop();let p;d(u,void 0,v(this,ct,"f")),t=this,e=this,s=this,i=this,n=this,r=this,o=this,a=this,h=this,l=this,c=this,f=this,({options:{set value(e){O(t,et,e,"f")}}.value,configObjects:p,exitProcess:{set value(t){O(e,T,t,"f")}}.value,groups:{set value(t){O(s,Y,t,"f")}}.value,output:{set value(t){O(i,tt,t,"f")}}.value,exitError:{set value(t){O(n,V,t,"f")}}.value,hasOutput:{set value(t){O(r,J,t,"f")}}.value,parsed:this.parsed,strict:{set value(t){O(o,ft,t,"f")}}.value,strictCommands:{set value(t){O(a,dt,t,"f")}}.value,strictOptions:{set value(t){O(h,ut,t,"f")}}.value,completionCommand:{set value(t){O(l,U,t,"f")}}.value,parseFn:{set value(t){O(c,nt,t,"f")}}.value,parseContext:{set value(t){O(f,rt,t,"f")}}.value}=u),v(this,et,"f").configObjects=p,v(this,pt,"f").unfreeze(),v(this,mt,"f").unfreeze(),v(this,z,"f").unfreeze(),v(this,B,"f").unfreeze()}[Dt](t,e){return j(e,(e=>(t(e),e)))}getInternalMethods(){return{getCommandInstance:this[Ht].bind(this),getContext:this[zt].bind(this),getHasOutput:this[qt].bind(this),getLoggerInstance:this[Wt].bind(this),getParseContext:this[Ft].bind(this),getParserConfiguration:this[jt].bind(this),getUsageInstance:this[Ut].bind(this),getValidationInstance:this[Lt].bind(this),hasParseCallback:this[Vt].bind(this),isGlobalContext:this[Gt].bind(this),postProcess:this[Rt].bind(this),reset:this[Kt].bind(this),runValidation:this[Yt].bind(this),runYargsParserAndExecuteCommands:this[Bt].bind(this),setHasOutput:this[Jt].bind(this)}}[Ht](){return v(this,z,"f")}[zt](){return v(this,W,"f")}[qt](){return v(this,J,"f")}[Wt](){return v(this,Q,"f")}[Ft](){return v(this,rt,"f")||{}}[Ut](){return v(this,pt,"f")}[Lt](){return v(this,mt,"f")}[Vt](){return!!v(this,nt,"f")}[Gt](){return v(this,X,"f")}[Rt](t,e,s,i){if(s)return t;if(f(t))return t;e||(t=this[yt](t));return(this[jt]()["parse-positional-numbers"]||void 0===this[jt]()["parse-positional-numbers"])&&(t=this[kt](t)),i&&(t=C(t,this,v(this,B,"f").getMiddleware(),!1)),t}[Kt](t={}){O(this,et,v(this,et,"f")||{},"f");const e={};e.local=v(this,et,"f").local||[],e.configObjects=v(this,et,"f").configObjects||[];const s={};e.local.forEach((e=>{s[e]=!0,(t[e]||[]).forEach((t=>{s[t]=!0}))})),Object.assign(v(this,at,"f"),Object.keys(v(this,Y,"f")).reduce(((t,e)=>{const i=v(this,Y,"f")[e].filter((t=>!(t in s)));return i.length>0&&(t[e]=i),t}),{})),O(this,Y,{},"f");return["array","boolean","string","skipValidation","count","normalize","number","hiddenOptions"].forEach((t=>{e[t]=(v(this,et,"f")[t]||[]).filter((t=>!s[t]))})),["narg","key","alias","default","defaultDescription","config","choices","demandedOptions","demandedCommands","deprecatedOptions"].forEach((t=>{e[t]=g(v(this,et,"f")[t],(t=>!s[t]))})),e.envPrefix=v(this,et,"f").envPrefix,O(this,et,e,"f"),O(this,pt,v(this,pt,"f")?v(this,pt,"f").reset(s):P(this,v(this,ct,"f")),"f"),O(this,mt,v(this,mt,"f")?v(this,mt,"f").reset(s):function(t,e,s){const i=s.y18n.__,n=s.y18n.__n,r={nonOptionCount:function(s){const i=t.getDemandedCommands(),r=s._.length+(s["--"]?s["--"].length:0)-t.getInternalMethods().getContext().commands.length;i._&&(r<i._.min||r>i._.max)&&(r<i._.min?void 0!==i._.minMsg?e.fail(i._.minMsg?i._.minMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.min.toString()):null):e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",r,r.toString(),i._.min.toString())):r>i._.max&&(void 0!==i._.maxMsg?e.fail(i._.maxMsg?i._.maxMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.max.toString()):null):e.fail(n("Too many non-option arguments: got %s, maximum of %s","Too many non-option arguments: got %s, maximum of %s",r,r.toString(),i._.max.toString()))))},positionalCount:function(t,s){s<t&&e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",s,s+"",t+""))},requiredArguments:function(t,s){let i=null;for(const e of Object.keys(s))Object.prototype.hasOwnProperty.call(t,e)&&void 0!==t[e]||(i=i||{},i[e]=s[e]);if(i){const t=[];for(const e of Object.keys(i)){const s=i[e];s&&t.indexOf(s)<0&&t.push(s)}const s=t.length?`\n${t.join("\n")}`:"";e.fail(n("Missing required argument: %s","Missing required arguments: %s",Object.keys(i).length,Object.keys(i).join(", ")+s))}},unknownArguments:function(s,i,o,a,h=!0){var l;const c=t.getInternalMethods().getCommandInstance().getCommands(),f=[],d=t.getInternalMethods().getContext();if(Object.keys(s).forEach((e=>{H.includes(e)||Object.prototype.hasOwnProperty.call(o,e)||Object.prototype.hasOwnProperty.call(t.getInternalMethods().getParseContext(),e)||r.isValidAndSomeAliasIsNotNew(e,i)||f.push(e)})),h&&(d.commands.length>0||c.length>0||a)&&s._.slice(d.commands.length).forEach((t=>{c.includes(""+t)||f.push(""+t)})),h){const e=(null===(l=t.getDemandedCommands()._)||void 0===l?void 0:l.max)||0,i=d.commands.length+e;i<s._.length&&s._.slice(i).forEach((t=>{t=String(t),d.commands.includes(t)||f.includes(t)||f.push(t)}))}f.length&&e.fail(n("Unknown argument: %s","Unknown arguments: %s",f.length,f.map((t=>t.trim()?t:`"${t}"`)).join(", ")))},unknownCommands:function(s){const i=t.getInternalMethods().getCommandInstance().getCommands(),r=[],o=t.getInternalMethods().getContext();return(o.commands.length>0||i.length>0)&&s._.slice(o.commands.length).forEach((t=>{i.includes(""+t)||r.push(""+t)})),r.length>0&&(e.fail(n("Unknown command: %s","Unknown commands: %s",r.length,r.join(", "))),!0)},isValidAndSomeAliasIsNotNew:function(e,s){if(!Object.prototype.hasOwnProperty.call(s,e))return!1;const i=t.parsed.newAliases;return[e,...s[e]].some((t=>!Object.prototype.hasOwnProperty.call(i,t)||!i[e]))},limitedChoices:function(s){const n=t.getOptions(),r={};if(!Object.keys(n.choices).length)return;Object.keys(s).forEach((t=>{-1===H.indexOf(t)&&Object.prototype.hasOwnProperty.call(n.choices,t)&&[].concat(s[t]).forEach((e=>{-1===n.choices[t].indexOf(e)&&void 0!==e&&(r[t]=(r[t]||[]).concat(e))}))}));const o=Object.keys(r);if(!o.length)return;let a=i("Invalid values:");o.forEach((t=>{a+=`\n  ${i("Argument: %s, Given: %s, Choices: %s",t,e.stringifiedValues(r[t]),e.stringifiedValues(n.choices[t]))}`})),e.fail(a)}};let o={};function a(t,e){const s=Number(e);return"number"==typeof(e=isNaN(s)?e:s)?e=t._.length>=e:e.match(/^--no-.+/)?(e=e.match(/^--no-(.+)/)[1],e=!Object.prototype.hasOwnProperty.call(t,e)):e=Object.prototype.hasOwnProperty.call(t,e),e}r.implies=function(e,i){h("<string|object> [array|number|string]",[e,i],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.implies(t,e[t])})):(t.global(e),o[e]||(o[e]=[]),Array.isArray(i)?i.forEach((t=>r.implies(e,t))):(d(i,void 0,s),o[e].push(i)))},r.getImplied=function(){return o},r.implications=function(t){const s=[];if(Object.keys(o).forEach((e=>{const i=e;(o[e]||[]).forEach((e=>{let n=i;const r=e;n=a(t,n),e=a(t,e),n&&!e&&s.push(` ${i} -> ${r}`)}))})),s.length){let t=`${i("Implications failed:")}\n`;s.forEach((e=>{t+=e})),e.fail(t)}};let l={};r.conflicts=function(e,s){h("<string|object> [array|string]",[e,s],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.conflicts(t,e[t])})):(t.global(e),l[e]||(l[e]=[]),Array.isArray(s)?s.forEach((t=>r.conflicts(e,t))):l[e].push(s))},r.getConflicting=()=>l,r.conflicting=function(n){Object.keys(n).forEach((t=>{l[t]&&l[t].forEach((s=>{s&&void 0!==n[t]&&void 0!==n[s]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,s))}))})),t.getInternalMethods().getParserConfiguration()["strip-dashed"]&&Object.keys(l).forEach((t=>{l[t].forEach((r=>{r&&void 0!==n[s.Parser.camelCase(t)]&&void 0!==n[s.Parser.camelCase(r)]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,r))}))}))},r.recommendCommands=function(t,s){s=s.sort(((t,e)=>e.length-t.length));let n=null,r=1/0;for(let e,i=0;void 0!==(e=s[i]);i++){const s=D(t,e);s<=3&&s<r&&(r=s,n=e)}n&&e.fail(i("Did you mean %s?",n))},r.reset=function(t){return o=g(o,(e=>!t[e])),l=g(l,(e=>!t[e])),r};const c=[];return r.freeze=function(){c.push({implied:o,conflicting:l})},r.unfreeze=function(){const t=c.pop();d(t,void 0,s),({implied:o,conflicting:l}=t)},r}(this,v(this,pt,"f"),v(this,ct,"f")),"f"),O(this,z,v(this,z,"f")?v(this,z,"f").reset():function(t,e,s,i){return new M(t,e,s,i)}(v(this,pt,"f"),v(this,mt,"f"),v(this,B,"f"),v(this,ct,"f")),"f"),v(this,F,"f")||O(this,F,function(t,e,s,i){return new N(t,e,s,i)}(this,v(this,pt,"f"),v(this,z,"f"),v(this,ct,"f")),"f"),v(this,B,"f").reset(),O(this,U,null,"f"),O(this,tt,"","f"),O(this,V,null,"f"),O(this,J,!1,"f"),this.parsed=!1,this}[Tt](t,e){return v(this,ct,"f").path.relative(t,e)}[Bt](t,s,i,n=0,r=!1){let o=!!i||r;t=t||v(this,ht,"f"),v(this,et,"f").__=v(this,ct,"f").y18n.__,v(this,et,"f").configuration=this[jt]();const a=!!v(this,et,"f").configuration["populate--"],h=Object.assign({},v(this,et,"f").configuration,{"populate--":!0}),l=v(this,ct,"f").Parser.detailed(t,Object.assign({},v(this,et,"f"),{configuration:{"parse-positional-numbers":!1,...h}})),c=Object.assign(l.argv,v(this,rt,"f"));let d;const u=l.aliases;let p=!1,g=!1;Object.keys(c).forEach((t=>{t===v(this,Z,"f")&&c[t]?p=!0:t===v(this,gt,"f")&&c[t]&&(g=!0)})),c.$0=this.$0,this.parsed=l,0===n&&v(this,pt,"f").clearCachedHelpMessage();try{if(this[_t](),s)return this[Rt](c,a,!!i,!1);if(v(this,Z,"f")){[v(this,Z,"f")].concat(u[v(this,Z,"f")]||[]).filter((t=>t.length>1)).includes(""+c._[c._.length-1])&&(c._.pop(),p=!0)}O(this,X,!1,"f");const h=v(this,z,"f").getCommands(),m=v(this,F,"f").completionKey in c,y=p||m||r;if(c._.length){if(h.length){let t;for(let e,s=n||0;void 0!==c._[s];s++){if(e=String(c._[s]),h.includes(e)&&e!==v(this,U,"f")){const t=v(this,z,"f").runCommand(e,this,l,s+1,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(!t&&e!==v(this,U,"f")){t=e;break}}!v(this,z,"f").hasDefaultCommand()&&v(this,lt,"f")&&t&&!y&&v(this,mt,"f").recommendCommands(t,h)}v(this,U,"f")&&c._.includes(v(this,U,"f"))&&!m&&(v(this,T,"f")&&E(!0),this.showCompletionScript(),this.exit(0))}if(v(this,z,"f").hasDefaultCommand()&&!y){const t=v(this,z,"f").runCommand(null,this,l,0,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(m){v(this,T,"f")&&E(!0);const s=(t=[].concat(t)).slice(t.indexOf(`--${v(this,F,"f").completionKey}`)+1);return v(this,F,"f").getCompletion(s,((t,s)=>{if(t)throw new e(t.message);(s||[]).forEach((t=>{v(this,Q,"f").log(t)})),this.exit(0)})),this[Rt](c,!a,!!i,!1)}if(v(this,J,"f")||(p?(v(this,T,"f")&&E(!0),o=!0,this.showHelp("log"),this.exit(0)):g&&(v(this,T,"f")&&E(!0),o=!0,v(this,pt,"f").showVersion("log"),this.exit(0))),!o&&v(this,et,"f").skipValidation.length>0&&(o=Object.keys(c).some((t=>v(this,et,"f").skipValidation.indexOf(t)>=0&&!0===c[t]))),!o){if(l.error)throw new e(l.error.message);if(!m){const t=this[Yt](u,{},l.error);i||(d=C(c,this,v(this,B,"f").getMiddleware(),!0)),d=this[Dt](t,null!=d?d:c),f(d)&&!i&&(d=d.then((()=>C(c,this,v(this,B,"f").getMiddleware(),!1))))}}}catch(t){if(!(t instanceof e))throw t;v(this,pt,"f").fail(t.message,t)}return this[Rt](null!=d?d:c,a,!!i,!0)}[Yt](t,s,i,n){const r={...this.getDemandedOptions()};return o=>{if(i)throw new e(i.message);v(this,mt,"f").nonOptionCount(o),v(this,mt,"f").requiredArguments(o,r);let a=!1;v(this,dt,"f")&&(a=v(this,mt,"f").unknownCommands(o)),v(this,ft,"f")&&!a?v(this,mt,"f").unknownArguments(o,t,s,!!n):v(this,ut,"f")&&v(this,mt,"f").unknownArguments(o,t,{},!1,!1),v(this,mt,"f").limitedChoices(o),v(this,mt,"f").implications(o),v(this,mt,"f").conflicting(o)}}[Jt](){O(this,J,!0,"f")}[Zt](t){if("string"==typeof t)v(this,et,"f").key[t]=!0;else for(const e of t)v(this,et,"f").key[e]=!0}}var Qt,te;const{readFileSync:ee}=require("fs"),{inspect:se}=require("util"),{resolve:ie}=require("path"),ne=require("y18n"),re=require("yargs-parser");var oe,ae={assert:{notStrictEqual:t.notStrictEqual,strictEqual:t.strictEqual},cliui:require("cliui"),findUp:require("escalade/sync"),getEnv:t=>process.env[t],getCallerFile:require("get-caller-file"),getProcessArgvBin:y,inspect:se,mainFilename:null!==(te=null===(Qt=null===require||void 0===require?void 0:require.main)||void 0===Qt?void 0:Qt.filename)&&void 0!==te?te:process.cwd(),Parser:re,path:require("path"),process:{argv:()=>process.argv,cwd:process.cwd,emitWarning:(t,e)=>process.emitWarning(t,e),execPath:()=>process.execPath,exit:t=>{process.exit(t)},nextTick:process.nextTick,stdColumns:void 0!==process.stdout.columns?process.stdout.columns:null},readFileSync:ee,require:require,requireDirectory:require("require-directory"),stringWidth:require("string-width"),y18n:ne({directory:ie(__dirname,"../locales"),updateFiles:!1})};const he=(null===(oe=null===process||void 0===process?void 0:process.env)||void 0===oe?void 0:oe.YARGS_MIN_NODE_VERSION)?Number(process.env.YARGS_MIN_NODE_VERSION):12;if(process&&process.version){if(Number(process.version.match(/v([^.]+)/)[1])<he)throw Error(`yargs supports a minimum Node.js version of ${he}. Read our version support policy: https://github.com/yargs/yargs#supported-nodejs-versions`)}const le=require("yargs-parser");var ce,fe={applyExtends:n,cjsPlatformShim:ae,Yargs:(ce=ae,(t=[],e=ce.process.cwd(),s)=>{const i=new Xt(t,e,s,ce);return Object.defineProperty(i,"argv",{get:()=>i.parse(),enumerable:!0}),i.help(),i.version(),i}),argsert:h,isPromise:f,objFilter:g,parseCommand:o,Parser:le,processArgv:b,YError:e};module.exports=fe;
-+"use strict";
-+// "Error.captureStackTrace(this,e)" is removed from the constructor of a
-+// custom Error class because that property doesn't exist when running
-+// with LavaMoat/SES.
-+var t=require("assert");class e extends Error{constructor(t){super(t||"yargs error"),this.name="YError",Error.captureStackTrace(this,e)}}let s,i=[];function n(t,o,a,h){s=h;let l={};if(Object.prototype.hasOwnProperty.call(t,"extends")){if("string"!=typeof t.extends)return l;const r=/\.json|\..*rc$/.test(t.extends);let h=null;if(r)h=function(t,e){return s.path.resolve(t,e)}(o,t.extends);else try{h=require.resolve(t.extends)}catch(e){return t}!function(t){if(i.indexOf(t)>-1)throw new e(`Circular extended configurations: '${t}'.`)}(h),i.push(h),l=r?JSON.parse(s.readFileSync(h,"utf8")):require(t.extends),delete t.extends,l=n(l,s.path.dirname(h),a,s)}return i=[],a?r(l,t):Object.assign({},l,t)}function r(t,e){const s={};function i(t){return t&&"object"==typeof t&&!Array.isArray(t)}Object.assign(s,t);for(const n of Object.keys(e))i(e[n])&&i(s[n])?s[n]=r(t[n],e[n]):s[n]=e[n];return s}function o(t){const e=t.replace(/\s{2,}/g," ").split(/\s+(?![^[]*]|[^<]*>)/),s=/\.*[\][<>]/g,i=e.shift();if(!i)throw new Error(`No command found in: ${t}`);const n={cmd:i.replace(s,""),demanded:[],optional:[]};return e.forEach(((t,i)=>{let r=!1;t=t.replace(/\s/g,""),/\.+[\]>]/.test(t)&&i===e.length-1&&(r=!0),/^\[/.test(t)?n.optional.push({cmd:t.replace(s,"").split("|"),variadic:r}):n.demanded.push({cmd:t.replace(s,"").split("|"),variadic:r})})),n}const a=["first","second","third","fourth","fifth","sixth"];function h(t,s,i){try{let n=0;const[r,a,h]="object"==typeof t?[{demanded:[],optional:[]},t,s]:[o(`cmd ${t}`),s,i],f=[].slice.call(a);for(;f.length&&void 0===f[f.length-1];)f.pop();const d=h||f.length;if(d<r.demanded.length)throw new e(`Not enough arguments provided. Expected ${r.demanded.length} but received ${f.length}.`);const u=r.demanded.length+r.optional.length;if(d>u)throw new e(`Too many arguments provided. Expected max ${u} but received ${d}.`);r.demanded.forEach((t=>{const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1})),r.optional.forEach((t=>{if(0===f.length)return;const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1}))}catch(t){console.warn(t.stack)}}function l(t){return Array.isArray(t)?"array":null===t?"null":typeof t}function c(t,s,i){throw new e(`Invalid ${a[i]||"manyith"} argument. Expected ${s.join(" or ")} but received ${t}.`)}function f(t){return!!t&&!!t.then&&"function"==typeof t.then}function d(t,e,s,i){s.assert.notStrictEqual(t,e,i)}function u(t,e){e.assert.strictEqual(typeof t,"string")}function p(t){return Object.keys(t)}function g(t={},e=(()=>!0)){const s={};return p(t).forEach((i=>{e(i,t[i])&&(s[i]=t[i])})),s}function m(){return process.versions.electron&&!process.defaultApp?0:1}function y(){return process.argv[m()]}var b=Object.freeze({__proto__:null,hideBin:function(t){return t.slice(m()+1)},getProcessArgvBin:y});function v(t,e,s,i){if("a"===s&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(t):i?i.value:e.get(t)}function O(t,e,s,i,n){if("m"===i)throw new TypeError("Private method is not writable");if("a"===i&&!n)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===i?n.call(t,s):n?n.value=s:e.set(t,s),s}class w{constructor(t){this.globalMiddleware=[],this.frozens=[],this.yargs=t}addMiddleware(t,e,s=!0,i=!1){if(h("<array|function> [boolean] [boolean] [boolean]",[t,e,s],arguments.length),Array.isArray(t)){for(let i=0;i<t.length;i++){if("function"!=typeof t[i])throw Error("middleware must be a function");const n=t[i];n.applyBeforeValidation=e,n.global=s}Array.prototype.push.apply(this.globalMiddleware,t)}else if("function"==typeof t){const n=t;n.applyBeforeValidation=e,n.global=s,n.mutates=i,this.globalMiddleware.push(t)}return this.yargs}addCoerceMiddleware(t,e){const s=this.yargs.getAliases();return this.globalMiddleware=this.globalMiddleware.filter((t=>{const i=[...s[e]||[],e];return!t.option||!i.includes(t.option)})),t.option=e,this.addMiddleware(t,!0,!0,!0)}getMiddleware(){return this.globalMiddleware}freeze(){this.frozens.push([...this.globalMiddleware])}unfreeze(){const t=this.frozens.pop();void 0!==t&&(this.globalMiddleware=t)}reset(){this.globalMiddleware=this.globalMiddleware.filter((t=>t.global))}}function C(t,e,s,i){return s.reduce(((t,s)=>{if(s.applyBeforeValidation!==i)return t;if(s.mutates){if(s.applied)return t;s.applied=!0}if(f(t))return t.then((t=>Promise.all([t,s(t,e)]))).then((([t,e])=>Object.assign(t,e)));{const i=s(t,e);return f(i)?i.then((e=>Object.assign(t,e))):Object.assign(t,i)}}),t)}function j(t,e,s=(t=>{throw t})){try{const s="function"==typeof t?t():t;return f(s)?s.then((t=>e(t))):e(s)}catch(t){return s(t)}}const _=/(^\*)|(^\$0)/;class M{constructor(t,e,s,i){this.requireCache=new Set,this.handlers={},this.aliasMap={},this.frozens=[],this.shim=i,this.usage=t,this.globalMiddleware=s,this.validation=e}addDirectory(t,e,s,i){"boolean"!=typeof(i=i||{}).recurse&&(i.recurse=!1),Array.isArray(i.extensions)||(i.extensions=["js"]);const n="function"==typeof i.visit?i.visit:t=>t;i.visit=(t,e,s)=>{const i=n(t,e,s);if(i){if(this.requireCache.has(e))return i;this.requireCache.add(e),this.addHandler(i)}return i},this.shim.requireDirectory({require:e,filename:s},t,i)}addHandler(t,e,s,i,n,r){let a=[];const h=function(t){return t?t.map((t=>(t.applyBeforeValidation=!1,t))):[]}(n);if(i=i||(()=>{}),Array.isArray(t))if(function(t){return t.every((t=>"string"==typeof t))}(t))[t,...a]=t;else for(const e of t)this.addHandler(e);else{if(function(t){return"object"==typeof t&&!Array.isArray(t)}(t)){let e=Array.isArray(t.command)||"string"==typeof t.command?t.command:this.moduleName(t);return t.aliases&&(e=[].concat(e).concat(t.aliases)),void this.addHandler(e,this.extractDesc(t),t.builder,t.handler,t.middlewares,t.deprecated)}if(k(s))return void this.addHandler([t].concat(a),e,s.builder,s.handler,s.middlewares,s.deprecated)}if("string"==typeof t){const n=o(t);a=a.map((t=>o(t).cmd));let l=!1;const c=[n.cmd].concat(a).filter((t=>!_.test(t)||(l=!0,!1)));0===c.length&&l&&c.push("$0"),l&&(n.cmd=c[0],a=c.slice(1),t=t.replace(_,n.cmd)),a.forEach((t=>{this.aliasMap[t]=n.cmd})),!1!==e&&this.usage.command(t,e,l,a,r),this.handlers[n.cmd]={original:t,description:e,handler:i,builder:s||{},middlewares:h,deprecated:r,demanded:n.demanded,optional:n.optional},l&&(this.defaultCommand=this.handlers[n.cmd])}}getCommandHandlers(){return this.handlers}getCommands(){return Object.keys(this.handlers).concat(Object.keys(this.aliasMap))}hasDefaultCommand(){return!!this.defaultCommand}runCommand(t,e,s,i,n,r){const o=this.handlers[t]||this.handlers[this.aliasMap[t]]||this.defaultCommand,a=e.getInternalMethods().getContext(),h=a.commands.slice(),l=!t;t&&(a.commands.push(t),a.fullCommands.push(o.original));const c=this.applyBuilderUpdateUsageAndParse(l,o,e,s.aliases,h,i,n,r);return f(c)?c.then((t=>this.applyMiddlewareAndGetResult(l,o,t.innerArgv,a,n,t.aliases,e))):this.applyMiddlewareAndGetResult(l,o,c.innerArgv,a,n,c.aliases,e)}applyBuilderUpdateUsageAndParse(t,e,s,i,n,r,o,a){const h=e.builder;let l=s;if(x(h)){const c=h(s.getInternalMethods().reset(i),a);if(f(c))return c.then((i=>{var a;return l=(a=i)&&"function"==typeof a.getInternalMethods?i:s,this.parseAndUpdateUsage(t,e,l,n,r,o)}))}else(function(t){return"object"==typeof t})(h)&&(l=s.getInternalMethods().reset(i),Object.keys(e.builder).forEach((t=>{l.option(t,h[t])})));return this.parseAndUpdateUsage(t,e,l,n,r,o)}parseAndUpdateUsage(t,e,s,i,n,r){t&&s.getInternalMethods().getUsageInstance().unfreeze(!0),this.shouldUpdateUsage(s)&&s.getInternalMethods().getUsageInstance().usage(this.usageFromParentCommandsCommandHandler(i,e),e.description);const o=s.getInternalMethods().runYargsParserAndExecuteCommands(null,void 0,!0,n,r);return f(o)?o.then((t=>({aliases:s.parsed.aliases,innerArgv:t}))):{aliases:s.parsed.aliases,innerArgv:o}}shouldUpdateUsage(t){return!t.getInternalMethods().getUsageInstance().getUsageDisabled()&&0===t.getInternalMethods().getUsageInstance().getUsage().length}usageFromParentCommandsCommandHandler(t,e){const s=_.test(e.original)?e.original.replace(_,"").trim():e.original,i=t.filter((t=>!_.test(t)));return i.push(s),`$0 ${i.join(" ")}`}applyMiddlewareAndGetResult(t,e,s,i,n,r,o){let a={};if(n)return s;o.getInternalMethods().getHasOutput()||(a=this.populatePositionals(e,s,i,o));const h=this.globalMiddleware.getMiddleware().slice(0).concat(e.middlewares);if(s=C(s,o,h,!0),!o.getInternalMethods().getHasOutput()){const e=o.getInternalMethods().runValidation(r,a,o.parsed.error,t);s=j(s,(t=>(e(t),t)))}if(e.handler&&!o.getInternalMethods().getHasOutput()){o.getInternalMethods().setHasOutput();const i=!!o.getOptions().configuration["populate--"];o.getInternalMethods().postProcess(s,i,!1,!1),s=j(s=C(s,o,h,!1),(t=>{const s=e.handler(t);return f(s)?s.then((()=>t)):t})),t||o.getInternalMethods().getUsageInstance().cacheHelpMessage(),f(s)&&!o.getInternalMethods().hasParseCallback()&&s.catch((t=>{try{o.getInternalMethods().getUsageInstance().fail(null,t)}catch(t){}}))}return t||(i.commands.pop(),i.fullCommands.pop()),s}populatePositionals(t,e,s,i){e._=e._.slice(s.commands.length);const n=t.demanded.slice(0),r=t.optional.slice(0),o={};for(this.validation.positionalCount(n.length,e._.length);n.length;){const t=n.shift();this.populatePositional(t,e,o)}for(;r.length;){const t=r.shift();this.populatePositional(t,e,o)}return e._=s.commands.concat(e._.map((t=>""+t))),this.postProcessPositionals(e,o,this.cmdToParseOptions(t.original),i),o}populatePositional(t,e,s){const i=t.cmd[0];t.variadic?s[i]=e._.splice(0).map(String):e._.length&&(s[i]=[String(e._.shift())])}cmdToParseOptions(t){const e={array:[],default:{},alias:{},demand:{}},s=o(t);return s.demanded.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i,e.demand[s]=!0})),s.optional.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i})),e}postProcessPositionals(t,e,s,i){const n=Object.assign({},i.getOptions());n.default=Object.assign(s.default,n.default);for(const t of Object.keys(s.alias))n.alias[t]=(n.alias[t]||[]).concat(s.alias[t]);n.array=n.array.concat(s.array),n.config={};const r=[];if(Object.keys(e).forEach((t=>{e[t].map((e=>{n.configuration["unknown-options-as-args"]&&(n.key[t]=!0),r.push(`--${t}`),r.push(e)}))})),!r.length)return;const o=Object.assign({},n.configuration,{"populate--":!1}),a=this.shim.Parser.detailed(r,Object.assign({},n,{configuration:o}));if(a.error)i.getInternalMethods().getUsageInstance().fail(a.error.message,a.error);else{const s=Object.keys(e);Object.keys(e).forEach((t=>{s.push(...a.aliases[t])}));const n=i.getOptions().default;Object.keys(a.argv).forEach((i=>{s.includes(i)&&(e[i]||(e[i]=a.argv[i]),!Object.hasOwnProperty.call(n,i)&&Object.hasOwnProperty.call(t,i)&&Object.hasOwnProperty.call(a.argv,i)&&(Array.isArray(t[i])||Array.isArray(a.argv[i]))?t[i]=[].concat(t[i],a.argv[i]):t[i]=a.argv[i])}))}}runDefaultBuilderOn(t){if(!this.defaultCommand)return;if(this.shouldUpdateUsage(t)){const e=_.test(this.defaultCommand.original)?this.defaultCommand.original:this.defaultCommand.original.replace(/^[^[\]<>]*/,"$0 ");t.getInternalMethods().getUsageInstance().usage(e,this.defaultCommand.description)}const e=this.defaultCommand.builder;if(x(e))return e(t,!0);k(e)||Object.keys(e).forEach((s=>{t.option(s,e[s])}))}moduleName(t){const e=function(t){if("undefined"==typeof require)return null;for(let e,s=0,i=Object.keys(require.cache);s<i.length;s++)if(e=require.cache[i[s]],e.exports===t)return e;return null}(t);if(!e)throw new Error(`No command name given for module: ${this.shim.inspect(t)}`);return this.commandFromFilename(e.filename)}commandFromFilename(t){return this.shim.path.basename(t,this.shim.path.extname(t))}extractDesc({describe:t,description:e,desc:s}){for(const i of[t,e,s]){if("string"==typeof i||!1===i)return i;d(i,!0,this.shim)}return!1}freeze(){this.frozens.push({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand})}unfreeze(){const t=this.frozens.pop();d(t,void 0,this.shim),({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand}=t)}reset(){return this.handlers={},this.aliasMap={},this.defaultCommand=void 0,this.requireCache=new Set,this}}function k(t){return"object"==typeof t&&!!t.builder&&"function"==typeof t.handler}function x(t){return"function"==typeof t}function E(t){"undefined"!=typeof process&&[process.stdout,process.stderr].forEach((e=>{const s=e;s._handle&&s.isTTY&&"function"==typeof s._handle.setBlocking&&s._handle.setBlocking(t)}))}function A(t){return"boolean"==typeof t}function P(t,s){const i=s.y18n.__,n={},r=[];n.failFn=function(t){r.push(t)};let o=null,a=null,h=!0;n.showHelpOnFail=function(e=!0,s){const[i,r]="string"==typeof e?[!0,e]:[e,s];return t.getInternalMethods().isGlobalContext()&&(a=r),o=r,h=i,n};let l=!1;n.fail=function(s,i){const c=t.getInternalMethods().getLoggerInstance();if(!r.length){if(t.getExitProcess()&&E(!0),!l){l=!0,h&&(t.showHelp("error"),c.error()),(s||i)&&c.error(s||i);const e=o||a;e&&((s||i)&&c.error(""),c.error(e))}if(i=i||new e(s),t.getExitProcess())return t.exit(1);if(t.getInternalMethods().hasParseCallback())return t.exit(1,i);throw i}for(let t=r.length-1;t>=0;--t){const e=r[t];if(A(e)){if(i)throw i;if(s)throw Error(s)}else e(s,i,n)}};let c=[],f=!1;n.usage=(t,e)=>null===t?(f=!0,c=[],n):(f=!1,c.push([t,e||""]),n),n.getUsage=()=>c,n.getUsageDisabled=()=>f,n.getPositionalGroupName=()=>i("Positionals:");let d=[];n.example=(t,e)=>{d.push([t,e||""])};let u=[];n.command=function(t,e,s,i,n=!1){s&&(u=u.map((t=>(t[2]=!1,t)))),u.push([t,e||"",s,i,n])},n.getCommands=()=>u;let p={};n.describe=function(t,e){Array.isArray(t)?t.forEach((t=>{n.describe(t,e)})):"object"==typeof t?Object.keys(t).forEach((e=>{n.describe(e,t[e])})):p[t]=e},n.getDescriptions=()=>p;let m=[];n.epilog=t=>{m.push(t)};let y,b=!1;function v(){return b||(y=function(){const t=80;return s.process.stdColumns?Math.min(t,s.process.stdColumns):t}(),b=!0),y}n.wrap=t=>{b=!0,y=t};const O="__yargsString__:";function w(t,e,i){let n=0;return Array.isArray(t)||(t=Object.values(t).map((t=>[t]))),t.forEach((t=>{n=Math.max(s.stringWidth(i?`${i} ${I(t[0])}`:I(t[0]))+$(t[0]),n)})),e&&(n=Math.min(n,parseInt((.5*e).toString(),10))),n}let C;function j(e){return t.getOptions().hiddenOptions.indexOf(e)<0||t.parsed.argv[t.getOptions().showHiddenOpt]}function _(t,e){let s=`[${i("default:")} `;if(void 0===t&&!e)return null;if(e)s+=e;else switch(typeof t){case"string":s+=`"${t}"`;break;case"object":s+=JSON.stringify(t);break;default:s+=t}return`${s}]`}n.deferY18nLookup=t=>O+t,n.help=function(){if(C)return C;!function(){const e=t.getDemandedOptions(),s=t.getOptions();(Object.keys(s.alias)||[]).forEach((i=>{s.alias[i].forEach((r=>{p[r]&&n.describe(i,p[r]),r in e&&t.demandOption(i,e[r]),s.boolean.includes(r)&&t.boolean(i),s.count.includes(r)&&t.count(i),s.string.includes(r)&&t.string(i),s.normalize.includes(r)&&t.normalize(i),s.array.includes(r)&&t.array(i),s.number.includes(r)&&t.number(i)}))}))}();const e=t.customScriptName?t.$0:s.path.basename(t.$0),r=t.getDemandedOptions(),o=t.getDemandedCommands(),a=t.getDeprecatedOptions(),h=t.getGroups(),l=t.getOptions();let g=[];g=g.concat(Object.keys(p)),g=g.concat(Object.keys(r)),g=g.concat(Object.keys(o)),g=g.concat(Object.keys(l.default)),g=g.filter(j),g=Object.keys(g.reduce(((t,e)=>("_"!==e&&(t[e]=!0),t)),{}));const y=v(),b=s.cliui({width:y,wrap:!!y});if(!f)if(c.length)c.forEach((t=>{b.div({text:`${t[0].replace(/\$0/g,e)}`}),t[1]&&b.div({text:`${t[1]}`,padding:[1,0,0,0]})})),b.div();else if(u.length){let t=null;t=o._?`${e} <${i("command")}>\n`:`${e} [${i("command")}]\n`,b.div(`${t}`)}if(u.length>1||1===u.length&&!u[0][2]){b.div(i("Commands:"));const s=t.getInternalMethods().getContext(),n=s.commands.length?`${s.commands.join(" ")} `:"";!0===t.getInternalMethods().getParserConfiguration()["sort-commands"]&&(u=u.sort(((t,e)=>t[0].localeCompare(e[0]))));const r=e?`${e} `:"";u.forEach((t=>{const s=`${r}${n}${t[0].replace(/^\$0 ?/,"")}`;b.span({text:s,padding:[0,2,0,2],width:w(u,y,`${e}${n}`)+4},{text:t[1]});const o=[];t[2]&&o.push(`[${i("default")}]`),t[3]&&t[3].length&&o.push(`[${i("aliases:")} ${t[3].join(", ")}]`),t[4]&&("string"==typeof t[4]?o.push(`[${i("deprecated: %s",t[4])}]`):o.push(`[${i("deprecated")}]`)),o.length?b.div({text:o.join(" "),padding:[0,0,0,2],align:"right"}):b.div()})),b.div()}const M=(Object.keys(l.alias)||[]).concat(Object.keys(t.parsed.newAliases)||[]);g=g.filter((e=>!t.parsed.newAliases[e]&&M.every((t=>-1===(l.alias[t]||[]).indexOf(e)))));const k=i("Options:");h[k]||(h[k]=[]),function(t,e,s,i){let n=[],r=null;Object.keys(s).forEach((t=>{n=n.concat(s[t])})),t.forEach((t=>{r=[t].concat(e[t]),r.some((t=>-1!==n.indexOf(t)))||s[i].push(t)}))}(g,l.alias,h,k);const x=t=>/^--/.test(I(t)),E=Object.keys(h).filter((t=>h[t].length>0)).map((t=>({groupName:t,normalizedKeys:h[t].filter(j).map((t=>{if(M.includes(t))return t;for(let e,s=0;void 0!==(e=M[s]);s++)if((l.alias[e]||[]).includes(t))return e;return t}))}))).filter((({normalizedKeys:t})=>t.length>0)).map((({groupName:t,normalizedKeys:e})=>{const s=e.reduce(((e,s)=>(e[s]=[s].concat(l.alias[s]||[]).map((e=>t===n.getPositionalGroupName()?e:(/^[0-9]$/.test(e)?l.boolean.includes(s)?"-":"--":e.length>1?"--":"-")+e)).sort(((t,e)=>x(t)===x(e)?0:x(t)?1:-1)).join(", "),e)),{});return{groupName:t,normalizedKeys:e,switches:s}}));if(E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).some((({normalizedKeys:t,switches:e})=>!t.every((t=>x(e[t])))))&&E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).forEach((({normalizedKeys:t,switches:e})=>{t.forEach((t=>{var s,i;x(e[t])&&(e[t]=(s=e[t],i="-x, ".length,S(s)?{text:s.text,indentation:s.indentation+i}:{text:s,indentation:i}))}))})),E.forEach((({groupName:t,normalizedKeys:e,switches:s})=>{b.div(t),e.forEach((t=>{const e=s[t];let o=p[t]||"",h=null;o.includes(O)&&(o=i(o.substring(O.length))),l.boolean.includes(t)&&(h=`[${i("boolean")}]`),l.count.includes(t)&&(h=`[${i("count")}]`),l.string.includes(t)&&(h=`[${i("string")}]`),l.normalize.includes(t)&&(h=`[${i("string")}]`),l.array.includes(t)&&(h=`[${i("array")}]`),l.number.includes(t)&&(h=`[${i("number")}]`);const c=[t in a?(f=a[t],"string"==typeof f?`[${i("deprecated: %s",f)}]`:`[${i("deprecated")}]`):null,h,t in r?`[${i("required")}]`:null,l.choices&&l.choices[t]?`[${i("choices:")} ${n.stringifiedValues(l.choices[t])}]`:null,_(l.default[t],l.defaultDescription[t])].filter(Boolean).join(" ");var f;b.span({text:I(e),padding:[0,2,0,2+$(e)],width:w(s,y)+4},o),c?b.div({text:c,padding:[0,0,0,2],align:"right"}):b.div()})),b.div()})),d.length&&(b.div(i("Examples:")),d.forEach((t=>{t[0]=t[0].replace(/\$0/g,e)})),d.forEach((t=>{""===t[1]?b.div({text:t[0],padding:[0,2,0,2]}):b.div({text:t[0],padding:[0,2,0,2],width:w(d,y)+4},{text:t[1]})})),b.div()),m.length>0){const t=m.map((t=>t.replace(/\$0/g,e))).join("\n");b.div(`${t}\n`)}return b.toString().replace(/\s*$/,"")},n.cacheHelpMessage=function(){C=this.help()},n.clearCachedHelpMessage=function(){C=void 0},n.hasCachedHelpMessage=function(){return!!C},n.showHelp=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(n.help())},n.functionDescription=t=>["(",t.name?s.Parser.decamelize(t.name,"-"):i("generated-value"),")"].join(""),n.stringifiedValues=function(t,e){let s="";const i=e||", ",n=[].concat(t);return t&&n.length?(n.forEach((t=>{s.length&&(s+=i),s+=JSON.stringify(t)})),s):s};let M=null;n.version=t=>{M=t},n.showVersion=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(M)},n.reset=function(t){return o=null,l=!1,c=[],f=!1,m=[],d=[],u=[],p=g(p,(e=>!t[e])),n};const k=[];return n.freeze=function(){k.push({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p})},n.unfreeze=function(t=!1){const e=k.pop();e&&(t?(p={...e.descriptions,...p},u=[...e.commands,...u],c=[...e.usages,...c],d=[...e.examples,...d],m=[...e.epilogs,...m]):({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p}=e))},n}function S(t){return"object"==typeof t}function $(t){return S(t)?t.indentation:0}function I(t){return S(t)?t.text:t}class N{constructor(t,e,s,i){var n,r,o;this.yargs=t,this.usage=e,this.command=s,this.shim=i,this.completionKey="get-yargs-completions",this.aliases=null,this.customCompletionFunction=null,this.indexAfterLastReset=0,this.zshShell=null!==(o=(null===(n=this.shim.getEnv("SHELL"))||void 0===n?void 0:n.includes("zsh"))||(null===(r=this.shim.getEnv("ZSH_NAME"))||void 0===r?void 0:r.includes("zsh")))&&void 0!==o&&o}defaultCompletion(t,e,s,i){const n=this.command.getCommandHandlers();for(let e=0,s=t.length;e<s;++e)if(n[t[e]]&&n[t[e]].builder){const s=n[t[e]].builder;if(x(s)){this.indexAfterLastReset=e+1;const t=this.yargs.getInternalMethods().reset();return s(t,!0),t.argv}}const r=[];this.commandCompletions(r,t,s),this.optionCompletions(r,t,e,s),this.choicesFromOptionsCompletions(r,t,e,s),this.choicesFromPositionalsCompletions(r,t,e,s),i(null,r)}commandCompletions(t,e,s){const i=this.yargs.getInternalMethods().getContext().commands;s.match(/^-/)||i[i.length-1]===s||this.previousArgHasChoices(e)||this.usage.getCommands().forEach((s=>{const i=o(s[0]).cmd;if(-1===e.indexOf(i))if(this.zshShell){const e=s[1]||"";t.push(i.replace(/:/g,"\\:")+":"+e)}else t.push(i)}))}optionCompletions(t,e,s,i){if((i.match(/^-/)||""===i&&0===t.length)&&!this.previousArgHasChoices(e)){const n=this.yargs.getOptions(),r=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[];Object.keys(n.key).forEach((o=>{const a=!!n.configuration["boolean-negation"]&&n.boolean.includes(o);r.includes(o)||n.hiddenOptions.includes(o)||this.argsContainKey(e,s,o,a)||(this.completeOptionKey(o,t,i),a&&n.default[o]&&this.completeOptionKey(`no-${o}`,t,i))}))}}choicesFromOptionsCompletions(t,e,s,i){if(this.previousArgHasChoices(e)){const s=this.getPreviousArgChoices(e);s&&s.length>0&&t.push(...s.map((t=>t.replace(/:/g,"\\:"))))}}choicesFromPositionalsCompletions(t,e,s,i){if(""===i&&t.length>0&&this.previousArgHasChoices(e))return;const n=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[],r=Math.max(this.indexAfterLastReset,this.yargs.getInternalMethods().getContext().commands.length+1),o=n[s._.length-r-1];if(!o)return;const a=this.yargs.getOptions().choices[o]||[];for(const e of a)e.startsWith(i)&&t.push(e.replace(/:/g,"\\:"))}getPreviousArgChoices(t){if(t.length<1)return;let e=t[t.length-1],s="";if(!e.startsWith("-")&&t.length>1&&(s=e,e=t[t.length-2]),!e.startsWith("-"))return;const i=e.replace(/^-+/,""),n=this.yargs.getOptions(),r=[i,...this.yargs.getAliases()[i]||[]];let o;for(const t of r)if(Object.prototype.hasOwnProperty.call(n.key,t)&&Array.isArray(n.choices[t])){o=n.choices[t];break}return o?o.filter((t=>!s||t.startsWith(s))):void 0}previousArgHasChoices(t){const e=this.getPreviousArgChoices(t);return void 0!==e&&e.length>0}argsContainKey(t,e,s,i){if(-1!==t.indexOf(`--${s}`))return!0;if(i&&-1!==t.indexOf(`--no-${s}`))return!0;if(this.aliases)for(const t of this.aliases[s])if(void 0!==e[t])return!0;return!1}completeOptionKey(t,e,s){const i=this.usage.getDescriptions(),n=!/^--/.test(s)&&(t=>/^[^0-9]$/.test(t))(t)?"-":"--";if(this.zshShell){const s=i[t]||"";e.push(n+`${t.replace(/:/g,"\\:")}:${s.replace("__yargsString__:","")}`)}else e.push(n+t)}customCompletion(t,e,s,i){if(d(this.customCompletionFunction,null,this.shim),this.customCompletionFunction.length<3){const t=this.customCompletionFunction(s,e);return f(t)?t.then((t=>{this.shim.process.nextTick((()=>{i(null,t)}))})).catch((t=>{this.shim.process.nextTick((()=>{i(t,void 0)}))})):i(null,t)}return function(t){return t.length>3}(this.customCompletionFunction)?this.customCompletionFunction(s,e,((n=i)=>this.defaultCompletion(t,e,s,n)),(t=>{i(null,t)})):this.customCompletionFunction(s,e,(t=>{i(null,t)}))}getCompletion(t,e){const s=t.length?t[t.length-1]:"",i=this.yargs.parse(t,!0),n=this.customCompletionFunction?i=>this.customCompletion(t,i,s,e):i=>this.defaultCompletion(t,i,s,e);return f(i)?i.then(n):n(i)}generateCompletionScript(t,e){let s=this.zshShell?'#compdef {{app_name}}\n###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.zshrc\n#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n  local reply\n  local si=$IFS\n  IFS=$\'\n\' reply=($(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" {{app_path}} --get-yargs-completions "${words[@]}"))\n  IFS=$si\n  _describe \'values\' reply\n}\ncompdef _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n':'###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.bashrc\n#    or {{app_path}} {{completion_command}} >> ~/.bash_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n    local cur_word args type_list\n\n    cur_word="${COMP_WORDS[COMP_CWORD]}"\n    args=("${COMP_WORDS[@]}")\n\n    # ask yargs to generate completions.\n    type_list=$({{app_path}} --get-yargs-completions "${args[@]}")\n\n    COMPREPLY=( $(compgen -W "${type_list}" -- ${cur_word}) )\n\n    # if no match was found, fall back to filename completion\n    if [ ${#COMPREPLY[@]} -eq 0 ]; then\n      COMPREPLY=()\n    fi\n\n    return 0\n}\ncomplete -o bashdefault -o default -F _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n';const i=this.shim.path.basename(t);return t.match(/\.js$/)&&(t=`./${t}`),s=s.replace(/{{app_name}}/g,i),s=s.replace(/{{completion_command}}/g,e),s.replace(/{{app_path}}/g,t)}registerFunction(t){this.customCompletionFunction=t}setParsed(t){this.aliases=t.aliases}}function D(t,e){if(0===t.length)return e.length;if(0===e.length)return t.length;const s=[];let i,n;for(i=0;i<=e.length;i++)s[i]=[i];for(n=0;n<=t.length;n++)s[0][n]=n;for(i=1;i<=e.length;i++)for(n=1;n<=t.length;n++)e.charAt(i-1)===t.charAt(n-1)?s[i][n]=s[i-1][n-1]:i>1&&n>1&&e.charAt(i-2)===t.charAt(n-1)&&e.charAt(i-1)===t.charAt(n-2)?s[i][n]=s[i-2][n-2]+1:s[i][n]=Math.min(s[i-1][n-1]+1,Math.min(s[i][n-1]+1,s[i-1][n]+1));return s[e.length][t.length]}const H=["$0","--","_"];var z,q,W,F,U,L,V,G,R,T,K,B,Y,J,Z,X,Q,tt,et,st,it,nt,rt,ot,at,ht,lt,ct,ft,dt,ut,pt,gt,mt;const yt=Symbol("copyDoubleDash"),bt=Symbol("copyDoubleDash"),vt=Symbol("deleteFromParserHintObject"),Ot=Symbol("emitWarning"),wt=Symbol("freeze"),Ct=Symbol("getDollarZero"),jt=Symbol("getParserConfiguration"),_t=Symbol("guessLocale"),Mt=Symbol("guessVersion"),kt=Symbol("parsePositionalNumbers"),xt=Symbol("pkgUp"),Et=Symbol("populateParserHintArray"),At=Symbol("populateParserHintSingleValueDictionary"),Pt=Symbol("populateParserHintArrayDictionary"),St=Symbol("populateParserHintDictionary"),$t=Symbol("sanitizeKey"),It=Symbol("setKey"),Nt=Symbol("unfreeze"),Dt=Symbol("validateAsync"),Ht=Symbol("getCommandInstance"),zt=Symbol("getContext"),qt=Symbol("getHasOutput"),Wt=Symbol("getLoggerInstance"),Ft=Symbol("getParseContext"),Ut=Symbol("getUsageInstance"),Lt=Symbol("getValidationInstance"),Vt=Symbol("hasParseCallback"),Gt=Symbol("isGlobalContext"),Rt=Symbol("postProcess"),Tt=Symbol("rebase"),Kt=Symbol("reset"),Bt=Symbol("runYargsParserAndExecuteCommands"),Yt=Symbol("runValidation"),Jt=Symbol("setHasOutput"),Zt=Symbol("kTrackManuallySetKeys");class Xt{constructor(t=[],e,s,i){this.customScriptName=!1,this.parsed=!1,z.set(this,void 0),q.set(this,void 0),W.set(this,{commands:[],fullCommands:[]}),F.set(this,null),U.set(this,null),L.set(this,"show-hidden"),V.set(this,null),G.set(this,!0),R.set(this,{}),T.set(this,!0),K.set(this,[]),B.set(this,void 0),Y.set(this,{}),J.set(this,!1),Z.set(this,null),X.set(this,!0),Q.set(this,void 0),tt.set(this,""),et.set(this,void 0),st.set(this,void 0),it.set(this,{}),nt.set(this,null),rt.set(this,null),ot.set(this,{}),at.set(this,{}),ht.set(this,void 0),lt.set(this,!1),ct.set(this,void 0),ft.set(this,!1),dt.set(this,!1),ut.set(this,!1),pt.set(this,void 0),gt.set(this,null),mt.set(this,void 0),O(this,ct,i,"f"),O(this,ht,t,"f"),O(this,q,e,"f"),O(this,st,s,"f"),O(this,B,new w(this),"f"),this.$0=this[Ct](),this[Kt](),O(this,z,v(this,z,"f"),"f"),O(this,pt,v(this,pt,"f"),"f"),O(this,mt,v(this,mt,"f"),"f"),O(this,et,v(this,et,"f"),"f"),v(this,et,"f").showHiddenOpt=v(this,L,"f"),O(this,Q,this[bt](),"f")}addHelpOpt(t,e){return h("[string|boolean] [string]",[t,e],arguments.length),v(this,Z,"f")&&(this[vt](v(this,Z,"f")),O(this,Z,null,"f")),!1===t&&void 0===e||(O(this,Z,"string"==typeof t?t:"help","f"),this.boolean(v(this,Z,"f")),this.describe(v(this,Z,"f"),e||v(this,pt,"f").deferY18nLookup("Show help"))),this}help(t,e){return this.addHelpOpt(t,e)}addShowHiddenOpt(t,e){if(h("[string|boolean] [string]",[t,e],arguments.length),!1===t&&void 0===e)return this;const s="string"==typeof t?t:v(this,L,"f");return this.boolean(s),this.describe(s,e||v(this,pt,"f").deferY18nLookup("Show hidden options")),v(this,et,"f").showHiddenOpt=s,this}showHidden(t,e){return this.addShowHiddenOpt(t,e)}alias(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.alias.bind(this),"alias",t,e),this}array(t){return h("<array|string>",[t],arguments.length),this[Et]("array",t),this[Zt](t),this}boolean(t){return h("<array|string>",[t],arguments.length),this[Et]("boolean",t),this[Zt](t),this}check(t,e){return h("<function> [boolean]",[t,e],arguments.length),this.middleware(((e,s)=>j((()=>t(e,s.getOptions())),(s=>(s?("string"==typeof s||s instanceof Error)&&v(this,pt,"f").fail(s.toString(),s):v(this,pt,"f").fail(v(this,ct,"f").y18n.__("Argument check failed: %s",t.toString())),e)),(t=>(v(this,pt,"f").fail(t.message?t.message:t.toString(),t),e)))),!1,e),this}choices(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.choices.bind(this),"choices",t,e),this}coerce(t,s){if(h("<object|string|array> [function]",[t,s],arguments.length),Array.isArray(t)){if(!s)throw new e("coerce callback must be provided");for(const e of t)this.coerce(e,s);return this}if("object"==typeof t){for(const e of Object.keys(t))this.coerce(e,t[e]);return this}if(!s)throw new e("coerce callback must be provided");return v(this,et,"f").key[t]=!0,v(this,B,"f").addCoerceMiddleware(((i,n)=>{let r;return Object.hasOwnProperty.call(i,t)?j((()=>(r=n.getAliases(),s(i[t]))),(e=>{i[t]=e;const s=n.getInternalMethods().getParserConfiguration()["strip-aliased"];if(r[t]&&!0!==s)for(const s of r[t])i[s]=e;return i}),(t=>{throw new e(t.message)})):i}),t),this}conflicts(t,e){return h("<string|object> [string|array]",[t,e],arguments.length),v(this,mt,"f").conflicts(t,e),this}config(t="config",e,s){return h("[object|string] [string|function] [function]",[t,e,s],arguments.length),"object"!=typeof t||Array.isArray(t)?("function"==typeof e&&(s=e,e=void 0),this.describe(t,e||v(this,pt,"f").deferY18nLookup("Path to JSON config file")),(Array.isArray(t)?t:[t]).forEach((t=>{v(this,et,"f").config[t]=s||!0})),this):(t=n(t,v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(t),this)}completion(t,e,s){return h("[string] [string|boolean|function] [function]",[t,e,s],arguments.length),"function"==typeof e&&(s=e,e=void 0),O(this,U,t||v(this,U,"f")||"completion","f"),e||!1===e||(e="generate completion script"),this.command(v(this,U,"f"),e),s&&v(this,F,"f").registerFunction(s),this}command(t,e,s,i,n,r){return h("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]",[t,e,s,i,n,r],arguments.length),v(this,z,"f").addHandler(t,e,s,i,n,r),this}commands(t,e,s,i,n,r){return this.command(t,e,s,i,n,r)}commandDir(t,e){h("<string> [object]",[t,e],arguments.length);const s=v(this,st,"f")||v(this,ct,"f").require;return v(this,z,"f").addDirectory(t,s,v(this,ct,"f").getCallerFile(),e),this}count(t){return h("<array|string>",[t],arguments.length),this[Et]("count",t),this[Zt](t),this}default(t,e,s){return h("<object|string|array> [*] [string]",[t,e,s],arguments.length),s&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]=s),"function"==typeof e&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]||(v(this,et,"f").defaultDescription[t]=v(this,pt,"f").functionDescription(e)),e=e.call()),this[At](this.default.bind(this),"default",t,e),this}defaults(t,e,s){return this.default(t,e,s)}demandCommand(t=1,e,s,i){return h("[number] [number|string] [string|null|undefined] [string|null|undefined]",[t,e,s,i],arguments.length),"number"!=typeof e&&(s=e,e=1/0),this.global("_",!1),v(this,et,"f").demandedCommands._={min:t,max:e,minMsg:s,maxMsg:i},this}demand(t,e,s){return Array.isArray(e)?(e.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})),e=1/0):"number"!=typeof e&&(s=e,e=1/0),"number"==typeof t?(d(s,!0,v(this,ct,"f")),this.demandCommand(t,e,s,s)):Array.isArray(t)?t.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})):"string"==typeof s?this.demandOption(t,s):!0!==s&&void 0!==s||this.demandOption(t),this}demandOption(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[At](this.demandOption.bind(this),"demandedOptions",t,e),this}deprecateOption(t,e){return h("<string> [string|boolean]",[t,e],arguments.length),v(this,et,"f").deprecatedOptions[t]=e,this}describe(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[It](t,!0),v(this,pt,"f").describe(t,e),this}detectLocale(t){return h("<boolean>",[t],arguments.length),O(this,G,t,"f"),this}env(t){return h("[string|boolean]",[t],arguments.length),!1===t?delete v(this,et,"f").envPrefix:v(this,et,"f").envPrefix=t||"",this}epilogue(t){return h("<string>",[t],arguments.length),v(this,pt,"f").epilog(t),this}epilog(t){return this.epilogue(t)}example(t,e){return h("<string|array> [string]",[t,e],arguments.length),Array.isArray(t)?t.forEach((t=>this.example(...t))):v(this,pt,"f").example(t,e),this}exit(t,e){O(this,J,!0,"f"),O(this,V,e,"f"),v(this,T,"f")&&v(this,ct,"f").process.exit(t)}exitProcess(t=!0){return h("[boolean]",[t],arguments.length),O(this,T,t,"f"),this}fail(t){if(h("<function|boolean>",[t],arguments.length),"boolean"==typeof t&&!1!==t)throw new e("Invalid first argument. Expected function or boolean 'false'");return v(this,pt,"f").failFn(t),this}getAliases(){return this.parsed?this.parsed.aliases:{}}async getCompletion(t,e){return h("<array> [function]",[t,e],arguments.length),e?v(this,F,"f").getCompletion(t,e):new Promise(((e,s)=>{v(this,F,"f").getCompletion(t,((t,i)=>{t?s(t):e(i)}))}))}getDemandedOptions(){return h([],0),v(this,et,"f").demandedOptions}getDemandedCommands(){return h([],0),v(this,et,"f").demandedCommands}getDeprecatedOptions(){return h([],0),v(this,et,"f").deprecatedOptions}getDetectLocale(){return v(this,G,"f")}getExitProcess(){return v(this,T,"f")}getGroups(){return Object.assign({},v(this,Y,"f"),v(this,at,"f"))}getHelp(){if(O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const t=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(t))return t.then((()=>v(this,pt,"f").help()))}const t=v(this,z,"f").runDefaultBuilderOn(this);if(f(t))return t.then((()=>v(this,pt,"f").help()))}return Promise.resolve(v(this,pt,"f").help())}getOptions(){return v(this,et,"f")}getStrict(){return v(this,ft,"f")}getStrictCommands(){return v(this,dt,"f")}getStrictOptions(){return v(this,ut,"f")}global(t,e){return h("<string|array> [boolean]",[t,e],arguments.length),t=[].concat(t),!1!==e?v(this,et,"f").local=v(this,et,"f").local.filter((e=>-1===t.indexOf(e))):t.forEach((t=>{v(this,et,"f").local.includes(t)||v(this,et,"f").local.push(t)})),this}group(t,e){h("<string|array> <string>",[t,e],arguments.length);const s=v(this,at,"f")[e]||v(this,Y,"f")[e];v(this,at,"f")[e]&&delete v(this,at,"f")[e];const i={};return v(this,Y,"f")[e]=(s||[]).concat(t).filter((t=>!i[t]&&(i[t]=!0))),this}hide(t){return h("<string>",[t],arguments.length),v(this,et,"f").hiddenOptions.push(t),this}implies(t,e){return h("<string|object> [number|string|array]",[t,e],arguments.length),v(this,mt,"f").implies(t,e),this}locale(t){return h("[string]",[t],arguments.length),t?(O(this,G,!1,"f"),v(this,ct,"f").y18n.setLocale(t),this):(this[_t](),v(this,ct,"f").y18n.getLocale())}middleware(t,e,s){return v(this,B,"f").addMiddleware(t,!!e,s)}nargs(t,e){return h("<string|object|array> [number]",[t,e],arguments.length),this[At](this.nargs.bind(this),"narg",t,e),this}normalize(t){return h("<array|string>",[t],arguments.length),this[Et]("normalize",t),this}number(t){return h("<array|string>",[t],arguments.length),this[Et]("number",t),this[Zt](t),this}option(t,e){if(h("<string|object> [object]",[t,e],arguments.length),"object"==typeof t)Object.keys(t).forEach((e=>{this.options(e,t[e])}));else{"object"!=typeof e&&(e={}),this[Zt](t),!v(this,gt,"f")||"version"!==t&&"version"!==(null==e?void 0:e.alias)||this[Ot](['"version" is a reserved word.',"Please do one of the following:",'- Disable version with `yargs.version(false)` if using "version" as an option',"- Use the built-in `yargs.version` method instead (if applicable)","- Use a different option key","https://yargs.js.org/docs/#api-reference-version"].join("\n"),void 0,"versionWarning"),v(this,et,"f").key[t]=!0,e.alias&&this.alias(t,e.alias);const s=e.deprecate||e.deprecated;s&&this.deprecateOption(t,s);const i=e.demand||e.required||e.require;i&&this.demand(t,i),e.demandOption&&this.demandOption(t,"string"==typeof e.demandOption?e.demandOption:void 0),e.conflicts&&this.conflicts(t,e.conflicts),"default"in e&&this.default(t,e.default),void 0!==e.implies&&this.implies(t,e.implies),void 0!==e.nargs&&this.nargs(t,e.nargs),e.config&&this.config(t,e.configParser),e.normalize&&this.normalize(t),e.choices&&this.choices(t,e.choices),e.coerce&&this.coerce(t,e.coerce),e.group&&this.group(t,e.group),(e.boolean||"boolean"===e.type)&&(this.boolean(t),e.alias&&this.boolean(e.alias)),(e.array||"array"===e.type)&&(this.array(t),e.alias&&this.array(e.alias)),(e.number||"number"===e.type)&&(this.number(t),e.alias&&this.number(e.alias)),(e.string||"string"===e.type)&&(this.string(t),e.alias&&this.string(e.alias)),(e.count||"count"===e.type)&&this.count(t),"boolean"==typeof e.global&&this.global(t,e.global),e.defaultDescription&&(v(this,et,"f").defaultDescription[t]=e.defaultDescription),e.skipValidation&&this.skipValidation(t);const n=e.describe||e.description||e.desc;this.describe(t,n),e.hidden&&this.hide(t),e.requiresArg&&this.requiresArg(t)}return this}options(t,e){return this.option(t,e)}parse(t,e,s){h("[string|array] [function|boolean|object] [function]",[t,e,s],arguments.length),this[wt](),void 0===t&&(t=v(this,ht,"f")),"object"==typeof e&&(O(this,rt,e,"f"),e=s),"function"==typeof e&&(O(this,nt,e,"f"),e=!1),e||O(this,ht,t,"f"),v(this,nt,"f")&&O(this,T,!1,"f");const i=this[Bt](t,!!e),n=this.parsed;return v(this,F,"f").setParsed(this.parsed),f(i)?i.then((t=>(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),t,v(this,tt,"f")),t))).catch((t=>{throw v(this,nt,"f")&&v(this,nt,"f")(t,this.parsed.argv,v(this,tt,"f")),t})).finally((()=>{this[Nt](),this.parsed=n})):(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),i,v(this,tt,"f")),this[Nt](),this.parsed=n,i)}parseAsync(t,e,s){const i=this.parse(t,e,s);return f(i)?i:Promise.resolve(i)}parseSync(t,s,i){const n=this.parse(t,s,i);if(f(n))throw new e(".parseSync() must not be used with asynchronous builders, handlers, or middleware");return n}parserConfiguration(t){return h("<object>",[t],arguments.length),O(this,it,t,"f"),this}pkgConf(t,e){h("<string> [string]",[t,e],arguments.length);let s=null;const i=this[xt](e||v(this,q,"f"));return i[t]&&"object"==typeof i[t]&&(s=n(i[t],e||v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(s)),this}positional(t,e){h("<string> <object>",[t,e],arguments.length);const s=["default","defaultDescription","implies","normalize","choices","conflicts","coerce","type","describe","desc","description","alias"];e=g(e,((t,e)=>!("type"===t&&!["string","number","boolean"].includes(e))&&s.includes(t)));const i=v(this,W,"f").fullCommands[v(this,W,"f").fullCommands.length-1],n=i?v(this,z,"f").cmdToParseOptions(i):{array:[],alias:{},default:{},demand:{}};return p(n).forEach((s=>{const i=n[s];Array.isArray(i)?-1!==i.indexOf(t)&&(e[s]=!0):i[t]&&!(s in e)&&(e[s]=i[t])})),this.group(t,v(this,pt,"f").getPositionalGroupName()),this.option(t,e)}recommendCommands(t=!0){return h("[boolean]",[t],arguments.length),O(this,lt,t,"f"),this}required(t,e,s){return this.demand(t,e,s)}require(t,e,s){return this.demand(t,e,s)}requiresArg(t){return h("<array|string|object> [number]",[t],arguments.length),"string"==typeof t&&v(this,et,"f").narg[t]||this[At](this.requiresArg.bind(this),"narg",t,NaN),this}showCompletionScript(t,e){return h("[string] [string]",[t,e],arguments.length),t=t||this.$0,v(this,Q,"f").log(v(this,F,"f").generateCompletionScript(t,e||v(this,U,"f")||"completion")),this}showHelp(t){if(h("[string|function]",[t],arguments.length),O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const e=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}const e=v(this,z,"f").runDefaultBuilderOn(this);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}return v(this,pt,"f").showHelp(t),this}scriptName(t){return this.customScriptName=!0,this.$0=t,this}showHelpOnFail(t,e){return h("[boolean|string] [string]",[t,e],arguments.length),v(this,pt,"f").showHelpOnFail(t,e),this}showVersion(t){return h("[string|function]",[t],arguments.length),v(this,pt,"f").showVersion(t),this}skipValidation(t){return h("<array|string>",[t],arguments.length),this[Et]("skipValidation",t),this}strict(t){return h("[boolean]",[t],arguments.length),O(this,ft,!1!==t,"f"),this}strictCommands(t){return h("[boolean]",[t],arguments.length),O(this,dt,!1!==t,"f"),this}strictOptions(t){return h("[boolean]",[t],arguments.length),O(this,ut,!1!==t,"f"),this}string(t){return h("<array|string>",[t],arguments.length),this[Et]("string",t),this[Zt](t),this}terminalWidth(){return h([],0),v(this,ct,"f").process.stdColumns}updateLocale(t){return this.updateStrings(t)}updateStrings(t){return h("<object>",[t],arguments.length),O(this,G,!1,"f"),v(this,ct,"f").y18n.updateLocale(t),this}usage(t,s,i,n){if(h("<string|null|undefined> [string|boolean] [function|object] [function]",[t,s,i,n],arguments.length),void 0!==s){if(d(t,null,v(this,ct,"f")),(t||"").match(/^\$0( |$)/))return this.command(t,s,i,n);throw new e(".usage() description must start with $0 if being used as alias for .command()")}return v(this,pt,"f").usage(t),this}version(t,e,s){const i="version";if(h("[boolean|string] [string] [string]",[t,e,s],arguments.length),v(this,gt,"f")&&(this[vt](v(this,gt,"f")),v(this,pt,"f").version(void 0),O(this,gt,null,"f")),0===arguments.length)s=this[Mt](),t=i;else if(1===arguments.length){if(!1===t)return this;s=t,t=i}else 2===arguments.length&&(s=e,e=void 0);return O(this,gt,"string"==typeof t?t:i,"f"),e=e||v(this,pt,"f").deferY18nLookup("Show version number"),v(this,pt,"f").version(s||void 0),this.boolean(v(this,gt,"f")),this.describe(v(this,gt,"f"),e),this}wrap(t){return h("<number|null|undefined>",[t],arguments.length),v(this,pt,"f").wrap(t),this}[(z=new WeakMap,q=new WeakMap,W=new WeakMap,F=new WeakMap,U=new WeakMap,L=new WeakMap,V=new WeakMap,G=new WeakMap,R=new WeakMap,T=new WeakMap,K=new WeakMap,B=new WeakMap,Y=new WeakMap,J=new WeakMap,Z=new WeakMap,X=new WeakMap,Q=new WeakMap,tt=new WeakMap,et=new WeakMap,st=new WeakMap,it=new WeakMap,nt=new WeakMap,rt=new WeakMap,ot=new WeakMap,at=new WeakMap,ht=new WeakMap,lt=new WeakMap,ct=new WeakMap,ft=new WeakMap,dt=new WeakMap,ut=new WeakMap,pt=new WeakMap,gt=new WeakMap,mt=new WeakMap,yt)](t){if(!t._||!t["--"])return t;t._.push.apply(t._,t["--"]);try{delete t["--"]}catch(t){}return t}[bt](){return{log:(...t)=>{this[Vt]()||console.log(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")},error:(...t)=>{this[Vt]()||console.error(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")}}}[vt](t){p(v(this,et,"f")).forEach((e=>{if("configObjects"===e)return;const s=v(this,et,"f")[e];Array.isArray(s)?s.includes(t)&&s.splice(s.indexOf(t),1):"object"==typeof s&&delete s[t]})),delete v(this,pt,"f").getDescriptions()[t]}[Ot](t,e,s){v(this,R,"f")[s]||(v(this,ct,"f").process.emitWarning(t,e),v(this,R,"f")[s]=!0)}[wt](){v(this,K,"f").push({options:v(this,et,"f"),configObjects:v(this,et,"f").configObjects.slice(0),exitProcess:v(this,T,"f"),groups:v(this,Y,"f"),strict:v(this,ft,"f"),strictCommands:v(this,dt,"f"),strictOptions:v(this,ut,"f"),completionCommand:v(this,U,"f"),output:v(this,tt,"f"),exitError:v(this,V,"f"),hasOutput:v(this,J,"f"),parsed:this.parsed,parseFn:v(this,nt,"f"),parseContext:v(this,rt,"f")}),v(this,pt,"f").freeze(),v(this,mt,"f").freeze(),v(this,z,"f").freeze(),v(this,B,"f").freeze()}[Ct](){let t,e="";return t=/\b(node|iojs|electron)(\.exe)?$/.test(v(this,ct,"f").process.argv()[0])?v(this,ct,"f").process.argv().slice(1,2):v(this,ct,"f").process.argv().slice(0,1),e=t.map((t=>{const e=this[Tt](v(this,q,"f"),t);return t.match(/^(\/|([a-zA-Z]:)?\\)/)&&e.length<t.length?e:t})).join(" ").trim(),v(this,ct,"f").getEnv("_")&&v(this,ct,"f").getProcessArgvBin()===v(this,ct,"f").getEnv("_")&&(e=v(this,ct,"f").getEnv("_").replace(`${v(this,ct,"f").path.dirname(v(this,ct,"f").process.execPath())}/`,"")),e}[jt](){return v(this,it,"f")}[_t](){if(!v(this,G,"f"))return;const t=v(this,ct,"f").getEnv("LC_ALL")||v(this,ct,"f").getEnv("LC_MESSAGES")||v(this,ct,"f").getEnv("LANG")||v(this,ct,"f").getEnv("LANGUAGE")||"en_US";this.locale(t.replace(/[.:].*/,""))}[Mt](){return this[xt]().version||"unknown"}[kt](t){const e=t["--"]?t["--"]:t._;for(let t,s=0;void 0!==(t=e[s]);s++)v(this,ct,"f").Parser.looksLikeNumber(t)&&Number.isSafeInteger(Math.floor(parseFloat(`${t}`)))&&(e[s]=Number(t));return t}[xt](t){const e=t||"*";if(v(this,ot,"f")[e])return v(this,ot,"f")[e];let s={};try{let e=t||v(this,ct,"f").mainFilename;!t&&v(this,ct,"f").path.extname(e)&&(e=v(this,ct,"f").path.dirname(e));const i=v(this,ct,"f").findUp(e,((t,e)=>e.includes("package.json")?"package.json":void 0));d(i,void 0,v(this,ct,"f")),s=JSON.parse(v(this,ct,"f").readFileSync(i,"utf8"))}catch(t){}return v(this,ot,"f")[e]=s||{},v(this,ot,"f")[e]}[Et](t,e){(e=[].concat(e)).forEach((e=>{e=this[$t](e),v(this,et,"f")[t].push(e)}))}[At](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=s}))}[Pt](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=(v(this,et,"f")[t][e]||[]).concat(s)}))}[St](t,e,s,i,n){if(Array.isArray(s))s.forEach((e=>{t(e,i)}));else if((t=>"object"==typeof t)(s))for(const e of p(s))t(e,s[e]);else n(e,this[$t](s),i)}[$t](t){return"__proto__"===t?"___proto___":t}[It](t,e){return this[At](this[It].bind(this),"key",t,e),this}[Nt](){var t,e,s,i,n,r,o,a,h,l,c,f;const u=v(this,K,"f").pop();let p;d(u,void 0,v(this,ct,"f")),t=this,e=this,s=this,i=this,n=this,r=this,o=this,a=this,h=this,l=this,c=this,f=this,({options:{set value(e){O(t,et,e,"f")}}.value,configObjects:p,exitProcess:{set value(t){O(e,T,t,"f")}}.value,groups:{set value(t){O(s,Y,t,"f")}}.value,output:{set value(t){O(i,tt,t,"f")}}.value,exitError:{set value(t){O(n,V,t,"f")}}.value,hasOutput:{set value(t){O(r,J,t,"f")}}.value,parsed:this.parsed,strict:{set value(t){O(o,ft,t,"f")}}.value,strictCommands:{set value(t){O(a,dt,t,"f")}}.value,strictOptions:{set value(t){O(h,ut,t,"f")}}.value,completionCommand:{set value(t){O(l,U,t,"f")}}.value,parseFn:{set value(t){O(c,nt,t,"f")}}.value,parseContext:{set value(t){O(f,rt,t,"f")}}.value}=u),v(this,et,"f").configObjects=p,v(this,pt,"f").unfreeze(),v(this,mt,"f").unfreeze(),v(this,z,"f").unfreeze(),v(this,B,"f").unfreeze()}[Dt](t,e){return j(e,(e=>(t(e),e)))}getInternalMethods(){return{getCommandInstance:this[Ht].bind(this),getContext:this[zt].bind(this),getHasOutput:this[qt].bind(this),getLoggerInstance:this[Wt].bind(this),getParseContext:this[Ft].bind(this),getParserConfiguration:this[jt].bind(this),getUsageInstance:this[Ut].bind(this),getValidationInstance:this[Lt].bind(this),hasParseCallback:this[Vt].bind(this),isGlobalContext:this[Gt].bind(this),postProcess:this[Rt].bind(this),reset:this[Kt].bind(this),runValidation:this[Yt].bind(this),runYargsParserAndExecuteCommands:this[Bt].bind(this),setHasOutput:this[Jt].bind(this)}}[Ht](){return v(this,z,"f")}[zt](){return v(this,W,"f")}[qt](){return v(this,J,"f")}[Wt](){return v(this,Q,"f")}[Ft](){return v(this,rt,"f")||{}}[Ut](){return v(this,pt,"f")}[Lt](){return v(this,mt,"f")}[Vt](){return!!v(this,nt,"f")}[Gt](){return v(this,X,"f")}[Rt](t,e,s,i){if(s)return t;if(f(t))return t;e||(t=this[yt](t));return(this[jt]()["parse-positional-numbers"]||void 0===this[jt]()["parse-positional-numbers"])&&(t=this[kt](t)),i&&(t=C(t,this,v(this,B,"f").getMiddleware(),!1)),t}[Kt](t={}){O(this,et,v(this,et,"f")||{},"f");const e={};e.local=v(this,et,"f").local||[],e.configObjects=v(this,et,"f").configObjects||[];const s={};e.local.forEach((e=>{s[e]=!0,(t[e]||[]).forEach((t=>{s[t]=!0}))})),Object.assign(v(this,at,"f"),Object.keys(v(this,Y,"f")).reduce(((t,e)=>{const i=v(this,Y,"f")[e].filter((t=>!(t in s)));return i.length>0&&(t[e]=i),t}),{})),O(this,Y,{},"f");return["array","boolean","string","skipValidation","count","normalize","number","hiddenOptions"].forEach((t=>{e[t]=(v(this,et,"f")[t]||[]).filter((t=>!s[t]))})),["narg","key","alias","default","defaultDescription","config","choices","demandedOptions","demandedCommands","deprecatedOptions"].forEach((t=>{e[t]=g(v(this,et,"f")[t],(t=>!s[t]))})),e.envPrefix=v(this,et,"f").envPrefix,O(this,et,e,"f"),O(this,pt,v(this,pt,"f")?v(this,pt,"f").reset(s):P(this,v(this,ct,"f")),"f"),O(this,mt,v(this,mt,"f")?v(this,mt,"f").reset(s):function(t,e,s){const i=s.y18n.__,n=s.y18n.__n,r={nonOptionCount:function(s){const i=t.getDemandedCommands(),r=s._.length+(s["--"]?s["--"].length:0)-t.getInternalMethods().getContext().commands.length;i._&&(r<i._.min||r>i._.max)&&(r<i._.min?void 0!==i._.minMsg?e.fail(i._.minMsg?i._.minMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.min.toString()):null):e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",r,r.toString(),i._.min.toString())):r>i._.max&&(void 0!==i._.maxMsg?e.fail(i._.maxMsg?i._.maxMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.max.toString()):null):e.fail(n("Too many non-option arguments: got %s, maximum of %s","Too many non-option arguments: got %s, maximum of %s",r,r.toString(),i._.max.toString()))))},positionalCount:function(t,s){s<t&&e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",s,s+"",t+""))},requiredArguments:function(t,s){let i=null;for(const e of Object.keys(s))Object.prototype.hasOwnProperty.call(t,e)&&void 0!==t[e]||(i=i||{},i[e]=s[e]);if(i){const t=[];for(const e of Object.keys(i)){const s=i[e];s&&t.indexOf(s)<0&&t.push(s)}const s=t.length?`\n${t.join("\n")}`:"";e.fail(n("Missing required argument: %s","Missing required arguments: %s",Object.keys(i).length,Object.keys(i).join(", ")+s))}},unknownArguments:function(s,i,o,a,h=!0){var l;const c=t.getInternalMethods().getCommandInstance().getCommands(),f=[],d=t.getInternalMethods().getContext();if(Object.keys(s).forEach((e=>{H.includes(e)||Object.prototype.hasOwnProperty.call(o,e)||Object.prototype.hasOwnProperty.call(t.getInternalMethods().getParseContext(),e)||r.isValidAndSomeAliasIsNotNew(e,i)||f.push(e)})),h&&(d.commands.length>0||c.length>0||a)&&s._.slice(d.commands.length).forEach((t=>{c.includes(""+t)||f.push(""+t)})),h){const e=(null===(l=t.getDemandedCommands()._)||void 0===l?void 0:l.max)||0,i=d.commands.length+e;i<s._.length&&s._.slice(i).forEach((t=>{t=String(t),d.commands.includes(t)||f.includes(t)||f.push(t)}))}f.length&&e.fail(n("Unknown argument: %s","Unknown arguments: %s",f.length,f.map((t=>t.trim()?t:`"${t}"`)).join(", ")))},unknownCommands:function(s){const i=t.getInternalMethods().getCommandInstance().getCommands(),r=[],o=t.getInternalMethods().getContext();return(o.commands.length>0||i.length>0)&&s._.slice(o.commands.length).forEach((t=>{i.includes(""+t)||r.push(""+t)})),r.length>0&&(e.fail(n("Unknown command: %s","Unknown commands: %s",r.length,r.join(", "))),!0)},isValidAndSomeAliasIsNotNew:function(e,s){if(!Object.prototype.hasOwnProperty.call(s,e))return!1;const i=t.parsed.newAliases;return[e,...s[e]].some((t=>!Object.prototype.hasOwnProperty.call(i,t)||!i[e]))},limitedChoices:function(s){const n=t.getOptions(),r={};if(!Object.keys(n.choices).length)return;Object.keys(s).forEach((t=>{-1===H.indexOf(t)&&Object.prototype.hasOwnProperty.call(n.choices,t)&&[].concat(s[t]).forEach((e=>{-1===n.choices[t].indexOf(e)&&void 0!==e&&(r[t]=(r[t]||[]).concat(e))}))}));const o=Object.keys(r);if(!o.length)return;let a=i("Invalid values:");o.forEach((t=>{a+=`\n  ${i("Argument: %s, Given: %s, Choices: %s",t,e.stringifiedValues(r[t]),e.stringifiedValues(n.choices[t]))}`})),e.fail(a)}};let o={};function a(t,e){const s=Number(e);return"number"==typeof(e=isNaN(s)?e:s)?e=t._.length>=e:e.match(/^--no-.+/)?(e=e.match(/^--no-(.+)/)[1],e=!Object.prototype.hasOwnProperty.call(t,e)):e=Object.prototype.hasOwnProperty.call(t,e),e}r.implies=function(e,i){h("<string|object> [array|number|string]",[e,i],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.implies(t,e[t])})):(t.global(e),o[e]||(o[e]=[]),Array.isArray(i)?i.forEach((t=>r.implies(e,t))):(d(i,void 0,s),o[e].push(i)))},r.getImplied=function(){return o},r.implications=function(t){const s=[];if(Object.keys(o).forEach((e=>{const i=e;(o[e]||[]).forEach((e=>{let n=i;const r=e;n=a(t,n),e=a(t,e),n&&!e&&s.push(` ${i} -> ${r}`)}))})),s.length){let t=`${i("Implications failed:")}\n`;s.forEach((e=>{t+=e})),e.fail(t)}};let l={};r.conflicts=function(e,s){h("<string|object> [array|string]",[e,s],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.conflicts(t,e[t])})):(t.global(e),l[e]||(l[e]=[]),Array.isArray(s)?s.forEach((t=>r.conflicts(e,t))):l[e].push(s))},r.getConflicting=()=>l,r.conflicting=function(n){Object.keys(n).forEach((t=>{l[t]&&l[t].forEach((s=>{s&&void 0!==n[t]&&void 0!==n[s]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,s))}))})),t.getInternalMethods().getParserConfiguration()["strip-dashed"]&&Object.keys(l).forEach((t=>{l[t].forEach((r=>{r&&void 0!==n[s.Parser.camelCase(t)]&&void 0!==n[s.Parser.camelCase(r)]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,r))}))}))},r.recommendCommands=function(t,s){s=s.sort(((t,e)=>e.length-t.length));let n=null,r=1/0;for(let e,i=0;void 0!==(e=s[i]);i++){const s=D(t,e);s<=3&&s<r&&(r=s,n=e)}n&&e.fail(i("Did you mean %s?",n))},r.reset=function(t){return o=g(o,(e=>!t[e])),l=g(l,(e=>!t[e])),r};const c=[];return r.freeze=function(){c.push({implied:o,conflicting:l})},r.unfreeze=function(){const t=c.pop();d(t,void 0,s),({implied:o,conflicting:l}=t)},r}(this,v(this,pt,"f"),v(this,ct,"f")),"f"),O(this,z,v(this,z,"f")?v(this,z,"f").reset():function(t,e,s,i){return new M(t,e,s,i)}(v(this,pt,"f"),v(this,mt,"f"),v(this,B,"f"),v(this,ct,"f")),"f"),v(this,F,"f")||O(this,F,function(t,e,s,i){return new N(t,e,s,i)}(this,v(this,pt,"f"),v(this,z,"f"),v(this,ct,"f")),"f"),v(this,B,"f").reset(),O(this,U,null,"f"),O(this,tt,"","f"),O(this,V,null,"f"),O(this,J,!1,"f"),this.parsed=!1,this}[Tt](t,e){return v(this,ct,"f").path.relative(t,e)}[Bt](t,s,i,n=0,r=!1){let o=!!i||r;t=t||v(this,ht,"f"),v(this,et,"f").__=v(this,ct,"f").y18n.__,v(this,et,"f").configuration=this[jt]();const a=!!v(this,et,"f").configuration["populate--"],h=Object.assign({},v(this,et,"f").configuration,{"populate--":!0}),l=v(this,ct,"f").Parser.detailed(t,Object.assign({},v(this,et,"f"),{configuration:{"parse-positional-numbers":!1,...h}})),c=Object.assign(l.argv,v(this,rt,"f"));let d;const u=l.aliases;let p=!1,g=!1;Object.keys(c).forEach((t=>{t===v(this,Z,"f")&&c[t]?p=!0:t===v(this,gt,"f")&&c[t]&&(g=!0)})),c.$0=this.$0,this.parsed=l,0===n&&v(this,pt,"f").clearCachedHelpMessage();try{if(this[_t](),s)return this[Rt](c,a,!!i,!1);if(v(this,Z,"f")){[v(this,Z,"f")].concat(u[v(this,Z,"f")]||[]).filter((t=>t.length>1)).includes(""+c._[c._.length-1])&&(c._.pop(),p=!0)}O(this,X,!1,"f");const h=v(this,z,"f").getCommands(),m=v(this,F,"f").completionKey in c,y=p||m||r;if(c._.length){if(h.length){let t;for(let e,s=n||0;void 0!==c._[s];s++){if(e=String(c._[s]),h.includes(e)&&e!==v(this,U,"f")){const t=v(this,z,"f").runCommand(e,this,l,s+1,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(!t&&e!==v(this,U,"f")){t=e;break}}!v(this,z,"f").hasDefaultCommand()&&v(this,lt,"f")&&t&&!y&&v(this,mt,"f").recommendCommands(t,h)}v(this,U,"f")&&c._.includes(v(this,U,"f"))&&!m&&(v(this,T,"f")&&E(!0),this.showCompletionScript(),this.exit(0))}if(v(this,z,"f").hasDefaultCommand()&&!y){const t=v(this,z,"f").runCommand(null,this,l,0,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(m){v(this,T,"f")&&E(!0);const s=(t=[].concat(t)).slice(t.indexOf(`--${v(this,F,"f").completionKey}`)+1);return v(this,F,"f").getCompletion(s,((t,s)=>{if(t)throw new e(t.message);(s||[]).forEach((t=>{v(this,Q,"f").log(t)})),this.exit(0)})),this[Rt](c,!a,!!i,!1)}if(v(this,J,"f")||(p?(v(this,T,"f")&&E(!0),o=!0,this.showHelp("log"),this.exit(0)):g&&(v(this,T,"f")&&E(!0),o=!0,v(this,pt,"f").showVersion("log"),this.exit(0))),!o&&v(this,et,"f").skipValidation.length>0&&(o=Object.keys(c).some((t=>v(this,et,"f").skipValidation.indexOf(t)>=0&&!0===c[t]))),!o){if(l.error)throw new e(l.error.message);if(!m){const t=this[Yt](u,{},l.error);i||(d=C(c,this,v(this,B,"f").getMiddleware(),!0)),d=this[Dt](t,null!=d?d:c),f(d)&&!i&&(d=d.then((()=>C(c,this,v(this,B,"f").getMiddleware(),!1))))}}}catch(t){if(!(t instanceof e))throw t;v(this,pt,"f").fail(t.message,t)}return this[Rt](null!=d?d:c,a,!!i,!0)}[Yt](t,s,i,n){const r={...this.getDemandedOptions()};return o=>{if(i)throw new e(i.message);v(this,mt,"f").nonOptionCount(o),v(this,mt,"f").requiredArguments(o,r);let a=!1;v(this,dt,"f")&&(a=v(this,mt,"f").unknownCommands(o)),v(this,ft,"f")&&!a?v(this,mt,"f").unknownArguments(o,t,s,!!n):v(this,ut,"f")&&v(this,mt,"f").unknownArguments(o,t,{},!1,!1),v(this,mt,"f").limitedChoices(o),v(this,mt,"f").implications(o),v(this,mt,"f").conflicting(o)}}[Jt](){O(this,J,!0,"f")}[Zt](t){if("string"==typeof t)v(this,et,"f").key[t]=!0;else for(const e of t)v(this,et,"f").key[e]=!0}}var Qt,te;const{readFileSync:ee}=require("fs"),{inspect:se}=require("util"),{resolve:ie}=require("path"),ne=require("y18n"),re=require("yargs-parser");var oe,ae={assert:{notStrictEqual:t.notStrictEqual,strictEqual:t.strictEqual},cliui:require("cliui"),findUp:require("escalade/sync"),getEnv:t=>process.env[t],getCallerFile:require("get-caller-file"),getProcessArgvBin:y,inspect:se,mainFilename:null!==(te=null===(Qt=null===require||void 0===require?void 0:require.main)||void 0===Qt?void 0:Qt.filename)&&void 0!==te?te:process.cwd(),Parser:re,path:require("path"),process:{argv:()=>process.argv,cwd:process.cwd,emitWarning:(t,e)=>process.emitWarning(t,e),execPath:()=>process.execPath,exit:t=>{process.exit(t)},nextTick:process.nextTick,stdColumns:void 0!==process.stdout.columns?process.stdout.columns:null},readFileSync:ee,require:require,requireDirectory:require("require-directory"),stringWidth:require("string-width"),y18n:ne({directory:ie(__dirname,"../locales"),updateFiles:!1})};const he=(null===(oe=null===process||void 0===process?void 0:process.env)||void 0===oe?void 0:oe.YARGS_MIN_NODE_VERSION)?Number(process.env.YARGS_MIN_NODE_VERSION):12;if(process&&process.version){if(Number(process.version.match(/v([^.]+)/)[1])<he)throw Error(`yargs supports a minimum Node.js version of ${he}. Read our version support policy: https://github.com/yargs/yargs#supported-nodejs-versions`)}const le=require("yargs-parser");var ce,fe={applyExtends:n,cjsPlatformShim:ae,Yargs:(ce=ae,(t=[],e=ce.process.cwd(),s)=>{const i=new Xt(t,e,s,ce);return Object.defineProperty(i,"argv",{get:()=>i.parse(),enumerable:!0}),i.help(),i.version(),i}),argsert:h,isPromise:f,objFilter:g,parseCommand:o,Parser:le,processArgv:b,YError:e};module.exports=fe;
diff --git a/shared/constants/app.js b/shared/constants/app.js
index bc27e0df168e..0d1aecc066e9 100644
--- a/shared/constants/app.js
+++ b/shared/constants/app.js
@@ -39,14 +39,11 @@ export const MESSAGE_TYPE = {
   ETH_REQUEST_ACCOUNTS: 'eth_requestAccounts',
   ETH_SIGN: 'eth_sign',
   ETH_SIGN_TYPED_DATA: 'eth_signTypedData',
-  ETH_SIGN_TYPED_DATA_V3: 'eth_signTypedData_v3',
-  ETH_SIGN_TYPED_DATA_V4: 'eth_signTypedData_v4',
   GET_PROVIDER_STATE: 'metamask_getProviderState',
   LOG_WEB3_SHIM_USAGE: 'metamask_logWeb3ShimUsage',
   PERSONAL_SIGN: 'personal_sign',
   SEND_METADATA: 'metamask_sendDomainMetadata',
   SWITCH_ETHEREUM_CHAIN: 'wallet_switchEthereumChain',
-  WALLET_REQUEST_PERMISSIONS: 'wallet_requestPermissions',
   WATCH_ASSET: 'wallet_watchAsset',
   WATCH_ASSET_LEGACY: 'metamask_watchAsset',
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -95,5 +92,3 @@ export const FIREFOX_BUILD_IDS = [
   METAMASK_PROD_FIREFOX_ID,
   METAMASK_FLASK_FIREFOX_ID,
 ];
-
-export const UNKNOWN_TICKER_SYMBOL = 'UNKNOWN';
diff --git a/shared/constants/gas.js b/shared/constants/gas.js
index f6a2ec337123..ae674e4a24e4 100644
--- a/shared/constants/gas.js
+++ b/shared/constants/gas.js
@@ -1,9 +1,7 @@
 import { addHexPrefix } from 'ethereumjs-util';
+import { MIN_GAS_LIMIT_HEX } from '../../ui/pages/send/send.constants';
 
 const ONE_HUNDRED_THOUSAND = 100000;
-const MIN_GAS_LIMIT_DEC = '21000';
-
-export const MIN_GAS_LIMIT_HEX = parseInt(MIN_GAS_LIMIT_DEC, 10).toString(16);
 
 export const GAS_LIMITS = {
   // maximum gasLimit of a simple send
@@ -12,22 +10,9 @@ export const GAS_LIMITS = {
   BASE_TOKEN_ESTIMATE: addHexPrefix(ONE_HUNDRED_THOUSAND.toString(16)),
 };
 
-/**
- * @typedef {Object} GasEstimateTypes
- * @property {'fee-market'} FEE_MARKET - A gas estimate for a fee market
- *  transaction generated by our gas estimation API.
- * @property {'legacy'} LEGACY - A gas estimate for a legacy Transaction
- *  generated by our gas estimation API.
- * @property {'eth_gasPrice'} ETH_GAS_PRICE - A gas estimate provided by the
- *  Ethereum node via eth_gasPrice.
- * @property {'none'} NONE - No gas estimate available.
- */
-
 /**
  * These are already declared in @metamask/controllers but importing them from
  * that module and re-exporting causes the UI bundle size to expand beyond 4MB
- *
- * @type {GasEstimateTypes}
  */
 export const GAS_ESTIMATE_TYPES = {
   FEE_MARKET: 'fee-market',
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index 8d18c9dc09b6..d2c9e6663318 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -164,9 +164,6 @@
  *  trait
  * @property {'networks_added'} NETWORKS_ADDED - when user modifies networks
  *  we identify the networks_added trait
- * @property {'networks_without_ticker'} NETWORKS_WITHOUT_TICKER - when user
- *  modifies networks we identify the networks_without_ticker trait for
- *  networks without a ticker.
  * @property {'nft_autodetection_enabled'} NFT_AUTODETECTION_ENABLED - when Autodetect NFTs
  * feature is toggled we identify the nft_autodetection_enabled trait
  * @property {'number_of_accounts'} NUMBER_OF_ACCOUNTS - when identities
@@ -194,7 +191,6 @@ export const TRAITS = {
   ADDRESS_BOOK_ENTRIES: 'address_book_entries',
   LEDGER_CONNECTION_TYPE: 'ledger_connection_type',
   NETWORKS_ADDED: 'networks_added',
-  NETWORKS_WITHOUT_TICKER: 'networks_without_ticker',
   NFT_AUTODETECTION_ENABLED: 'nft_autodetection_enabled',
   NUMBER_OF_ACCOUNTS: 'number_of_accounts',
   NUMBER_OF_NFT_COLLECTIONS: 'number_of_nft_collections',
@@ -214,9 +210,6 @@ export const TRAITS = {
  *  type of ledger connection set by user preference.
  * @property {Array<string>} [networks_added] - An array consisting of chainIds
  *  that indicate the networks a user has added to their MetaMask.
- * @property {Array<string>} [networks_without_ticker] - An array consisting of
- *  chainIds that indicate the networks added by the user that do not have a
- *  ticker.
  * @property {number} [nft_autodetection_enabled] - does the user have the
  * use collection/nft detection enabled?
  * @property {number} [number_of_accounts] - A number representing the number
@@ -276,23 +269,13 @@ export const REJECT_NOTFICIATION_CLOSE_SIG =
  */
 
 export const EVENT_NAMES = {
-  ENCRYPTION_PUBLIC_KEY_APPROVED: 'Encryption Public Key Approved',
-  ENCRYPTION_PUBLIC_KEY_REJECTED: 'Encryption Public Key Rejected',
   ENCRYPTION_PUBLIC_KEY_REQUESTED: 'Encryption Public Key Requested',
-  DECRYPTION_APPROVED: 'Decryption Approved',
-  DECRYPTION_REJECTED: 'Decryption Rejected',
   DECRYPTION_REQUESTED: 'Decryption Requested',
-  PERMISSIONS_APPROVED: 'Permissions Approved',
-  PERMISSIONS_REJECTED: 'Permissions Rejected',
   PERMISSIONS_REQUESTED: 'Permissions Requested',
-  PROVIDER_METHOD_CALLED: 'Provider Method Called',
-  SIGNATURE_APPROVED: 'Signature Approved',
-  SIGNATURE_REJECTED: 'Signature Rejected',
   SIGNATURE_REQUESTED: 'Signature Requested',
   TOKEN_ADDED: 'Token Added',
   TOKEN_DETECTED: 'Token Detected',
   TOKEN_HIDDEN: 'Token Hidden',
-  NFT_ADDED: 'NFT Added',
   TOKEN_IMPORT_CANCELED: 'Token Import Canceled',
   TOKEN_IMPORT_CLICKED: 'Token Import Clicked',
 };
@@ -315,10 +298,6 @@ export const EVENT = {
     WALLET: 'Wallet',
   },
   SOURCE: {
-    NETWORK: {
-      POPULAR_NETWORK_LIST: 'popular_network_list',
-      CUSTOM_NETWORK_FORM: 'custom_network_form',
-    },
     SWAPS: {
       MAIN_VIEW: 'Main View',
       TOKEN_VIEW: 'Token View',
diff --git a/shared/constants/network.js b/shared/constants/network.js
index 6891017d992b..8036f36d4dcf 100644
--- a/shared/constants/network.js
+++ b/shared/constants/network.js
@@ -7,7 +7,6 @@ export const MAINNET = 'mainnet';
 export const GOERLI = 'goerli';
 export const LOCALHOST = 'localhost';
 export const NETWORK_TYPE_RPC = 'rpc';
-export const HOMESTEAD = 'homestead';
 
 export const MAINNET_NETWORK_ID = '1';
 export const ROPSTEN_NETWORK_ID = '3';
@@ -24,14 +23,11 @@ export const KOVAN_CHAIN_ID = '0x2a';
 export const LOCALHOST_CHAIN_ID = '0x539';
 export const BSC_CHAIN_ID = '0x38';
 export const OPTIMISM_CHAIN_ID = '0xa';
-export const OPTIMISM_TESTNET_CHAIN_ID = '0x1a4';
+export const OPTIMISM_TESTNET_CHAIN_ID = '0x45';
 export const POLYGON_CHAIN_ID = '0x89';
 export const AVALANCHE_CHAIN_ID = '0xa86a';
 export const FANTOM_CHAIN_ID = '0xfa';
 export const CELO_CHAIN_ID = '0xa4ec';
-export const ARBITRUM_CHAIN_ID = '0xa4b1';
-export const HARMONY_CHAIN_ID = '0x63564c40';
-export const PALM_CHAIN_ID = '0x2a15c308d';
 
 /**
  * The largest possible chain ID we can handle.
@@ -47,16 +43,9 @@ export const GOERLI_DISPLAY_NAME = 'Goerli';
 export const LOCALHOST_DISPLAY_NAME = 'Localhost 8545';
 export const BSC_DISPLAY_NAME = 'Binance Smart Chain';
 export const POLYGON_DISPLAY_NAME = 'Polygon';
-export const AVALANCHE_DISPLAY_NAME = 'Avalanche Network C-Chain';
-export const ARBITRUM_DISPLAY_NAME = 'Arbitrum One';
-export const BNB_DISPLAY_NAME =
-  'BNB Smart Chain (previously Binance Smart Chain Mainnet)';
-export const OPTIMISM_DISPLAY_NAME = 'Optimism';
-export const FANTOM_DISPLAY_NAME = 'Fantom Opera';
-export const HARMONY_DISPLAY_NAME = 'Harmony Mainnet Shard 0';
-export const PALM_DISPLAY_NAME = 'Palm';
+export const AVALANCHE_DISPLAY_NAME = 'Avalanche';
 
-export const infuraProjectId = process.env.INFURA_PROJECT_ID;
+const infuraProjectId = process.env.INFURA_PROJECT_ID;
 export const getRpcUrl = ({ network, excludeProjectId = false }) =>
   `https://${network}.infura.io/v3/${excludeProjectId ? '' : infuraProjectId}`;
 
@@ -75,20 +64,12 @@ export const MATIC_SYMBOL = 'MATIC';
 export const AVALANCHE_SYMBOL = 'AVAX';
 export const FANTOM_SYMBOL = 'FTM';
 export const CELO_SYMBOL = 'CELO';
-export const ARBITRUM_SYMBOL = 'AETH';
-export const HARMONY_SYMBOL = 'ONE';
-export const PALM_SYMBOL = 'PALM';
 
 export const ETH_TOKEN_IMAGE_URL = './images/eth_logo.svg';
 export const TEST_ETH_TOKEN_IMAGE_URL = './images/black-eth-logo.svg';
 export const BNB_TOKEN_IMAGE_URL = './images/bnb.png';
 export const MATIC_TOKEN_IMAGE_URL = './images/matic-token.png';
 export const AVAX_TOKEN_IMAGE_URL = './images/avax-token.png';
-export const AETH_TOKEN_IMAGE_URL = './images/arbitrum.svg';
-export const FTM_TOKEN_IMAGE_URL = './images/fantom-opera.svg';
-export const HARMONY_ONE_TOKEN_IMAGE_URL = './images/harmony-one.svg';
-export const OPTIMISM_TOKEN_IMAGE_URL = './images/optimism.svg';
-export const PALM_TOKEN_IMAGE_URL = './images/palm.svg';
 
 export const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET, GOERLI];
 
@@ -185,19 +166,6 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = {
   [AVALANCHE_CHAIN_ID]: AVAX_TOKEN_IMAGE_URL,
   [BSC_CHAIN_ID]: BNB_TOKEN_IMAGE_URL,
   [POLYGON_CHAIN_ID]: MATIC_TOKEN_IMAGE_URL,
-  [ARBITRUM_CHAIN_ID]: AETH_TOKEN_IMAGE_URL,
-  [BSC_CHAIN_ID]: BNB_TOKEN_IMAGE_URL,
-  [FANTOM_CHAIN_ID]: FTM_TOKEN_IMAGE_URL,
-  [HARMONY_CHAIN_ID]: HARMONY_ONE_TOKEN_IMAGE_URL,
-  [OPTIMISM_CHAIN_ID]: OPTIMISM_TOKEN_IMAGE_URL,
-  [PALM_CHAIN_ID]: PALM_TOKEN_IMAGE_URL,
-};
-
-export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP = {
-  [ROPSTEN_NETWORK_ID]: ROPSTEN,
-  [RINKEBY_NETWORK_ID]: RINKEBY,
-  [GOERLI_NETWORK_ID]: GOERLI,
-  [MAINNET_NETWORK_ID]: HOMESTEAD,
 };
 
 export const CHAIN_ID_TO_NETWORK_ID_MAP = Object.values(
@@ -268,11 +236,6 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'eth',
       showOnlyCurrencies: 'eth,usdt,usdc,dai',
     },
-    wyre: {
-      srn: 'ethereum',
-      currencyCode: ETH_SYMBOL,
-    },
-    coinbasePayCurrencies: [ETH_SYMBOL, 'USDC', 'DAI'],
   },
   [ROPSTEN_CHAIN_ID]: {
     nativeCurrency: TEST_NETWORK_TICKER_MAP[ROPSTEN],
@@ -307,10 +270,6 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'matic_polygon',
       showOnlyCurrencies: 'matic_polygon,usdc_polygon',
     },
-    wyre: {
-      srn: 'matic',
-      currencyCode: MATIC_SYMBOL,
-    },
   },
   [AVALANCHE_CHAIN_ID]: {
     nativeCurrency: AVALANCHE_SYMBOL,
@@ -320,11 +279,6 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'avax_cchain',
       showOnlyCurrencies: 'avax_cchain',
     },
-    wyre: {
-      srn: 'avalanche',
-      currencyCode: AVALANCHE_SYMBOL,
-    },
-    coinbasePayCurrencies: [AVALANCHE_SYMBOL],
   },
   [FANTOM_CHAIN_ID]: {
     nativeCurrency: FANTOM_SYMBOL,
@@ -341,86 +295,3 @@ export const BUYABLE_CHAINS_MAP = {
     },
   },
 };
-
-export const FEATURED_RPCS = [
-  {
-    chainId: ARBITRUM_CHAIN_ID,
-    nickname: ARBITRUM_DISPLAY_NAME,
-    rpcUrl: `https://arbitrum-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: ARBITRUM_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://explorer.arbitrum.io',
-      imageUrl: AETH_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: AVALANCHE_CHAIN_ID,
-    nickname: AVALANCHE_DISPLAY_NAME,
-    rpcUrl: 'https://api.avax.network/ext/bc/C/rpc',
-    ticker: AVALANCHE_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://snowtrace.io/',
-      imageUrl: AVAX_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: BSC_CHAIN_ID,
-    nickname: BNB_DISPLAY_NAME,
-    rpcUrl: 'https://bsc-dataseed.binance.org/',
-    ticker: BNB_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://bscscan.com/',
-      imageUrl: BNB_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: FANTOM_CHAIN_ID,
-    nickname: FANTOM_DISPLAY_NAME,
-    rpcUrl: 'https://rpc.ftm.tools/',
-    ticker: FANTOM_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://ftmscan.com/',
-      imageUrl: FTM_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: HARMONY_CHAIN_ID,
-    nickname: HARMONY_DISPLAY_NAME,
-    rpcUrl: 'https://api.harmony.one/',
-    ticker: HARMONY_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://explorer.harmony.one/',
-      imageUrl: HARMONY_ONE_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: OPTIMISM_CHAIN_ID,
-    nickname: OPTIMISM_DISPLAY_NAME,
-    rpcUrl: `https://optimism-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: ETH_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://optimistic.etherscan.io/',
-      imageUrl: OPTIMISM_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: PALM_CHAIN_ID,
-    nickname: PALM_DISPLAY_NAME,
-    rpcUrl: `https://palm-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: PALM_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://explorer.palm.io/',
-      imageUrl: PALM_TOKEN_IMAGE_URL,
-    },
-  },
-  {
-    chainId: POLYGON_CHAIN_ID,
-    nickname: `${POLYGON_DISPLAY_NAME} ${capitalize(MAINNET)}`,
-    rpcUrl: `https://polygon-mainnet.infura.io/v3/${infuraProjectId}`,
-    ticker: MATIC_SYMBOL,
-    rpcPrefs: {
-      blockExplorerUrl: 'https://polygonscan.com/',
-      imageUrl: MATIC_TOKEN_IMAGE_URL,
-    },
-  },
-];
diff --git a/shared/constants/permissions.js b/shared/constants/permissions.js
index 77df6431f804..c1e4e69e7ebe 100644
--- a/shared/constants/permissions.js
+++ b/shared/constants/permissions.js
@@ -21,7 +21,6 @@ export const PermissionNamespaces = Object.freeze({
 
 export const EndowmentPermissions = Object.freeze({
   'endowment:network-access': 'endowment:network-access',
-  'endowment:long-running': 'endowment:long-running',
 });
 
 // Methods / permissions in external packages that we are temporarily excluding.
diff --git a/shared/constants/permissions.test.js b/shared/constants/permissions.test.js
index 3637fed5818a..c6ace6243656 100644
--- a/shared/constants/permissions.test.js
+++ b/shared/constants/permissions.test.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
+import { endowmentPermissionBuilders } from '@metamask/controllers';
 import { restrictedMethodPermissionBuilders } from '@metamask/rpc-methods';
 import {
   EndowmentPermissions,
diff --git a/shared/constants/phishing.js b/shared/constants/phishing.js
deleted file mode 100644
index 63dea370626b..000000000000
--- a/shared/constants/phishing.js
+++ /dev/null
@@ -1,4 +0,0 @@
-export const PHISHING_NEW_ISSUE_URLS = {
-  MetaMask: 'https://github.com/metamask/eth-phishing-detect/issues/new',
-  PhishFort: 'https://github.com/phishfort/phishfort-lists/issues/new',
-};
diff --git a/shared/constants/swaps.js b/shared/constants/swaps.js
index 8482709caf09..10db41a2e634 100644
--- a/shared/constants/swaps.js
+++ b/shared/constants/swaps.js
@@ -206,8 +206,3 @@ export const TOKEN_BUCKET_PRIORITY = {
   OWNED: 'owned',
   TOP: 'top',
 };
-
-export const SLIPPAGE = {
-  DEFAULT: 2,
-  HIGH: 3,
-};
diff --git a/shared/constants/tokens.js b/shared/constants/tokens.js
index 2a878f3df1de..c4e52317a3ad 100644
--- a/shared/constants/tokens.js
+++ b/shared/constants/tokens.js
@@ -8,16 +8,3 @@ import contractMap from '@metamask/contract-metadata';
 export const LISTED_CONTRACT_ADDRESSES = Object.keys(
   contractMap,
 ).map((address) => address.toLowerCase());
-
-/**
- * @typedef {Object} TokenDetails
- * @property {string} address - The address of the selected 'TOKEN' or
- *  'COLLECTIBLE' contract.
- * @property {string} [symbol] - The symbol of the token.
- * @property {number} [decimals] - The number of decimals of the selected
- *  'ERC20' asset.
- * @property {number} [tokenId] - The id of the selected 'COLLECTIBLE' asset.
- * @property {TokenStandardStrings} [standard] - The standard of the selected
- *  asset.
- * @property {boolean} [isERC721] - True when the asset is a ERC721 token.
- */
diff --git a/shared/constants/transaction.js b/shared/constants/transaction.js
index 845f769a0310..411e14248124 100644
--- a/shared/constants/transaction.js
+++ b/shared/constants/transaction.js
@@ -15,8 +15,6 @@ import { MESSAGE_TYPE } from './app';
  *  to ensure that the receiver is an address capable of handling with the token being sent.
  * @property {'approve'} TOKEN_METHOD_APPROVE - A token transaction requesting an
  *  allowance of the token to spend on behalf of the user
- * @property {'setapprovalforall'} TOKEN_METHOD_SET_APPROVAL_FOR_ALL - A token transaction requesting an
- *  allowance of all of a user's token to spend on behalf of the user
  * @property {'incoming'} INCOMING - An incoming (deposit) transaction
  * @property {'simpleSend'} SIMPLE_SEND - A transaction sending a network's native asset to a recipient
  * @property {'contractInteraction'} CONTRACT_INTERACTION - A transaction that is
@@ -51,24 +49,23 @@ import { MESSAGE_TYPE } from './app';
  */
 export const TRANSACTION_TYPES = {
   CANCEL: 'cancel',
-  CONTRACT_INTERACTION: 'contractInteraction',
-  DEPLOY_CONTRACT: 'contractDeployment',
-  ETH_DECRYPT: MESSAGE_TYPE.ETH_DECRYPT,
-  ETH_GET_ENCRYPTION_PUBLIC_KEY: MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY,
-  INCOMING: 'incoming',
-  PERSONAL_SIGN: MESSAGE_TYPE.PERSONAL_SIGN,
   RETRY: 'retry',
-  SIGN: MESSAGE_TYPE.ETH_SIGN,
-  SIGN_TYPED_DATA: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
+  TOKEN_METHOD_TRANSFER: 'transfer',
+  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
+  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
+  TOKEN_METHOD_APPROVE: 'approve',
+  INCOMING: 'incoming',
   SIMPLE_SEND: 'simpleSend',
-  SMART: 'smart',
+  CONTRACT_INTERACTION: 'contractInteraction',
+  DEPLOY_CONTRACT: 'contractDeployment',
   SWAP: 'swap',
   SWAP_APPROVAL: 'swapApproval',
-  TOKEN_METHOD_APPROVE: 'approve',
-  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
-  TOKEN_METHOD_TRANSFER: 'transfer',
-  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
-  TOKEN_METHOD_SET_APPROVAL_FOR_ALL: 'setapprovalforall',
+  SMART: 'smart',
+  SIGN: MESSAGE_TYPE.ETH_SIGN,
+  SIGN_TYPED_DATA: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
+  PERSONAL_SIGN: MESSAGE_TYPE.PERSONAL_SIGN,
+  ETH_DECRYPT: MESSAGE_TYPE.ETH_DECRYPT,
+  ETH_GET_ENCRYPTION_PUBLIC_KEY: MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY,
 };
 
 /**
@@ -217,10 +214,10 @@ export const SMART_TRANSACTION_STATUSES = {
  * @type {TransactionGroupCategories}
  */
 export const TRANSACTION_GROUP_CATEGORIES = {
-  APPROVAL: 'approval',
-  INTERACTION: 'interaction',
-  RECEIVE: 'receive',
   SEND: 'send',
+  RECEIVE: 'receive',
+  INTERACTION: 'interaction',
+  APPROVAL: 'approval',
   SIGNATURE_REQUEST: 'signature-request',
   SWAP: 'swap',
 };
@@ -252,8 +249,6 @@ export const TRANSACTION_GROUP_CATEGORIES = {
  * @property {number} id - An internally unique tx identifier.
  * @property {number} time - Time the transaction was first suggested, in unix
  *  epoch time (ms).
- * @property {string} contractMethodName - A string representing a name of
- * transaction contract method.
  * @property {TransactionTypeString} type - The type of transaction this txMeta
  *  represents.
  * @property {TransactionStatusString} status - The current status of the
@@ -328,28 +323,13 @@ export const TRANSACTION_EVENTS = {
   SUBMITTED: 'Transaction Submitted',
 };
 
-/**
- * @typedef {Object} AssetTypes
- * @property {'NATIVE'} NATIVE - The native asset for the current network, such
- *  as ETH
- * @property {'TOKEN'} TOKEN - An ERC20 token.
- * @property {'COLLECTIBLE'} COLLECTIBLE - An ERC721 or ERC1155 token.
- * @property {'UNKNOWN'} UNKNOWN - A transaction interacting with a contract
- *  that isn't a token method interaction will be marked as dealing with an
- *  unknown asset type.
- */
-
-/**
- * This type will work anywhere you expect a string that can be one of the
- * above asset types
- *
- * @typedef {AssetTypes[keyof AssetTypes]} AssetTypesString
- */
-
 /**
  * The types of assets that a user can send
- *
- * @type {AssetTypes}
+ * 1. NATIVE - The native asset for the current network, such as ETH
+ * 2. TOKEN - An ERC20 token.
+ * 3. COLLECTIBLE - An ERC721 or ERC1155 token.
+ * 4. UNKNOWN - A transaction interacting with a contract that isn't a token
+ *  method interaction will be marked as dealing with an unknown asset type.
  */
 export const ASSET_TYPES = {
   NATIVE: 'NATIVE',
@@ -357,36 +337,3 @@ export const ASSET_TYPES = {
   COLLECTIBLE: 'COLLECTIBLE',
   UNKNOWN: 'UNKNOWN',
 };
-
-export const ERC20 = 'ERC20';
-export const ERC721 = 'ERC721';
-export const ERC1155 = 'ERC1155';
-
-/**
- * @typedef {Object} TokenStandards
- * @property {'ERC20'} ERC20 - A token that conforms to the ERC20 standard.
- * @property {'ERC721'} ERC721 - A token that conforms to the ERC721 standard.
- * @property {'ERC1155'} ERC1155 - A token that conforms to the ERC1155
- *  standard.
- * @property {'NONE'} NONE - Not a token, but rather the base asset of the
- *  selected chain.
- */
-
-/**
- * This type will work anywhere you expect a string that can be one of the
- * above statuses
- *
- * @typedef {TokenStandards[keyof TokenStandards]} TokenStandardStrings
- */
-
-/**
- * Describes the standard which a token conforms to.
- *
- * @type {TokenStandards}
- */
-export const TOKEN_STANDARDS = {
-  ERC20,
-  ERC721,
-  ERC1155,
-  NONE: 'NONE',
-};
diff --git a/shared/modules/fetch-with-timeout.js b/shared/modules/fetch-with-timeout.js
index 791470d77cdc..b12e8cba56d0 100644
--- a/shared/modules/fetch-with-timeout.js
+++ b/shared/modules/fetch-with-timeout.js
@@ -1,7 +1,6 @@
 import { memoize } from 'lodash';
-import { SECOND } from '../constants/time';
 
-const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
+const getFetchWithTimeout = memoize((timeout) => {
   if (!Number.isInteger(timeout) || timeout < 1) {
     throw new Error('Must specify positive integer timeout.');
   }
diff --git a/shared/modules/fetch-with-timeout.test.js b/shared/modules/fetch-with-timeout.test.js
index 2129db1c30fa..8d7ae57852b9 100644
--- a/shared/modules/fetch-with-timeout.test.js
+++ b/shared/modules/fetch-with-timeout.test.js
@@ -6,7 +6,7 @@ describe('getFetchWithTimeout', () => {
   it('fetches a url', async () => {
     nock('https://api.infura.io').get('/money').reply(200, '{"hodl": false}');
 
-    const fetchWithTimeout = getFetchWithTimeout();
+    const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
     const response = await (
       await fetchWithTimeout('https://api.infura.io/money')
     ).json();
@@ -46,9 +46,15 @@ describe('getFetchWithTimeout', () => {
   });
 
   it('throws on invalid timeout', async () => {
+    await expect(() => getFetchWithTimeout()).toThrow(
+      'Must specify positive integer timeout.',
+    );
     await expect(() => getFetchWithTimeout(-1)).toThrow(
       'Must specify positive integer timeout.',
     );
+    await expect(() => getFetchWithTimeout({})).toThrow(
+      'Must specify positive integer timeout.',
+    );
     await expect(() => getFetchWithTimeout(true)).toThrow(
       'Must specify positive integer timeout.',
     );
diff --git a/shared/modules/mv3.utils.js b/shared/modules/mv3.utils.js
deleted file mode 100644
index a990075b680f..000000000000
--- a/shared/modules/mv3.utils.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import browser from 'webextension-polyfill';
-
-export const isManifestV3 = () =>
-  browser.runtime.getManifest().manifest_version === 3;
diff --git a/shared/modules/object.utils.js b/shared/modules/object.utils.js
deleted file mode 100644
index ea2af06c40fd..000000000000
--- a/shared/modules/object.utils.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Return a "masked" copy of the given object.
- *
- * The returned object includes only the properties present in the mask. The
- * mask is an object that mirrors the structure of the given object, except
- * the only values are `true` or a sub-mask. `true` implies the property
- * should be included, and a sub-mask implies the property should be further
- * masked according to that sub-mask.
- *
- * @param {Object} object - The object to mask
- * @param {Object<Object|boolean>} mask - The mask to apply to the object
- */
-export function maskObject(object, mask) {
-  return Object.keys(object).reduce((state, key) => {
-    if (mask[key] === true) {
-      state[key] = object[key];
-    } else if (mask[key]) {
-      state[key] = maskObject(object[key], mask[key]);
-    }
-    return state;
-  }, {});
-}
diff --git a/shared/modules/rpc.utils.js b/shared/modules/rpc.utils.js
index 341ef1d97bb0..ab0c006b6fda 100644
--- a/shared/modules/rpc.utils.js
+++ b/shared/modules/rpc.utils.js
@@ -1,6 +1,7 @@
+import { SECOND } from '../constants/time';
 import getFetchWithTimeout from './fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 /**
  * Makes a JSON RPC request to the given URL, with the given RPC method and params.
diff --git a/shared/modules/transaction.utils.js b/shared/modules/transaction.utils.js
index 78c46d34d385..08adb46e3618 100644
--- a/shared/modules/transaction.utils.js
+++ b/shared/modules/transaction.utils.js
@@ -2,16 +2,13 @@ import { isHexString } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 import { abiERC721, abiERC20, abiERC1155 } from '@metamask/metamask-eth-abis';
 import log from 'loglevel';
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-  TRANSACTION_TYPES,
-} from '../constants/transaction';
+import { TOKEN_STANDARDS } from '../../ui/helpers/constants/common';
+import { ASSET_TYPES, TRANSACTION_TYPES } from '../constants/transaction';
 import { readAddressAsContract } from './contract-utils';
 import { isEqualCaseInsensitive } from './string-utils';
 
 /**
- * @typedef { 'transfer' | 'approve' | 'setapprovalforall' | 'transferfrom' | 'contractInteraction'| 'simpleSend' } InferrableTransactionTypes
+ * @typedef { 'transfer' | 'approve' | 'transferfrom' | 'contractInteraction'| 'simpleSend' } InferrableTransactionTypes
  */
 
 /**
@@ -151,35 +148,32 @@ export async function determineTransactionType(txParams, query) {
     log.debug('Failed to parse transaction data.', error, data);
   }
 
+  const tokenMethodName = [
+    TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+    TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+    TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
+    TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
+  ].find((methodName) => isEqualCaseInsensitive(methodName, name));
+
   let result;
+  if (data && tokenMethodName) {
+    result = tokenMethodName;
+  } else if (data && !to) {
+    result = TRANSACTION_TYPES.DEPLOY_CONTRACT;
+  }
+
   let contractCode;
 
-  if (data && !to) {
-    result = TRANSACTION_TYPES.DEPLOY_CONTRACT;
-  } else {
+  if (!result) {
     const {
       contractCode: resultCode,
       isContractAddress,
     } = await readAddressAsContract(query, to);
 
     contractCode = resultCode;
-
-    if (isContractAddress) {
-      const tokenMethodName = [
-        TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-        TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
-        TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-        TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
-        TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
-      ].find((methodName) => isEqualCaseInsensitive(methodName, name));
-
-      result =
-        data && tokenMethodName
-          ? tokenMethodName
-          : TRANSACTION_TYPES.CONTRACT_INTERACTION;
-    } else {
-      result = TRANSACTION_TYPES.SIMPLE_SEND;
-    }
+    result = isContractAddress
+      ? TRANSACTION_TYPES.CONTRACT_INTERACTION
+      : TRANSACTION_TYPES.SIMPLE_SEND;
   }
 
   return { type: result, getCodeResponse: contractCode };
@@ -187,7 +181,6 @@ export async function determineTransactionType(txParams, query) {
 
 const INFERRABLE_TRANSACTION_TYPES = [
   TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-  TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
   TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
   TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
   TRANSACTION_TYPES.CONTRACT_INTERACTION,
@@ -227,7 +220,6 @@ export async function determineTransactionAssetType(
   // method to get the asset type.
   const isTokenMethod = [
     TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-    TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
   ].find((methodName) => methodName === inferrableType);
diff --git a/shared/modules/transaction.utils.test.js b/shared/modules/transaction.utils.test.js
index 6998022e44cc..fba8c7827562 100644
--- a/shared/modules/transaction.utils.test.js
+++ b/shared/modules/transaction.utils.test.js
@@ -111,23 +111,13 @@ describe('Transaction.utils', function () {
     const genericProvider = createTestProviderTools().provider;
     const query = new EthQuery(genericProvider);
 
-    it('should return a simple send type when to is truthy and is not a contract address', async function () {
-      const _providerResultStub = {
-        // 1 gwei
-        eth_gasPrice: '0x0de0b6b3a7640000',
-        // by default, all accounts are external accounts (not contracts)
-        eth_getCode: '0x',
-      };
-      const _provider = createTestProviderTools({
-        scaffold: _providerResultStub,
-      }).provider;
-
+    it('should return a simple send type when to is truthy but data is falsy', async function () {
       const result = await determineTransactionType(
         {
           to: '0xabc',
           data: '',
         },
-        new EthQuery(_provider),
+        query,
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.SIMPLE_SEND,
@@ -135,78 +125,33 @@ describe('Transaction.utils', function () {
       });
     });
 
-    it('should return a token transfer type when the recipient is a contract and data is for the respective method call', async function () {
-      const _providerResultStub = {
-        // 1 gwei
-        eth_gasPrice: '0x0de0b6b3a7640000',
-        // by default, all accounts are external accounts (not contracts)
-        eth_getCode: '0xab',
-      };
-      const _provider = createTestProviderTools({
-        scaffold: _providerResultStub,
-      }).provider;
-
+    it('should return a token transfer type when data is for the respective method call', async function () {
       const result = await determineTransactionType(
         {
-          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
+          to: '0xabc',
           data:
             '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
         },
-        new EthQuery(_provider),
+        query,
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-        getCodeResponse: '0xab',
-      });
-    });
-
-    it('should NOT return a token transfer type when the recipient is not a contract but the data matches the respective method call', async function () {
-      const _providerResultStub = {
-        // 1 gwei
-        eth_gasPrice: '0x0de0b6b3a7640000',
-        // by default, all accounts are external accounts (not contracts)
-        eth_getCode: '0x',
-      };
-      const _provider = createTestProviderTools({
-        scaffold: _providerResultStub,
-      }).provider;
-
-      const result = await determineTransactionType(
-        {
-          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
-          data:
-            '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
-        },
-        new EthQuery(_provider),
-      );
-      expect(result).toMatchObject({
-        type: TRANSACTION_TYPES.SIMPLE_SEND,
-        getCodeResponse: '0x',
+        getCodeResponse: undefined,
       });
     });
 
-    it('should return a token approve type when when the recipient is a contract and data is for the respective method call', async function () {
-      const _providerResultStub = {
-        // 1 gwei
-        eth_gasPrice: '0x0de0b6b3a7640000',
-        // by default, all accounts are external accounts (not contracts)
-        eth_getCode: '0xab',
-      };
-      const _provider = createTestProviderTools({
-        scaffold: _providerResultStub,
-      }).provider;
-
+    it('should return a token approve type when data is for the respective method call', async function () {
       const result = await determineTransactionType(
         {
-          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
+          to: '0xabc',
           data:
             '0x095ea7b30000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C9700000000000000000000000000000000000000000000000000000000000000005',
         },
-        new EthQuery(_provider),
+        query,
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-        getCodeResponse: '0xab',
+        getCodeResponse: undefined,
       });
     });
 
@@ -239,22 +184,12 @@ describe('Transaction.utils', function () {
     });
 
     it('should return a simple send type with a null getCodeResponse when to is truthy and there is data and but getCode returns an error', async function () {
-      const _providerResultStub = {
-        // 1 gwei
-        eth_gasPrice: '0x0de0b6b3a7640000',
-        // by default, all accounts are external accounts (not contracts)
-        eth_getCode: null,
-      };
-      const _provider = createTestProviderTools({
-        scaffold: _providerResultStub,
-      }).provider;
-
       const result = await determineTransactionType(
         {
-          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
+          to: '0xabc',
           data: '0xabd',
         },
-        new EthQuery(_provider),
+        query,
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.SIMPLE_SEND,
diff --git a/shared/notifications/index.js b/shared/notifications/index.js
index a721b2e009c3..65fc49fdeb9e 100644
--- a/shared/notifications/index.js
+++ b/shared/notifications/index.js
@@ -66,13 +66,9 @@ export const UI_NOTIFICATIONS = {
       width: '100%',
     },
   },
-  13: {
-    id: 13,
-    date: '2022-07-12',
-  },
 };
 
-export const getTranslatedUINotifications = (t, locale) => {
+export const getTranslatedUINoficiations = (t, locale) => {
   const formattedLocale = locale.replace('_', '-');
   return {
     1: {
@@ -186,14 +182,5 @@ export const getTranslatedUINotifications = (t, locale) => {
         new Date(UI_NOTIFICATIONS[12].date),
       ),
     },
-    13: {
-      ...UI_NOTIFICATIONS[13],
-      title: t('notifications13Title'),
-      description: t('notifications13Description'),
-      actionText: t('notifications13ActionText'),
-      date: new Intl.DateTimeFormat(formattedLocale).format(
-        new Date(UI_NOTIFICATIONS[13].date),
-      ),
-    },
   };
 };
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index 231f050696f1..d856bb3b6a45 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -37,22 +37,6 @@
         "1559": true
       }
     },
-    "notifications": {
-      "test": {
-        "id": "test",
-        "origin": "local:http://localhost:8086/",
-        "createdDate": 1652967897732,
-        "readDate": null,
-        "message": "Hello, http://localhost:8086!"
-      },
-      "test2": {
-        "id": "test2",
-        "origin": "local:http://localhost:8086/",
-        "createdDate": 1652967897732,
-        "readDate": 1652967897732,
-        "message": "Hello, http://localhost:8086!"
-      }
-    },
     "cachedBalances": {},
     "incomingTransactions": {},
     "unapprovedTxs": {
diff --git a/test/e2e/benchmark.js b/test/e2e/benchmark.js
index df4c957568a7..fe2dc7926c81 100644
--- a/test/e2e/benchmark.js
+++ b/test/e2e/benchmark.js
@@ -1,16 +1,12 @@
 #!/usr/bin/env node
 
 const path = require('path');
-const { promises: fs } = require('fs');
+const { promises: fs, constants: fsConstants } = require('fs');
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const ttest = require('ttest');
 const { retry } = require('../../development/lib/retry');
 const { exitWithError } = require('../../development/lib/exit-with-error');
-const {
-  isWritable,
-  getFirstParentDirectoryThatExists,
-} = require('../helpers/file');
 const { withFixtures, tinyDelayMs } = require('./helpers');
 const { PAGES } = require('./webdriver/driver');
 
@@ -112,6 +108,35 @@ async function profilePageLoad(pages, numSamples, retries) {
   return results;
 }
 
+async function isWritable(directory) {
+  try {
+    await fs.access(directory, fsConstants.W_OK);
+    return true;
+  } catch (error) {
+    if (error.code !== 'EACCES') {
+      throw error;
+    }
+    return false;
+  }
+}
+
+async function getFirstParentDirectoryThatExists(directory) {
+  let nextDirectory = directory;
+  for (;;) {
+    try {
+      await fs.access(nextDirectory, fsConstants.F_OK);
+      return nextDirectory;
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
+      } else if (nextDirectory === path.dirname(nextDirectory)) {
+        throw new Error('Failed to find parent directory that exists');
+      }
+      nextDirectory = path.dirname(nextDirectory);
+    }
+  }
+}
+
 async function main() {
   const { argv } = yargs(hideBin(process.argv)).usage(
     '$0 [options]',
diff --git a/test/e2e/fixtures/address-entry/state.json b/test/e2e/fixtures/address-entry/state.json
index 1ce7f2d95f46..96b17cdb1d08 100644
--- a/test/e2e/fixtures/address-entry/state.json
+++ b/test/e2e/fixtures/address-entry/state.json
@@ -69,9 +69,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/connected-state/state.json b/test/e2e/fixtures/connected-state/state.json
index 11af1d9b2b4b..4d48df472e21 100644
--- a/test/e2e/fixtures/connected-state/state.json
+++ b/test/e2e/fixtures/connected-state/state.json
@@ -59,9 +59,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/custom-rpc/state.json b/test/e2e/fixtures/custom-rpc/state.json
index 02cc6d5f8eb0..222eb01592c9 100644
--- a/test/e2e/fixtures/custom-rpc/state.json
+++ b/test/e2e/fixtures/custom-rpc/state.json
@@ -55,9 +55,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/custom-token/state.json b/test/e2e/fixtures/custom-token/state.json
index baf7c2984d35..ae1fcd1b49d3 100644
--- a/test/e2e/fixtures/custom-token/state.json
+++ b/test/e2e/fixtures/custom-token/state.json
@@ -73,9 +73,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/eip-1559-v2-dapp/state.json b/test/e2e/fixtures/eip-1559-v2-dapp/state.json
index dc889b1e58e6..8394842404e5 100644
--- a/test/e2e/fixtures/eip-1559-v2-dapp/state.json
+++ b/test/e2e/fixtures/eip-1559-v2-dapp/state.json
@@ -56,9 +56,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/eip-1559-v2/state.json b/test/e2e/fixtures/eip-1559-v2/state.json
index 6ac0aa7ad373..0c79d8c61405 100644
--- a/test/e2e/fixtures/eip-1559-v2/state.json
+++ b/test/e2e/fixtures/eip-1559-v2/state.json
@@ -56,9 +56,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/import-ui/state.json b/test/e2e/fixtures/import-ui/state.json
index c5f3da0043f5..20c6bf87c4bc 100644
--- a/test/e2e/fixtures/import-ui/state.json
+++ b/test/e2e/fixtures/import-ui/state.json
@@ -110,9 +110,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json
index 7a79d293bf8d..cb5c96950091 100644
--- a/test/e2e/fixtures/imported-account/state.json
+++ b/test/e2e/fixtures/imported-account/state.json
@@ -55,9 +55,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/localization/state.json b/test/e2e/fixtures/localization/state.json
index 45d09cf57ba3..4b32460b55d7 100644
--- a/test/e2e/fixtures/localization/state.json
+++ b/test/e2e/fixtures/localization/state.json
@@ -55,9 +55,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/metrics-enabled/state.json b/test/e2e/fixtures/metrics-enabled/state.json
index 58c7c51090b9..43b345204263 100644
--- a/test/e2e/fixtures/metrics-enabled/state.json
+++ b/test/e2e/fixtures/metrics-enabled/state.json
@@ -59,9 +59,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json
index e5774eed663f..1613c7f5897f 100644
--- a/test/e2e/fixtures/navigate-transactions/state.json
+++ b/test/e2e/fixtures/navigate-transactions/state.json
@@ -55,9 +55,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/onboarding/state.json b/test/e2e/fixtures/onboarding/state.json
index 06582c44332c..6a4c94b96946 100644
--- a/test/e2e/fixtures/onboarding/state.json
+++ b/test/e2e/fixtures/onboarding/state.json
@@ -30,9 +30,6 @@
       "notifications": {
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/send-edit-v2/state.json b/test/e2e/fixtures/send-edit-v2/state.json
index 90a8dc1d9c9a..9de073c00046 100644
--- a/test/e2e/fixtures/send-edit-v2/state.json
+++ b/test/e2e/fixtures/send-edit-v2/state.json
@@ -56,9 +56,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/send-edit/state.json b/test/e2e/fixtures/send-edit/state.json
index 19dc61b39d14..1272fbd04c7c 100644
--- a/test/e2e/fixtures/send-edit/state.json
+++ b/test/e2e/fixtures/send-edit/state.json
@@ -56,9 +56,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/special-settings/state.json b/test/e2e/fixtures/special-settings/state.json
deleted file mode 100644
index 8b66b91559d4..000000000000
--- a/test/e2e/fixtures/special-settings/state.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "data": {
-    "AppStateController": {
-      "mkrMigrationReminderTimestamp": null
-    },
-    "CachedBalancesController": {
-      "cachedBalances": {
-        "4": {}
-      }
-    },
-    "CurrencyController": {
-      "conversionDate": 1575697244.188,
-      "conversionRate": 149.61,
-      "currentCurrency": "usd",
-      "nativeCurrency": "ETH"
-    },
-    "IncomingTransactionsController": {
-      "incomingTransactions": {},
-      "incomingTxLastFetchedBlocksByNetwork": {
-        "goerli": null,
-        "kovan": null,
-        "mainnet": null,
-        "rinkeby": 5570536
-      }
-    },
-    "KeyringController": {
-      "vault": "{\"data\":\"s6TpYjlUNsn7ifhEFTkuDGBUM1GyOlPrim7JSjtfIxgTt8/6MiXgiR/CtFfR4dWW2xhq85/NGIBYEeWrZThGdKGarBzeIqBfLFhw9n509jprzJ0zc2Rf+9HVFGLw+xxC4xPxgCS0IIWeAJQ+XtGcHmn0UZXriXm8Ja4kdlow6SWinB7sr/WM3R0+frYs4WgllkwggDf2/Tv6VHygvLnhtzp6hIJFyTjh+l/KnyJTyZW1TkZhDaNDzX3SCOHT\",\"iv\":\"FbeHDAW5afeWNORfNJBR0Q==\",\"salt\":\"TxZ+WbCW6891C9LK/hbMAoUsSEW1E8pyGLVBU6x5KR8=\"}"
-    },
-    "NetworkController": {
-      "network": "1337",
-      "provider": {
-        "nickname": "Localhost 8545",
-        "rpcUrl": "http://localhost:8545",
-        "chainId": "0x539",
-        "ticker": "ETH",
-        "type": "rpc"
-      }
-    },
-    "NotificationController": {
-      "notifications": {
-        "1": {
-          "isShown": true
-        },
-        "3": {
-          "isShown": true
-        },
-        "5": {
-          "isShown": true
-        },
-        "6": {
-          "isShown": true
-        },
-        "8": {
-          "isShown": true
-        },
-        "12": {
-          "isShown": true
-        },
-        "13": {
-          "isShown": true
-        }
-      }
-    },
-    "OnboardingController": {
-      "onboardingTabs": {},
-      "seedPhraseBackedUp": false
-    },
-    "PermissionsMetadata": {
-      "domainMetadata": {
-        "metamask.github.io": {
-          "icon": null,
-          "name": "M E T A M A S K M E S H T E S T"
-        }
-      },
-      "permissionsHistory": {},
-      "permissionsLog": [
-        {
-          "id": 746677923,
-          "method": "eth_accounts",
-          "methodType": "restricted",
-          "origin": "metamask.github.io",
-          "request": {
-            "id": 746677923,
-            "jsonrpc": "2.0",
-            "method": "eth_accounts",
-            "origin": "metamask.github.io",
-            "params": []
-          },
-          "requestTime": 1575697241368,
-          "response": {
-            "id": 746677923,
-            "jsonrpc": "2.0",
-            "result": []
-          },
-          "responseTime": 1575697241370,
-          "success": true
-        }
-      ]
-    },
-    "PreferencesController": {
-      "accountTokens": {
-        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
-          "rinkeby": [],
-          "ropsten": []
-        }
-      },
-      "assetImages": {},
-      "completedOnboarding": true,
-      "dismissSeedBackUpReminder": true,
-      "currentLocale": "en",
-      "featureFlags": {
-        "showIncomingTransactions": true,
-        "transactionTime": false,
-        "sendHexData": true
-      },
-      "firstTimeFlowType": "create",
-      "forgottenPassword": false,
-      "frequentRpcListDetail": [],
-      "identities": {
-        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
-          "address": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
-          "name": "Account 1"
-        }
-      },
-      "knownMethodData": {},
-      "lostIdentities": {},
-      "metaMetricsId": null,
-      "participateInMetaMetrics": false,
-      "preferences": {
-        "useNativeCurrencyAsPrimaryCurrency": true
-      },
-      "selectedAddress": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
-      "suggestedTokens": {},
-      "tokens": [],
-      "useBlockie": false,
-      "useNonceField": false,
-      "usePhishDetect": true,
-      "useTokenDetection": true
-    },
-    "config": {},
-    "firstTimeInfo": {
-      "date": 1575697234195,
-      "version": "7.7.0"
-    }
-  },
-  "meta": {
-    "version": 40
-  }
-}
diff --git a/test/e2e/fixtures/threebox-enabled/state.json b/test/e2e/fixtures/threebox-enabled/state.json
index 549ddb635242..78b6f1226a37 100644
--- a/test/e2e/fixtures/threebox-enabled/state.json
+++ b/test/e2e/fixtures/threebox-enabled/state.json
@@ -66,9 +66,6 @@
         },
         "12": {
           "isShown": true
-        },
-        "13": {
-          "isShown": true
         }
       }
     },
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 6e1230a05916..8e13c4c6cca6 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -6,10 +6,8 @@ const enLocaleMessages = require('../../app/_locales/en/messages.json');
 const { setupMocking } = require('./mock-e2e');
 const Ganache = require('./ganache');
 const FixtureServer = require('./fixture-server');
-const PhishingWarningPageServer = require('./phishing-warning-page-server');
 const { buildWebDriver } = require('./webdriver');
 const { ensureXServerIsRunning } = require('./x-server');
-const GanacheSeeder = require('./seeder/ganache-seeder');
 
 const tinyDelayMs = 200;
 const regularDelayMs = tinyDelayMs * 2;
@@ -24,13 +22,11 @@ async function withFixtures(options, testSuite) {
     dapp,
     fixtures,
     ganacheOptions,
-    smartContract,
     driverOptions,
     dappOptions,
     title,
     failOnConsoleError = true,
     dappPath = undefined,
-    dappPaths,
     testSpecificMock = function () {
       // do nothing.
     },
@@ -42,20 +38,11 @@ async function withFixtures(options, testSuite) {
   let secondaryGanacheServer;
   let numberOfDapps = dapp ? 1 : 0;
   const dappServer = [];
-  const phishingPageServer = new PhishingWarningPageServer();
 
   let webDriver;
   let failed = false;
   try {
     await ganacheServer.start(ganacheOptions);
-    let contractRegistry;
-
-    if (smartContract) {
-      const ganacheSeeder = new GanacheSeeder(true);
-      await ganacheSeeder.deploySmartContract(smartContract);
-      contractRegistry = ganacheSeeder.getContractRegistry();
-    }
-
     if (ganacheOptions?.concurrent) {
       const { port, chainId } = ganacheOptions.concurrent;
       secondaryGanacheServer = new Ganache();
@@ -68,15 +55,14 @@ async function withFixtures(options, testSuite) {
     }
     await fixtureServer.start();
     await fixtureServer.loadState(path.join(__dirname, 'fixtures', fixtures));
-    await phishingPageServer.start();
     if (dapp) {
       if (dappOptions?.numberOfDapps) {
         numberOfDapps = dappOptions.numberOfDapps;
       }
       for (let i = 0; i < numberOfDapps; i++) {
         let dappDirectory;
-        if (dappPath || (dappPaths && dappPaths[i])) {
-          dappDirectory = path.resolve(__dirname, dappPath || dappPaths[i]);
+        if (dappPath) {
+          dappDirectory = path.resolve(__dirname, dappPath);
         } else {
           dappDirectory = path.resolve(
             __dirname,
@@ -110,7 +96,6 @@ async function withFixtures(options, testSuite) {
     await testSuite({
       driver,
       mockServer,
-      contractRegistry,
     });
 
     if (process.env.SELENIUM_BROWSER === 'chrome') {
@@ -161,9 +146,6 @@ async function withFixtures(options, testSuite) {
           }
         }
       }
-      if (phishingPageServer.isRunning()) {
-        await phishingPageServer.quit();
-      }
       await mockServer.stop();
     }
   }
@@ -248,12 +230,12 @@ const completeImportSRPOnboardingFlow = async (
       tag: 'button',
     });
 
-    // clicks the "No thanks" option on the metametrics opt-in screen
-    await driver.clickElement('.btn-secondary');
-
     // clicks the "Import Wallet" option
     await driver.clickElement({ text: 'Import wallet', tag: 'button' });
 
+    // clicks the "No thanks" option on the metametrics opt-in screen
+    await driver.clickElement('.btn-secondary');
+
     // Import Secret Recovery Phrase
     await driver.pasteIntoField(
       '[data-testid="import-srp__srp-word-0"]',
@@ -290,12 +272,12 @@ const completeImportSRPOnboardingFlowWordByWord = async (
     tag: 'button',
   });
 
-  // clicks the "No thanks" option on the metametrics opt-in screen
-  await driver.clickElement('.btn-secondary');
-
   // clicks the "Import Wallet" option
   await driver.clickElement({ text: 'Import wallet', tag: 'button' });
 
+  // clicks the "No thanks" option on the metametrics opt-in screen
+  await driver.clickElement('.btn-secondary');
+
   const words = seedPhrase.split(' ');
   for (const word of words) {
     await driver.pasteIntoField(
diff --git a/test/e2e/lavamoat-stats.js b/test/e2e/lavamoat-stats.js
deleted file mode 100644
index 4abf00a686b7..000000000000
--- a/test/e2e/lavamoat-stats.js
+++ /dev/null
@@ -1,140 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable node/shebang */
-const path = require('path');
-const { promises: fs, constants: fsConstants } = require('fs');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
-const { exitWithError } = require('../../development/lib/exit-with-error');
-const { withFixtures, tinyDelayMs } = require('./helpers');
-
-async function measurePage() {
-  let metrics;
-  try {
-    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
-      await driver.delay(tinyDelayMs);
-      await driver.navigate();
-      await driver.findElement('#password');
-      await driver.delay(1000);
-      const logs = await driver.checkBrowserForLavamoatLogs();
-
-      let logString = '';
-      let inObject = false;
-
-      const parsedLogs = [];
-
-      logs.forEach((log) => {
-        if (log.indexOf('"version": 1') >= 0) {
-          logString += log;
-          parsedLogs.push(`{${logString}}`);
-          logString = '';
-          inObject = false;
-        } else if (inObject) {
-          logString += log;
-        } else if (
-          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0 ||
-          log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0
-        ) {
-          logString += log;
-          inObject = true;
-        }
-      });
-
-      metrics = parsedLogs.map((pl) => JSON.parse(pl));
-    });
-  } catch (error) {
-    // do nothing
-  }
-  return metrics;
-}
-
-async function profilePageLoad() {
-  const results = await measurePage();
-  const metrics = {};
-
-  metrics['background.js'] = results[0];
-  metrics['ui.js'] = results[1];
-
-  return metrics;
-}
-
-async function isWritable(directory) {
-  try {
-    await fs.access(directory, fsConstants.W_OK);
-    return true;
-  } catch (error) {
-    if (error.code !== 'EACCES') {
-      throw error;
-    }
-    return false;
-  }
-}
-
-async function getFirstParentDirectoryThatExists(directory) {
-  let nextDirectory = directory;
-  for (;;) {
-    try {
-      await fs.access(nextDirectory, fsConstants.F_OK);
-      return nextDirectory;
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        throw error;
-      } else if (nextDirectory === path.dirname(nextDirectory)) {
-        throw new Error('Failed to find parent directory that exists');
-      }
-      nextDirectory = path.dirname(nextDirectory);
-    }
-  }
-}
-
-async function main() {
-  const { argv } = yargs(hideBin(process.argv)).usage(
-    '$0 [options]',
-    'Run a page load benchmark',
-    (_yargs) =>
-      _yargs.option('out', {
-        description:
-          'Output filename. Output printed to STDOUT of this is omitted.',
-        type: 'string',
-        normalize: true,
-      }),
-  );
-
-  const { out } = argv;
-
-  let outputDirectory;
-  let existingParentDirectory;
-  if (out) {
-    outputDirectory = path.dirname(out);
-    existingParentDirectory = await getFirstParentDirectoryThatExists(
-      outputDirectory,
-    );
-    if (!(await isWritable(existingParentDirectory))) {
-      throw new Error('Specified output file directory is not writable');
-    }
-  }
-
-  const results = await profilePageLoad();
-
-  if (out) {
-    if (outputDirectory !== existingParentDirectory) {
-      await fs.mkdir(outputDirectory, { recursive: true });
-    }
-
-    await fs.writeFile(
-      path.join(out, 'background.json'),
-      JSON.stringify(results['background.js'], null, 2),
-    );
-
-    await fs.writeFile(
-      path.join(out, 'ui.json'),
-      JSON.stringify(results['ui.js'], null, 2),
-    );
-  } else {
-    console.log(JSON.stringify(results, null, 2));
-  }
-}
-
-main().catch((error) => {
-  exitWithError(error);
-});
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 9e85bff8420d..854b597a09af 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -99,13 +99,13 @@ describe('MetaMask', function () {
       await driver.delay(largeDelayMs);
     });
 
-    it('clicks the "No thanks" option on the metametrics opt-in screen', async function () {
-      await driver.clickElement('.btn-secondary');
+    it('clicks the "Create New Wallet" option', async function () {
+      await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
       await driver.delay(largeDelayMs);
     });
 
-    it('clicks the "Create New Wallet" option', async function () {
-      await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
+    it('clicks the "No thanks" option on the metametrics opt-in screen', async function () {
+      await driver.clickElement('.btn-secondary');
       await driver.delay(largeDelayMs);
     });
 
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index b4e6f595f191..a6d5d6518eac 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -25,28 +25,6 @@ async function setupMocking(server, testSpecificMock) {
     };
   });
 
-  await server
-    .forGet('https://www.4byte.directory/api/v1/signatures/')
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {
-          count: 1,
-          next: null,
-          previous: null,
-          results: [
-            {
-              id: 1,
-              created_at: null,
-              text_signature: 'deposit()',
-              hex_signature: null,
-              bytes_signature: null,
-            },
-          ],
-        },
-      };
-    });
-
   await server
     .forGet('https://gas-api.metaswap.codefi.network/networks/1/gasPrices')
     .thenCallback(() => {
@@ -176,35 +154,6 @@ async function setupMocking(server, testSpecificMock) {
       };
     });
 
-  await server
-    .forGet('https://token-api.metaswap.codefi.network/token/0x539')
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: {},
-      };
-    });
-
-  await server
-    .forGet(
-      'https://static.metaswap.codefi.network/api/v1/tokenIcons/1337/0x0d8775f648430679a709e98d2b0cb6250d2887ef.png',
-    )
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-      };
-    });
-
-  await server
-    .forGet(
-      'https://static.metaswap.codefi.network/api/v1/tokenIcons/1337/0x2efa2cb29c2341d8e5ba7d3262c9e9d6f1bf3711.png',
-    )
-    .thenCallback(() => {
-      return {
-        statusCode: 200,
-      };
-    });
-
   testSpecificMock(server);
 }
 
diff --git a/test/e2e/mock-page-with-disallowed-iframe/index.html b/test/e2e/mock-page-with-disallowed-iframe/index.html
deleted file mode 100644
index ffadeeefa819..000000000000
--- a/test/e2e/mock-page-with-disallowed-iframe/index.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <title>Mock E2E Phishing Page</title>
-</head>
-<script type="text/javascript">
-	function setIframeSource() {
-		const urlSearchParams = new URLSearchParams(window.location.search);
-		const params = Object.fromEntries(urlSearchParams.entries());
-		const extensionUrl = new URL(params.extensionUrl);
-		document.getElementById('frame').src = `http://localhost:9999/#hostname=${encodeURIComponent(extensionUrl.hostname)}&href=${encodeURIComponent(extensionUrl.href)}`;
-	}
-	window.onload = setIframeSource;
-</script>
-<body>
-	<div>Hello</div>
-	<iframe id="frame" width=900 height=900>
-</body>
-
-</html>
diff --git a/test/e2e/mock-page-with-iframe/index.html b/test/e2e/mock-page-with-iframe/index.html
deleted file mode 100644
index 36b613dd2475..000000000000
--- a/test/e2e/mock-page-with-iframe/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-  <title>Mock E2E Phishing Page</title>
-</head>
-<body>
-	<div>Hello</div>
-<iframe src="http://127.0.0.1:8081" width=900 height=900>
-</body>
-
-</html>
\ No newline at end of file
diff --git a/test/e2e/mv3-perf-stats/bundle-size.js b/test/e2e/mv3-perf-stats/bundle-size.js
deleted file mode 100644
index da52d916c506..000000000000
--- a/test/e2e/mv3-perf-stats/bundle-size.js
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable node/shebang */
-const path = require('path');
-const { promises: fs } = require('fs');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
-const {
-  isWritable,
-  getFirstParentDirectoryThatExists,
-} = require('../../helpers/file');
-
-const { exitWithError } = require('../../../development/lib/exit-with-error');
-
-/**
- * The e2e test case is used to capture bundle time statistics for extension.
- */
-
-const backgroundFiles = [
-  'runtime-lavamoat.js',
-  'lockdown-more.js',
-  'globalthis.js',
-  'sentry-install.js',
-  'policy-load.js',
-];
-
-const uiFiles = [
-  'globalthis.js',
-  'sentry-install.js',
-  'runtime-lavamoat.js',
-  'lockdown-more.js',
-  'policy-load.js',
-];
-
-const BackgroundFileRegex = /background-[0-9]*.js/u;
-const CommonFileRegex = /common-[0-9]*.js/u;
-const UIFileRegex = /ui-[0-9]*.js/u;
-
-async function main() {
-  const { argv } = yargs(hideBin(process.argv)).usage(
-    '$0 [options]',
-    'Run a page load benchmark',
-    (_yargs) =>
-      _yargs.option('out', {
-        description:
-          'Output filename. Output printed to STDOUT of this is omitted.',
-        type: 'string',
-        normalize: true,
-      }),
-  );
-  const { out } = argv;
-
-  const distFolder = 'dist/chrome';
-  const backgroundFileList = [];
-  const uiFileList = [];
-
-  const files = await fs.readdir(distFolder);
-  for (let i = 0; i < files.length; i++) {
-    const file = files[i];
-    if (CommonFileRegex.test(file)) {
-      const stats = await fs.stat(`${distFolder}/${file}`);
-      backgroundFileList.push({ name: file, size: stats.size });
-      uiFileList.push({ name: file, size: stats.size });
-    } else if (
-      backgroundFiles.includes(file) ||
-      BackgroundFileRegex.test(file)
-    ) {
-      const stats = await fs.stat(`${distFolder}/${file}`);
-      backgroundFileList.push({ name: file, size: stats.size });
-    } else if (uiFiles.includes(file) || UIFileRegex.test(file)) {
-      const stats = await fs.stat(`${distFolder}/${file}`);
-      uiFileList.push({ name: file, size: stats.size });
-    }
-  }
-
-  const backgroundBundleSize = backgroundFileList.reduce(
-    (result, file) => result + file.size,
-    0,
-  );
-
-  const uiBundleSize = uiFileList.reduce(
-    (result, file) => result + file.size,
-    0,
-  );
-
-  const result = {
-    background: {
-      name: 'background',
-      size: backgroundBundleSize,
-      fileList: backgroundFileList,
-    },
-    ui: {
-      name: 'ui',
-      size: uiBundleSize,
-      fileList: uiFileList,
-    },
-  };
-
-  if (out) {
-    const outPath = `${out}/bundle_size.json`;
-    const outputDirectory = path.dirname(outPath);
-    const existingParentDirectory = await getFirstParentDirectoryThatExists(
-      outputDirectory,
-    );
-    if (!(await isWritable(existingParentDirectory))) {
-      throw new Error('Specified output file directory is not writable');
-    }
-    if (outputDirectory !== existingParentDirectory) {
-      await fs.mkdir(outputDirectory, { recursive: true });
-    }
-    await fs.writeFile(outPath, JSON.stringify(result, null, 2));
-  } else {
-    console.log(JSON.stringify(result, null, 2));
-  }
-}
-
-main().catch((error) => {
-  exitWithError(error);
-});
diff --git a/test/e2e/mv3-perf-stats/index.js b/test/e2e/mv3-perf-stats/index.js
deleted file mode 100644
index 4e56a2385a67..000000000000
--- a/test/e2e/mv3-perf-stats/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-require('./init-load-stats');
-require('./bundle-size');
diff --git a/test/e2e/mv3-perf-stats/init-load-stats.js b/test/e2e/mv3-perf-stats/init-load-stats.js
deleted file mode 100644
index de51940318e1..000000000000
--- a/test/e2e/mv3-perf-stats/init-load-stats.js
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable node/shebang */
-const path = require('path');
-const { promises: fs } = require('fs');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
-
-const { exitWithError } = require('../../../development/lib/exit-with-error');
-const {
-  isWritable,
-  getFirstParentDirectoryThatExists,
-} = require('../../helpers/file');
-const { withFixtures, tinyDelayMs } = require('../helpers');
-
-/**
- * The e2e test case is used to capture load and initialisation time statistics for extension in MV3 environment.
- */
-
-async function profilePageLoad() {
-  const parsedLogs = {};
-  try {
-    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
-      await driver.delay(tinyDelayMs);
-      await driver.navigate();
-      await driver.delay(1000);
-      const logs = await driver.checkBrowserForLavamoatLogs();
-
-      let logString = '';
-      let logType = '';
-
-      logs.forEach((log) => {
-        if (log.indexOf('"version": 1') >= 0) {
-          // log end here
-          logString += log;
-          parsedLogs[logType] = JSON.parse(`{${logString}}`);
-          logString = '';
-          logType = '';
-        } else if (logType) {
-          // log string continues
-          logString += log;
-        } else if (
-          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
-        ) {
-          // background log starts
-          logString += log;
-          logType = 'background';
-        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
-          // ui log starts
-          logString += log;
-          logType = 'ui';
-        } else if (log.search(/"name": "Total"/u) >= 0) {
-          // load time log starts
-          logString += log;
-          logType = 'loadTime';
-        }
-      });
-    });
-  } catch (error) {
-    console.log('Error in trying to parse logs.');
-  }
-  return parsedLogs;
-}
-
-async function main() {
-  const { argv } = yargs(hideBin(process.argv)).usage(
-    '$0 [options]',
-    'Run a page load benchmark',
-    (_yargs) =>
-      _yargs.option('out', {
-        description:
-          'Output filename. Output printed to STDOUT of this is omitted.',
-        type: 'string',
-        normalize: true,
-      }),
-  );
-
-  const results = await profilePageLoad();
-  const { out } = argv;
-
-  const logCategories = [
-    { key: 'background', dirPath: 'initialisation/background/stacks.json' },
-    { key: 'ui', dirPath: 'initialisation/ui/stacks.json' },
-    { key: 'loadTime', dirPath: 'load_time/stats.json' },
-  ];
-
-  if (out) {
-    logCategories.forEach(async ({ key, dirPath }) => {
-      if (results[key]) {
-        const outPath = `${out}/${dirPath}`;
-        const outputDirectory = path.dirname(outPath);
-        const existingParentDirectory = await getFirstParentDirectoryThatExists(
-          outputDirectory,
-        );
-        if (!(await isWritable(existingParentDirectory))) {
-          throw new Error('Specified output file directory is not writable');
-        }
-        if (outputDirectory !== existingParentDirectory) {
-          await fs.mkdir(outputDirectory, { recursive: true });
-        }
-        await fs.writeFile(outPath, JSON.stringify(results[key], null, 2));
-      }
-    });
-  } else {
-    console.log(JSON.stringify(results, null, 2));
-  }
-}
-
-main().catch((error) => {
-  exitWithError(error);
-});
diff --git a/test/e2e/mv3-stats.js b/test/e2e/mv3-stats.js
deleted file mode 100644
index 8e8180e024a9..000000000000
--- a/test/e2e/mv3-stats.js
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env node
-
-/* eslint-disable node/shebang */
-const path = require('path');
-const { promises: fs } = require('fs');
-const yargs = require('yargs/yargs');
-const { hideBin } = require('yargs/helpers');
-
-const { exitWithError } = require('../../development/lib/exit-with-error');
-const {
-  isWritable,
-  getFirstParentDirectoryThatExists,
-} = require('../helpers/file');
-const { withFixtures, tinyDelayMs } = require('./helpers');
-
-/**
- * The e2e test case is used to capture load and initialisation time statistics for extension in MV3 environment.
- */
-
-async function profilePageLoad() {
-  const parsedLogs = {};
-  try {
-    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
-      await driver.delay(tinyDelayMs);
-      await driver.navigate();
-      await driver.delay(1000);
-      const logs = await driver.checkBrowserForLavamoatLogs();
-
-      let logString = '';
-      let logType = '';
-
-      logs.forEach((log) => {
-        if (log.indexOf('"version": 1') >= 0) {
-          // log end here
-          logString += log;
-          parsedLogs[logType] = JSON.parse(`{${logString}}`);
-          logString = '';
-          logType = '';
-        } else if (logType) {
-          // log string continues
-          logString += log;
-        } else if (
-          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
-        ) {
-          // background log starts
-          logString += log;
-          logType = 'background';
-        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
-          // ui log starts
-          logString += log;
-          logType = 'ui';
-        } else if (log.search(/"name": "Total"/u) >= 0) {
-          // load time log starts
-          logString += log;
-          logType = 'loadTime';
-        }
-      });
-    });
-  } catch (error) {
-    console.log('Error in trying to parse logs.');
-  }
-  return parsedLogs;
-}
-
-async function main() {
-  const { argv } = yargs(hideBin(process.argv)).usage(
-    '$0 [options]',
-    'Run a page load benchmark',
-    (_yargs) =>
-      _yargs.option('out', {
-        description:
-          'Output filename. Output printed to STDOUT of this is omitted.',
-        type: 'string',
-        normalize: true,
-      }),
-  );
-
-  const results = await profilePageLoad();
-  const { out } = argv;
-
-  const logCategories = [
-    { key: 'background', dirPath: 'initialisation/background/stacks.json' },
-    { key: 'ui', dirPath: 'initialisation/ui/stacks.json' },
-    { key: 'loadTime', dirPath: 'load_time/stats.json' },
-  ];
-
-  if (out) {
-    logCategories.forEach(async ({ key, dirPath }) => {
-      if (results[key]) {
-        const outPath = `${out}/${dirPath}`;
-        const outputDirectory = path.dirname(outPath);
-        const existingParentDirectory = await getFirstParentDirectoryThatExists(
-          outputDirectory,
-        );
-        if (!(await isWritable(existingParentDirectory))) {
-          throw new Error('Specified output file directory is not writable');
-        }
-        if (outputDirectory !== existingParentDirectory) {
-          await fs.mkdir(outputDirectory, { recursive: true });
-        }
-        await fs.writeFile(outPath, JSON.stringify(results[key], null, 2));
-      }
-    });
-  } else {
-    console.log(JSON.stringify(results, null, 2));
-  }
-}
-
-main().catch((error) => {
-  exitWithError(error);
-});
diff --git a/test/e2e/phishing-warning-page-server.js b/test/e2e/phishing-warning-page-server.js
deleted file mode 100644
index 2f6099e1a3d0..000000000000
--- a/test/e2e/phishing-warning-page-server.js
+++ /dev/null
@@ -1,58 +0,0 @@
-const path = require('path');
-const createStaticServer = require('../../development/create-static-server');
-
-const phishingWarningDirectory = path.resolve(
-  __dirname,
-  '..',
-  '..',
-  'node_modules',
-  '@metamask',
-  'phishing-warning',
-  'dist',
-);
-
-class PhishingWarningPageServer {
-  constructor() {
-    this._server = createStaticServer(phishingWarningDirectory);
-  }
-
-  async start({ port = 9999 } = {}) {
-    this._server.listen(port);
-
-    let resolveStart;
-    let rejectStart;
-    const result = new Promise((resolve, reject) => {
-      resolveStart = resolve;
-      rejectStart = reject;
-    });
-    this._server.once('listening', resolveStart);
-    this._server.once('error', rejectStart);
-
-    try {
-      await result;
-      // clean up listener to ensure later errors properly bubble up
-      this._server.removeListener('error', rejectStart);
-    } catch (error) {
-      this._server.removeListener('listening', resolveStart);
-      throw error;
-    }
-  }
-
-  isRunning() {
-    return this._server.listening;
-  }
-
-  async quit() {
-    await new Promise((resolve, reject) =>
-      this._server.close((error) => {
-        if (error) {
-          reject(error);
-        } else {
-          resolve();
-        }
-      }),
-    );
-  }
-}
-
-module.exports = PhishingWarningPageServer;
diff --git a/test/e2e/run-e2e-test.js b/test/e2e/run-e2e-test.js
index 043f061db760..195ec41b661e 100644
--- a/test/e2e/run-e2e-test.js
+++ b/test/e2e/run-e2e-test.js
@@ -70,12 +70,10 @@ async function main() {
   }
 
   let testTimeoutInMilliseconds = 60 * 1000;
-  let exit = '--exit';
 
   if (leaveRunning) {
     process.env.E2E_LEAVE_RUNNING = 'true';
     testTimeoutInMilliseconds = 0;
-    exit = '--no-exit';
   }
 
   await retry({ retries }, async () => {
@@ -85,7 +83,6 @@ async function main() {
       '--timeout',
       testTimeoutInMilliseconds,
       e2eTestPath,
-      exit,
     ]);
   });
 }
diff --git a/test/e2e/seeder/ganache-contract-address-registry.js b/test/e2e/seeder/ganache-contract-address-registry.js
deleted file mode 100644
index bfad708d3c90..000000000000
--- a/test/e2e/seeder/ganache-contract-address-registry.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Use this class to store pre-deployed smart contract addresses of the contracts deployed to
- * a local blockchain instance ran by Ganache.
- */
-class GanacheContractAddressRegistry {
-  #addresses = {};
-
-  /**
-   * Store new contract address in key:value pair.
-   *
-   * @param contractName
-   * @param contractAddress
-   */
-  storeNewContractAddress(contractName, contractAddress) {
-    this.#addresses[contractName] = contractAddress;
-  }
-
-  /**
-   * Get deployed contract address by its name (key).
-   *
-   * @param contractName
-   */
-  getContractAddress(contractName) {
-    return this.#addresses[contractName];
-  }
-}
-
-module.exports = GanacheContractAddressRegistry;
diff --git a/test/e2e/seeder/ganache-seeder.js b/test/e2e/seeder/ganache-seeder.js
deleted file mode 100644
index 85cc199bca39..000000000000
--- a/test/e2e/seeder/ganache-seeder.js
+++ /dev/null
@@ -1,88 +0,0 @@
-const { ethers } = require('ethers');
-const ganache = require('ganache');
-const { contractConfiguration } = require('./smart-contracts');
-const GanacheContractAddressRegistry = require('./ganache-contract-address-registry');
-
-/*
- * Ganache seeder is used to seed initial smart contract or set initial blockchain state.
- */
-class GanacheSeeder {
-  constructor(debug = false) {
-    this.debug = debug;
-    this.smartContractRegistry = new GanacheContractAddressRegistry();
-  }
-
-  /**
-   * Deploy initial smart contracts that can be used later within the e2e tests.
-   *
-   * @param contractName
-   */
-
-  async deploySmartContract(contractName) {
-    if (this.debug) {
-      console.log('Deploying smart contracts using GanacheSeeder');
-    }
-
-    const ethersProvider = new ethers.providers.Web3Provider(
-      ganache.provider(),
-      'any',
-    );
-    const contractFactory = new ethers.ContractFactory(
-      contractConfiguration[contractName].abi,
-      contractConfiguration[contractName].bytecode,
-      ethersProvider.getSigner(),
-    );
-
-    let contract;
-
-    if (contractName === 'hst') {
-      contract = await contractFactory.deploy(
-        contractConfiguration.hst.initialAmount,
-        contractConfiguration.hst.tokenName,
-        contractConfiguration.hst.decimalUnits,
-        contractConfiguration.hst.tokenSymbol,
-      );
-    } else {
-      contract = await contractFactory.deploy();
-    }
-
-    await contract.deployTransaction.wait();
-
-    if (this.debug) {
-      console.log(
-        `Contract mined! address: ${contract.address} transactionHash: ${contract.deployTransaction.hash}`,
-      );
-    }
-    this.storeSmartContractAddress(contractName, contract.address);
-  }
-
-  /**
-   * Store deployed smart contract address within the environment variables
-   * to make it available everywhere.
-   *
-   * @param contractName
-   * @param contractAddress
-   */
-  storeSmartContractAddress(contractName, contractAddress) {
-    if (this.debug) {
-      console.log(
-        `Storing smart contract address: [${contractName}] => ${contractAddress}`,
-      );
-    }
-    this.smartContractRegistry.storeNewContractAddress(
-      contractName,
-      contractAddress,
-    );
-  }
-
-  /**
-   * Return an instance of the currently used smart contract registry.
-   *
-   * @returns GanacheContractAddressRegistry
-   */
-  getContractRegistry() {
-    return this.smartContractRegistry;
-  }
-}
-
-module.exports = GanacheSeeder;
diff --git a/test/e2e/seeder/smart-contracts.js b/test/e2e/seeder/smart-contracts.js
deleted file mode 100644
index c2394bb9a70e..000000000000
--- a/test/e2e/seeder/smart-contracts.js
+++ /dev/null
@@ -1,43 +0,0 @@
-const {
-  hstBytecode,
-  hstAbi,
-  piggybankBytecode,
-  piggybankAbi,
-  collectiblesAbi,
-  collectiblesBytecode,
-  failingContractAbi,
-  failingContractBytecode,
-} = require('../../../node_modules/@metamask/test-dapp/dist/constants.json');
-
-const hstFactory = {
-  initialAmount: 100,
-  tokenName: 'TST',
-  decimalUnits: 4,
-  tokenSymbol: 'TST',
-  bytecode: hstBytecode,
-  abi: hstAbi,
-};
-
-const collectiblesFactory = {
-  bytecode: collectiblesBytecode,
-  abi: collectiblesAbi,
-};
-
-const piggybankFactory = {
-  bytecode: piggybankBytecode,
-  abi: piggybankAbi,
-};
-
-const failingContract = {
-  bytecode: failingContractBytecode,
-  abi: failingContractAbi,
-};
-
-const contractConfiguration = {
-  hst: hstFactory,
-  collectibles: collectiblesFactory,
-  piggybank: piggybankFactory,
-  failing: failingContract,
-};
-
-module.exports = { contractConfiguration };
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
deleted file mode 100644
index 5787056e8155..000000000000
--- a/test/e2e/snaps/enums.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/2.0.0',
-};
diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index 541f38e1937f..689e62b03e2c 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
-const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap bip-44', function () {
   it('can pop up bip-44 snap and get private key result', async function () {
@@ -18,6 +17,9 @@ describe('Test Snap bip-44', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
+        driverOptions: {
+          type: 'flask',
+        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -27,17 +29,12 @@ describe('Test Snap bip-44', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
-        await driver.fill('#snapId3', 'npm:@metamask/test-snap-bip44');
-
-        // reveal snapId3 by finding and scrolling to #snapId4
-        const snapButton = await driver.findElement('#snapId4');
-        await driver.scrollToElement(snapButton);
-        await driver.delay(500);
-
-        // connect the snap
-        await driver.clickElement('#connectBip44');
+        await driver.driver.get('https://metamask.github.io/test-snaps/0.1.3/');
+        await driver.fill('.snapId3', 'npm:@metamask/test-snap-bip44');
+        await driver.clickElement({
+          text: 'Connect BIP-44 Snap',
+          tag: 'button',
+        });
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -79,11 +76,14 @@ describe('Test Snap bip-44', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement('#sendBip44');
+        await driver.clickElement({
+          text: 'Send Test to BIP-44 Snap',
+          tag: 'button',
+        });
 
         // check the results of the public key test
         await driver.delay(2000);
-        const bip44Result = await driver.findElement('#bip44Result');
+        const bip44Result = await driver.findElement('.bip44Result');
         assert.equal(
           await bip44Result.getText(),
           'Public key: "0x86debb44fb3a984d93f326131d4c1db0bc39644f1a67b673b3ab45941a1cea6a385981755185ac4594b6521e4d1e8d1"',
diff --git a/test/e2e/snaps/test-snap-confirm.spec.js b/test/e2e/snaps/test-snap-confirm.spec.js
index 02ff70ed238a..2100c2ff543f 100644
--- a/test/e2e/snaps/test-snap-confirm.spec.js
+++ b/test/e2e/snaps/test-snap-confirm.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
-const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap Confirm', function () {
   it('can pop up a snap confirm and get its result', async function () {
@@ -18,6 +17,9 @@ describe('Test Snap Confirm', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
+        driverOptions: {
+          type: 'flask',
+        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -27,9 +29,12 @@ describe('Test Snap Confirm', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.fill('#snapId1', 'npm:@metamask/test-snap-confirm');
-        await driver.clickElement('#connectHello');
+        await driver.driver.get('https://metamask.github.io/test-snaps/');
+        await driver.fill('.snapId', 'npm:@metamask/test-snap-confirm');
+        await driver.clickElement({
+          text: 'Connect To Confirm Snap',
+          tag: 'button',
+        });
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -64,7 +69,10 @@ describe('Test Snap Confirm', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement('#sendConfirmButton');
+        await driver.clickElement({
+          text: 'Send Inputs to Hello Snap',
+          tag: 'button',
+        });
 
         // hit 'approve' on the custom confirm
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -82,7 +90,7 @@ describe('Test Snap Confirm', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        const confirmResult = await driver.findElement('#confirmResult');
+        const confirmResult = await driver.findElement('.sendResults');
         assert.equal(await confirmResult.getText(), 'true');
       },
     );
diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js
index 866dc0cf30fa..91ebd2ce1c8f 100644
--- a/test/e2e/snaps/test-snap-error.spec.js
+++ b/test/e2e/snaps/test-snap-error.spec.js
@@ -1,7 +1,6 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
 const { PAGES } = require('../webdriver/driver');
-const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap Error', function () {
   it('can pop up a snap error and see the error', async function () {
@@ -19,6 +18,7 @@ describe('Test Snap Error', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
+        driverOptions: { type: 'flask' },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -28,9 +28,12 @@ describe('Test Snap Error', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.fill('#snapId2', 'npm:@metamask/test-snap-error');
-        await driver.clickElement('#connectError');
+        await driver.driver.get('https://metamask.github.io/test-snaps/');
+        await driver.fill('.snapId2', 'npm:@metamask/test-snap-error');
+        await driver.clickElement({
+          text: 'Connect Error Snap',
+          tag: 'button',
+        });
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -64,7 +67,10 @@ describe('Test Snap Error', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement('#sendError');
+        await driver.clickElement({
+          text: 'Send Test to Error Snap',
+          tag: 'button',
+        });
 
         await driver.navigate(PAGES.HOME);
 
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index 01341c00f908..631724e17981 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -1,6 +1,5 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
-const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap manageState', function () {
   it('can pop up manageState snap and do update get and clear', async function () {
@@ -13,12 +12,14 @@ describe('Test Snap manageState', function () {
         },
       ],
     };
-
     await withFixtures(
       {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
+        driverOptions: {
+          type: 'flask',
+        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -27,18 +28,13 @@ describe('Test Snap manageState', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        // navigate to test snaps page, then fill in the snapId
-        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
-        await driver.fill('#snapId4', 'npm:@metamask/test-snap-managestate');
-
-        // find and scroll to the rest of the card
-        const snapButton = await driver.findElement('#snapId4');
-        await driver.scrollToElement(snapButton);
-        await driver.delay(500);
-
-        // connect the snap
-        await driver.clickElement('#connectManageState');
+        // navigate to test snaps page and connect
+        await driver.driver.get('https://metamask.github.io/test-snaps/0.2.0/');
+        await driver.fill('.snapId3', 'npm:@metamask/test-snap-managestate');
+        await driver.clickElement({
+          text: 'Connect manageState Snap',
+          tag: 'button',
+        });
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -54,6 +50,7 @@ describe('Test Snap manageState', function () {
           },
           10000,
         );
+
         await driver.delay(2000);
 
         // approve install of snap
@@ -72,23 +69,32 @@ describe('Test Snap manageState', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.fill('#dataManageState', '23');
-        await driver.clickElement('#sendManageState');
+        await driver.fill('.dataManageState', '23');
+        await driver.clickElement({
+          text: 'Send data to manageState Snap',
+          tag: 'button',
+        });
 
         // check the results of the public key test
-        await driver.delay(500);
+        await driver.delay(2000);
         const manageStateResult = await driver.findElement(
-          '#sendManageStateResult',
+          '.sendManageStateResult',
         );
         assert.equal(await manageStateResult.getText(), 'true');
 
         // click get results
-        await driver.clickElement('#retrieveManageState');
+        await driver.waitUntilXWindowHandles(1, 5000, 10000);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+        await driver.clickElement({
+          text: 'Get data from manageState Snap',
+          tag: 'button',
+        });
 
         // check the results
-        await driver.delay(500);
+        await driver.delay(2000);
         const retrieveManageStateResult = await driver.findElement(
-          '#retrieveManageStateResult',
+          '.retrieveManageStateResult',
         );
         assert.equal(
           await retrieveManageStateResult.getText(),
@@ -96,22 +102,34 @@ describe('Test Snap manageState', function () {
         );
 
         // click clear results
-        await driver.clickElement('#clearManageState');
+        await driver.waitUntilXWindowHandles(1, 5000, 10000);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+        await driver.clickElement({
+          text: 'Clear data of manageState Snap',
+          tag: 'button',
+        });
 
         // check if true
-        await driver.delay(500);
+        await driver.delay(2000);
         const clearManageStateResult = await driver.findElement(
-          '#clearManageStateResult',
+          '.clearManageStateResult',
         );
         assert.equal(await clearManageStateResult.getText(), 'true');
 
         // click get results again
-        await driver.clickElement('#retrieveManageState');
+        await driver.waitUntilXWindowHandles(1, 5000, 10000);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+        await driver.clickElement({
+          text: 'Get data from manageState Snap',
+          tag: 'button',
+        });
 
         // check result array is empty
-        await driver.delay(500);
+        await driver.delay(2000);
         const retrieveManageStateResult2 = await driver.findElement(
-          '#retrieveManageStateResult',
+          '.retrieveManageStateResult',
         );
         assert.equal(
           await retrieveManageStateResult2.getText(),
diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
deleted file mode 100644
index 1be88412e400..000000000000
--- a/test/e2e/snaps/test-snap-notification.spec.js
+++ /dev/null
@@ -1,109 +0,0 @@
-const { strict: assert } = require('assert');
-const { withFixtures } = require('../helpers');
-const { PAGES } = require('../webdriver/driver');
-const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
-
-describe('Test Snap Notification', function () {
-  it('can send 1 correctly read inapp notification', async function () {
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: 25000000000000000000,
-        },
-      ],
-    };
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-
-        // enter pw into extension
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // navigate to test snaps page
-        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
-        await driver.delay(1000);
-
-        // find and scroll down to snapId5
-        const snapButton = await driver.findElement('#snapId5');
-        await driver.scrollToElement(snapButton);
-        await driver.delay(500);
-        await driver.fill('#snapId5', 'npm:@metamask/test-snap-notification');
-
-        // connect the snap
-        await driver.clickElement('#connectNotification');
-
-        // switch to metamask extension and click connect
-        await driver.waitUntilXWindowHandles(2, 5000, 10000);
-        let windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement(
-          {
-            text: 'Connect',
-            tag: 'button',
-          },
-          10000,
-        );
-        await driver.delay(2000);
-
-        // approve install of snap
-        await driver.waitUntilXWindowHandles(2, 5000, 10000);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({
-          text: 'Approve & Install',
-          tag: 'button',
-        });
-
-        // click send inputs on test snap page
-        await driver.waitUntilXWindowHandles(1, 5000, 10000);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement('#sendInAppNotification');
-
-        // try to go to the MM pages
-        await driver.navigate(PAGES.HOME);
-        await driver.delay(1500);
-
-        // check to see that there is one notification
-        const notificationResult = await driver.findElement(
-          '.account-menu__icon__notification-count',
-        );
-        assert.equal(await notificationResult.getText(), '1');
-
-        // try to click on the account menu icon (via xpath)
-        await driver.clickElement('.account-menu__icon');
-        await driver.delay(500);
-
-        // try to click on the notification item (via xpath)
-        await driver.clickElement({
-          text: 'Notifications',
-          tag: 'div',
-        });
-        await driver.delay(500);
-
-        // look for the correct text in notifications (via xpath)
-        const notificationResultMessage = await driver.findElement(
-          '.notifications__item__details__message',
-        );
-        assert.equal(
-          await notificationResultMessage.getText(),
-          'TEST INAPP NOTIFICATION',
-        );
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/add-hide-token.spec.js b/test/e2e/tests/add-hide-token.spec.js
index bb0655815484..066bd87820b9 100644
--- a/test/e2e/tests/add-hide-token.spec.js
+++ b/test/e2e/tests/add-hide-token.spec.js
@@ -72,9 +72,6 @@ describe('Add existing token using search', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
-        driverOptions: {
-          timeOut: 20000,
-        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -83,10 +80,7 @@ describe('Add existing token using search', function () {
 
         await driver.clickElement({ text: 'import tokens', tag: 'a' });
         await driver.fill('#search-tokens', 'BAT');
-        await driver.clickElement({
-          text: 'BAT',
-          tag: 'span',
-        });
+        await driver.clickElement({ text: 'BAT', tag: 'span' });
         await driver.clickElement({ text: 'Next', tag: 'button' });
         await driver.clickElement({ text: 'Import Tokens', tag: 'button' });
 
diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js
index b0121bcab2d7..e4d43d347877 100644
--- a/test/e2e/tests/address-book.spec.js
+++ b/test/e2e/tests/address-book.spec.js
@@ -14,6 +14,7 @@ describe('Address Book', function () {
   it('Adds an entry to the address book and sends eth to that address', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/chain-interactions.spec.js b/test/e2e/tests/chain-interactions.spec.js
index 3b7d57408eee..c1879ccef5df 100644
--- a/test/e2e/tests/chain-interactions.spec.js
+++ b/test/e2e/tests/chain-interactions.spec.js
@@ -2,19 +2,16 @@ const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
 
 describe('Chain Interactions', function () {
-  const port = 8546;
-  const chainId = 1338;
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-    concurrent: { port, chainId },
-  };
-  it('should add the Ganache test chain and not switch the network', async function () {
+  it('should add the XDAI chain and not switch the network', async function () {
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: convertToHexValue(25000000000000000000),
+        },
+      ],
+    };
     await withFixtures(
       {
         dapp: true,
@@ -39,14 +36,12 @@ describe('Chain Interactions', function () {
         );
 
         // verify chain details
-        const [
-          networkName,
-          networkUrl,
-          chainIdElement,
-        ] = await driver.findElements('.definition-list dd');
-        assert.equal(await networkName.getText(), `Localhost ${port}`);
-        assert.equal(await networkUrl.getText(), `http://127.0.0.1:${port}`);
-        assert.equal(await chainIdElement.getText(), chainId.toString());
+        const [networkName, networkUrl, chainId] = await driver.findElements(
+          '.definition-list dd',
+        );
+        assert.equal(await networkName.getText(), 'xDAI Chain');
+        assert.equal(await networkUrl.getText(), 'https://dai.poa.network');
+        assert.equal(await chainId.getText(), '100');
 
         // approve add chain, cancel switch chain
         await driver.clickElement({ text: 'Approve', tag: 'button' });
@@ -60,16 +55,25 @@ describe('Chain Interactions', function () {
         const networkDisplay = await driver.findElement('.network-display');
         await networkDisplay.click();
         assert.equal(await networkDisplay.getText(), 'Localhost 8545');
-        const ganacheChain = await driver.findElements({
-          text: `Localhost ${port}`,
+        const xDaiChain = await driver.findElements({
+          text: 'xDAI Chain',
           tag: 'span',
         });
-        assert.ok(ganacheChain.length, 1);
+        assert.ok(xDaiChain.length, 1);
       },
     );
   });
 
-  it('should add the Ganache chain and switch the network', async function () {
+  it('should add the XDAI chain and switch the network', async function () {
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: convertToHexValue(25000000000000000000),
+        },
+      ],
+    };
     await withFixtures(
       {
         dapp: true,
@@ -103,7 +107,7 @@ describe('Chain Interactions', function () {
 
         // verify current network
         const networkDisplay = await driver.findElement('.network-display');
-        assert.equal(await networkDisplay.getText(), `Localhost ${port}`);
+        assert.equal(await networkDisplay.getText(), 'xDAI Chain');
       },
     );
   });
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index ad0ce7fd6dc8..db70f08452cf 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -103,7 +103,7 @@ describe('Deploy contract and call contract methods', function () {
         );
         await driver.waitForSelector({
           css: '.confirm-page-container-summary__action__name',
-          text: 'Deposit',
+          text: 'Withdraw',
         });
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
index dad19482c4ad..49dd59059a3e 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/custom-rpc-history.spec.js
@@ -1,5 +1,5 @@
 const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures, largeDelayMs } = require('../helpers');
+const { convertToHexValue, withFixtures } = require('../helpers');
 
 describe('Stores custom RPC history', function () {
   const ganacheOptions = {
@@ -29,8 +29,6 @@ describe('Stores custom RPC history', function () {
         const rpcUrl = `http://127.0.0.1:${port}`;
         const networkName = 'Secondary Ganache Testnet';
 
-        await driver.delay(largeDelayMs);
-
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -79,8 +77,6 @@ describe('Stores custom RPC history', function () {
         // duplicate network
         const duplicateRpcUrl = 'https://mainnet.infura.io/v3/';
 
-        await driver.delay(largeDelayMs);
-
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -117,8 +113,6 @@ describe('Stores custom RPC history', function () {
         const newRpcUrl = 'http://localhost:8544';
         const duplicateChainId = '0x539';
 
-        await driver.delay(largeDelayMs);
-
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -160,8 +154,6 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        await driver.delay(largeDelayMs);
-
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'span' });
@@ -181,7 +173,6 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        await driver.delay(largeDelayMs);
         await driver.clickElement('.network-display');
 
         // only recent 3 are found and in correct order (most recent at the top)
@@ -211,7 +202,6 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        await driver.delay(largeDelayMs);
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
diff --git a/test/e2e/tests/custom-token-add-approve.spec.js b/test/e2e/tests/custom-token-add-approve.spec.js
deleted file mode 100644
index 0f366784c4a7..000000000000
--- a/test/e2e/tests/custom-token-add-approve.spec.js
+++ /dev/null
@@ -1,358 +0,0 @@
-/* eslint-disable mocha/no-skipped-tests */
-const { strict: assert } = require('assert');
-
-const {
-  convertToHexValue,
-  withFixtures,
-  getWindowHandles,
-} = require('../helpers');
-
-describe.skip('Create token, approve token and approve token without gas', function () {
-  describe('Add a custom token from a dapp', function () {
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: convertToHexValue(25000000000000000000),
-        },
-      ],
-    };
-
-    it('creates, imports and renders the balance for the new token', async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: 'connected-state',
-          ganacheOptions,
-          title: this.test.title,
-        },
-        async ({ driver }) => {
-          await driver.navigate();
-          await driver.fill('#password', 'correct horse battery staple');
-          await driver.press('#password', driver.Key.ENTER);
-
-          // create token
-          await driver.openNewPage(`http://127.0.0.1:8080/`);
-          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
-          await driver.clickElement({ text: 'Create Token', tag: 'button' });
-
-          const windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-          await driver.clickElement({ text: 'Edit', tag: 'button' });
-          const inputs = await driver.findElements('input[type="number"]');
-          const gasLimitInput = inputs[0];
-          const gasPriceInput = inputs[1];
-          await gasLimitInput.fill('4700000');
-          await gasPriceInput.fill('20');
-          await driver.waitForSelector({ text: 'Save', tag: 'button' });
-          await driver.clickElement({ text: 'Save', tag: 'button' });
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-          await driver.switchToWindow(windowHandles.dapp);
-
-          const tokenContractAddress = await driver.waitForSelector({
-            css: '#tokenAddress',
-            text: '0x',
-          });
-          const tokenAddress = await tokenContractAddress.getText();
-
-          // imports custom token from extension
-          await driver.switchToWindow(windowHandles.extension);
-          await driver.clickElement(`[data-testid="home__asset-tab"]`);
-          await driver.clickElement({ tag: 'button', text: 'Assets' });
-
-          await driver.clickElement({ text: 'import tokens', tag: 'a' });
-          await driver.clickElement({
-            text: 'Custom Token',
-            tag: 'button',
-          });
-          await driver.waitForSelector('#custom-address');
-          await driver.fill('#custom-address', tokenAddress);
-          await driver.waitForSelector('#custom-symbol');
-          await driver.waitForSelector('#custom-decimals');
-          await driver.delay(2000);
-
-          await driver.clickElement({
-            text: 'Add Custom Token',
-            tag: 'button',
-          });
-
-          await driver.delay(2000);
-          await driver.clickElement({
-            text: 'Import Tokens',
-            tag: 'button',
-          });
-
-          // renders balance for newly created token
-          await driver.waitForSelector('.app-header__logo-container');
-          await driver.clickElement('.app-header__logo-container');
-          await driver.clickElement({ tag: 'button', text: 'Assets' });
-          const asset = await driver.waitForSelector({
-            css: '.asset-list-item__token-value',
-            text: '10',
-          });
-          assert.equal(await asset.getText(), '10');
-        },
-      );
-    });
-  });
-
-  describe('Approves a custom token from dapp', function () {
-    let windowHandles;
-
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: convertToHexValue(25000000000000000000),
-        },
-      ],
-    };
-    it('approves an already created token and displays the token approval data', async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: 'connected-state',
-          ganacheOptions,
-          title: this.test.title,
-        },
-        async ({ driver }) => {
-          await driver.navigate();
-          await driver.fill('#password', 'correct horse battery staple');
-          await driver.press('#password', driver.Key.ENTER);
-
-          await driver.openNewPage(`http://127.0.0.1:8080/`);
-
-          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
-          await driver.clickElement({ text: 'Create Token', tag: 'button' });
-          windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-          await driver.switchToWindow(windowHandles.dapp);
-          await driver.waitForSelector({
-            text: 'Approve Tokens',
-            tag: 'button',
-          });
-          await driver.clickElement({ text: 'Approve Tokens', tag: 'button' });
-
-          // displays the token approval data
-          // switch to popup
-          windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-
-          const functionType = await driver.findElement(
-            '.confirm-approve-content__data .confirm-approve-content__small-text',
-          );
-
-          await driver.scrollToElement(functionType);
-          const functionTypeText = await functionType.getText();
-          assert.equal(functionTypeText, 'Function: Approve');
-          const confirmDataDiv = await driver.findElement(
-            '.confirm-approve-content__data__data-block',
-          );
-          const confirmDataText = await confirmDataDiv.getText();
-          assert(
-            confirmDataText.match(
-              /0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef4/u,
-            ),
-          );
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-          await driver.switchToWindow(windowHandles.extension);
-          await driver.clickElement({ tag: 'button', text: 'Activity' });
-
-          await driver.wait(async () => {
-            const pendingTxes = await driver.findElements(
-              '.transaction-list-item',
-            );
-            return pendingTxes.length === 2;
-          }, 10000);
-
-          await driver.waitForSelector({
-            // Selects only the very first transaction list item immediately following the 'Pending' header
-            css:
-              '.transaction-list__pending-transactions .transaction-list__header + .transaction-list-item .list-item__heading',
-            text: 'Approve Token spend limit',
-          });
-        },
-      );
-    });
-
-    it('customizes gas, edit permissions and checks transaction in transaction list', async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: 'connected-state',
-          ganacheOptions,
-          title: this.test.title,
-        },
-        async ({ driver }) => {
-          await driver.navigate();
-          await driver.fill('#password', 'correct horse battery staple');
-          await driver.press('#password', driver.Key.ENTER);
-
-          await driver.openNewPage(`http://127.0.0.1:8080/`);
-
-          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
-          await driver.clickElement({ text: 'Create Token', tag: 'button' });
-          windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-          await driver.switchToWindow(windowHandles.dapp);
-
-          await driver.waitForSelector({
-            text: 'Approve Tokens',
-            tag: 'button',
-          });
-          await driver.clickElement({ text: 'Approve Tokens', tag: 'button' });
-
-          // switch to popup
-          windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-
-          await driver.clickElement(
-            '.confirm-approve-content__small-blue-text',
-          );
-          await driver.clickElement(
-            { text: 'Edit suggested gas fee', tag: 'button' },
-            10000,
-          );
-          const [gasLimitInput, gasPriceInput] = await driver.findElements(
-            'input[type="number"]',
-          );
-          await gasPriceInput.clear();
-          await gasPriceInput.fill('10');
-          await gasLimitInput.clear();
-          await gasLimitInput.fill('60001');
-          await driver.findClickableElement({ text: 'Save', tag: 'button' });
-          await driver.clickElement({ text: 'Save', tag: 'button' });
-
-          await driver.waitForSelector({
-            css:
-              '.confirm-approve-content__transaction-details-content__secondary-fee',
-            text: '0.0006 ETH',
-          });
-
-          // edits the permission
-          const editButtons = await driver.findClickableElements(
-            '.confirm-approve-content__small-blue-text',
-          );
-          await editButtons[2].click();
-
-          // wait for permission modal to be visible
-          const permissionModal = await driver.findVisibleElement(
-            'span .modal',
-          );
-          const radioButtons = await driver.findClickableElements(
-            '.edit-approval-permission__edit-section__radio-button',
-          );
-          const customSpendLimit = await radioButtons[1];
-          await customSpendLimit.click();
-          await driver.fill('input', '5');
-          await driver.clickElement({ text: 'Save', tag: 'button' });
-
-          // wait for permission modal to be removed from DOM.
-          await permissionModal.waitForElementState('hidden');
-          const permissionInfo = await driver.findElements(
-            '.confirm-approve-content__medium-text',
-          );
-          const amountDiv = permissionInfo[0];
-          assert.equal(await amountDiv.getText(), '5 TST');
-
-          // submits the transaction
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-          // finds the transaction in transaction list
-          await driver.switchToWindow(windowHandles.extension);
-          await driver.clickElement({ tag: 'button', text: 'Activity' });
-          await driver.waitForSelector({
-            // Select only the heading of the first entry in the transaction list.
-            css:
-              '.transaction-list__completed-transactions .transaction-list-item:first-child .list-item__heading',
-            text: 'Approve Token spend limit',
-          });
-        },
-      );
-    });
-  });
-
-  describe('Approves a custom token from dapp when no gas value is specified', function () {
-    let windowHandles;
-
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: convertToHexValue(25000000000000000000),
-        },
-      ],
-    };
-
-    it('approves an already created token, shows the correct recipient, submits the transaction and finds the transaction in the transactions list', async function () {
-      await withFixtures(
-        {
-          dapp: true,
-          fixtures: 'connected-state',
-          ganacheOptions,
-          title: this.test.title,
-        },
-        async ({ driver }) => {
-          await driver.navigate();
-          await driver.fill('#password', 'correct horse battery staple');
-          await driver.press('#password', driver.Key.ENTER);
-
-          await driver.openNewPage(`http://127.0.0.1:8080/`);
-
-          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
-          await driver.clickElement({ text: 'Create Token', tag: 'button' });
-          windowHandles = await getWindowHandles(driver, 3);
-          await driver.switchToWindow(windowHandles.popup);
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-          await driver.switchToWindow(windowHandles.dapp);
-
-          await driver.clickElement({
-            text: 'Approve Tokens Without Gas',
-            tag: 'button',
-          });
-
-          await driver.switchToWindow(windowHandles.extension);
-          await driver.clickElement({ tag: 'button', text: 'Activity' });
-
-          await driver.wait(async () => {
-            const pendingTxes = await driver.findElements(
-              '.transaction-list__pending-transactions .transaction-list-item',
-            );
-            return pendingTxes.length === 1;
-          }, 10000);
-
-          await driver.waitForSelector({
-            // Selects only the very first transaction list item immediately following the 'Pending' header
-            css:
-              '.transaction-list__pending-transactions .transaction-list__header + .transaction-list-item .list-item__heading',
-            text: 'Approve Token spend limit',
-          });
-
-          await driver.clickElement('.transaction-list-item');
-
-          const permissionInfo = await driver.findElements(
-            '.confirm-approve-content__medium-text',
-          );
-          const recipientDiv = permissionInfo[1];
-          assert.equal(await recipientDiv.getText(), '0x2f318C33...C970');
-
-          await driver.clickElement({ text: 'Confirm', tag: 'button' });
-
-          await driver.waitForSelector({
-            css:
-              '.transaction-list__completed-transactions .transaction-list-item:first-child .list-item__heading',
-            text: 'Approve Token spend limit',
-          });
-        },
-      );
-    });
-  });
-});
diff --git a/test/e2e/tests/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions.spec.js
index 40cef1b18a91..af9f0af89189 100644
--- a/test/e2e/tests/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions.spec.js
@@ -23,10 +23,7 @@ describe('Dapp interactions', function () {
       {
         dapp: true,
         fixtures: 'imported-account',
-        ganacheOptions: {
-          ...ganacheOptions,
-          concurrent: { port: 8546, chainId: 1338 },
-        },
+        ganacheOptions,
         title: this.test.title,
       },
       async ({ driver }) => {
@@ -47,7 +44,6 @@ describe('Dapp interactions', function () {
         // Trigger Notification
         await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
         await driver.clickElement('#addEthereumChain');
-        await driver.waitUntilXWindowHandles(3);
         await driver.switchToWindowWithTitle(
           'MetaMask Notification',
           windowHandles,
@@ -64,7 +60,7 @@ describe('Dapp interactions', function () {
     );
   });
 
-  it('should connect a second Dapp despite MetaMask being locked', async function () {
+  it('should connect a second Dapp despite Metamask being locked', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 41c63ccb10c4..6bc41b1facfe 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -9,7 +9,7 @@ const {
   completeImportSRPOnboardingFlowWordByWord,
 } = require('../helpers');
 
-describe('MetaMask Import UI', function () {
+describe('Metamask Import UI', function () {
   it('Importing wallet using Secret Recovery Phrase', async function () {
     const ganacheOptions = {
       accounts: [
@@ -72,8 +72,7 @@ describe('MetaMask Import UI', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // Create a new account
-        // switches to localhost
-        await driver.delay(largeDelayMs);
+        // switches to locakhost
         await driver.clickElement('.network-display');
         await driver.clickElement({ text: 'Localhost', tag: 'span' });
 
diff --git a/test/e2e/tests/incremental-security.spec.js b/test/e2e/tests/incremental-security.spec.js
index a12f49831872..a94f0f3e2a7f 100644
--- a/test/e2e/tests/incremental-security.spec.js
+++ b/test/e2e/tests/incremental-security.spec.js
@@ -38,12 +38,12 @@ describe('Incremental Security', function () {
           tag: 'button',
         });
 
-        // clicks the "No thanks" option on the metametrics opt-in screen
-        await driver.clickElement('.btn-secondary');
-
         // clicks the "Create New Wallet" option
         await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
 
+        // clicks the "No thanks" option on the metametrics opt-in screen
+        await driver.clickElement('.btn-secondary');
+
         // accepts a secure password
         await driver.fill(
           '.first-time-flow__form #create-password',
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index 3b796834ec13..8daa2024ff44 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -2,7 +2,7 @@ const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures, tinyDelayMs } = require('../helpers');
 const enLocaleMessages = require('../../../app/_locales/en/messages.json');
 
-describe('MetaMask Responsive UI', function () {
+describe('Metamask Responsive UI', function () {
   it('Creating a new wallet', async function () {
     const driverOptions = { responsive: true };
 
@@ -87,12 +87,12 @@ describe('MetaMask Responsive UI', function () {
           });
           await driver.delay(tinyDelayMs);
 
-          // clicks the "I Agree" option on the metametrics opt-in screen
-          await driver.clickElement('.btn-primary');
-
           // clicks the "Create New Wallet" option
           await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
 
+          // clicks the "I Agree" option on the metametrics opt-in screen
+          await driver.clickElement('.btn-primary');
+
           // accepts a secure password
           await driver.fill(
             '.first-time-flow__form #create-password',
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index 08ca96a83671..4d02097f5005 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -14,6 +14,7 @@ describe('Navigate transactions', function () {
   it('should navigate the unapproved transactions', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -149,6 +150,7 @@ describe('Navigate transactions', function () {
   it('should reject and remove an unapproved transaction', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -180,6 +182,7 @@ describe('Navigate transactions', function () {
   it('should confirm and remove an unapproved transaction', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -211,6 +214,7 @@ describe('Navigate transactions', function () {
   it('should reject and remove all unapproved transactions', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/phishing-detection.spec.js b/test/e2e/tests/phishing-detection.spec.js
index ccad1dd4aa52..2b1450413392 100644
--- a/test/e2e/tests/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-detection.spec.js
@@ -1,9 +1,6 @@
 const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
 
-const PHISHFORT_CDN_URL =
-  'https://cdn.jsdelivr.net/gh/phishfort/phishfort-lists@master/blacklists/hotlist.json';
-
 describe('Phishing Detection', function () {
   async function mockPhishingDetection(mockServer) {
     await mockServer
@@ -18,19 +15,11 @@ describe('Phishing Detection', function () {
             tolerance: 2,
             fuzzylist: [],
             whitelist: [],
-            blacklist: ['127.0.0.1'],
+            blacklist: ['example.com'],
           },
         };
       });
   }
-  async function mockPhishfortPhishingDetection(mockServer) {
-    await mockServer.forGet(PHISHFORT_CDN_URL).thenCallback(() => {
-      return {
-        statusCode: 200,
-        json: ['127.0.0.1'],
-      };
-    });
-  }
   const ganacheOptions = {
     accounts: [
       {
@@ -40,124 +29,22 @@ describe('Phishing Detection', function () {
       },
     ],
   };
-  it('should display the MetaMask Phishing Detection page and take the user to the blocked page if they continue', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        testSpecificMock: mockPhishingDetection,
-        dapp: true,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-        await driver.openNewPage('http://127.0.0.1:8080');
-        await driver.clickElement({
-          text: 'continuing at your own risk',
-        });
-        const header = await driver.findElement('h1');
-        assert.equal(await header.getText(), 'E2E Test Dapp');
-      },
-    );
-  });
-
-  it('should display the MetaMask Phishing Detection page in an iframe and take the user to the blocked page if they continue', async function () {
+  it('should display the MetaMask Phishing Detection page', async function () {
     await withFixtures(
       {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
         testSpecificMock: mockPhishingDetection,
-        dapp: true,
-        dappPaths: ['mock-page-with-iframe'],
-        dappOptions: {
-          numberOfDapps: 2,
-        },
-        failOnConsoleError: false,
       },
       async ({ driver }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
-        await driver.openNewPage('http://localhost:8080/');
-
-        const iframe = await driver.findElement('iframe');
-
-        await driver.switchToFrame(iframe);
-        await driver.clickElement({
-          text: 'Open this warning in a new tab',
-        });
-        await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
-        await driver.clickElement({
-          text: 'continuing at your own risk',
-        });
+        await driver.openNewPage('http://example.com');
+        await driver.waitForSelector({ text: 'continuing at your own risk' });
         const header = await driver.findElement('h1');
-        assert.equal(await header.getText(), 'E2E Test Dapp');
-      },
-    );
-  });
-
-  it('should display the MetaMask Phishing Detection page in an iframe but should NOT take the user to the blocked page if it is not an accessible resource', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        testSpecificMock: mockPhishingDetection,
-        dapp: true,
-        dappPaths: ['mock-page-with-disallowed-iframe'],
-        dappOptions: {
-          numberOfDapps: 2,
-        },
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-        await driver.openNewPage(
-          `http://localhost:8080?extensionUrl=${driver.extensionUrl}`,
-        );
-
-        const iframe = await driver.findElement('iframe');
-
-        await driver.switchToFrame(iframe);
-        await driver.clickElement({
-          text: 'Open this warning in a new tab',
-        });
-        await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
-        await driver.clickElement({
-          text: 'continuing at your own risk',
-        });
-
-        // Ensure we're not on the wallet home page
-        await driver.assertElementNotPresent('[data-testid="wallet-balance"]');
-      },
-    );
-  });
-
-  it('should display the MetaMask Phishing Detection page with the correct new issue link if the issue was detected from the phishfort list', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        testSpecificMock: mockPhishfortPhishingDetection,
-        dapp: true,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-        await driver.openNewPage('http://127.0.0.1:8080');
-        const newIssueLink = await driver.findElements(
-          "a[href='https://github.com/phishfort/phishfort-lists/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F']",
-        );
-        assert.equal(newIssueLink.length, 1);
+        assert.equal(await header.getText(), 'MetaMask Phishing Detection');
       },
     );
   });
diff --git a/test/e2e/tests/provider-api.spec.js b/test/e2e/tests/provider-api.spec.js
index b85b4fb32f19..14a4ff0eb300 100644
--- a/test/e2e/tests/provider-api.spec.js
+++ b/test/e2e/tests/provider-api.spec.js
@@ -47,7 +47,7 @@ describe('MetaMask', function () {
         await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
         const switchedNetworkDiv = await driver.waitForSelector({
           css: '#network',
-          text: '0x1',
+          text: '1',
         });
         const switchedChainIdDiv = await driver.waitForSelector({
           css: '#chainId',
@@ -55,7 +55,7 @@ describe('MetaMask', function () {
         });
         const accountsDiv = await driver.findElement('#accounts');
 
-        assert.equal(await switchedNetworkDiv.getText(), '0x1');
+        assert.equal(await switchedNetworkDiv.getText(), '1');
         assert.equal(await switchedChainIdDiv.getText(), '0x1');
         assert.equal(
           await accountsDiv.getText(),
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index f14bb1bc52ad..e34ab57316c1 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -92,54 +92,6 @@ describe('Send ETH from inside MetaMask using default gas', function () {
   });
 });
 
-describe('Send ETH non-contract address with data that matches ERC20 transfer data signature', function () {
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('renders the correct recipient on the confirmation screen', async function () {
-    await withFixtures(
-      {
-        fixtures: 'special-settings',
-        ganacheOptions,
-        title: this.test.title,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        await driver.fill(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
-        );
-
-        await driver.fill(
-          'textarea[placeholder="Optional',
-          '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
-        );
-
-        await driver.clickElement({ text: 'Next', tag: 'button' });
-
-        await driver.clickElement({ text: '0xc42...cd28' });
-
-        const recipientAddress = await driver.findElements({
-          text: '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
-        });
-
-        assert.equal(recipientAddress.length, 1);
-      },
-    );
-  });
-});
-
 /* eslint-disable-next-line mocha/max-top-level-suites */
 describe('Send ETH from inside MetaMask using advanced gas modal', function () {
   const ganacheOptions = {
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
deleted file mode 100644
index ed89901db453..000000000000
--- a/test/e2e/tests/send-hex-address.spec.js
+++ /dev/null
@@ -1,329 +0,0 @@
-const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures } = require('../helpers');
-
-const hexPrefixedAddress = '0x2f318C334780961FB129D2a6c30D0763d9a5C970';
-const nonHexPrefixedAddress = hexPrefixedAddress.substring(2);
-
-describe('Send ETH to a 40 character hexadecimal address', function () {
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('should ensure the address is prefixed with 0x when pasted and should send ETH to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Send ETH
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Paste address without hex prefix
-        await driver.pasteIntoField(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.waitForSelector({
-          css: '.ens-input__selected-input__title',
-          text: hexPrefixedAddress,
-        });
-        await driver.wait(async () => {
-          const sendDialogMsgs = await driver.findElements(
-            '.send-v2__form div.dialog',
-          );
-          return sendDialogMsgs.length === 1;
-        }, 10000);
-        await driver.clickElement({ text: 'Next', tag: 'button' });
-
-        // Confirm transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        const sendTransactionListItem = await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
-
-        // Verify address in activity log
-        const publicAddress = await driver.findElement(
-          '.nickname-popover__public-address',
-        );
-        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
-      },
-    );
-  });
-  it('should ensure the address is prefixed with 0x when typed and should send ETH to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Send ETH
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Type address without hex prefix
-        await driver.fill(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.waitForSelector({
-          css: '.ens-input__selected-input__title',
-          text: hexPrefixedAddress,
-        });
-        await driver.wait(async () => {
-          const sendDialogMsgs = await driver.findElements(
-            '.send-v2__form div.dialog',
-          );
-          return sendDialogMsgs.length === 1;
-        }, 10000);
-        await driver.clickElement({ text: 'Next', tag: 'button' });
-
-        // Confirm transaction
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        const sendTransactionListItem = await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
-
-        // Verify address in activity log
-        const publicAddress = await driver.findElement(
-          '.nickname-popover__public-address',
-        );
-        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
-      },
-    );
-  });
-});
-
-describe('Send ERC20 to a 40 character hexadecimal address', function () {
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('should ensure the address is prefixed with 0x when pasted and should send TST to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: 'connected-state',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Create TST
-        await driver.openNewPage('http://127.0.0.1:8080/');
-        await driver.clickElement('#createToken');
-        await driver.waitUntilXWindowHandles(3);
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-        const dapp = await driver.switchToWindowWithTitle(
-          'E2E Test Dapp',
-          windowHandles,
-        );
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-
-        // Add token
-        await driver.switchToWindow(dapp);
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add Token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-
-        // Send TST
-        await driver.clickElement('[data-testid="home__asset-tab"]');
-        await driver.clickElement('.token-cell');
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Paste address without hex prefix
-        await driver.pasteIntoField(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.waitForSelector({
-          css: '.ens-input__selected-input__title',
-          text: hexPrefixedAddress,
-        });
-        await driver.wait(async () => {
-          const sendDialogMsgs = await driver.findElements(
-            '.send-v2__form div.dialog',
-          );
-          return sendDialogMsgs.length === 1;
-        }, 10000);
-        await driver.delay(2000);
-        await driver.clickElement({ text: 'Next', tag: 'button' });
-
-        // Confirm transaction
-        await driver.waitForSelector({
-          css: '.confirm-page-container-summary__title',
-          text: '0 TST',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
-          { timeout: 10000 },
-        );
-        const sendTransactionListItem = await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
-
-        // Verify address in activity log
-        const publicAddress = await driver.findElement(
-          '.nickname-popover__public-address',
-        );
-        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
-      },
-    );
-  });
-  it('should ensure the address is prefixed with 0x when typed and should send TST to a valid hexadecimal address', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: 'connected-state',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Create TST
-        await driver.openNewPage('http://127.0.0.1:8080/');
-        await driver.clickElement('#createToken');
-        await driver.waitUntilXWindowHandles(3);
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-        const dapp = await driver.switchToWindowWithTitle(
-          'E2E Test Dapp',
-          windowHandles,
-        );
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-          { timeout: 10000 },
-        );
-
-        // Add token
-        await driver.switchToWindow(dapp);
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add Token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-
-        // Send TST
-        await driver.clickElement('[data-testid="home__asset-tab"]');
-        await driver.clickElement('.token-cell');
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Type address without hex prefix
-        await driver.fill(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          nonHexPrefixedAddress,
-        );
-        await driver.waitForSelector({
-          css: '.ens-input__selected-input__title',
-          text: hexPrefixedAddress,
-        });
-        await driver.wait(async () => {
-          const sendDialogMsgs = await driver.findElements(
-            '.send-v2__form div.dialog',
-          );
-          return sendDialogMsgs.length === 1;
-        }, 10000);
-        await driver.delay(2000);
-        await driver.clickElement({ text: 'Next', tag: 'button' });
-
-        // Confirm transaction
-        await driver.waitForSelector({
-          css: '.confirm-page-container-summary__title',
-          text: '0 TST',
-        });
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.clickElement('[data-testid="home__activity-tab"]');
-        await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
-          { timeout: 10000 },
-        );
-        const sendTransactionListItem = await driver.waitForSelector(
-          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
-        );
-        await sendTransactionListItem.click();
-        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
-        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
-
-        // Verify address in activity log
-        const publicAddress = await driver.findElement(
-          '.nickname-popover__public-address',
-        );
-        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/send-to-contract.spec.js b/test/e2e/tests/send-to-contract.spec.js
deleted file mode 100644
index 1ab704de10bb..000000000000
--- a/test/e2e/tests/send-to-contract.spec.js
+++ /dev/null
@@ -1,83 +0,0 @@
-const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures } = require('../helpers');
-
-describe('Send ERC20 token to contract address', function () {
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('should display the token contract warning to the user', async function () {
-    await withFixtures(
-      {
-        dapp: true,
-        fixtures: 'connected-state',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Create TST
-        await driver.openNewPage('http://127.0.0.1:8080/');
-        await driver.clickElement('#createToken');
-        await driver.waitUntilXWindowHandles(3);
-        let windowHandles = await driver.getAllWindowHandles();
-        const extension = windowHandles[0];
-        const dapp = await driver.switchToWindowWithTitle(
-          'E2E Test Dapp',
-          windowHandles,
-        );
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Confirm', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(dapp);
-        const tokenAddress = await driver.waitForSelector({
-          css: '#tokenAddress',
-          text: '0x',
-        });
-        const tokenAddressText = await tokenAddress.getText();
-
-        // Add token
-        await driver.switchToWindow(dapp);
-        await driver.clickElement('#watchAsset');
-        await driver.waitUntilXWindowHandles(3);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle(
-          'MetaMask Notification',
-          windowHandles,
-        );
-        await driver.clickElement({ text: 'Add Token', tag: 'button' });
-        await driver.waitUntilXWindowHandles(2);
-        await driver.switchToWindow(extension);
-
-        // Send TST
-        await driver.clickElement('[data-testid="home__asset-tab"]');
-        await driver.clickElement('.token-cell');
-        await driver.clickElement('[data-testid="eth-overview-send"]');
-
-        // Type contract address
-        await driver.fill(
-          'input[placeholder="Search, public address (0x), or ENS"]',
-          tokenAddressText,
-        );
-
-        // Verify warning
-        const warningText =
-          'Warning: you are about to send to a token contract which could result in a loss of funds. Learn more\nI understand';
-        const warning = await driver.findElement('.send__warning-container');
-        assert.equal(await warning.getText(), warningText);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/settings-search.spec.js b/test/e2e/tests/settings-search.spec.js
index 966e63d7eb90..d817acb1ccc0 100644
--- a/test/e2e/tests/settings-search.spec.js
+++ b/test/e2e/tests/settings-search.spec.js
@@ -25,6 +25,7 @@ describe('Settings Search', function () {
   it('should find element inside the General tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -51,6 +52,7 @@ describe('Settings Search', function () {
   it('should find element inside the Advanced tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -78,6 +80,7 @@ describe('Settings Search', function () {
   it('should find element inside the Contacts tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -105,6 +108,7 @@ describe('Settings Search', function () {
   it('should find element inside the Security tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -132,6 +136,7 @@ describe('Settings Search', function () {
   it('should find element inside the Alerts tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -159,6 +164,7 @@ describe('Settings Search', function () {
   it('should find element inside the Networks tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -186,6 +192,7 @@ describe('Settings Search', function () {
   it('should find element inside the Experimental tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -213,6 +220,7 @@ describe('Settings Search', function () {
   it('should find element inside the About tab', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -240,6 +248,7 @@ describe('Settings Search', function () {
   it('should display "Element not found" for a non-existing element', async function () {
     await withFixtures(
       {
+        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/state-logs.spec.js b/test/e2e/tests/state-logs.spec.js
deleted file mode 100644
index 6152ff01afde..000000000000
--- a/test/e2e/tests/state-logs.spec.js
+++ /dev/null
@@ -1,65 +0,0 @@
-const { strict: assert } = require('assert');
-const { promises: fs } = require('fs');
-const { convertToHexValue, withFixtures } = require('../helpers');
-
-const downloadsFolder = `${process.cwd()}/test-artifacts/downloads`;
-
-const createDownloadFolder = async () => {
-  await fs.rm(downloadsFolder, { recursive: true, force: true });
-  await fs.mkdir(downloadsFolder, { recursive: true });
-};
-
-const stateLogsExist = async () => {
-  try {
-    const stateLogs = `${downloadsFolder}/MetaMask State Logs.json`;
-    await fs.access(stateLogs);
-    return true;
-  } catch (e) {
-    return false;
-  }
-};
-
-describe('State logs', function () {
-  const ganacheOptions = {
-    accounts: [
-      {
-        secretKey:
-          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-        balance: convertToHexValue(25000000000000000000),
-      },
-    ],
-  };
-  it('should download state logs for the account', async function () {
-    await withFixtures(
-      {
-        fixtures: 'imported-account',
-        ganacheOptions,
-        title: this.test.title,
-        failOnConsoleError: false,
-      },
-      async ({ driver }) => {
-        await createDownloadFolder();
-        await driver.navigate();
-        await driver.fill('#password', 'correct horse battery staple');
-        await driver.press('#password', driver.Key.ENTER);
-
-        // Download State Logs
-        await driver.clickElement('.account-menu__icon');
-        await driver.clickElement({ text: 'Settings', tag: 'div' });
-        await driver.clickElement({ text: 'Advanced', tag: 'div' });
-        await driver.clickElement({
-          text: 'Download State Logs',
-          tag: 'button',
-        });
-
-        // Verify download
-        let fileExists;
-        await driver.wait(async () => {
-          fileExists = await stateLogsExist();
-          return fileExists === true;
-        }, 10000);
-        assert.equal(fileExists, true);
-      },
-    );
-  });
-});
diff --git a/test/e2e/tests/swap-eth.spec.js b/test/e2e/tests/swap-eth.spec.js
index 6ee37471086a..5e26b00e04d0 100644
--- a/test/e2e/tests/swap-eth.spec.js
+++ b/test/e2e/tests/swap-eth.spec.js
@@ -18,9 +18,6 @@ describe('Swap Eth for another Token', function () {
         ganacheOptions,
         title: this.test.title,
         failOnConsoleError: false,
-        driverOptions: {
-          timeOut: 20000,
-        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -40,6 +37,7 @@ describe('Swap Eth for another Token', function () {
           '[class="dropdown-search-list__closed-primary-label dropdown-search-list__select-default"]',
         );
         await driver.clickElement('[placeholder="Search for a token"]');
+        await driver.clickElement('[placeholder="Search for a token"]');
         await driver.fill('[placeholder="Search for a token"]', 'DAI');
         await driver.waitForSelector(
           '[class="searchable-item-list__primary-label"]',
diff --git a/test/e2e/webdriver/chrome.js b/test/e2e/webdriver/chrome.js
index 09069906c1b6..13ff00f62e1c 100644
--- a/test/e2e/webdriver/chrome.js
+++ b/test/e2e/webdriver/chrome.js
@@ -18,20 +18,10 @@ class ChromeDriver {
     if (responsive) {
       args.push('--auto-open-devtools-for-tabs');
     }
-
-    if (process.env.ENABLE_MV3) {
-      args.push('--log-level=0');
-      args.push('--enable-logging');
-      args.push(`--user-data-dir=${process.cwd()}/test-artifacts/chrome`);
-    } else {
-      args.push('--log-level=3');
-    }
+    args.push('--log-level=3');
     const options = new chrome.Options().addArguments(args);
     options.setProxy(proxy.manual({ https: HTTPS_PROXY_HOST }));
     options.setAcceptInsecureCerts(true);
-    options.setUserPreferences({
-      'download.default_directory': `${process.cwd()}/test-artifacts/downloads`,
-    });
     const builder = new Builder()
       .forBrowser('chrome')
       .setChromeOptions(options);
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index 9886872a4a66..7c3ffa86e135 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -266,21 +266,21 @@ class Driver {
   /**
    * Paste a string into a field.
    *
-   * @param {string} rawLocator - The element locator.
+   * @param {string} element - The element locator.
    * @param {string} contentToPaste - The content to paste.
    */
-  async pasteIntoField(rawLocator, contentToPaste) {
+  async pasteIntoField(element, contentToPaste) {
     // Throw if double-quote is present in content to paste
     // so that we don't have to worry about escaping double-quotes
     if (contentToPaste.includes('"')) {
       throw new Error('Cannot paste content with double-quote');
     }
     // Click to focus the field
-    await this.clickElement(rawLocator);
+    await this.clickElement(element);
     await this.executeScript(
       `navigator.clipboard.writeText("${contentToPaste}")`,
     );
-    await this.fill(rawLocator, Key.chord(this.Key.MODIFIER, 'v'));
+    await this.fill(element, Key.chord(this.Key.MODIFIER, 'v'));
   }
 
   // Navigation
@@ -307,10 +307,6 @@ class Driver {
     await this.driver.switchTo().window(handle);
   }
 
-  async switchToFrame(element) {
-    await this.driver.switchTo().frame(element);
-  }
-
   async getAllWindowHandles() {
     return await this.driver.getAllWindowHandles();
   }
@@ -397,20 +393,6 @@ class Driver {
     );
   }
 
-  async checkBrowserForLavamoatLogs() {
-    const browserLogs = (
-      await fs.readFile(
-        `${process.cwd()}/test-artifacts/chrome/chrome_debug.log`,
-      )
-    )
-      .toString('utf-8')
-      .split(/\r?\n/u);
-
-    await fs.writeFile('/tmp/all_logs.json', JSON.stringify(browserLogs));
-
-    return browserLogs;
-  }
-
   async checkBrowserForConsoleErrors() {
     const ignoredLogTypes = ['WARNING'];
     const ignoredErrorMessages = [
diff --git a/test/e2e/webdriver/firefox.js b/test/e2e/webdriver/firefox.js
index 28afddc069e3..71111df58654 100644
--- a/test/e2e/webdriver/firefox.js
+++ b/test/e2e/webdriver/firefox.js
@@ -4,6 +4,8 @@ const path = require('path');
 const { Builder, By, until } = require('selenium-webdriver');
 const firefox = require('selenium-webdriver/firefox');
 const proxy = require('selenium-webdriver/proxy');
+const { getVersion } = require('../../../development/lib/get-version');
+const { BuildType } = require('../../../development/lib/build-type');
 
 /**
  * The prefix for temporary Firefox profiles. All Firefox profiles used for e2e tests
@@ -30,18 +32,14 @@ class FirefoxDriver {
    * @param {Object} options - the options for the build
    * @param options.responsive
    * @param options.port
+   * @param options.type
    * @returns {Promise<{driver: !ThenableWebDriver, extensionUrl: string, extensionId: string}>}
    */
-  static async build({ responsive, port }) {
+  static async build({ responsive, port, type }) {
     const templateProfile = fs.mkdtempSync(TEMP_PROFILE_PATH_PREFIX);
     const options = new firefox.Options().setProfile(templateProfile);
     options.setProxy(proxy.manual({ https: HTTPS_PROXY_HOST }));
     options.setAcceptInsecureCerts(true);
-    options.setPreference('browser.download.folderList', 2);
-    options.setPreference(
-      'browser.download.dir',
-      `${process.cwd()}/test-artifacts/downloads`,
-    );
     const builder = new Builder()
       .forBrowser('firefox')
       .setFirefoxOptions(options);
@@ -52,7 +50,14 @@ class FirefoxDriver {
     const driver = builder.build();
     const fxDriver = new FirefoxDriver(driver);
 
-    const extensionId = await fxDriver.installExtension('dist/firefox');
+    const version = getVersion(type || BuildType.main, 0);
+    let extensionString = `builds/metamask-firefox-${version}.zip`;
+
+    if (type) {
+      extensionString = `builds/metamask-${type}-firefox-${version}.zip`;
+    }
+
+    const extensionId = await fxDriver.installExtension(extensionString);
     const internalExtensionId = await fxDriver.getInternalId();
 
     if (responsive) {
diff --git a/test/e2e/webdriver/index.js b/test/e2e/webdriver/index.js
index ebec9a002403..13fcbb29f82e 100644
--- a/test/e2e/webdriver/index.js
+++ b/test/e2e/webdriver/index.js
@@ -3,15 +3,15 @@ const Driver = require('./driver');
 const ChromeDriver = require('./chrome');
 const FirefoxDriver = require('./firefox');
 
-async function buildWebDriver({ responsive, port, timeOut } = {}) {
+async function buildWebDriver({ responsive, port, type } = {}) {
   const browser = process.env.SELENIUM_BROWSER;
 
   const {
     driver: seleniumDriver,
     extensionId,
     extensionUrl,
-  } = await buildBrowserWebDriver(browser, { responsive, port });
-  const driver = new Driver(seleniumDriver, browser, extensionUrl, timeOut);
+  } = await buildBrowserWebDriver(browser, { responsive, port, type });
+  const driver = new Driver(seleniumDriver, browser, extensionUrl);
 
   return {
     driver,
diff --git a/test/helpers/file.js b/test/helpers/file.js
deleted file mode 100644
index f2f13fa83bb7..000000000000
--- a/test/helpers/file.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/* eslint-disable node/shebang */
-const path = require('path');
-const { promises: fs, constants: fsConstants } = require('fs');
-
-async function isWritable(directory) {
-  try {
-    await fs.access(directory, fsConstants.W_OK);
-    return true;
-  } catch (error) {
-    if (error.code !== 'EACCES') {
-      throw error;
-    }
-    return false;
-  }
-}
-
-async function getFirstParentDirectoryThatExists(directory) {
-  let nextDirectory = directory;
-  for (;;) {
-    try {
-      await fs.access(nextDirectory, fsConstants.F_OK);
-      return nextDirectory;
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        throw error;
-      } else if (nextDirectory === path.dirname(nextDirectory)) {
-        throw new Error('Failed to find parent directory that exists');
-      }
-      nextDirectory = path.dirname(nextDirectory);
-    }
-  }
-}
-
-module.exports = {
-  isWritable,
-  getFirstParentDirectoryThatExists,
-};
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 2595746c0c05..73f4892b3477 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -2,102 +2,51 @@ import { MAINNET_CHAIN_ID } from '../../shared/constants/network';
 
 const createGetSmartTransactionFeesApiResponse = () => {
   return {
-    tradeTxFees: {
-      // Approval tx.
-      cancelFees: [
-        { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
-        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
-        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
-        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-        { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
-        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-        { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
-        { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
-        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-        { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
-        { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
-        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
-        { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
-        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
-        { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
-        { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
-      ],
-      feeEstimate: 42000000000000,
-      fees: [
-        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
-        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
-        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-        { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
-        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-        { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
-        { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
-        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-        { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
-        { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
-        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
-        { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
-        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
-        { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
-        { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
-        { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
-      ],
-      gasLimit: 21000,
-      gasUsed: 21000,
-    },
-    approvalTxFees: {
-      // Trade tx.
-      cancelFees: [
-        { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
-        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
-        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
-        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-        { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
-        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-        { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
-        { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
-        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-        { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
-        { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
-        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
-        { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
-        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
-        { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
-        { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
-      ],
-      feeEstimate: 42000000000000,
-      fees: [
-        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
-        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
-        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-        { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
-        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-        { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
-        { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
-        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-        { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
-        { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
-        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
-        { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
-        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
-        { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
-        { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
-        { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
-      ],
-      gasLimit: 21000,
-      gasUsed: 21000,
-    },
+    cancelFees: [
+      { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
+      { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+      { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
+      { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+      { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
+      { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+      { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
+      { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+      { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
+      { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
+      { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+      { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+      { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
+      { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
+      { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
+      { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
+      { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
+      { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
+      { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
+    ],
+    feeEstimate: 42000000000000,
+    fees: [
+      { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+      { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
+      { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+      { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
+      { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+      { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
+      { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+      { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
+      { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
+      { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+      { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+      { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
+      { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
+      { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
+      { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
+      { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
+      { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
+      { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
+      { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
+    ],
+    gasLimit: 21000,
+    gasUsed: 21000,
   };
 };
 
@@ -435,6 +384,11 @@ export const createSwapsMockStore = () => {
             },
           ],
         },
+        estimatedGas: {
+          txData: {
+            feeEstimate: 5435000587128155,
+          },
+        },
       },
     },
     appState: {
diff --git a/test/jest/mocks.js b/test/jest/mocks.js
index 47c8a1f99ccd..6e257adaa9c7 100644
--- a/test/jest/mocks.js
+++ b/test/jest/mocks.js
@@ -1,8 +1,3 @@
-import {
-  draftTransactionInitialState,
-  initialState,
-} from '../../ui/ducks/send';
-
 export const TOP_ASSETS_GET_RESPONSE = [
   {
     symbol: 'LINK',
@@ -108,42 +103,3 @@ export const createGasFeeEstimatesForFeeMarket = () => {
     estimatedBaseFee: '50',
   };
 };
-
-export const INITIAL_SEND_STATE_FOR_EXISTING_DRAFT = {
-  ...initialState,
-  currentTransactionUUID: 'test-uuid',
-  draftTransactions: {
-    'test-uuid': {
-      ...draftTransactionInitialState,
-    },
-  },
-};
-
-export const getInitialSendStateWithExistingTxState = (draftTxState) => ({
-  ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-  draftTransactions: {
-    'test-uuid': {
-      ...draftTransactionInitialState,
-      ...draftTxState,
-      amount: {
-        ...draftTransactionInitialState.amount,
-        ...draftTxState.amount,
-      },
-      asset: {
-        ...draftTransactionInitialState.asset,
-        ...draftTxState.asset,
-      },
-      gas: {
-        ...draftTransactionInitialState.gas,
-        ...draftTxState.gas,
-      },
-      recipient: {
-        ...draftTransactionInitialState.recipient,
-        ...draftTxState.recipient,
-      },
-      history: draftTxState.history ?? [],
-      // Use this key if you want to console.log inside the send.js file.
-      test: draftTxState.test ?? 'yo',
-    },
-  },
-});
diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index 44b68b739033..eaa8e32e76a4 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -23,11 +23,9 @@ import {
   IMPORT_ACCOUNT_ROUTE,
   CONNECT_HARDWARE_ROUTE,
   DEFAULT_ROUTE,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  NOTIFICATIONS_ROUTE,
-  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/routes';
 import TextField from '../../ui/text-field';
+import SearchIcon from '../../ui/search-icon';
 import IconCheck from '../../ui/icon/icon-check';
 import IconSpeechBubbles from '../../ui/icon/icon-speech-bubbles';
 import IconConnect from '../../ui/icon/icon-connect';
@@ -36,7 +34,6 @@ import IconPlus from '../../ui/icon/icon-plus';
 import IconImport from '../../ui/icon/icon-import';
 
 import Button from '../../ui/button';
-import SearchIcon from '../../ui/icon/search-icon';
 import KeyRingLabel from './keyring-label';
 
 export function AccountMenuItem(props) {
@@ -50,13 +47,13 @@ export function AccountMenuItem(props) {
       {children}
     </div>
   ) : (
-    <button className={itemClassName} onClick={onClick}>
+    <div className={itemClassName} onClick={onClick}>
       {icon ? <div className="account-menu__item__icon">{icon}</div> : null}
       {text ? <div className="account-menu__item__text">{text}</div> : null}
       {subText ? (
         <div className="account-menu__item__subtext">{subText}</div>
       ) : null}
-    </button>
+    </div>
   );
 }
 
@@ -87,9 +84,6 @@ export default class AccountMenu extends Component {
     toggleAccountMenu: PropTypes.func,
     addressConnectedSubjectMap: PropTypes.object,
     originOfCurrentTab: PropTypes.string,
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    unreadNotificationsCount: PropTypes.number,
-    ///: END:ONLY_INCLUDE_IN
   };
 
   accountsRef;
@@ -100,12 +94,11 @@ export default class AccountMenu extends Component {
   };
 
   addressFuse = new Fuse([], {
-    threshold: 0.55,
+    threshold: 0.45,
     location: 0,
     distance: 100,
     maxPatternLength: 32,
     minMatchCharLength: 1,
-    ignoreFieldNorm: true,
     keys: [
       { name: 'name', weight: 0.5 },
       { name: 'address', weight: 0.5 },
@@ -131,11 +124,6 @@ export default class AccountMenu extends Component {
   }
 
   renderAccountsSearch() {
-    const handleChange = (e) => {
-      const val = e.target.value.length > 1 ? e.target.value : '';
-      this.setSearchQuery(val);
-    };
-
     const inputAdornment = (
       <InputAdornment
         position="start"
@@ -145,7 +133,7 @@ export default class AccountMenu extends Component {
           marginLeft: '8px',
         }}
       >
-        <SearchIcon color="var(--color-icon-muted)" />
+        <SearchIcon color="currentColor" />
       </InputAdornment>
     );
 
@@ -155,7 +143,8 @@ export default class AccountMenu extends Component {
         id="search-accounts"
         placeholder={this.context.t('searchAccounts')}
         type="text"
-        onChange={handleChange}
+        value={this.state.searchQuery}
+        onChange={(e) => this.setSearchQuery(e.target.value)}
         startAdornment={inputAdornment}
         fullWidth
         theme="material-white-padded"
@@ -205,7 +194,7 @@ export default class AccountMenu extends Component {
       const iconAndNameForOpenSubject = addressSubjects[originOfCurrentTab];
 
       return (
-        <button
+        <div
           className="account-menu__account account-menu__item--clickable"
           onClick={() => {
             this.context.trackEvent({
@@ -244,7 +233,7 @@ export default class AccountMenu extends Component {
               />
             </div>
           ) : null}
-        </button>
+        </div>
       );
     });
   }
@@ -304,9 +293,6 @@ export default class AccountMenu extends Component {
       toggleAccountMenu,
       lockMetamask,
       history,
-      ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      unreadNotificationsCount,
-      ///: END:ONLY_INCLUDE_IN
     } = this.props;
 
     if (!isAccountMenuOpen) {
@@ -364,7 +350,7 @@ export default class AccountMenu extends Component {
             });
             history.push(NEW_ACCOUNT_ROUTE);
           }}
-          icon={<IconPlus color="var(--color-icon-alternative)" />}
+          icon={<IconPlus color="var(--color-icon-default)" />}
           text={t('createAccount')}
         />
         <AccountMenuItem
@@ -382,7 +368,7 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconImport
-              color="var(--color-icon-alternative)"
+              color="var(--color-icon-default)"
               ariaLabel={t('importAccount')}
             />
           }
@@ -407,44 +393,20 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconConnect
-              color="var(--color-icon-alternative)"
+              color="var(--color-icon-default)"
               ariaLabel={t('connectHardwareWallet')}
             />
           }
           text={t('connectHardwareWallet')}
         />
         <div className="account-menu__divider" />
-        {
-          ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          <>
-            <AccountMenuItem
-              onClick={() => {
-                toggleAccountMenu();
-                history.push(NOTIFICATIONS_ROUTE);
-              }}
-              icon={
-                <div className="account-menu__notifications">
-                  <i className="fa fa-bell fa-xl" />
-                  {unreadNotificationsCount > 0 && (
-                    <div className="account-menu__notifications__count">
-                      {unreadNotificationsCount}
-                    </div>
-                  )}
-                </div>
-              }
-              text={t('notifications')}
-            />
-            <div className="account-menu__divider" />
-          </>
-          ///: END:ONLY_INCLUDE_IN
-        }
         <AccountMenuItem
           onClick={() => {
             global.platform.openTab({ url: supportLink });
           }}
           icon={
             <IconSpeechBubbles
-              color="var(--color-icon-alternative)"
+              color="var(--color-icon-default)"
               ariaLabel={supportText}
             />
           }
@@ -466,7 +428,7 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconCog
-              color="var(--color-icon-alternative)"
+              color="var(--color-icon-default)"
               ariaLabel={t('settings')}
             />
           }
diff --git a/ui/components/app/account-menu/account-menu.container.js b/ui/components/app/account-menu/account-menu.container.js
index 6862709201bd..936c05eb652d 100644
--- a/ui/components/app/account-menu/account-menu.container.js
+++ b/ui/components/app/account-menu/account-menu.container.js
@@ -13,9 +13,6 @@ import {
   getMetaMaskKeyrings,
   getOriginOfCurrentTab,
   getSelectedAddress,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  getUnreadNotificationsCount,
-  ///: END:ONLY_INCLUDE_IN
 } from '../../../selectors';
 import AccountMenu from './account-menu.component';
 
@@ -31,9 +28,7 @@ function mapStateToProps(state) {
   const accounts = getMetaMaskAccountsOrdered(state);
   const origin = getOriginOfCurrentTab(state);
   const selectedAddress = getSelectedAddress(state);
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  const unreadNotificationsCount = getUnreadNotificationsCount(state);
-  ///: END:ONLY_INCLUDE_IN
+
   return {
     isAccountMenuOpen,
     addressConnectedSubjectMap: getAddressConnectedSubjectMap(state),
@@ -42,9 +37,6 @@ function mapStateToProps(state) {
     keyrings: getMetaMaskKeyrings(state),
     accounts,
     shouldShowAccountsSearch: accounts.length >= SHOW_SEARCH_ACCOUNTS_MIN_COUNT,
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    unreadNotificationsCount,
-    ///: END:ONLY_INCLUDE_IN
   };
 }
 
diff --git a/ui/components/app/account-menu/index.scss b/ui/components/app/account-menu/index.scss
index 7d6e4a0131bb..b5bb8846d6be 100644
--- a/ui/components/app/account-menu/index.scss
+++ b/ui/components/app/account-menu/index.scss
@@ -5,7 +5,7 @@
   width: 320px;
   border-radius: 4px;
   background: var(--color-background-default);
-  box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+  box-shadow: rgba($black, 0.15) 0 2px 2px 2px;
   min-width: 150px;
   color: var(--color-text-default);
 
@@ -32,9 +32,6 @@
     align-items: center;
     position: relative;
     z-index: 201;
-    border: 0;
-    background: none;
-    width: 100%;
 
     @media screen and (max-width: $break-small) {
       padding: 14px;
@@ -56,18 +53,10 @@
     &__icon {
       margin-right: 8px;
       display: flex;
-      color: var(--color-icon-alternative);
-
-      i {
-        text-align: center;
-        width: 24px;
-      }
     }
 
     &__text {
       @include Paragraph;
-
-      color: var(--color-text-default);
     }
 
     &__subtext {
@@ -111,9 +100,8 @@
   & &__lock-button {
     @include H7;
 
-    padding: 0.25rem 0.5rem;
-    min-width: 59px;
-    width: auto;
+    padding: 3.5px 5px;
+    width: 59px;
   }
 
   &__accounts-container {
@@ -134,7 +122,7 @@
     scrollbar-width: auto;
 
     @media screen and (max-width: $break-small) {
-      max-height: 156px;
+      max-height: 228px;
     }
 
     .keyring-label {
@@ -148,7 +136,6 @@
       margin-top: 5px;
       margin-right: 10px;
       background-color: var(--color-background-alternative);
-      border: 1px solid var(--color-border-default);
       color: var(--color-text-default);
       font-weight: normal;
       letter-spacing: 0.5px;
@@ -157,25 +144,6 @@
     }
   }
 
-  &__notifications {
-    position: relative;
-
-    &__count {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      right: 0;
-      bottom: 0;
-      min-width: 12px;
-      min-height: 12px;
-      font-size: 8px;
-      border-radius: 50%;
-      background-color: var(--color-primary-default);
-      color: var(--color-primary-inverse);
-    }
-  }
-
   &__no-accounts {
     @include H6;
 
@@ -187,9 +155,6 @@
     flex-flow: row nowrap;
     padding: 16px 14px;
     flex: 0 0 auto;
-    background: none;
-    border: 0;
-    width: 100%;
 
     @media screen and (max-width: $break-small) {
       padding: 12px 14px;
@@ -238,7 +203,6 @@
     overflow: hidden;
     white-space: nowrap;
     max-width: 200px;
-    text-align: start;
   }
 
   &__balance {
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
index 94dd233960c5..c453eedf59ab 100644
--- a/ui/components/app/add-network/add-network.js
+++ b/ui/components/app/add-network/add-network.js
@@ -1,287 +1,168 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
 import { I18nContext } from '../../../contexts/i18n';
 import Box from '../../ui/box';
 import Typography from '../../ui/typography';
 import {
   ALIGN_ITEMS,
+  BLOCK_SIZES,
   COLORS,
   DISPLAY,
   FLEX_DIRECTION,
   FONT_WEIGHT,
   TYPOGRAPHY,
   JUSTIFY_CONTENT,
-  SIZES,
 } from '../../../helpers/constants/design-system';
 import Button from '../../ui/button';
+import IconCaretLeft from '../../ui/icon/icon-caret-left';
 import Tooltip from '../../ui/tooltip';
 import IconWithFallback from '../../ui/icon-with-fallback';
 import IconBorder from '../../ui/icon-border';
-import {
-  getFrequentRpcListDetail,
-  getUnapprovedConfirmations,
-} from '../../../selectors';
-
-import {
-  ENVIRONMENT_TYPE_FULLSCREEN,
-  ENVIRONMENT_TYPE_POPUP,
-  MESSAGE_TYPE,
-} from '../../../../shared/constants/app';
-import { requestUserApproval } from '../../../store/actions';
-import Popover from '../../ui/popover';
-import ConfirmationPage from '../../../pages/confirmation/confirmation';
-import { FEATURED_RPCS } from '../../../../shared/constants/network';
-import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes';
-import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { getTheme } from '../../../selectors';
+import { THEME_TYPE } from '../../../pages/settings/experimental-tab/experimental-tab.constant';
 
-const AddNetwork = () => {
+const AddNetwork = ({
+  onBackClick,
+  onAddNetworkClick,
+  onAddNetworkManuallyClick,
+  featuredRPCS,
+}) => {
   const t = useContext(I18nContext);
-  const dispatch = useDispatch();
-  const history = useHistory();
-  const frequentRpcList = useSelector(getFrequentRpcListDetail);
-
-  const frequentRpcListChainIds = Object.values(frequentRpcList).map(
-    (net) => net.chainId,
-  );
+  const theme = useSelector(getTheme);
 
   const infuraRegex = /infura.io/u;
 
-  const nets = FEATURED_RPCS.sort((a, b) =>
-    a.ticker > b.ticker ? 1 : -1,
-  ).slice(0, FEATURED_RPCS.length);
-
-  const notFrequentRpcNetworks = nets.filter(
-    (net) => frequentRpcListChainIds.indexOf(net.chainId) === -1,
-  );
-  const unapprovedConfirmations = useSelector(getUnapprovedConfirmations);
-  const [showPopover, setShowPopover] = useState(false);
-
-  useEffect(() => {
-    const anAddNetworkConfirmationFromMetaMaskExists = unapprovedConfirmations?.find(
-      (confirmation) => {
-        return (
-          confirmation.origin === 'metamask' &&
-          confirmation.type === MESSAGE_TYPE.ADD_ETHEREUM_CHAIN
-        );
-      },
-    );
-    if (!showPopover && anAddNetworkConfirmationFromMetaMaskExists) {
-      setShowPopover(true);
-    }
-
-    if (showPopover && !anAddNetworkConfirmationFromMetaMaskExists) {
-      setShowPopover(false);
-    }
-  }, [unapprovedConfirmations, showPopover]);
+  const nets = featuredRPCS
+    .sort((a, b) => (a.ticker > b.ticker ? 1 : -1))
+    .slice(0, 8);
 
   return (
-    <>
-      {Object.keys(notFrequentRpcNetworks).length === 0 ? (
-        <Box
-          className="add-network__edge-case-box"
-          borderRadius={SIZES.MD}
-          padding={4}
-          marginTop={4}
-          marginRight={6}
-          marginLeft={6}
-          display={DISPLAY.FLEX}
-          flexDirection={FLEX_DIRECTION.ROW}
-          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+    <Box>
+      <Box
+        height={BLOCK_SIZES.TWO_TWELFTHS}
+        padding={[4, 0, 4, 0]}
+        display={DISPLAY.FLEX}
+        alignItems={ALIGN_ITEMS.CENTER}
+        flexDirection={FLEX_DIRECTION.ROW}
+        className="add-network__header"
+      >
+        <IconCaretLeft
+          aria-label={t('back')}
+          onClick={onBackClick}
+          className="add-network__header__back-icon"
+        />
+        <Typography variant={TYPOGRAPHY.H3} color={COLORS.TEXT_DEFAULT}>
+          {t('addNetwork')}
+        </Typography>
+      </Box>
+      <Box
+        height={BLOCK_SIZES.FOUR_FIFTHS}
+        width={BLOCK_SIZES.TEN_TWELFTHS}
+        margin={[0, 6, 0, 6]}
+      >
+        <Typography
+          variant={TYPOGRAPHY.H6}
+          color={COLORS.TEXT_ALTERNATIVE}
+          margin={[4, 0, 0, 0]}
         >
-          <Box marginRight={4}>
-            <img src="images/info-fox.svg" />
-          </Box>
-          <Box>
-            <Typography variant={TYPOGRAPHY.H7}>
-              {t('youHaveAddedAll', [
-                <a
-                  key="link"
-                  className="add-network__edge-case-box__link"
-                  href="https://chainlist.wtf/"
-                  target="_blank"
-                  rel="noreferrer"
-                >
-                  {t('here')}.
-                </a>,
-                <Button
-                  key="button"
-                  type="inline"
-                  onClick={(event) => {
-                    event.preventDefault();
-                    getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
-                      ? global.platform.openExtensionInBrowser(
-                          ADD_NETWORK_ROUTE,
-                        )
-                      : history.push(ADD_NETWORK_ROUTE);
-                  }}
-                >
-                  <Typography
-                    variant={TYPOGRAPHY.H7}
-                    color={COLORS.INFO_DEFAULT}
-                  >
-                    {t('addMoreNetworks')}.
-                  </Typography>
-                </Button>,
-              ])}
-            </Typography>
-          </Box>
-        </Box>
-      ) : (
-        <Box className="add-network__networks-container">
-          {getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN && (
-            <Box
-              display={DISPLAY.FLEX}
-              alignItems={ALIGN_ITEMS.CENTER}
-              flexDirection={FLEX_DIRECTION.ROW}
-              marginTop={7}
-              marginBottom={4}
-              paddingBottom={2}
-              className="add-network__header"
-            >
-              <Typography variant={TYPOGRAPHY.H4} color={COLORS.TEXT_MUTED}>
-                {t('networks')}
-              </Typography>
-              <span className="add-network__header__subtitle">{'  >  '}</span>
-              <Typography variant={TYPOGRAPHY.H4} color={COLORS.TEXT_DEFAULT}>
-                {t('addANetwork')}
-              </Typography>
-            </Box>
-          )}
+          {t('addFromAListOfPopularNetworks')}
+        </Typography>
+        <Typography
+          variant={TYPOGRAPHY.H7}
+          color={COLORS.TEXT_MUTED}
+          margin={[4, 0, 3, 0]}
+        >
+          {t('popularCustomNetworks')}
+        </Typography>
+        {nets.map((item, index) => (
           <Box
-            marginTop={getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? 0 : 4}
-            marginBottom={1}
-            className="add-network__main-container"
+            key={index}
+            display={DISPLAY.FLEX}
+            alignItems={ALIGN_ITEMS.CENTER}
+            justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
+            marginBottom={6}
           >
-            <Typography
-              variant={TYPOGRAPHY.H6}
-              color={COLORS.TEXT_ALTERNATIVE}
-              margin={0}
-              marginTop={4}
-            >
-              {t('addFromAListOfPopularNetworks')}
-            </Typography>
-            <Typography
-              variant={TYPOGRAPHY.H7}
-              color={COLORS.TEXT_MUTED}
-              marginTop={4}
-              marginBottom={3}
-            >
-              {t('popularCustomNetworks')}
-            </Typography>
-            {notFrequentRpcNetworks.map((item, index) => (
-              <Box
-                key={index}
-                display={DISPLAY.FLEX}
-                alignItems={ALIGN_ITEMS.CENTER}
-                justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
-                marginBottom={6}
-                className="add-network__list-of-networks"
+            <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
+              <IconBorder size={24}>
+                <IconWithFallback
+                  icon={item.rpcPrefs.imageUrl}
+                  name={item.nickname}
+                  size={24}
+                />
+              </IconBorder>
+              <Typography
+                variant={TYPOGRAPHY.H7}
+                color={COLORS.TEXT_DEFAULT}
+                fontWeight={FONT_WEIGHT.BOLD}
+                boxProps={{ marginLeft: 2 }}
               >
-                <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
-                  <Box>
-                    <IconBorder size={24}>
-                      <IconWithFallback
-                        icon={item.rpcPrefs.imageUrl}
-                        name={item.nickname}
-                        size={24}
-                      />
-                    </IconBorder>
-                  </Box>
-                  <Box marginLeft={2}>
-                    <Typography
-                      variant={TYPOGRAPHY.H7}
-                      color={COLORS.TEXT_DEFAULT}
-                      fontWeight={FONT_WEIGHT.BOLD}
-                    >
-                      {item.nickname}
-                    </Typography>
-                  </Box>
-                </Box>
-                <Box
-                  display={DISPLAY.FLEX}
-                  alignItems={ALIGN_ITEMS.CENTER}
-                  marginLeft={1}
-                >
-                  {
-                    // Warning for the networks that doesn't use infura.io as the RPC
-                    !infuraRegex.test(item.rpcUrl) && (
-                      <Tooltip
-                        position="top"
-                        interactive
-                        html={
-                          <Box
-                            margin={3}
-                            className="add-network__warning-tooltip"
+                {item.nickname}
+              </Typography>
+            </Box>
+            <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
+              {
+                // Warning for the networks that doesn't use infura.io as the RPC
+                !infuraRegex.test(item.rpcUrl) && (
+                  <Tooltip
+                    className="add-network__warning-tooltip"
+                    position="top"
+                    interactive
+                    html={
+                      <Box margin={3} className="add-network__warning-tooltip">
+                        {t('addNetworkTooltipWarning', [
+                          <a
+                            key="zendesk_page_link"
+                            href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
+                            rel="noreferrer"
+                            target="_blank"
                           >
-                            {t('addNetworkTooltipWarning', [
-                              <a
-                                key="zendesk_page_link"
-                                href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
-                                rel="noreferrer"
-                                target="_blank"
-                              >
-                                {t('learnMoreUpperCase')}
-                              </a>,
-                            ])}
-                          </Box>
-                        }
-                        trigger="mouseenter"
-                      >
-                        <i
-                          className="fa fa-exclamation-triangle add-network__warning-icon"
-                          title={t('warning')}
-                        />
-                      </Tooltip>
-                    )
-                  }
-                  <Button
-                    type="inline"
-                    className="add-network__add-button"
-                    onClick={async () => {
-                      await dispatch(requestUserApproval(item, true));
-                    }}
+                            {t('learnMoreUpperCase')}
+                          </a>,
+                        ])}
+                      </Box>
+                    }
+                    trigger="mouseenter"
+                    theme={theme === THEME_TYPE.DEFAULT ? 'light' : 'dark'}
                   >
-                    {t('add')}
-                  </Button>
-                </Box>
-              </Box>
-            ))}
-          </Box>
-          <Box
-            padding={
-              getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
-                ? [2, 0, 2, 6]
-                : [2, 0, 2, 0]
-            }
-            className="add-network__footer"
-          >
-            <Button
-              type="link"
-              onClick={(event) => {
-                event.preventDefault();
-                getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
-                  ? global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE)
-                  : history.push(ADD_NETWORK_ROUTE);
-              }}
-            >
-              <Typography
-                variant={TYPOGRAPHY.H6}
-                color={COLORS.PRIMARY_DEFAULT}
+                    <i
+                      className="fa fa-exclamation-triangle add-network__warning-icon"
+                      title={t('warning')}
+                    />
+                  </Tooltip>
+                )
+              }
+              <Button
+                type="inline"
+                className="add-network__add-button"
+                onClick={onAddNetworkClick}
               >
-                {t('addANetworkManually')}
-              </Typography>
-            </Button>
+                {t('add')}
+              </Button>
+            </Box>
           </Box>
-        </Box>
-      )}
-      {showPopover && (
-        <Popover>
-          <ConfirmationPage />
-        </Popover>
-      )}
-    </>
+        ))}
+      </Box>
+      <Box
+        height={BLOCK_SIZES.ONE_TWELFTH}
+        padding={[4, 4, 4, 4]}
+        className="add-network__footer"
+      >
+        <Button type="link" onClick={onAddNetworkManuallyClick}>
+          <Typography variant={TYPOGRAPHY.H6} color={COLORS.PRIMARY_DEFAULT}>
+            {t('addANetworkManually')}
+          </Typography>
+        </Button>
+      </Box>
+    </Box>
   );
 };
 
+AddNetwork.propTypes = {
+  onBackClick: PropTypes.func,
+  onAddNetworkClick: PropTypes.func,
+  onAddNetworkManuallyClick: PropTypes.func,
+  featuredRPCS: PropTypes.array,
+};
+
 export default AddNetwork;
diff --git a/ui/components/app/add-network/add-network.test.js b/ui/components/app/add-network/add-network.test.js
deleted file mode 100644
index d0272608f635..000000000000
--- a/ui/components/app/add-network/add-network.test.js
+++ /dev/null
@@ -1,60 +0,0 @@
-import React from 'react';
-import { screen } from '@testing-library/react';
-import { renderWithProvider } from '../../../../test/jest';
-import configureStore from '../../../store/store';
-import mockState from '../../../../test/data/mock-state.json';
-import AddNetwork from './add-network';
-
-jest.mock('../../../selectors', () => ({
-  getFrequentRpcListDetail: () => ({
-    frequentRpcList: [
-      {
-        chainId: '0x539',
-        nickname: 'Localhost 8545',
-        rpcPrefs: {},
-        rpcUrl: 'http://localhost:8545',
-        ticker: 'ETH',
-      },
-      {
-        chainId: '0xA4B1',
-        nickname: 'Arbitrum One',
-        rpcPrefs: { blockExplorerUrl: 'https://explorer.arbitrum.io' },
-        rpcUrl:
-          'https://arbitrum-mainnet.infura.io/v3/7e127583378c4732a858df2550aff333',
-        ticker: 'AETH',
-      },
-    ],
-  }),
-  getUnapprovedConfirmations: jest.fn(),
-  getTheme: () => 'light',
-}));
-
-const render = () => {
-  const store = configureStore({
-    metamask: {
-      ...mockState.metamask,
-    },
-  });
-  return renderWithProvider(<AddNetwork />, store);
-};
-
-describe('AddNetwork', () => {
-  it('should show Add from a list.. text', () => {
-    render();
-    expect(
-      screen.getByText(
-        'Add from a list of popular networks or add a network manually. Only interact with the entities you trust.',
-      ),
-    ).toBeInTheDocument();
-  });
-
-  it('should show Popular custom networks text', () => {
-    render();
-    expect(screen.getByText('Popular custom networks')).toBeInTheDocument();
-  });
-
-  it('should show Arbitrum One network nickname', () => {
-    render();
-    expect(screen.getByText('Arbitrum One')).toBeInTheDocument();
-  });
-});
diff --git a/ui/components/app/add-network/index.scss b/ui/components/app/add-network/index.scss
index 4c7d9f9099b9..6da064bf57cb 100644
--- a/ui/components/app/add-network/index.scss
+++ b/ui/components/app/add-network/index.scss
@@ -1,36 +1,10 @@
 .add-network {
-  &__networks-container {
-    padding-inline-end: 24px;
-
-    @media screen and (max-width: $break-small) {
-      padding: 0;
-    }
-  }
-
   &__header {
     border-bottom: 1px solid var(--color-border-default);
 
-    @media screen and (max-width: 575px) {
-      padding-inline-start: 24px;
-      padding-inline-end: 24px;
-    }
-
-    &__subtitle {
-      margin-inline-start: 10px;
-      margin-inline-end: 10px;
-    }
-  }
-
-  &__main-container {
-    @media screen and (max-width: 575px) {
-      padding-inline-start: 24px;
-      padding-inline-end: 24px;
-    }
-  }
-
-  &__list-of-networks {
-    @media screen and (min-width: $break-large) {
-      width: 75%;
+    &__back-icon {
+      margin-left: 24px;
+      margin-right: 16px;
     }
   }
 
@@ -49,25 +23,19 @@
 
   &__add-icon {
     color: var(--color-text-alternative);
-    margin-inline-start: auto;
-    margin-inline-end: 0;
+    margin-left: auto;
+    margin-right: 0;
     cursor: pointer;
   }
 
   &__add-button.button {
     color: var(--color-primary-default);
     font-size: $font-size-h7;
-    margin-inline-start: 24px;
+    margin-left: 24px;
   }
 
   &__footer {
     border-top: 1px solid var(--color-border-muted);
-    width: 100%;
-    padding-bottom: 8px;
-
-    @media screen and (max-width: 575px) {
-      padding-inline-start: 24px !important;
-    }
 
     & .btn-link {
       display: initial;
@@ -83,14 +51,6 @@
       color: var(--color-text-alternative);
     }
   }
+}
 
-  &__edge-case-box {
-    border: 1px solid var(--color-border-muted);
 
-    &__link {
-      color: var(--color-info-default);
-      display: inline;
-      padding: 0;
-    }
-  }
-}
diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
index ce7d4463fd40..cc2e09680e3f 100644
--- a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
+++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
@@ -124,12 +124,12 @@ AdvancedGasControls.propTypes = {
   gasEstimateType: PropTypes.oneOf(Object.values(GAS_ESTIMATE_TYPES)),
   setMaxPriorityFee: PropTypes.func,
   setMaxFee: PropTypes.func,
-  maxPriorityFee: PropTypes.string,
-  maxFee: PropTypes.string,
+  maxPriorityFee: PropTypes.number,
+  maxFee: PropTypes.number,
   onManualChange: PropTypes.func,
   gasLimit: PropTypes.number,
   setGasLimit: PropTypes.func,
-  gasPrice: PropTypes.string,
+  gasPrice: PropTypes.number,
   setGasPrice: PropTypes.func,
   maxPriorityFeeFiat: PropTypes.string,
   maxFeeFiat: PropTypes.string,
diff --git a/ui/components/app/advanced-gas-controls/index.scss b/ui/components/app/advanced-gas-controls/index.scss
index 48e0d8707979..e7b41ba31911 100644
--- a/ui/components/app/advanced-gas-controls/index.scss
+++ b/ui/components/app/advanced-gas-controls/index.scss
@@ -21,6 +21,6 @@
   }
 
   path {
-    fill: var(--color-icon-alternative);
+    fill: var(--color-icon-muted);
   }
 }
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
index 24e68840715a..beefff4fa066 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
@@ -78,9 +78,7 @@ const AdvancedGasFeeDefaults = () => {
     <Box
       display={DISPLAY.FLEX}
       flexDirection={FLEX_DIRECTION.ROW}
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
+      margin={[4, 2, 0, 2]}
       className="advanced-gas-fee-defaults"
     >
       <label className="advanced-gas-fee-defaults__label">
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
index 1be16963df94..94359ce9afe4 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
@@ -7,6 +7,7 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { MAX_GAS_LIMIT_DEC } from '../../../../pages/send/send.constants';
 import Button from '../../../ui/button';
 import FormField from '../../../ui/form-field';
+import I18nValue from '../../../ui/i18n-value';
 import Typography from '../../../ui/typography';
 
 import { useAdvancedGasFeePopoverContext } from '../context';
@@ -65,11 +66,11 @@ const AdvancedGasFeeGasLimit = () => {
       tag={TYPOGRAPHY.Paragraph}
       variant={TYPOGRAPHY.H7}
       className="advanced-gas-fee-gas-limit"
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
+      margin={[4, 2, 0, 2]}
     >
-      <strong>{t('gasLimitV2')}</strong>
+      <strong>
+        <I18nValue messageKey="gasLimitV2" />
+      </strong>
       <span>{gasLimit}</span>
       <Button
         data-testid="advanced-gas-fee-edit"
@@ -77,7 +78,7 @@ const AdvancedGasFeeGasLimit = () => {
         onClick={() => setEditing(true)}
         type="link"
       >
-        {t('edit')}
+        <I18nValue messageKey="edit" />
       </Button>
     </Typography>
   );
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
index 9aba43ec0a9e..ddc0fd1ad4ac 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
@@ -25,7 +25,7 @@ function determineTrendInfo(trend, t) {
     case 'level':
       return {
         className: 'fa-arrow-right advanced-gas-fee-input-subtext__level',
-        color: 'var(--color-icon-alternative)',
+        color: 'var(--color-icon-default)',
         title: t('levelArrow'),
       };
     default:
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
index 466a965322dc..ee3737431e2f 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
@@ -115,7 +115,7 @@ const BaseFeeInput = () => {
   ]);
 
   return (
-    <Box className="base-fee-input" marginLeft={2} marginRight={2}>
+    <Box className="base-fee-input" margin={[0, 2]}>
       <FormField
         dataTestId="base-fee-input"
         error={baseFeeError ? t(baseFeeError) : ''}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
index b06798b817a6..a2b13fe944ad 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
@@ -103,12 +103,7 @@ const PriorityFeeInput = () => {
   ]);
 
   return (
-    <Box
-      marginTop={4}
-      marginLeft={2}
-      marginRight={2}
-      className="priority-fee-input"
-    >
+    <Box margin={[4, 2, 0, 2]} className="priority-fee-input">
       <FormField
         dataTestId="priority-fee-input"
         error={priorityFeeError ? t(priorityFeeError) : ''}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
index ee0ecaf08cf7..47c3abd28cd9 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
@@ -5,8 +5,8 @@ import { decGWEIToHexWEI } from '../../../../../shared/modules/conversion.utils'
 import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
 import Button from '../../../ui/button';
+import I18nValue from '../../../ui/i18n-value';
 
 import { useAdvancedGasFeePopoverContext } from '../context';
 
@@ -14,7 +14,6 @@ const AdvancedGasFeeSaveButton = () => {
   const { closeModal } = useTransactionModalContext();
   const { updateTransactionEventFragment } = useTransactionEventFragment();
   const { updateTransaction } = useGasFeeContext();
-  const t = useI18nContext();
   const {
     gasLimit,
     hasErrors,
@@ -39,7 +38,7 @@ const AdvancedGasFeeSaveButton = () => {
 
   return (
     <Button type="primary" disabled={hasErrors} onClick={onSave}>
-      {t('save')}
+      <I18nValue messageKey="save" />
     </Button>
   );
 };
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 6fd148adc069..3920e5372416 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -14,7 +14,6 @@
 @import 'collectibles-items/index';
 @import 'collectibles-tab/index';
 @import 'collectible-details/index';
-@import 'collectible-default-image/index';
 @import 'collectible-options/index';
 @import 'collectibles-detection-notice/index';
 @import 'connected-accounts-list/index';
diff --git a/ui/components/app/app-header/app-header.component.js b/ui/components/app/app-header/app-header.component.js
index 8f3fc588d2b7..c2a6a092640a 100644
--- a/ui/components/app/app-header/app-header.component.js
+++ b/ui/components/app/app-header/app-header.component.js
@@ -20,9 +20,6 @@ export default class AppHeader extends PureComponent {
     disabled: PropTypes.bool,
     disableNetworkIndicator: PropTypes.bool,
     isAccountMenuOpen: PropTypes.bool,
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    unreadNotificationsCount: PropTypes.number,
-    ///: END:ONLY_INCLUDE_IN
     onClick: PropTypes.func,
   };
 
@@ -69,14 +66,11 @@ export default class AppHeader extends PureComponent {
       selectedAddress,
       disabled,
       isAccountMenuOpen,
-      ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      unreadNotificationsCount,
-      ///: END:ONLY_INCLUDE_IN
     } = this.props;
 
     return (
       isUnlocked && (
-        <button
+        <div
           className={classnames('account-menu__icon', {
             'account-menu__icon--disabled': disabled,
           })}
@@ -96,16 +90,7 @@ export default class AppHeader extends PureComponent {
           }}
         >
           <Identicon address={selectedAddress} diameter={32} addBorder />
-          {
-            ///: BEGIN:ONLY_INCLUDE_IN(flask)
-            unreadNotificationsCount > 0 && (
-              <div className="account-menu__icon__notification-count">
-                {unreadNotificationsCount}
-              </div>
-            )
-            ///: END:ONLY_INCLUDE_IN
-          }
-        </button>
+        </div>
       )
     );
   }
diff --git a/ui/components/app/app-header/app-header.container.js b/ui/components/app/app-header/app-header.container.js
index e30049bc387f..a7d632b6d89d 100644
--- a/ui/components/app/app-header/app-header.container.js
+++ b/ui/components/app/app-header/app-header.container.js
@@ -1,9 +1,6 @@
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import { compose } from 'redux';
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { getUnreadNotificationsCount } from '../../../selectors';
-///: END:ONLY_INCLUDE_IN
 
 import * as actions from '../../../store/actions';
 import AppHeader from './app-header.component';
@@ -13,18 +10,11 @@ const mapStateToProps = (state) => {
   const { networkDropdownOpen } = appState;
   const { selectedAddress, isUnlocked, isAccountMenuOpen } = metamask;
 
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  const unreadNotificationsCount = getUnreadNotificationsCount(state);
-  ///: END:ONLY_INCLUDE_IN
-
   return {
     networkDropdownOpen,
     selectedAddress,
     isUnlocked,
     isAccountMenuOpen,
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    unreadNotificationsCount,
-    ///: END:ONLY_INCLUDE_IN
   };
 };
 
diff --git a/ui/components/app/app-header/index.scss b/ui/components/app/app-header/index.scss
index dd3e27fd15cd..a5906af7f46d 100644
--- a/ui/components/app/app-header/index.scss
+++ b/ui/components/app/app-header/index.scss
@@ -86,25 +86,4 @@
     width: 0;
     justify-content: flex-end;
   }
-
-  .account-menu__icon {
-    position: relative;
-    border: 0;
-    background: none;
-
-    &__notification-count {
-      position: absolute;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      right: 0;
-      bottom: 0;
-      min-width: 16px;
-      min-height: 16px;
-      font-size: 10px;
-      border-radius: 50%;
-      background-color: var(--color-primary-default);
-      color: var(--color-primary-inverse);
-    }
-  }
 }
diff --git a/ui/components/app/asset-list-item/asset-list-item.js b/ui/components/app/asset-list-item/asset-list-item.js
index bc19aff878c8..77ab7f53d67f 100644
--- a/ui/components/app/asset-list-item/asset-list-item.js
+++ b/ui/components/app/asset-list-item/asset-list-item.js
@@ -9,7 +9,7 @@ import Tooltip from '../../ui/tooltip';
 import InfoIcon from '../../ui/icon/info-icon.component';
 import Button from '../../ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { startNewDraftTransaction } from '../../../ducks/send';
+import { updateSendAsset } from '../../../ducks/send';
 import { SEND_ROUTE } from '../../../helpers/constants/routes';
 import { SEVERITIES } from '../../../helpers/constants/design-system';
 import { INVALID_ASSET_TYPE } from '../../../helpers/constants/error-keys';
@@ -74,7 +74,7 @@ const AssetListItem = ({
           });
           try {
             await dispatch(
-              startNewDraftTransaction({
+              updateSendAsset({
                 type: ASSET_TYPES.TOKEN,
                 details: {
                   address: tokenAddress,
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 08f8c6169358..3ba7a0c7dc3a 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -7,7 +7,7 @@ import AssetListItem from '../asset-list-item';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
 import {
-  getSelectedAccountCachedBalance,
+  getCurrentAccountWithSendEtherInfo,
   getShouldShowFiat,
   getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
@@ -33,12 +33,12 @@ const AssetList = ({ onClickAsset }) => {
 
   const [showDetectedTokens, setShowDetectedTokens] = useState(false);
 
-  const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance);
+  const selectedAccountBalance = useSelector(
+    (state) => getCurrentAccountWithSendEtherInfo(state).balance,
+  );
   const nativeCurrency = useSelector(getNativeCurrency);
   const showFiat = useSelector(getShouldShowFiat);
   const trackEvent = useContext(MetaMetricsContext);
-  const balance = useSelector(getSelectedAccountCachedBalance);
-  const balanceIsLoading = !balance;
 
   const {
     currency: primaryCurrency,
@@ -78,7 +78,7 @@ const AssetList = ({ onClickAsset }) => {
         }
         tokenSymbol={primaryCurrencyProperties.suffix}
         secondary={showFiat ? secondaryCurrencyDisplay : undefined}
-        tokenImage={balanceIsLoading ? null : primaryTokenImage}
+        tokenImage={primaryTokenImage}
         identiconBorder
       />
       <TokenList
diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
index 55f68a1ad3e3..aa487cc6dd7c 100644
--- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
+++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
@@ -20,6 +20,7 @@ import EditGasFeeButton from '../edit-gas-fee-button';
 import GasDetailsItem from '../gas-details-item';
 import Box from '../../ui/box';
 import Button from '../../ui/button';
+import I18nValue from '../../ui/i18n-value';
 import InfoTooltip from '../../ui/info-tooltip';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography';
@@ -103,12 +104,16 @@ const CancelSpeedupPopover = () => {
         <Typography
           boxProps={{ alignItems: ALIGN_ITEMS.CENTER, display: DISPLAY.FLEX }}
           variant={TYPOGRAPHY.H6}
-          marginTop={0}
-          marginBottom={2}
+          margin={[0, 0, 2, 0]}
         >
-          {t('cancelSpeedUpLabel', [
-            <strong key="cancelSpeedupReplace">{t('replace')}</strong>,
-          ])}
+          <I18nValue
+            messageKey="cancelSpeedUpLabel"
+            options={[
+              <strong key="cancelSpeedupReplace">
+                <I18nValue messageKey="replace" />
+              </strong>,
+            ]}
+          />
           <InfoTooltip
             position="top"
             contentText={
@@ -146,7 +151,7 @@ const CancelSpeedupPopover = () => {
           </Box>
         </Box>
         <Button type="primary" onClick={submitTransactionChange}>
-          {t('submit')}
+          <I18nValue messageKey="submit" />
         </Button>
       </div>
     </Popover>
diff --git a/ui/components/app/collectible-default-image/collectible-default-image.js b/ui/components/app/collectible-default-image/collectible-default-image.js
deleted file mode 100644
index c301c2c2ca58..000000000000
--- a/ui/components/app/collectible-default-image/collectible-default-image.js
+++ /dev/null
@@ -1,41 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import Typography from '../../ui/typography';
-import { TYPOGRAPHY } from '../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-
-export default function CollectibleDefaultImage({
-  name,
-  tokenId,
-  handleImageClick,
-}) {
-  const t = useI18nContext();
-  return (
-    <div
-      className={classnames('collectible-default', {
-        'collectible-default--clickable': handleImageClick,
-      })}
-      onClick={handleImageClick}
-    >
-      <Typography variant={TYPOGRAPHY.H6} className="collectible-default__text">
-        {name ?? t('unknownCollection')} <br /> #{tokenId}
-      </Typography>
-    </div>
-  );
-}
-
-CollectibleDefaultImage.propTypes = {
-  /**
-   * The name of the collectible collection if not supplied will default to "Unnamed collection"
-   */
-  name: PropTypes.string,
-  /**
-   * The token id of the collectible
-   */
-  tokenId: PropTypes.string,
-  /**
-   * The click handler for the collectible default image
-   */
-  handleImageClick: PropTypes.func,
-};
diff --git a/ui/components/app/collectible-default-image/collectible-default-image.stories.js b/ui/components/app/collectible-default-image/collectible-default-image.stories.js
deleted file mode 100644
index d4b7a2a69fd5..000000000000
--- a/ui/components/app/collectible-default-image/collectible-default-image.stories.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import CollectibleDefaultImage from '.';
-
-export default {
-  title: 'Components/App/CollectibleDefaultImage',
-  id: __filename,
-  argTypes: {
-    name: {
-      control: 'text',
-    },
-    tokenId: {
-      control: 'text',
-    },
-    handleImageClick: {
-      action: 'handleImageClick',
-    },
-  },
-  args: {
-    name: null,
-    tokenId: '12345',
-    handleImageClick: null,
-  },
-};
-
-export const DefaultStory = (args) => (
-  <div style={{ width: 200, height: 200 }}>
-    <CollectibleDefaultImage {...args} />
-  </div>
-);
-
-DefaultStory.storyName = 'Default';
-
-export const handleImageClick = (args) => (
-  <div style={{ width: 200, height: 200 }}>
-    <CollectibleDefaultImage {...args} />
-  </div>
-);
-
-handleImageClick.args = {
-  // eslint-disable-next-line no-alert
-  handleImageClick: () => window.alert('CollectibleDefaultImage clicked!'),
-};
diff --git a/ui/components/app/collectible-default-image/index.js b/ui/components/app/collectible-default-image/index.js
deleted file mode 100644
index 76ab58746e9b..000000000000
--- a/ui/components/app/collectible-default-image/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './collectible-default-image';
diff --git a/ui/components/app/collectible-default-image/index.scss b/ui/components/app/collectible-default-image/index.scss
deleted file mode 100644
index ff2ba60e15a4..000000000000
--- a/ui/components/app/collectible-default-image/index.scss
+++ /dev/null
@@ -1,22 +0,0 @@
-.collectible-default {
-  background-color: var(--color-background-alternative);
-  padding-top: 100%; // retains 1:1 aspect ratio
-  position: relative;
-  width: 100%;
-
-  &__text {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    text-align: center;
-    position: absolute;
-    white-space: nowrap;
-    top: 50%;
-    left: 50%;
-    transform: translate(-50%, -50%);
-    width: calc(100% - 32px);
-  }
-
-  &--clickable {
-    cursor: pointer;
-  }
-}
diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/collectible-details/collectible-details.js
index b50dd60627a0..4e7c433d4a63 100644
--- a/ui/components/app/collectible-details/collectible-details.js
+++ b/ui/components/app/collectible-details/collectible-details.js
@@ -45,13 +45,13 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import CollectibleOptions from '../collectible-options/collectible-options';
 import Button from '../../ui/button';
-import { startNewDraftTransaction } from '../../../ducks/send';
+import { updateSendAsset } from '../../../ducks/send';
 import InfoTooltip from '../../ui/info-tooltip';
+import { ERC721 } from '../../../helpers/constants/common';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
-import { ASSET_TYPES, ERC721 } from '../../../../shared/constants/transaction';
-import CollectibleDefaultImage from '../collectible-default-image';
+import { ASSET_TYPES } from '../../../../shared/constants/transaction';
 
 export default function CollectibleDetails({ collectible }) {
   const {
@@ -119,7 +119,7 @@ export default function CollectibleDetails({ collectible }) {
 
   const onSend = async () => {
     await dispatch(
-      startNewDraftTransaction({
+      updateSendAsset({
         type: ASSET_TYPES.COLLECTIBLE,
         details: collectible,
       }),
@@ -176,11 +176,7 @@ export default function CollectibleDetails({ collectible }) {
             justifyContent={JUSTIFY_CONTENT.CENTER}
             className="collectible-details__card"
           >
-            {image ? (
-              <img className="collectible-details__image" src={image} />
-            ) : (
-              <CollectibleDefaultImage name={name} tokenId={tokenId} />
-            )}
+            <img className="collectible-details__image" src={image} />
           </Card>
           <Box
             flexDirection={FLEX_DIRECTION.COLUMN}
@@ -219,7 +215,6 @@ export default function CollectibleDetails({ collectible }) {
                 <Typography
                   color={COLORS.TEXT_ALTERNATIVE}
                   variant={TYPOGRAPHY.H6}
-                  overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
                   boxProps={{ margin: 0, marginBottom: 4 }}
                 >
                   {description}
@@ -316,7 +311,7 @@ export default function CollectibleDetails({ collectible }) {
                 {copied ? (
                   t('copiedExclamation')
                 ) : (
-                  <Copy size={15} color="var(--color-icon-alternative)" />
+                  <Copy size={15} color="var(--color-icon-default)" />
                 )}
               </button>
             </Box>
diff --git a/ui/components/app/collectible-details/collectible-details.stories.js b/ui/components/app/collectible-details/collectible-details.stories.js
index a40e81c0299e..bbd18bac0b74 100644
--- a/ui/components/app/collectible-details/collectible-details.stories.js
+++ b/ui/components/app/collectible-details/collectible-details.stories.js
@@ -1,15 +1,6 @@
 import React from 'react';
 import CollectibleDetails from './collectible-details';
 
-const collectible = {
-  name: 'Catnip Spicywright',
-  tokenId: '1124157',
-  address: '0x06012c8cf97bead5deae237070f9587f8e7a266d',
-  image: './catnip-spicywright.png',
-  description:
-    "Good day. My name is Catnip Spicywight, which got me teased a lot in high school. If I want to put low fat mayo all over my hamburgers, I shouldn't have to answer to anyone about it, am I right? One time I beat Arlene in an arm wrestle.",
-};
-
 export default {
   title: 'Components/App/CollectiblesDetail',
   id: __filename,
@@ -18,24 +9,23 @@ export default {
       control: 'object',
     },
   },
-  args: {
-    collectible,
-  },
 };
 
-export const DefaultStory = (args) => {
-  return <CollectibleDetails {...args} />;
+const collectible = {
+  name: 'Catnip Spicywright',
+  tokenId: '1124157',
+  address: '0x06012c8cf97bead5deae237070f9587f8e7a266d',
+  image: './catnip-spicywright.png',
+  description:
+    "Good day. My name is Catnip Spicywight, which got me teased a lot in high school. If I want to put low fat mayo all over my hamburgers, I shouldn't have to answer to anyone about it, am I right? One time I beat Arlene in an arm wrestle.",
+};
+
+export const DefaultStory = () => {
+  return <CollectibleDetails collectible={collectible} />;
 };
 
 DefaultStory.storyName = 'Default';
 
-export const NoImage = (args) => {
-  return <CollectibleDetails {...args} />;
-};
-
-NoImage.args = {
-  collectible: {
-    ...collectible,
-    image: undefined,
-  },
+DefaultStory.args = {
+  collectible,
 };
diff --git a/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js b/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
index 00e51238551f..3cf95e716d8b 100644
--- a/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
+++ b/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
@@ -56,9 +56,8 @@ export default function CollectiblesDetectionNotice() {
             </Typography>
             <Button
               type="link"
-              onClick={(e) => {
-                e.preventDefault();
-                history.push(`${EXPERIMENTAL_ROUTE}#autodetect-nfts`);
+              onClick={() => {
+                history.push(EXPERIMENTAL_ROUTE);
               }}
               className="collectibles-detection-notice__message__link"
             >
diff --git a/ui/components/app/collectibles-items/collectibles-items.js b/ui/components/app/collectibles-items/collectibles-items.js
index 2f3eeb21166d..1027cda9f6bd 100644
--- a/ui/components/app/collectibles-items/collectibles-items.js
+++ b/ui/components/app/collectibles-items/collectibles-items.js
@@ -28,8 +28,6 @@ import { getAssetImageURL } from '../../../helpers/utils/util';
 import { updateCollectibleDropDownState } from '../../../store/actions';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { getCollectiblesDropdownState } from '../../../ducks/metamask/metamask';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-import CollectibleDefaultImage from '../collectible-default-image';
 
 const width =
   getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
@@ -48,7 +46,6 @@ export default function CollectiblesItems({
   const previousCollectionKeys = usePrevious(collectionsKeys);
   const selectedAddress = useSelector(getSelectedAddress);
   const chainId = useSelector(getCurrentChainId);
-  const t = useI18nContext();
 
   useEffect(() => {
     if (
@@ -104,7 +101,7 @@ export default function CollectiblesItems({
     }
     return (
       <div className="collectibles-items__collection-image-alt">
-        {collectionName?.[0]?.toUpperCase() ?? null}
+        {collectionName[0]}
       </div>
     );
   };
@@ -165,20 +162,13 @@ export default function CollectiblesItems({
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H5}
-                marginTop={0}
-                marginBottom={2}
+                margin={[0, 0, 0, 2]}
               >
-                {`${collectionName ?? t('unknownCollection')} (${
-                  collectibles.length
-                })`}
+                {`${collectionName} (${collectibles.length})`}
               </Typography>
             </Box>
             <Box alignItems={ALIGN_ITEMS.FLEX_END}>
-              <i
-                className={`collectibles-items__collection__icon-chevron fa fa-chevron-${
-                  isExpanded ? 'down' : 'right'
-                }`}
-              />
+              <i className={`fa fa-chevron-${isExpanded ? 'down' : 'right'}`} />
             </Box>
           </Box>
         </button>
@@ -186,48 +176,29 @@ export default function CollectiblesItems({
         {isExpanded ? (
           <Box display={DISPLAY.FLEX} flexWrap={FLEX_WRAP.WRAP} gap={4}>
             {collectibles.map((collectible, i) => {
-              const {
-                image,
-                address,
-                tokenId,
-                backgroundColor,
-                name,
-              } = collectible;
+              const { image, address, tokenId, backgroundColor } = collectible;
               const collectibleImage = getAssetImageURL(image, ipfsGateway);
-              const handleImageClick = () =>
-                history.push(`${ASSET_ROUTE}/${address}/${tokenId}`);
-
               return (
                 <Box
                   width={width}
                   key={`collectible-${i}`}
-                  className="collectibles-items__item-wrapper"
+                  className="collectibles-items__collection-item-wrapper"
                 >
-                  <Card
-                    padding={0}
-                    justifyContent={JUSTIFY_CONTENT.CENTER}
-                    className="collectibles-items__item-wrapper__card"
-                  >
-                    {collectibleImage ? (
-                      <div
-                        className="collectibles-items__item"
-                        style={{
-                          backgroundColor,
-                        }}
-                      >
-                        <img
-                          onClick={handleImageClick}
-                          className="collectibles-items__item-image"
-                          src={collectibleImage}
-                        />
-                      </div>
-                    ) : (
-                      <CollectibleDefaultImage
-                        name={name}
-                        tokenId={tokenId}
-                        handleImageClick={handleImageClick}
+                  <Card padding={0} justifyContent={JUSTIFY_CONTENT.CENTER}>
+                    <div
+                      className="collectibles-items__collection-item"
+                      style={{
+                        backgroundColor,
+                      }}
+                    >
+                      <img
+                        onClick={() =>
+                          history.push(`${ASSET_ROUTE}/${address}/${tokenId}`)
+                        }
+                        className="collectibles-items__collection-item-image"
+                        src={collectibleImage}
                       />
-                    )}
+                    </div>
                   </Card>
                 </Box>
               );
@@ -240,13 +211,7 @@ export default function CollectiblesItems({
 
   return (
     <div className="collectibles-items">
-      <Box
-        paddingTop={6}
-        paddingBottom={6}
-        paddingLeft={4}
-        paddingRight={4}
-        flexDirection={FLEX_DIRECTION.COLUMN}
-      >
+      <Box padding={[6, 4]} flexDirection={FLEX_DIRECTION.COLUMN}>
         <>
           {collectionsKeys.map((key) => {
             const {
diff --git a/ui/components/app/collectibles-items/index.scss b/ui/components/app/collectibles-items/index.scss
index 545528fde4d4..a2dc0dd58a89 100644
--- a/ui/components/app/collectibles-items/index.scss
+++ b/ui/components/app/collectibles-items/index.scss
@@ -27,33 +27,25 @@
       color: var(--color-overlay-inverse);
       text-align: center;
     }
-  }
-
-  &__item-wrapper {
-    align-self: center;
 
-    &__card {
-      overflow: hidden;
+    &-item-wrapper {
+      align-self: center;
     }
-  }
 
-  &__item {
-    border-radius: 4px;
-    width: 100%;
-    display: flex;
-    justify-content: center;
-    cursor: pointer;
-    align-self: center;
+    &-item {
+      border-radius: 4px;
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      cursor: pointer;
+      align-self: center;
+    }
 
-    &-image {
+    &-item-image {
       border-radius: 4px;
       width: 100%;
       height: 100%;
       cursor: pointer;
     }
   }
-
-  &__icon-chevron {
-    color: var(--color-icon-default);
-  }
 }
diff --git a/ui/components/app/collectibles-tab/collectibles-tab.test.js b/ui/components/app/collectibles-tab/collectibles-tab.test.js
index d364d5b51d2b..9a1eba4611d2 100644
--- a/ui/components/app/collectibles-tab/collectibles-tab.test.js
+++ b/ui/components/app/collectibles-tab/collectibles-tab.test.js
@@ -214,16 +214,14 @@ describe('Collectible Items', () => {
       });
       expect(screen.queryByText('New! NFT detection')).not.toBeInTheDocument();
     });
-    it('should take user to the experimental settings tab in settings when user clicks "Turn on NFT detection in Settings"', () => {
+    it('should take user to the experimental settings tab in setings when user clicks "Turn on NFT detection in Settings"', () => {
       render({
         selectedAddress: ACCOUNT_2,
         collectibles: COLLECTIBLES,
       });
       fireEvent.click(screen.queryByText('Turn on NFT detection in Settings'));
       expect(historyPushMock).toHaveBeenCalledTimes(1);
-      expect(historyPushMock).toHaveBeenCalledWith(
-        `${EXPERIMENTAL_ROUTE}#autodetect-nfts`,
-      );
+      expect(historyPushMock).toHaveBeenCalledWith(EXPERIMENTAL_ROUTE);
     });
     it('should not render the Collectibles Detection Notice when currently selected network is Mainnet and currently selected account has no collectibles but use collectible autodetection preference is set to true', () => {
       render({
diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
deleted file mode 100644
index 929082c4ddc3..000000000000
--- a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import ConfirmDetailRow from '.';
-
-export default {
-  title: 'Components/App/ConfirmPageContainer/ConfirmDetailRow',
-  id: __filename,
-  argTypes: {
-    headerText: {
-      control: 'text',
-    },
-    headerTextClassName: {
-      control: 'text',
-    },
-    label: {
-      control: 'text',
-    },
-    onHeaderClick: {
-      control: 'text',
-    },
-    primaryValueTextColor: {
-      control: 'text',
-    },
-    primaryText: {
-      control: 'text',
-    },
-    secondaryText: {
-      control: 'text',
-    },
-    value: {
-      control: 'text',
-    },
-  },
-  args: {
-    headerText: 'headerText',
-    headerTextClassName: 'headerTextClassName',
-    label: 'label',
-    onHeaderClick: 'onHeaderClick',
-    primaryValueTextColor: 'primaryValueTextColor',
-    primaryText: 'primaryText',
-    secondaryText: 'secondaryText',
-    value: 'value',
-  },
-};
-
-export const DefaultStory = (args) => <ConfirmDetailRow {...args} />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/index.scss b/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
index cfb382f83f8f..25a7d8fe16e5 100644
--- a/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
+++ b/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
@@ -26,7 +26,7 @@
   }
 
   &__secondary {
-    color: var(--color-text-alternative);
+    color: var(--color-icon-default);
     justify-content: flex-end;
   }
 
@@ -35,7 +35,7 @@
 
     text-transform: uppercase;
     margin-bottom: 6px;
-    color: var(--color-text-default);
+    color: var(--color-icon-default);
 
     &--edit {
       color: var(--color-primary-default);
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
index e31e81bce2b6..a83cc1e4eb67 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
@@ -14,7 +14,6 @@ import NicknamePopovers from '../../../modals/nickname-popovers';
 import Typography from '../../../../ui/typography';
 import { TYPOGRAPHY } from '../../../../../helpers/constants/design-system';
 import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
-import SiteOrigin from '../../../../ui/site-origin';
 
 const ConfirmPageContainerSummary = (props) => {
   const {
@@ -53,8 +52,7 @@ const ConfirmPageContainerSummary = (props) => {
     contractAddress =
       transactionType === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
       transactionType === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM ||
-      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL
+      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
         ? tokenAddress
         : toAddress;
   }
@@ -87,10 +85,7 @@ const ConfirmPageContainerSummary = (props) => {
   return (
     <div className={classnames('confirm-page-container-summary', className)}>
       {origin === ORIGIN_METAMASK ? null : (
-        <SiteOrigin
-          className="confirm-page-container-summary__origin"
-          siteOrigin={origin}
-        />
+        <div className="confirm-page-container-summary__origin">{origin}</div>
       )}
       <div className="confirm-page-container-summary__action-row">
         <div className="confirm-page-container-summary__action">
diff --git a/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js b/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
index a0d33a1512ef..b9019424e250 100644
--- a/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
+++ b/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
@@ -34,9 +34,7 @@ export default function EnableEIP1559V2Notice({ isFirstAlert }) {
 
   return (
     <Box
-      marginRight={4}
-      marginBottom={4}
-      marginLeft={4}
+      margin={[0, 4, 4, 4]}
       marginTop={isFirstAlert ? 4 : 0}
       className="enableEIP1559V2-notice"
     >
diff --git a/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js b/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
deleted file mode 100644
index 48f79b19e134..000000000000
--- a/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import React from 'react';
-import ConnectedAccountsList from '.';
-
-export default {
-  title: 'Components/App/ConnectedAccountsList',
-  id: __filename,
-  argTypes: {
-    connectedAccounts: {
-      control: 'array',
-    },
-    selectedAddress: {
-      control: 'text',
-    },
-    shouldRenderListOptions: {
-      control: 'boolean',
-    },
-  },
-  args: {
-    connectedAccounts: [
-      {
-        name: 'This is a Really Long Account Name',
-        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
-        index: 0,
-        balance: '0x176e5b6f173ebe66',
-      },
-      {
-        name: 'Account 2',
-        address: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
-        index: 1,
-        balance: '0x2d3142f5000',
-      },
-    ],
-  },
-};
-
-export const DefaultStory = (args) => <ConnectedAccountsList {...args} />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/connected-sites-list/connected-sites-list.component.js b/ui/components/app/connected-sites-list/connected-sites-list.component.js
index 7b23820c033d..52245e7cb42a 100644
--- a/ui/components/app/connected-sites-list/connected-sites-list.component.js
+++ b/ui/components/app/connected-sites-list/connected-sites-list.component.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import Button from '../../ui/button';
 import SiteIcon from '../../ui/site-icon';
 import { stripHttpsSchemeWithoutPort } from '../../../helpers/utils/util';
-import SiteOrigin from '../../ui/site-origin';
 
 export default class ConnectedSitesList extends Component {
   static contextTypes = {
@@ -34,11 +33,12 @@ export default class ConnectedSitesList extends Component {
           >
             <div className="connected-sites-list__subject-info">
               <SiteIcon icon={subject.iconUrl} name={subject.name} size={32} />
-              <SiteOrigin
+              <span
                 className="connected-sites-list__subject-name"
                 title={subject.extensionId || subject.origin}
-                siteOrigin={this.getSubjectDisplayName(subject)}
-              />
+              >
+                {this.getSubjectDisplayName(subject)}
+              </span>
             </div>
             <Button
               className="connected-sites-list__content-row-link-button"
diff --git a/ui/components/app/connected-sites-list/index.scss b/ui/components/app/connected-sites-list/index.scss
index 7e9fc0d105ec..3a690d18931c 100644
--- a/ui/components/app/connected-sites-list/index.scss
+++ b/ui/components/app/connected-sites-list/index.scss
@@ -34,6 +34,10 @@
 
   &__subject-name {
     max-width: 215px;
+    white-space: nowrap;
+    overflow: hidden;
+    direction: rtl;
+    text-overflow: ellipsis;
     margin-left: 6px;
   }
 }
diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index df8e85660512..194b4838112b 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -44,11 +44,17 @@ export default function CurrencyInput({
 
   const [isSwapped, setSwapped] = useState(false);
   const [newHexValue, setNewHexValue] = useState(hexValue);
-  const [shouldDisplayFiat, setShouldDisplayFiat] = useState(featureSecondary);
-  const shouldUseFiat = hideSecondary ? false : Boolean(shouldDisplayFiat);
+
+  const shouldUseFiat = () => {
+    if (hideSecondary) {
+      return false;
+    }
+
+    return Boolean(featureSecondary);
+  };
 
   const getDecimalValue = () => {
-    const decimalValueString = shouldUseFiat
+    const decimalValueString = shouldUseFiat()
       ? getValueFromWeiHex({
           value: hexValue,
           toCurrency: secondaryCurrency,
@@ -65,15 +71,22 @@ export default function CurrencyInput({
   };
 
   const initialDecimalValue = hexValue ? getDecimalValue() : 0;
+  const [decimalValue, setDecimalValue] = useState(initialDecimalValue);
+
+  useEffect(() => {
+    setNewHexValue(hexValue);
+    const newDecimalValue = getDecimalValue();
+    setDecimalValue(newDecimalValue);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [hexValue]);
 
   const swap = async () => {
     await onPreferenceToggle();
     setSwapped(!isSwapped);
-    setShouldDisplayFiat(!shouldDisplayFiat);
   };
 
   const handleChange = (newDecimalValue) => {
-    const hexValueNew = shouldUseFiat
+    const hexValueNew = shouldUseFiat()
       ? getWeiHexFromDecimalValue({
           value: newDecimalValue,
           fromCurrency: secondaryCurrency,
@@ -88,20 +101,17 @@ export default function CurrencyInput({
         });
 
     setNewHexValue(hexValueNew);
+    setDecimalValue(newDecimalValue);
     onChange(hexValueNew);
     setSwapped(!isSwapped);
   };
 
   useEffect(() => {
-    setNewHexValue(hexValue);
-  }, [hexValue]);
-
-  useEffect(() => {
-    if (featureSecondary) {
-      handleChange(initialDecimalValue);
+    if (isSwapped) {
+      handleChange(decimalValue);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [featureSecondary, initialDecimalValue]);
+  }, [isSwapped]);
 
   const renderConversionComponent = () => {
     let currency, numberOfDecimals;
@@ -114,7 +124,7 @@ export default function CurrencyInput({
       );
     }
 
-    if (shouldUseFiat) {
+    if (shouldUseFiat()) {
       // Display ETH
       currency = preferredCurrency || ETH;
       numberOfDecimals = 8;
@@ -146,9 +156,9 @@ export default function CurrencyInput({
         onChange,
         onPreferenceToggle,
       }}
-      suffix={shouldUseFiat ? secondarySuffix : primarySuffix}
+      suffix={shouldUseFiat() ? secondarySuffix : primarySuffix}
       onChange={handleChange}
-      value={initialDecimalValue}
+      value={decimalValue}
       actionComponent={
         <button className="currency-input__swap-component" onClick={swap}>
           <i className="fa fa-retweet fa-lg" />
diff --git a/ui/components/app/currency-input/currency-input.test.js b/ui/components/app/currency-input/currency-input.test.js
index 0b452307d194..a12e529df6bf 100644
--- a/ui/components/app/currency-input/currency-input.test.js
+++ b/ui/components/app/currency-input/currency-input.test.js
@@ -109,15 +109,10 @@ describe('CurrencyInput Component', () => {
         },
       };
       const store = configureMockStore()(mockStore);
-      const handleChangeSpy = sinon.spy();
 
       const wrapper = mount(
         <Provider store={store}>
-          <CurrencyInput
-            onChange={handleChangeSpy}
-            hexValue="f602f2234d0ea"
-            featureSecondary
-          />
+          <CurrencyInput hexValue="f602f2234d0ea" featureSecondary />
         </Provider>,
       );
 
@@ -145,16 +140,12 @@ describe('CurrencyInput Component', () => {
         },
         hideSecondary: true,
       };
+
       const store = configureMockStore()(mockStore);
-      const handleChangeSpy = sinon.spy();
 
       const wrapper = mount(
         <Provider store={store}>
-          <CurrencyInput
-            onChange={handleChangeSpy}
-            hexValue="f602f2234d0ea"
-            featureSecondary
-          />
+          <CurrencyInput hexValue="f602f2234d0ea" featureSecondary />
         </Provider>,
         {
           context: { t: (str) => `${str}_t` },
@@ -214,7 +205,7 @@ describe('CurrencyInput Component', () => {
       expect(input.props().value).toStrictEqual(0.00432788);
 
       input.simulate('change', { target: { value: 1 } });
-      expect(handleChangeSpy.callCount).toStrictEqual(1);
+      expect(handleChangeSpy.callCount).toStrictEqual(2);
       expect(handleChangeSpy.calledWith('de0b6b3a7640000')).toStrictEqual(true);
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
         '$231.06USD',
@@ -243,7 +234,7 @@ describe('CurrencyInput Component', () => {
       );
 
       expect(wrapper).toHaveLength(1);
-      expect(handleChangeSpy.callCount).toStrictEqual(1);
+      expect(handleChangeSpy.callCount).toStrictEqual(0);
       expect(handleBlurSpy.callCount).toStrictEqual(0);
 
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
@@ -316,7 +307,7 @@ describe('CurrencyInput Component', () => {
       );
 
       expect(wrapper).toHaveLength(1);
-      expect(handleChangeSpy.callCount).toStrictEqual(1);
+      expect(handleChangeSpy.callCount).toStrictEqual(0);
       expect(handleBlurSpy.callCount).toStrictEqual(0);
 
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
diff --git a/ui/components/app/detected-token/detected-token-address/detected-token-address.js b/ui/components/app/detected-token/detected-token-address/detected-token-address.js
index 8002bf7431c1..3c4f012de6cc 100644
--- a/ui/components/app/detected-token/detected-token-address/detected-token-address.js
+++ b/ui/components/app/detected-token/detected-token-address/detected-token-address.js
@@ -29,8 +29,7 @@ const DetectedTokenAddress = ({ tokenAddress }) => {
       <Typography
         variant={TYPOGRAPHY.H7}
         color={COLORS.PRIMARY_DEFAULT}
-        marginLeft={2}
-        marginRight={2}
+        margin={[1, 2]}
       >
         {shortenAddress(tokenAddress)}
       </Typography>
diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
index 6eaa9c3529d0..25777ed4973d 100644
--- a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
+++ b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
@@ -41,10 +41,7 @@ const DetectedTokenIgnoredPopover = ({
       <Typography
         variant={TYPOGRAPHY.H6}
         tag={TYPOGRAPHY.H6}
-        marginTop={0}
-        marginRight={5}
-        marginBottom={7}
-        marginLeft={5}
+        margin={[0, 5, 7, 5]}
       >
         {t('ignoreTokenWarning')}
       </Typography>
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index 02416ec3710b..0bfede9d144b 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -4,17 +4,15 @@ import { useSelector, useDispatch } from 'react-redux';
 import { chain } from 'lodash';
 
 import {
-  addImportedTokens,
+  importTokens,
   ignoreTokens,
   setNewTokensImported,
 } from '../../../store/actions';
 import { getDetectedTokensInCurrentNetwork } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-} from '../../../../shared/constants/transaction';
+import { TOKEN_STANDARDS } from '../../../helpers/constants/common';
+import { ASSET_TYPES } from '../../../../shared/constants/transaction';
 import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import DetectedTokenSelectionPopover from './detected-token-selection-popover/detected-token-selection-popover';
 import DetectedTokenIgnoredPopover from './detected-token-ignored-popover/detected-token-ignored-popover';
@@ -65,7 +63,7 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         },
       });
     });
-    await dispatch(addImportedTokens(selectedTokens));
+    await dispatch(importTokens(selectedTokens));
     const tokenSymbols = selectedTokens.map(({ symbol }) => symbol);
     dispatch(setNewTokensImported(tokenSymbols.join(', ')));
   };
@@ -92,15 +90,7 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         asset_type: ASSET_TYPES.TOKEN,
       },
     });
-    const deSelectedTokensAddresses = deSelectedTokens.map(
-      ({ address }) => address,
-    );
-    await dispatch(
-      ignoreTokens({
-        tokensToIgnore: deSelectedTokensAddresses,
-        dontShowLoadingIndicator: true,
-      }),
-    );
+    await dispatch(ignoreTokens(deSelectedTokens));
     setShowDetectedTokens(false);
   };
 
diff --git a/ui/components/app/detected-token/detected-token.test.js b/ui/components/app/detected-token/detected-token.test.js
index e130708f44fe..7c7f9ee791eb 100644
--- a/ui/components/app/detected-token/detected-token.test.js
+++ b/ui/components/app/detected-token/detected-token.test.js
@@ -8,11 +8,7 @@ import DetectedToken from './detected-token';
 describe('DetectedToken', () => {
   it('should render the detected token found page', async () => {
     const store = configureStore(testData);
-    const props = {
-      setShowDetectedTokens: jest.fn(),
-    };
-
-    renderWithProvider(<DetectedToken {...props} />, store);
+    renderWithProvider(<DetectedToken />, store);
 
     expect(screen.getByText('0 LINK')).toBeInTheDocument();
     expect(screen.getByText('0 COMP')).toBeInTheDocument();
diff --git a/ui/components/app/dropdowns/dropdown.js b/ui/components/app/dropdowns/dropdown.js
index de296034b8c2..18e87d215589 100644
--- a/ui/components/app/dropdowns/dropdown.js
+++ b/ui/components/app/dropdowns/dropdown.js
@@ -18,7 +18,7 @@ export class Dropdown extends Component {
       borderRadius: '4px',
       padding: '8px 16px',
       background: 'var(--color-background-default)',
-      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
+      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
       ...innerStyle,
     };
 
diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index 54af45b12e0e..48af4be2c898 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -20,7 +20,6 @@ import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import {
   ADD_NETWORK_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
   ADVANCED_ROUTE,
 } from '../../../helpers/constants/routes';
 import IconCheck from '../../ui/icon/icon-check';
@@ -50,7 +49,6 @@ function mapStateToProps(state) {
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     networkDropdownOpen: state.appState.networkDropdownOpen,
     showTestnetMessageInDropdown: state.metamask.showTestnetMessageInDropdown,
-    addPopularNetworkFeatureToggledOn: state.metamask.customNetworkListEnabled,
   };
 }
 
@@ -103,7 +101,6 @@ class NetworkDropdown extends Component {
     showTestnetMessageInDropdown: PropTypes.bool.isRequired,
     hideTestNetMessage: PropTypes.func.isRequired,
     history: PropTypes.object,
-    addPopularNetworkFeatureToggledOn: PropTypes.bool,
   };
 
   handleClick(newProviderType) {
@@ -132,12 +129,10 @@ class NetworkDropdown extends Component {
         <Button
           type="secondary"
           onClick={() => {
-            if (this.props.addPopularNetworkFeatureToggledOn) {
-              this.props.history.push(ADD_POPULAR_CUSTOM_NETWORK);
+            if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
+              global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
             } else {
-              getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
-                ? global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE)
-                : this.props.history.push(ADD_NETWORK_ROUTE);
+              this.props.history.push(ADD_NETWORK_ROUTE);
             }
             this.props.hideNetworkDropdown();
           }}
@@ -179,7 +174,7 @@ class NetworkDropdown extends Component {
             <div className="network-check__transparent">✓</div>
           )}
           <ColorIndicator
-            color={opts.isLocalHost ? 'localhost' : COLORS.ICON_MUTED}
+            color={opts.isLocalHost ? 'localhost' : COLORS.TEXT_MUTED}
             size={SIZES.LG}
             type={ColorIndicator.TYPES.FILLED}
           />
diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js
index 5067988ca380..1a963c9e86b6 100644
--- a/ui/components/app/dropdowns/network-dropdown.test.js
+++ b/ui/components/app/dropdowns/network-dropdown.test.js
@@ -19,7 +19,6 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
-        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: true,
         },
@@ -51,7 +50,6 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
-        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: true,
         },
@@ -79,7 +77,7 @@ describe('Network Dropdown', () => {
       let found = false;
       while (!found) {
         if (
-          _wrapper.find(ColorIndicator).at(i).prop('color') === 'icon-muted'
+          _wrapper.find(ColorIndicator).at(i).prop('color') === 'text-muted'
         ) {
           i += 1;
         } else {
@@ -158,7 +156,6 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
-        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: false,
         },
diff --git a/ui/components/app/edit-gas-display/edit-gas-display.component.js b/ui/components/app/edit-gas-display/edit-gas-display.component.js
index 2025ee30accf..f1d0b04f4986 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.component.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.component.js
@@ -81,7 +81,7 @@ export default function EditGasDisplay({
   const isMainnet = useSelector(getIsMainnet);
   const supportsEIP1559 =
     useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction?.txParams);
+    !isLegacyTransaction(transaction.txParams);
   const showAdvancedInlineGasIfPossible = useSelector(
     getAdvancedInlineGasShown,
   );
@@ -217,8 +217,8 @@ export default function EditGasDisplay({
             hasGasErrors === false &&
             supportsEIP1559 && (
               <GasTiming
-                maxFeePerGas={maxFeePerGas.toString()}
-                maxPriorityFeePerGas={maxPriorityFeePerGas.toString()}
+                maxFeePerGas={maxFeePerGas}
+                maxPriorityFeePerGas={maxPriorityFeePerGas}
                 gasWarnings={gasWarnings}
               />
             )
diff --git a/ui/components/app/edit-gas-display/edit-gas-display.stories.js b/ui/components/app/edit-gas-display/edit-gas-display.stories.js
index 89ef4174b0e3..9de3300f2a34 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.stories.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.stories.js
@@ -4,36 +4,32 @@ import EditGasDisplay from '.';
 export default {
   title: 'Components/App/EditGasDisplay',
   id: __filename,
-  args: {
-    transaction: {},
-  },
 };
 
-export const DefaultStory = (args) => {
+export const DefaultStory = () => {
   return (
     <div style={{ width: '600px' }}>
-      <EditGasDisplay {...args} />
+      <EditGasDisplay />
     </div>
   );
 };
 
 DefaultStory.storyName = 'Default';
 
-export const WithEducation = (args) => {
+export const WithEducation = () => {
   return (
     <div style={{ width: '600px' }}>
-      <EditGasDisplay showEducationButton {...args} />
+      <EditGasDisplay showEducationButton />
     </div>
   );
 };
 
-export const WithDappSuggestedGas = (args) => {
+export const WithDappSuggestedGas = () => {
   return (
     <div style={{ width: '600px' }}>
       <EditGasDisplay
         dappSuggestedGasFee="100000"
         dappOrigin="davidwalsh.name"
-        {...args}
       />
     </div>
   );
diff --git a/ui/components/app/edit-gas-display/index.scss b/ui/components/app/edit-gas-display/index.scss
index ee0e13145098..3af1e402ca2e 100644
--- a/ui/components/app/edit-gas-display/index.scss
+++ b/ui/components/app/edit-gas-display/index.scss
@@ -28,8 +28,8 @@
   button.edit-gas-display__dapp-acknowledgement-button {
     margin: 40px auto 0 auto;
     display: block;
-    color: var(--color-warning-default);
-    border: 1px solid var(--color-warning-default);
+    color: var(--color-secondary-default);
+    border: 1px solid var(--color-secondary-default);
     text-transform: unset;
     width: auto;
     background: transparent;
diff --git a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
index d872a28957a5..7f73181c919f 100644
--- a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
+++ b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
@@ -80,22 +80,23 @@ export default function EditGasFeeButton({ userAcknowledgedGasMissing }) {
         <InfoTooltip
           contentText={
             <div className="edit-gas-fee-button__tooltip">
-              {transaction?.origin && (
-                <Typography
-                  variant={TYPOGRAPHY.H7}
-                  color={COLORS.TEXT_ALTERNATIVE}
-                >
-                  {t('dappSuggestedTooltip', [transaction.origin])}
-                </Typography>
-              )}
+              <Typography
+                variant={TYPOGRAPHY.H7}
+                color={COLORS.TEXT_ALTERNATIVE}
+              >
+                {t('dappSuggestedTooltip', [transaction.origin])}
+              </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxBaseFee')}</b> {maxFeePerGas}
+                <b>{t('maxBaseFee')}</b>
+                {maxFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxPriorityFee')}</b> {maxPriorityFeePerGas}
+                <b>{t('maxPriorityFee')}</b>
+                {maxPriorityFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('gasLimit')}</b> {gasLimit}
+                <b>{t('gasLimit')}</b>
+                {gasLimit}
               </Typography>
             </div>
           }
diff --git a/ui/components/app/edit-gas-fee-button/index.scss b/ui/components/app/edit-gas-fee-button/index.scss
index 448eab6741dd..52c7cbaf48bf 100644
--- a/ui/components/app/edit-gas-fee-button/index.scss
+++ b/ui/components/app/edit-gas-fee-button/index.scss
@@ -47,10 +47,3 @@
     }
   }
 }
-
-
-// Overrides react-tippy
-
-.tippy-tooltip .tippy-tooltip-content .edit-gas-fee-button__tooltip {
-  min-width: 170px;
-}
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
index af4da536b4a1..0eade1419e1f 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
@@ -8,6 +8,7 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTransactionModalContext } from '../../../contexts/transaction-modal';
 import Box from '../../ui/box';
 import ErrorMessage from '../../ui/error-message';
+import I18nValue from '../../ui/i18n-value';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography/typography';
 
@@ -59,13 +60,15 @@ const EditGasFeePopover = () => {
               )}
               <div className="edit-gas-fee-popover__content__header">
                 <span className="edit-gas-fee-popover__content__header-option">
-                  {t('gasOption')}
+                  <I18nValue messageKey="gasOption" />
                 </span>
                 <span className="edit-gas-fee-popover__content__header-time">
-                  {editGasMode !== EDIT_GAS_MODES.SWAPS && t('time')}
+                  {editGasMode !== EDIT_GAS_MODES.SWAPS && (
+                    <I18nValue messageKey="time" />
+                  )}
                 </span>
                 <span className="edit-gas-fee-popover__content__header-max-fee">
-                  {t('maxFee')}
+                  <I18nValue messageKey="maxFee" />
                 </span>
               </div>
               {(editGasMode === EDIT_GAS_MODES.CANCEL ||
@@ -94,16 +97,19 @@ const EditGasFeePopover = () => {
                 tag={TYPOGRAPHY.Paragraph}
                 variant={TYPOGRAPHY.H7}
               >
-                {t('learmMoreAboutGas', [
-                  <a
-                    key="learnMoreLink"
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    href="https://metamask.zendesk.com/hc/en-us/articles/4404600179227-User-Guide-Gas"
-                  >
-                    {t('learnMore')}
-                  </a>,
-                ])}
+                <I18nValue
+                  messageKey="learmMoreAboutGas"
+                  options={[
+                    <a
+                      key="learnMoreLink"
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      href="https://metamask.zendesk.com/hc/en-us/articles/4404600179227-User-Guide-Gas"
+                    >
+                      <I18nValue messageKey="learnMore" />
+                    </a>,
+                  ]}
+                />
               </Typography>
             </Box>
           </div>
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
index e3fbc9eb9f69..e8ffe93e1527 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
@@ -13,6 +13,7 @@ import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
 import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
+import I18nValue from '../../../ui/i18n-value';
 import InfoTooltip from '../../../ui/info-tooltip';
 import LoadingHeartBeat from '../../../ui/loading-heartbeat';
 import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display';
@@ -120,7 +121,7 @@ const EditGasItem = ({ priorityLevel }) => {
             {PRIORITY_LEVEL_ICON_MAP[icon]}
           </span>
         )}
-        {t(title)}
+        <I18nValue messageKey={title} />
       </span>
       <span
         className={`edit-gas-item__time-estimate edit-gas-item__time-estimate-${priorityLevel}`}
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
index 8e8e2607a041..ed6fd00357aa 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
@@ -78,7 +78,7 @@
 
   &__time-estimate-low,
   &__fee-estimate-high {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
   }
 
   &__time-estimate-medium,
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
index 0e354d33eb79..92d067deca58 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
@@ -17,7 +17,7 @@
     }
 
     &__dialog {
-      background-color: var(--color-warning-default);
+      background-color: var(--color-secondary-default);
       border-radius: 30px;
       margin: 4px 0;
       text-align: center;
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
index e108164471be..548490b2e68d 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
@@ -32,8 +32,7 @@ const NetworkStatistics = () => {
       <Typography
         color={COLORS.TEXT_ALTERNATIVE}
         fontWeight={FONT_WEIGHT.BOLD}
-        marginTop={3}
-        marginBottom={3}
+        margin={[3, 0]}
         variant={TYPOGRAPHY.H8}
       >
         {t('networkStatus')}
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
index d8a89e0fc0e6..1c295cbb96db 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
@@ -29,7 +29,7 @@
     height: 0;
     border-left: 10px solid transparent;
     border-right: 10px solid transparent;
-    border-top: 10px solid var(--color-background-default);
+    border-top: 10px solid white;
     position: relative;
     margin-bottom: -2px;
   }
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
index 35889b6874e9..13987af3bc4d 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { NETWORK_CONGESTION_THRESHOLDS } from '../../../../../../shared/constants/gas';
 import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import I18nValue from '../../../../ui/i18n-value';
 import { NetworkStabilityTooltip } from '../tooltips';
 
 const GRADIENT_COLORS = [
@@ -49,7 +49,6 @@ const determineStatusInfo = (givenNetworkCongestion) => {
 };
 
 const StatusSlider = () => {
-  const t = useI18nContext();
   const { gasFeeEstimates } = useGasFeeContext();
   const statusInfo = determineStatusInfo(gasFeeEstimates.networkCongestion);
 
@@ -82,7 +81,7 @@ const StatusSlider = () => {
           style={{ color: statusInfo.color }}
           data-testid="status-slider-label"
         >
-          {t(statusInfo.statusLabel)}
+          <I18nValue messageKey={statusInfo.statusLabel} />
         </div>
       </div>
     </NetworkStabilityTooltip>
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js b/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
index 1e5a409d7f0c..f626959bd341 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
@@ -11,7 +11,7 @@ import {
 } from '../../../../helpers/constants/design-system';
 
 const NetworkStatusTooltip = ({ children, html, title }) => (
-  <Tooltip position="top" html={html} title={title}>
+  <Tooltip position="top" html={html} title={title} theme="tippy-tooltip-info">
     <Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN}>
       {children}
     </Box>
diff --git a/ui/components/app/flask/snaps-authorship-pill/index.scss b/ui/components/app/flask/snaps-authorship-pill/index.scss
index 1d6b6b3a9f40..a67d876d7a2b 100644
--- a/ui/components/app/flask/snaps-authorship-pill/index.scss
+++ b/ui/components/app/flask/snaps-authorship-pill/index.scss
@@ -3,18 +3,6 @@
 .snaps-authorship-pill {
   display: inline-block;
 
-  .chip {
-    padding-right: 8px;
-    margin-top: 4px;
-  }
-
-  .chip__label {
-    max-width: 168px;
-    text-overflow: ellipsis;
-    overflow: hidden;
-    white-space: nowrap;
-  }
-
   &:hover,
   &:focus {
     .chip {
@@ -24,14 +12,5 @@
 }
 
 .snaps-authorship-icon {
-  color: var(--color-icon-alternative);
-}
-
-.snaps-authorship-version {
-  border-radius: 100px;
-  line-height: 100%;
-}
-
-.snaps-authorship-version > span {
-  vertical-align: middle;
+  color: var(--color-icon-default);
 }
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
index c6846a052a25..6625694b7b6e 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
+++ b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
@@ -7,22 +7,9 @@ import Typography from '../../../ui/typography';
 import {
   COLORS,
   TYPOGRAPHY,
-  TEXT_ALIGN,
 } from '../../../../helpers/constants/design-system';
-import { useI18nContext } from '../../../../hooks/useI18nContext';
 
-const snapIdPrefixes = ['npm:', 'local:'];
-
-const SnapsAuthorshipPill = ({ snapId, version, className }) => {
-  // @todo Use getSnapPrefix from snaps-skunkworks when possible
-  const snapPrefix = snapIdPrefixes.find((prefix) => snapId.startsWith(prefix));
-  const packageName = snapId.replace(snapPrefix, '');
-  const isNPM = snapPrefix === 'npm:';
-  const url = isNPM
-    ? `https://www.npmjs.com/package/${packageName}`
-    : packageName;
-  const icon = isNPM ? 'fab fa-npm fa-lg' : 'fas fa-code';
-  const t = useI18nContext();
+const SnapsAuthorshipPill = ({ packageName, className, url }) => {
   return (
     <a
       href={url}
@@ -33,29 +20,9 @@ const SnapsAuthorshipPill = ({ snapId, version, className }) => {
       <Chip
         leftIcon={
           <Box paddingLeft={2}>
-            <i className={`${icon} snaps-authorship-icon`} />
+            <i className="fab fa-npm fa-lg snaps-authorship-icon" />
           </Box>
         }
-        rightIcon={
-          version && (
-            <Box
-              className="snaps-authorship-version"
-              backgroundColor={COLORS.PRIMARY_DEFAULT}
-              paddingLeft={2}
-              paddingRight={2}
-            >
-              <Typography
-                color={COLORS.PRIMARY_INVERSE}
-                variant={TYPOGRAPHY.H7}
-                align={TEXT_ALIGN.CENTER}
-                tag="span"
-                className="version"
-              >
-                {t('shorthandVersion', [version])}
-              </Typography>
-            </Box>
-          )
-        }
         backgroundColor={COLORS.BACKGROUND_DEFAULT}
       >
         <Typography
@@ -63,7 +30,6 @@ const SnapsAuthorshipPill = ({ snapId, version, className }) => {
           variant={TYPOGRAPHY.H7}
           tag="span"
           color={COLORS.TEXT_ALTERNATIVE}
-          title={packageName}
         >
           {packageName}
         </Typography>
@@ -74,17 +40,17 @@ const SnapsAuthorshipPill = ({ snapId, version, className }) => {
 
 SnapsAuthorshipPill.propTypes = {
   /**
-   * The id of the snap
-   */
-  snapId: PropTypes.string,
-  /**
-   * The version of the snap
+   * NPM package name of the snap
    */
-  version: PropTypes.string,
+  packageName: PropTypes.string,
   /**
    * The className of the SnapsAuthorshipPill
    */
   className: PropTypes.string,
+  /**
+   * The url of the snap's package
+   */
+  url: PropTypes.string,
 };
 
 export default SnapsAuthorshipPill;
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
index 3808ea5baf16..2bd50d0df02b 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
+++ b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
@@ -6,7 +6,10 @@ export default {
   id: __filename,
   component: SnapsAuthorshipPill,
   argTypes: {
-    snapId: {
+    packageName: {
+      control: 'text',
+    },
+    url: {
       control: 'text',
     },
   },
@@ -17,5 +20,6 @@ export const DefaultStory = (args) => <SnapsAuthorshipPill {...args} />;
 DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
-  snapId: 'npm:@metamask/test-snap-bip44',
+  packageName: 'npm-package-name',
+  url: 'https://www.npmjs.com/package/@airswap/protocols',
 };
diff --git a/ui/components/app/gas-customization/advanced-gas-inputs/index.scss b/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
index 177078d9a638..a389efc655b2 100644
--- a/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
+++ b/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
@@ -23,7 +23,7 @@
       }
 
       .fa-info-circle {
-        color: var(--color-icon-alternative);
+        color: var(--color-icon-default);
         cursor: pointer;
       }
 
@@ -41,7 +41,7 @@
     &__warning-text {
       @include H7;
 
-      color: var(--color-warning-default);
+      color: var(--color-secondary-default);
     }
 
     &__input-wrapper {
diff --git a/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js b/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
deleted file mode 100644
index 41db3bd8755c..000000000000
--- a/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React from 'react';
-import { GAS_ESTIMATE_TYPES } from '../../../../helpers/constants/common';
-import GasPriceButtonGroup from '.';
-
-export default {
-  title: 'Components/App/GasCustomization/GasPriceButtonGroup',
-  id: __filename,
-  argTypes: {
-    handleGasPriceSelection: {
-      action: 'handleGasPriceSelection',
-    },
-  },
-  args: {
-    buttonDataLoading: false,
-    className: 'gas-price-button-group',
-    gasButtonInfo: [
-      {
-        gasEstimateType: GAS_ESTIMATE_TYPES.SLOW,
-        feeInPrimaryCurrency: '$0.52',
-        feeInSecondaryCurrency: '0.0048 ETH',
-        timeEstimate: '~ 1 min 0 sec',
-        priceInHexWei: '0xa1b2c3f',
-      },
-      {
-        gasEstimateType: GAS_ESTIMATE_TYPES.AVERAGE,
-        feeInPrimaryCurrency: '$0.39',
-        feeInSecondaryCurrency: '0.004 ETH',
-        timeEstimate: '~ 1 min 30 sec',
-        priceInHexWei: '0xa1b2c39',
-      },
-      {
-        gasEstimateType: GAS_ESTIMATE_TYPES.FAST,
-        feeInPrimaryCurrency: '$0.30',
-        feeInSecondaryCurrency: '0.00354 ETH',
-        timeEstimate: '~ 2 min 1 sec',
-        priceInHexWei: '0xa1b2c30',
-      },
-    ],
-    noButtonActiveByDefault: true,
-    defaultActiveButtonIndex: 2,
-    showCheck: true,
-  },
-};
-
-export const DefaultStory = (args) => <GasPriceButtonGroup {...args} />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/gas-customization/gas-price-button-group/index.scss b/ui/components/app/gas-customization/gas-price-button-group/index.scss
index 51137268fc59..5573d923d2a7 100644
--- a/ui/components/app/gas-customization/gas-price-button-group/index.scss
+++ b/ui/components/app/gas-customization/gas-price-button-group/index.scss
@@ -195,7 +195,7 @@
     color: var(--color-text-default);
     width: 108px;
     height: 97px;
-    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.151579);
     border-radius: 6px;
     border: none;
 
diff --git a/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js b/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
deleted file mode 100644
index a2c0a3b56c20..000000000000
--- a/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import GasSlider from '.';
-
-export default {
-  title: 'Components/App/GasCustomization/GasSlider',
-  id: __filename,
-  argTypes: {
-    onChange: {
-      action: 'onChange',
-    },
-    lowLabel: {
-      control: 'text',
-    },
-    highLabel: {
-      control: 'text',
-    },
-    value: {
-      control: 'number',
-    },
-    step: {
-      control: 'number',
-    },
-    max: {
-      control: 'number',
-    },
-    min: {
-      control: 'number',
-    },
-  },
-};
-
-export const DefaultStory = () => <GasSlider />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/gas-customization/gas-slider/index.scss b/ui/components/app/gas-customization/gas-slider/index.scss
index e3d3ac45565a..876c5664b942 100644
--- a/ui/components/app/gas-customization/gas-slider/index.scss
+++ b/ui/components/app/gas-customization/gas-slider/index.scss
@@ -17,6 +17,7 @@
     height: 34px;
     width: 34px;
     background-color: var(--color-primary-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     border-radius: 50%;
     position: relative;
     z-index: 10;
diff --git a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
index 447116953abd..6dde9ea3c47f 100644
--- a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
+++ b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
@@ -5,6 +5,7 @@ import { TYPOGRAPHY } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { getIsMainnet } from '../../../../selectors';
 import Box from '../../../ui/box';
+import I18nValue from '../../../ui/i18n-value';
 import InfoTooltip from '../../../ui/info-tooltip/info-tooltip';
 import Typography from '../../../ui/typography/typography';
 
@@ -14,9 +15,11 @@ const GasDetailsItemTitle = () => {
 
   return (
     <Box display="flex">
-      <Box marginRight={1}>{t('gas')}</Box>
+      <Box marginRight={1}>
+        <I18nValue messageKey="gas" />
+      </Box>
       <span className="gas-details-item-title__estimate">
-        ({t('transactionDetailGasInfoV2')})
+        (<I18nValue messageKey="transactionDetailGasInfoV2" />)
       </span>
       <InfoTooltip
         contentText={
diff --git a/ui/components/app/gas-details-item/gas-details-item.js b/ui/components/app/gas-details-item/gas-details-item.js
index 560031f5c0c6..bb90fbe4a5e2 100644
--- a/ui/components/app/gas-details-item/gas-details-item.js
+++ b/ui/components/app/gas-details-item/gas-details-item.js
@@ -7,9 +7,9 @@ import { COLORS } from '../../../helpers/constants/design-system';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { getPreferences } from '../../../selectors';
 import { useGasFeeContext } from '../../../contexts/gasFee';
-import { useI18nContext } from '../../../hooks/useI18nContext';
 
 import Box from '../../ui/box';
+import I18nValue from '../../ui/i18n-value';
 import LoadingHeartBeat from '../../ui/loading-heartbeat';
 import GasTiming from '../gas-timing/gas-timing.component';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
@@ -17,7 +17,6 @@ import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display
 import GasDetailsItemTitle from './gas-details-item-title';
 
 const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
-  const t = useI18nContext();
   const {
     estimateUsed,
     hasSimulationError,
@@ -71,7 +70,7 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
             <Box marginRight={1}>
               <strong>
                 {estimateUsed === 'high' && '⚠ '}
-                {t('editGasSubTextFeeLabel')}
+                <I18nValue messageKey="editGasSubTextFeeLabel" />
               </strong>
             </Box>
             <div
@@ -91,8 +90,8 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
       }
       subTitle={
         <GasTiming
-          maxPriorityFeePerGas={maxPriorityFeePerGas.toString()}
-          maxFeePerGas={maxFeePerGas.toString()}
+          maxPriorityFeePerGas={maxPriorityFeePerGas}
+          maxFeePerGas={maxFeePerGas}
         />
       }
     />
diff --git a/ui/components/app/gas-details-item/index.scss b/ui/components/app/gas-details-item/index.scss
index c73c6f42145e..43b2da44ba2f 100644
--- a/ui/components/app/gas-details-item/index.scss
+++ b/ui/components/app/gas-details-item/index.scss
@@ -1,6 +1,6 @@
 .gas-details-item {
   &__gas-fee-warning {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default); //@TODO: revisit when warning color tokens are revisited
   }
 
   &__currency-container,
diff --git a/ui/components/app/gas-timing/index.scss b/ui/components/app/gas-timing/index.scss
index 00d6c024db7c..ca8d1e989b5a 100644
--- a/ui/components/app/gas-timing/index.scss
+++ b/ui/components/app/gas-timing/index.scss
@@ -20,7 +20,7 @@
   }
 
   &--negative-V2 {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
     font-weight: bold;
   }
 
diff --git a/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js b/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
index ad8db9347fa9..076b02f30576 100644
--- a/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
+++ b/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
@@ -160,7 +160,7 @@ export default function HoldToRevealButton({ buttonText, onLongPressed }) {
         </div>
       </div>
     ) : null;
-  }, [isUnlocking, hasTriggeredUnlock, triggerOnLongPressed, t]);
+  }, [isUnlocking, hasTriggeredUnlock, t]);
 
   return (
     <Button
diff --git a/ui/components/app/home-notification/index.scss b/ui/components/app/home-notification/index.scss
index a1e812ee1ecd..a8e99db346df 100644
--- a/ui/components/app/home-notification/index.scss
+++ b/ui/components/app/home-notification/index.scss
@@ -3,7 +3,7 @@
   flex-flow: column;
   justify-content: space-between;
   background: var(--color-background-default);
-  box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
   border: 1px solid var(--color-border-muted);
   border-radius: 8px;
   min-height: 116px;
diff --git a/ui/components/app/metamask-template-renderer/metamask-template-renderer.js b/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
index ad15d03cb89c..6aaca546b564 100644
--- a/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
+++ b/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
@@ -43,9 +43,6 @@ const MetaMaskTemplateRenderer = ({ sections }) => {
   return (
     <>
       {sections.reduce((allChildren, child) => {
-        if (child?.hide === true) {
-          return allChildren;
-        }
         if (typeof child === 'string') {
           // React can render strings directly, so push them into the accumulator
           allChildren.push(child);
diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js
index 07aad3630f26..29ded06ac425 100644
--- a/ui/components/app/metamask-template-renderer/safe-component-list.js
+++ b/ui/components/app/metamask-template-renderer/safe-component-list.js
@@ -9,8 +9,6 @@ import MetaMaskTranslation from '../metamask-translation';
 import NetworkDisplay from '../network-display';
 import TextArea from '../../ui/textarea/textarea';
 import ConfirmationNetworkSwitch from '../../../pages/confirmation/components/confirmation-network-switch';
-import UrlIcon from '../../ui/url-icon';
-import Tooltip from '../../ui/tooltip/tooltip';
 
 export const safeComponentList = {
   MetaMaskTranslation,
@@ -29,7 +27,4 @@ export const safeComponentList = {
   NetworkDisplay,
   TextArea,
   ConfirmationNetworkSwitch,
-  UrlIcon,
-  Tooltip,
-  i: 'i',
 };
diff --git a/ui/components/app/modals/account-details-modal/account-details-modal.test.js b/ui/components/app/modals/account-details-modal/account-details-modal.test.js
index 8b61394d8928..917be6bf3e6c 100644
--- a/ui/components/app/modals/account-details-modal/account-details-modal.test.js
+++ b/ui/components/app/modals/account-details-modal/account-details-modal.test.js
@@ -30,14 +30,12 @@ describe('Account Details Modal', () => {
         name: 'Account 1',
       },
     },
-    accounts: [
-      {
-        address: '0xAddress',
-        lastSelected: 1637764711510,
-        name: 'Account 1',
-        balance: '0x543a5fb6caccf599',
-      },
-    ],
+    accounts: {
+      address: '0xAddress',
+      lastSelected: 1637764711510,
+      name: 'Account 1',
+      balance: '0x543a5fb6caccf599',
+    },
   };
 
   beforeEach(() => {
diff --git a/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js b/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
index 6b5cc9673f70..21f16a640f8a 100644
--- a/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
+++ b/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
@@ -12,7 +12,7 @@ import {
   ASSET_ROUTE,
 } from '../../../../helpers/constants/routes';
 import { getCollectibles } from '../../../../ducks/metamask/metamask';
-import { ignoreTokens } from '../../../../store/actions';
+import { removeToken } from '../../../../store/actions';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 
 const ConvertTokenToNFTModal = ({ hideModal, tokenAddress }) => {
@@ -28,12 +28,7 @@ const ConvertTokenToNFTModal = ({ hideModal, tokenAddress }) => {
     <Modal
       onSubmit={async () => {
         if (tokenAddedAsNFT) {
-          await dispatch(
-            ignoreTokens({
-              tokensToIgnore: tokenAddress,
-              dontShowLoadingIndicator: true,
-            }),
-          );
+          await dispatch(removeToken(tokenAddress));
           const { tokenId } = tokenAddedAsNFT;
           history.push({
             pathname: `${ASSET_ROUTE}/${tokenAddress}/${tokenId}`,
diff --git a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
index 561932fa1453..42730a460792 100644
--- a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
+++ b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
@@ -9,7 +9,6 @@ import Button from '../../../ui/button';
 import LogoMoonPay from '../../../ui/logo/logo-moonpay';
 import LogoWyre from '../../../ui/logo/logo-wyre';
 import LogoTransak from '../../../ui/logo/logo-transak';
-import LogoCoinbasePay from '../../../ui/logo/logo-coinbasepay';
 import LogoDepositEth from '../../../ui/logo/logo-deposit-eth';
 
 export default class DepositEtherModal extends Component {
@@ -21,14 +20,12 @@ export default class DepositEtherModal extends Component {
   static propTypes = {
     chainId: PropTypes.string.isRequired,
     isTestnet: PropTypes.bool.isRequired,
+    isMainnet: PropTypes.bool.isRequired,
     isBuyableTransakChain: PropTypes.bool.isRequired,
     isBuyableMoonPayChain: PropTypes.bool.isRequired,
-    isBuyableWyreChain: PropTypes.bool.isRequired,
-    isBuyableCoinbasePayChain: PropTypes.bool.isRequired,
     toWyre: PropTypes.func.isRequired,
     toTransak: PropTypes.func.isRequired,
     toMoonPay: PropTypes.func.isRequired,
-    toCoinbasePay: PropTypes.func.isRequired,
     address: PropTypes.string.isRequired,
     toFaucet: PropTypes.func.isRequired,
     hideWarning: PropTypes.func.isRequired,
@@ -104,14 +101,12 @@ export default class DepositEtherModal extends Component {
       toWyre,
       toTransak,
       toMoonPay,
-      toCoinbasePay,
       address,
       toFaucet,
       isTestnet,
+      isMainnet,
       isBuyableTransakChain,
       isBuyableMoonPayChain,
-      isBuyableWyreChain,
-      isBuyableCoinbasePayChain,
     } = this.props;
     const { t } = this.context;
     const networkName = NETWORK_TO_NAME_MAP[chainId];
@@ -136,24 +131,6 @@ export default class DepositEtherModal extends Component {
         </div>
         <div className="page-container__content">
           <div className="deposit-ether-modal__buy-rows">
-            {this.renderRow({
-              logo: <LogoCoinbasePay className="deposit-ether-modal__logo" />,
-              title: t('buyCryptoWithCoinbasePay', [symbol]),
-              text: t('buyCryptoWithCoinbasePayDescription', [symbol]),
-              buttonLabel: t('continueToCoinbasePay'),
-              onButtonClick: () => {
-                this.context.trackEvent({
-                  category: EVENT.CATEGORIES.ACCOUNTS,
-                  event: 'Click buy Ether via Coinbase Pay',
-                  properties: {
-                    action: 'Deposit Ether',
-                    legacy_event: true,
-                  },
-                });
-                toCoinbasePay(address, chainId);
-              },
-              hide: !isBuyableCoinbasePayChain,
-            })}
             {this.renderRow({
               logo: <LogoTransak className="deposit-ether-modal__logo" />,
               title: t('buyCryptoWithTransak', [symbol]),
@@ -192,8 +169,8 @@ export default class DepositEtherModal extends Component {
             })}
             {this.renderRow({
               logo: <LogoWyre className="deposit-ether-modal__logo" />,
-              title: t('buyWithWyre', [symbol]),
-              text: t('buyWithWyreDescription', [symbol]),
+              title: t('buyWithWyre'),
+              text: t('buyWithWyreDescription'),
               buttonLabel: t('continueToWyre'),
               onButtonClick: () => {
                 this.context.trackEvent({
@@ -204,9 +181,9 @@ export default class DepositEtherModal extends Component {
                     legacy_event: true,
                   },
                 });
-                toWyre(address, chainId);
+                toWyre(address);
               },
-              hide: !isBuyableWyreChain,
+              hide: !isMainnet,
             })}
             {this.renderRow({
               logo: (
diff --git a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
index 3b71d5740f69..227e630473cc 100644
--- a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
+++ b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
@@ -12,8 +12,6 @@ import {
   getSelectedAddress,
   getIsBuyableTransakChain,
   getIsBuyableMoonPayChain,
-  getIsBuyableWyreChain,
-  getIsBuyableCoinbasePayChain,
 } from '../../../../selectors/selectors';
 import DepositEtherModal from './deposit-ether-modal.component';
 
@@ -25,15 +23,13 @@ function mapStateToProps(state) {
     address: getSelectedAddress(state),
     isBuyableTransakChain: getIsBuyableTransakChain(state),
     isBuyableMoonPayChain: getIsBuyableMoonPayChain(state),
-    isBuyableWyreChain: getIsBuyableWyreChain(state),
-    isBuyableCoinbasePayChain: getIsBuyableCoinbasePayChain(state),
   };
 }
 
 function mapDispatchToProps(dispatch) {
   return {
-    toWyre: (address, chainId) => {
-      dispatch(buyEth({ service: 'wyre', address, chainId }));
+    toWyre: (address) => {
+      dispatch(buyEth({ service: 'wyre', address }));
     },
     toTransak: (address, chainId) => {
       dispatch(buyEth({ service: 'transak', address, chainId }));
@@ -41,9 +37,6 @@ function mapDispatchToProps(dispatch) {
     toMoonPay: (address, chainId) => {
       dispatch(buyEth({ service: 'moonpay', address, chainId }));
     },
-    toCoinbasePay: (address, chainId) => {
-      dispatch(buyEth({ service: 'coinbase', address, chainId }));
-    },
     hideModal: () => {
       dispatch(hideModal());
     },
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
index ef1a962d09ca..480d1610b920 100644
--- a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
+++ b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
@@ -17,11 +17,7 @@ function mapDispatchToProps(dispatch) {
   return {
     hideModal: () => dispatch(actions.hideModal()),
     hideToken: (address) => {
-      dispatch(
-        actions.ignoreTokens({
-          tokensToIgnore: address,
-        }),
-      ).then(() => {
+      dispatch(actions.removeToken(address)).then(() => {
         dispatch(actions.hideModal());
       });
     },
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
deleted file mode 100644
index 4d4cebcf09cd..000000000000
--- a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import HideTokenConfirmationModal from '.';
-
-export default {
-  title: 'Components/App/Modals/HideTokenConfirmationModal',
-  id: __filename,
-};
-
-export const DefaultStory = () => <HideTokenConfirmationModal />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/index.scss b/ui/components/app/modals/hide-token-confirmation-modal/index.scss
index 43cbe304e8aa..90e9dbc32e4c 100644
--- a/ui/components/app/modals/hide-token-confirmation-modal/index.scss
+++ b/ui/components/app/modals/hide-token-confirmation-modal/index.scss
@@ -2,7 +2,7 @@
   min-height: 250.72px;
   border-radius: 4px;
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+  box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.5);
 
   &__container {
     padding: 24px 27px 21px;
diff --git a/ui/components/app/modals/modal.js b/ui/components/app/modals/modal.js
index 4df937f2d27f..0e5d1dcda4cd 100644
--- a/ui/components/app/modals/modal.js
+++ b/ui/components/app/modals/modal.js
@@ -35,7 +35,7 @@ const modalContainerBaseStyle = {
   border: '1px solid var(--color-border-default)',
   borderRadius: '8px',
   backgroundColor: 'var(--color-background-default)',
-  boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
+  boxShadow: '0 2px 22px 0 rgba(0,0,0,0.2)',
 };
 
 const modalContainerLaptopStyle = {
@@ -54,7 +54,7 @@ const accountModalStyle = {
   mobileModalStyle: {
     width: '95%',
     // top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh',
-    boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
+    boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
     borderRadius: '4px',
     top: '10%',
     transform: 'none',
@@ -65,7 +65,7 @@ const accountModalStyle = {
   laptopModalStyle: {
     width: '335px',
     // top: 'calc(33% + 45px)',
-    boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
+    boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
     borderRadius: '4px',
     top: '10%',
     transform: 'none',
@@ -89,7 +89,7 @@ const MODALS = {
       left: '0',
       right: '0',
       margin: '0 auto',
-      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
+      boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
       top: '0',
       display: 'flex',
     },
@@ -100,7 +100,7 @@ const MODALS = {
       left: '0',
       right: '0',
       margin: '0 auto',
-      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
+      boxShadow: '0 0 6px 0 rgba(0,0,0,0.3)',
       borderRadius: '7px',
       transform: 'none',
       height: 'calc(80% - 20px)',
@@ -117,7 +117,7 @@ const MODALS = {
     mobileModalStyle: {
       width: '95%',
       top: '10%',
-      boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
+      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
       transform: 'none',
       left: '0',
       right: '0',
@@ -127,7 +127,7 @@ const MODALS = {
     laptopModalStyle: {
       width: '375px',
       top: '10%',
-      boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
+      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
       transform: 'none',
       left: '0',
       right: '0',
diff --git a/ui/components/app/modals/new-account-modal/index.scss b/ui/components/app/modals/new-account-modal/index.scss
index dc9a19e9498a..364cf1ce4a23 100644
--- a/ui/components/app/modals/new-account-modal/index.scss
+++ b/ui/components/app/modals/new-account-modal/index.scss
@@ -3,7 +3,7 @@
   flex-flow: column nowrap;
   background-color: var(--color-background-default);
   border-radius: 10px;
-  box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+  box-shadow: 0 5px 16px rgba($black, 0.25);
 
   &__content {
     @extend %col-nowrap;
diff --git a/ui/components/app/modals/new-account-modal/new-account-modal.stories.js b/ui/components/app/modals/new-account-modal/new-account-modal.stories.js
deleted file mode 100644
index e751f3ddf943..000000000000
--- a/ui/components/app/modals/new-account-modal/new-account-modal.stories.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import React from 'react';
-import NewAccountModal from './new-account-modal.component';
-
-export default {
-  title: 'Components/App/Modals/NewAccountModal',
-  id: __filename,
-};
-
-export const DefaultStory = () => <NewAccountModal />;
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
index adc2ae25489c..664358a66868 100644
--- a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
+++ b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
@@ -43,7 +43,7 @@ const NicknamePopovers = ({ address, onClose }) => {
       <UpdateNicknamePopover
         address={address}
         nickname={recipientNickname || null}
-        memo={addressBookEntryObject?.memo || null}
+        memo={addressBookEntryObject?.memo}
         onClose={() => setPopoverToDisplay(SHOW_NICKNAME_POPOVER)}
         onAdd={(recipient, nickname, memo) =>
           dispatch(addToAddressBook(recipient, nickname, memo))
diff --git a/ui/components/app/modals/qr-scanner/qr-scanner.component.js b/ui/components/app/modals/qr-scanner/qr-scanner.component.js
index a3fd4350138a..68cd8444f31c 100644
--- a/ui/components/app/modals/qr-scanner/qr-scanner.component.js
+++ b/ui/components/app/modals/qr-scanner/qr-scanner.component.js
@@ -251,7 +251,7 @@ export default class QrScanner extends Component {
               }}
             />
             {ready === READY_STATE.READY ? null : (
-              <Spinner color="var(--color-warning-default)" />
+              <Spinner color="var(--color-secondary-default)" />
             )}
           </div>
         </div>
diff --git a/ui/components/app/network-display/network-display.js b/ui/components/app/network-display/network-display.js
index 63af71f90f5d..6e3d6aabbefd 100644
--- a/ui/components/app/network-display/network-display.js
+++ b/ui/components/app/network-display/network-display.js
@@ -48,7 +48,9 @@ export default function NetworkDisplay({
         >
           <ColorIndicator
             color={
-              networkType === NETWORK_TYPE_RPC ? COLORS.ICON_MUTED : networkType
+              networkType === NETWORK_TYPE_RPC
+                ? COLORS.ICON_DEFAULT
+                : networkType
             }
             size={indicatorSize}
             type={ColorIndicator.TYPES.FILLED}
diff --git a/ui/components/app/permissions-connect-header/index.scss b/ui/components/app/permissions-connect-header/index.scss
index 3f77ad9f5ba7..faecd4ab15af 100644
--- a/ui/components/app/permissions-connect-header/index.scss
+++ b/ui/components/app/permissions-connect-header/index.scss
@@ -7,7 +7,6 @@
     display: flex;
     flex-direction: column;
     align-items: center;
-    margin-bottom: 16px;
   }
 
   &__title {
@@ -15,6 +14,7 @@
 
     text-align: center;
     color: var(--color-text-default);
+    margin-top: 16px;
     font-weight: bold;
   }
 
diff --git a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
index 70603789974c..c5ddf011074c 100644
--- a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
+++ b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
@@ -5,9 +5,15 @@ import Box from '../../ui/box';
 import {
   FLEX_DIRECTION,
   JUSTIFY_CONTENT,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  COLORS,
+  TYPOGRAPHY,
+  TEXT_ALIGN,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/design-system';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import SnapsAuthorshipPill from '../flask/snaps-authorship-pill';
+import Typography from '../../ui/typography';
 ///: END:ONLY_INCLUDE_IN
 
 export default class PermissionsConnectHeader extends Component {
@@ -25,8 +31,8 @@ export default class PermissionsConnectHeader extends Component {
     boxProps: PropTypes.shape({ ...Box.propTypes }),
     headerText: PropTypes.string,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    npmPackageName: PropTypes.string,
     snapVersion: PropTypes.string,
-    isSnapInstall: PropTypes.bool,
     ///: END:ONLY_INCLUDE_IN
   };
 
@@ -38,29 +44,11 @@ export default class PermissionsConnectHeader extends Component {
   };
 
   renderHeaderIcon() {
-    const {
-      iconUrl,
-      iconName,
-      siteOrigin,
-      ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      isSnapInstall,
-      ///: END:ONLY_INCLUDE_IN
-    } = this.props;
-
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    if (isSnapInstall) {
-      return null;
-    }
-    ///: END:ONLY_INCLUDE_IN
+    const { iconUrl, iconName, siteOrigin } = this.props;
 
     return (
       <div className="permissions-connect-header__icon">
-        <SiteOrigin
-          chip
-          siteOrigin={siteOrigin}
-          iconSrc={iconUrl}
-          name={iconName}
-        />
+        <SiteOrigin siteOrigin={siteOrigin} iconSrc={iconUrl} name={iconName} />
       </div>
     );
   }
@@ -71,11 +59,14 @@ export default class PermissionsConnectHeader extends Component {
       headerTitle,
       headerText,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      siteOrigin,
+      npmPackageName,
       snapVersion,
-      isSnapInstall,
       ///: END:ONLY_INCLUDE_IN
     } = this.props;
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    const npmPackageUrl = `https://www.npmjs.com/package/${npmPackageName}`;
+    const { t } = this.context;
+    ///: END:ONLY_INCLUDE_IN
     return (
       <Box
         className="permissions-connect-header"
@@ -87,8 +78,29 @@ export default class PermissionsConnectHeader extends Component {
         <div className="permissions-connect-header__title">{headerTitle}</div>
         {
           ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          isSnapInstall && (
-            <SnapsAuthorshipPill snapId={siteOrigin} version={snapVersion} />
+          npmPackageName ? (
+            <SnapsAuthorshipPill
+              packageName={npmPackageName}
+              url={npmPackageUrl}
+            />
+          ) : null
+          ///: END:ONLY_INCLUDE_IN
+        }
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          snapVersion && (
+            <Typography
+              boxProps={{
+                margin: [2, 0],
+              }}
+              color={COLORS.TEXT_MUTED}
+              variant={TYPOGRAPHY.H7}
+              align={TEXT_ALIGN.CENTER}
+              tag="span"
+              className="version"
+            >
+              {t('shorthandVersion', [snapVersion])}
+            </Typography>
           )
           ///: END:ONLY_INCLUDE_IN
         }
diff --git a/ui/components/app/permissions-connect-permission-list/index.scss b/ui/components/app/permissions-connect-permission-list/index.scss
index 8dfc4cb6bca2..cb2b462db2ca 100644
--- a/ui/components/app/permissions-connect-permission-list/index.scss
+++ b/ui/components/app/permissions-connect-permission-list/index.scss
@@ -17,7 +17,7 @@
       padding: 16px;
       min-width: 16px;
       min-height: 16px;
-      color: var(--color-icon-alternative);
+      color: var(--color-icon-default);
       font-size: 1rem;
     }
   }
diff --git a/ui/components/app/qr-hardware-popover/enhanced-reader.js b/ui/components/app/qr-hardware-popover/enhanced-reader.js
index 18ae2f931da2..ae753145e3a2 100644
--- a/ui/components/app/qr-hardware-popover/enhanced-reader.js
+++ b/ui/components/app/qr-hardware-popover/enhanced-reader.js
@@ -55,7 +55,7 @@ const EnhancedReader = ({ handleScan }) => {
           filter: 'blur(4px)',
         }}
       />
-      {canplay ? null : <Spinner color="var(--color-warning-default)" />}
+      {canplay ? null : <Spinner color="var(--color-secondary-default)" />}
     </div>
   );
 };
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
index d74acef9b768..ea55f6b0911d 100644
--- a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
@@ -43,12 +43,7 @@ const Player = ({ type, cbor, cancelQRHardwareSignRequest, toRead }) => {
         alignItems={ALIGN_ITEMS.CENTER}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <div
-          style={{
-            padding: 20,
-            backgroundColor: 'var(--qr-code-white-background)',
-          }}
-        >
+        <div style={{ border: '20px solid var(--qr-code-white-background)' }}>
           <QRCode value={currentQRCode.toUpperCase()} size={250} />
         </div>
       </Box>
diff --git a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
index 570d7c2a153d..46778932fcb3 100644
--- a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
+++ b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
@@ -29,12 +29,7 @@ export default function RecoveryPhraseReminder({ onConfirm, hasBackedUp }) {
 
   return (
     <Popover centerTitle title={t('recoveryPhraseReminderTitle')}>
-      <Box
-        paddingRight={4}
-        paddingBottom={6}
-        paddingLeft={4}
-        className="recovery-phrase-reminder"
-      >
+      <Box padding={[0, 4, 6, 4]} className="recovery-phrase-reminder">
         <Typography
           color={COLORS.TEXT_DEFAULT}
           align={TEXT_ALIGN.CENTER}
@@ -43,7 +38,7 @@ export default function RecoveryPhraseReminder({ onConfirm, hasBackedUp }) {
         >
           {t('recoveryPhraseReminderSubText')}
         </Typography>
-        <Box marginTop={4} marginBottom={8}>
+        <Box margin={[4, 0, 8, 0]}>
           <ul className="recovery-phrase-reminder__list">
             <li>
               <Typography
diff --git a/ui/components/app/selected-account/selected-account.component.js b/ui/components/app/selected-account/selected-account.component.js
index 06609b54f263..1dc3c135fab1 100644
--- a/ui/components/app/selected-account/selected-account.component.js
+++ b/ui/components/app/selected-account/selected-account.component.js
@@ -63,7 +63,7 @@ class SelectedAccount extends Component {
             <div className="selected-account__address">
               {shortenAddress(checksummedAddress)}
               <div className="selected-account__copy">
-                <CopyIcon size={11} color="var(--color-icon-alternative)" />
+                <CopyIcon size={11} color="var(--color-icon-default)" />
               </div>
             </div>
           </button>
diff --git a/ui/components/app/signature-request-original/README.mdx b/ui/components/app/signature-request-original/README.mdx
deleted file mode 100644
index 6c07ccd380d1..000000000000
--- a/ui/components/app/signature-request-original/README.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import SignatureRequestOriginal from '.';
-
-# Signature Request
-
-dApp requesting a signature from the user. This component appears for eth_signTypedData signatures are not v3 or v4. For other signatures, please see SignatureRequest.
-
-<Canvas>
-  <Story id="ui-components-app-signature-request-signature-request-original-stories-js--default-story" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={SignatureRequestOriginal} />
diff --git a/ui/components/app/signature-request-original/index.scss b/ui/components/app/signature-request-original/index.scss
index 65ff59fa5ddf..2e2aca65fa1f 100644
--- a/ui/components/app/signature-request-original/index.scss
+++ b/ui/components/app/signature-request-original/index.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -20,10 +20,6 @@
     @media screen and (min-width: $break-large) {
       height: 620px;
     }
-
-    &__reject {
-      padding-bottom: 20px;
-    }
   }
 
   &__typed-container {
@@ -170,6 +166,8 @@
 
   &__origin {
     margin-left: 5px;
+    overflow: hidden;
+    text-overflow: ellipsis;
   }
 
   &__notice,
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index 6b878ac33f2c..80954ce93abe 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -13,7 +13,6 @@ import AccountListItem from '../account-list-item';
 import { conversionUtil } from '../../../../shared/modules/conversion.utils';
 import Button from '../../ui/button';
 import SiteIcon from '../../ui/site-icon';
-import SiteOrigin from '../../ui/site-origin';
 
 export default class SignatureRequestOriginal extends Component {
   static contextTypes = {
@@ -39,9 +38,6 @@ export default class SignatureRequestOriginal extends Component {
     hardwareWalletRequiresConnection: PropTypes.bool,
     isLedgerWallet: PropTypes.bool,
     nativeCurrency: PropTypes.string.isRequired,
-    messagesCount: PropTypes.number,
-    showRejectTransactionsConfirmationModal: PropTypes.func.isRequired,
-    cancelAll: PropTypes.func.isRequired,
   };
 
   state = {
@@ -149,10 +145,9 @@ export default class SignatureRequestOriginal extends Component {
             size={24}
           />
         ) : null}
-        <SiteOrigin
-          className="request-signature__origin"
-          siteOrigin={txData.msgParams.origin}
-        />
+        <div className="request-signature__origin">
+          {txData.msgParams.origin}
+        </div>
       </div>
     );
   };
@@ -320,31 +315,7 @@ export default class SignatureRequestOriginal extends Component {
     );
   };
 
-  handleCancelAll = () => {
-    const {
-      cancelAll,
-      clearConfirmTransaction,
-      history,
-      mostRecentOverviewPage,
-      showRejectTransactionsConfirmationModal,
-      messagesCount,
-    } = this.props;
-    const unapprovedTxCount = messagesCount;
-
-    showRejectTransactionsConfirmationModal({
-      unapprovedTxCount,
-      onSubmit: async () => {
-        await cancelAll();
-        clearConfirmTransaction();
-        history.push(mostRecentOverviewPage);
-      },
-    });
-  };
-
   render = () => {
-    const { messagesCount } = this.props;
-    const { t } = this.context;
-    const rejectNText = t('rejectTxsN', [messagesCount]);
     return (
       <div className="request-signature__container">
         {this.renderHeader()}
@@ -355,15 +326,6 @@ export default class SignatureRequestOriginal extends Component {
           </div>
         ) : null}
         {this.renderFooter()}
-        {messagesCount > 1 ? (
-          <Button
-            type="link"
-            className="request-signature__container__reject"
-            onClick={() => this.handleCancelAll()}
-          >
-            {rejectNText}
-          </Button>
-        ) : null}
       </div>
     );
   };
diff --git a/ui/components/app/signature-request-original/signature-request-original.container.js b/ui/components/app/signature-request-original/signature-request-original.container.js
index f30310358782..8031d92ede83 100644
--- a/ui/components/app/signature-request-original/signature-request-original.container.js
+++ b/ui/components/app/signature-request-original/signature-request-original.container.js
@@ -3,16 +3,14 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
 
 import { MESSAGE_TYPE } from '../../../../shared/constants/app';
-import { goHome, cancelMsgs, showModal } from '../../../store/actions';
+import { goHome } from '../../../store/actions';
 import {
   accountsWithSendEtherInfoSelector,
   conversionRateSelector,
   getSubjectMetadata,
   doesAddressRequireLedgerHidConnection,
-  unconfirmedMessagesHashSelector,
-  getTotalUnapprovedMessagesCount,
 } from '../../../selectors';
-import { getAccountByAddress, valuesFor } from '../../../helpers/utils/util';
+import { getAccountByAddress } from '../../../helpers/utils/util';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import {
@@ -31,8 +29,6 @@ function mapStateToProps(state, ownProps) {
     from,
   );
   const isLedgerWallet = isAddressLedger(state, from);
-  const messagesList = unconfirmedMessagesHashSelector(state);
-  const messagesCount = getTotalUnapprovedMessagesCount(state);
 
   return {
     requester: null,
@@ -45,8 +41,6 @@ function mapStateToProps(state, ownProps) {
     // not passed to component
     allAccounts: accountsWithSendEtherInfoSelector(state),
     subjectMetadata: getSubjectMetadata(state),
-    messagesList,
-    messagesCount,
   };
 }
 
@@ -54,19 +48,6 @@ function mapDispatchToProps(dispatch) {
   return {
     goHome: () => dispatch(goHome()),
     clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
-    showRejectTransactionsConfirmationModal: ({
-      onSubmit,
-      unapprovedTxCount: messagesCount,
-    }) => {
-      return dispatch(
-        showModal({
-          name: 'REJECT_TRANSACTIONS',
-          onSubmit,
-          unapprovedTxCount: messagesCount,
-        }),
-      );
-    },
-    cancelAll: (messagesList) => dispatch(cancelMsgs(messagesList)),
   };
 }
 
@@ -81,7 +62,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     txData,
   } = ownProps;
 
-  const { allAccounts, messagesList, ...otherStateProps } = stateProps;
+  const { allAccounts, ...otherStateProps } = stateProps;
 
   const {
     type,
@@ -90,8 +71,6 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 
   const fromAccount = getAccountByAddress(allAccounts, from);
 
-  const { cancelAll: dispatchCancelAll } = dispatchProps;
-
   let cancel;
   let sign;
   if (type === MESSAGE_TYPE.PERSONAL_SIGN) {
@@ -113,7 +92,6 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     txData,
     cancel,
     sign,
-    cancelAll: () => dispatchCancelAll(valuesFor(messagesList)),
   };
 }
 
diff --git a/ui/components/app/signature-request-original/signature-request-original.stories.js b/ui/components/app/signature-request-original/signature-request-original.stories.js
deleted file mode 100644
index bc2c73900073..000000000000
--- a/ui/components/app/signature-request-original/signature-request-original.stories.js
+++ /dev/null
@@ -1,132 +0,0 @@
-import React from 'react';
-import { action } from '@storybook/addon-actions';
-import { MESSAGE_TYPE } from '../../../../shared/constants/app';
-import testData from '../../../../.storybook/test-data';
-import README from './README.mdx';
-import SignatureRequestOriginal from './signature-request-original.component';
-
-const [MOCK_PRIMARY_IDENTITY] = Object.values(testData.metamask.identities);
-
-const MOCK_SIGN_DATA = JSON.stringify({
-  domain: {
-    name: 'happydapp.website',
-  },
-  message: {
-    string: 'haay wuurl',
-    number: 42,
-  },
-  primaryType: 'Mail',
-  types: {
-    EIP712Domain: [
-      { name: 'name', type: 'string' },
-      { name: 'version', type: 'string' },
-      { name: 'chainId', type: 'uint256' },
-      { name: 'verifyingContract', type: 'address' },
-    ],
-    Group: [
-      { name: 'name', type: 'string' },
-      { name: 'members', type: 'Person[]' },
-    ],
-    Mail: [
-      { name: 'from', type: 'Person' },
-      { name: 'to', type: 'Person[]' },
-      { name: 'contents', type: 'string' },
-    ],
-    Person: [
-      { name: 'name', type: 'string' },
-      { name: 'wallets', type: 'address[]' },
-    ],
-  },
-});
-
-export default {
-  title: 'Components/App/SignatureRequestOriginal',
-  id: __filename,
-  component: SignatureRequestOriginal,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argTypes: {
-    fromAccount: {
-      table: {
-        address: { control: 'text' },
-        balance: { control: 'text' },
-        name: { control: 'text' },
-      },
-    },
-    hardwareWalletRequiresConnection: { control: 'boolean' },
-    isLedgerWallet: { control: 'boolean' },
-    nativeCurrency: { control: 'text' },
-    txData: { control: 'object' },
-    clearConfirmTransaction: { action: 'Clean Confirm' },
-    cancel: { action: 'Cancel' },
-    sign: { action: 'Sign' },
-  },
-  args: {
-    fromAccount: MOCK_PRIMARY_IDENTITY,
-    history: {
-      push: action('history.push()'),
-    },
-    mostRecentOverviewPage: '/',
-    nativeCurrency: 'ETH',
-  },
-};
-
-const Template = (args) => {
-  return <SignatureRequestOriginal {...args} />;
-};
-
-export const DefaultStory = Template.bind({});
-
-DefaultStory.storyName = 'personal_sign Type';
-
-DefaultStory.args = {
-  txData: {
-    msgParams: {
-      data: MOCK_SIGN_DATA,
-      origin: 'https://happydapp.website/governance?futarchy=true',
-    },
-    type: MESSAGE_TYPE.PERSONAL_SIGN,
-  },
-};
-
-export const ETHSignStory = Template.bind({});
-
-ETHSignStory.storyName = 'eth_sign Type';
-
-ETHSignStory.args = {
-  txData: {
-    msgParams: {
-      data: MOCK_SIGN_DATA,
-      origin: 'https://happydapp.website/governance?futarchy=true',
-    },
-    type: MESSAGE_TYPE.ETH_SIGN,
-  },
-};
-
-export const ETHSignTypedStory = Template.bind({});
-
-ETHSignTypedStory.storyName = 'eth_signTypedData Type';
-
-ETHSignTypedStory.args = {
-  txData: {
-    msgParams: {
-      data: [
-        {
-          type: 'string',
-          name: 'Message',
-          value: 'Hi, Alice!',
-        },
-        {
-          type: 'uint32',
-          name: 'A number',
-          value: '1337',
-        },
-      ],
-      origin: 'https://happydapp.website/governance?futarchy=true',
-    },
-    type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
-  },
-};
diff --git a/ui/components/app/signature-request/index.scss b/ui/components/app/signature-request/index.scss
index f1e6f6906387..1483054d52d7 100644
--- a/ui/components/app/signature-request/index.scss
+++ b/ui/components/app/signature-request/index.scss
@@ -53,6 +53,7 @@
     border-radius: 50%;
     border: 1px solid var(--color-background-default);
     position: absolute;
+    box-shadow: 0 2px 2px 0.5px rgba(0, 0, 0, 0.19);
   }
 
   &__identicon-initial {
@@ -62,13 +63,11 @@
     font-size: 60px;
     color: var(--color-background-default);
     z-index: 1;
-    text-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    text-shadow: 0 4px 6px rgba(0, 0, 0, 0.422);
   }
 
   &__info {
     @include H7;
-
-    padding: 0 12px 4px;
   }
 
   &__info--bolded {
@@ -82,5 +81,10 @@
 
     color: var(--color-text-muted);
   }
+
+  .identicon {}
 }
 
+.signature-request-footer {
+  flex: 1 1 auto;
+}
diff --git a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
index f4a84b734389..a42e4f2ae561 100644
--- a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
+++ b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
@@ -17,10 +17,10 @@ export default class SignatureRequestFooter extends PureComponent {
     const { cancelAction, signAction, disabled = false } = this.props;
     return (
       <div className="signature-request-footer">
-        <Button onClick={cancelAction} type="secondary">
+        <Button onClick={cancelAction} type="secondary" large>
           {this.context.t('cancel')}
         </Button>
-        <Button onClick={signAction} type="primary" disabled={disabled}>
+        <Button onClick={signAction} type="primary" disabled={disabled} large>
           {this.context.t('sign')}
         </Button>
       </div>
diff --git a/ui/components/app/signature-request/signature-request-message/index.scss b/ui/components/app/signature-request/signature-request-message/index.scss
index ef2baa76d58f..343bd0563b4d 100644
--- a/ui/components/app/signature-request/signature-request-message/index.scss
+++ b/ui/components/app/signature-request/signature-request-message/index.scss
@@ -1,7 +1,7 @@
 .signature-request-message {
   flex: 1 60%;
   display: flex;
-  max-height: 231px;
+  max-height: 230px;
   flex-direction: column;
   position: relative;
 
diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
index 64193191910b..2a02cdcdd387 100644
--- a/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
+++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
@@ -26,7 +26,7 @@ export default class SignatureRequestMessage extends PureComponent {
     }
 
     const { scrollTop, offsetHeight, scrollHeight } = this.props.messageRootRef;
-    const isAtBottom = Math.round(scrollTop) + offsetHeight >= scrollHeight;
+    const isAtBottom = scrollTop + offsetHeight >= scrollHeight;
 
     if (isAtBottom) {
       this.setState({ messageIsScrolled: true });
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index a76dfa8b0387..4edaab599176 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -4,7 +4,6 @@ import Identicon from '../../ui/identicon';
 import LedgerInstructionField from '../ledger-instruction-field';
 import { sanitizeMessage } from '../../../helpers/utils/util';
 import { EVENT } from '../../../../shared/constants/metametrics';
-import SiteOrigin from '../../ui/site-origin';
 import Header from './signature-request-header';
 import Footer from './signature-request-footer';
 import Message from './signature-request-message';
@@ -125,10 +124,7 @@ export default class SignatureRequest extends PureComponent {
           <div className="signature-request-content__info--bolded">
             {domain.name}
           </div>
-          <SiteOrigin
-            className="signature-request-content__info"
-            siteOrigin={origin}
-          />
+          <div className="signature-request-content__info">{origin}</div>
           <div className="signature-request-content__info">
             {this.formatWallet(fromAddress)}
           </div>
diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js
index f20d49942cc6..f2e235b6f075 100644
--- a/ui/components/app/signature-request/signature-request.component.test.js
+++ b/ui/components/app/signature-request/signature-request.component.test.js
@@ -66,7 +66,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
+          hardwareWalletRequiresConnection={() => false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
@@ -105,7 +105,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={false}
+          hardwareWalletRequiresConnection={() => false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
diff --git a/ui/components/app/signature-request/signature-request.container.test.js b/ui/components/app/signature-request/signature-request.container.test.js
index 5ed1888ae766..0eb4a6deb4ea 100644
--- a/ui/components/app/signature-request/signature-request.container.test.js
+++ b/ui/components/app/signature-request/signature-request.container.test.js
@@ -32,7 +32,6 @@ describe('Signature Request', () => {
     history: {
       push: sinon.spy(),
     },
-    hardwareWalletRequiresConnection: false,
     clearConfirmTransaction: sinon.spy(),
     cancelMessage: sinon.spy(),
     cancel: sinon.stub().resolves(),
diff --git a/ui/components/app/signature-request/signature-request.stories.js b/ui/components/app/signature-request/signature-request.stories.js
index f3ebe0e1bf62..a1c53a69b8ff 100644
--- a/ui/components/app/signature-request/signature-request.stories.js
+++ b/ui/components/app/signature-request/signature-request.stories.js
@@ -3,7 +3,7 @@ import testData from '../../../../.storybook/test-data';
 import README from './README.mdx';
 import SignatureRequest from './signature-request.component';
 
-const [MOCK_PRIMARY_IDENTITY] = Object.values(testData.metamask.identities);
+const primaryIdentity = Object.values(testData.metamask.identities)[0];
 
 export default {
   title: 'Components/App/SignatureRequest',
@@ -23,11 +23,13 @@ export default {
         name: { control: 'text' },
       },
     },
-    hardwareWalletRequiresConnection: { control: 'boolean' },
     isLedgerWallet: { control: 'boolean' },
     clearConfirmTransaction: { action: 'Clean Confirm' },
     cancel: { action: 'Cancel' },
     sign: { action: 'Sign' },
+    hardwareWalletRequiresConnection: {
+      action: 'hardwareWalletRequiresConnection',
+    },
   },
 };
 
@@ -48,31 +50,11 @@ DefaultStory.args = {
           string: 'haay wuurl',
           number: 42,
         },
-        primaryType: 'Mail',
-        types: {
-          EIP712Domain: [
-            { name: 'name', type: 'string' },
-            { name: 'version', type: 'string' },
-            { name: 'chainId', type: 'uint256' },
-            { name: 'verifyingContract', type: 'address' },
-          ],
-          Group: [
-            { name: 'name', type: 'string' },
-            { name: 'members', type: 'Person[]' },
-          ],
-          Mail: [
-            { name: 'from', type: 'Person' },
-            { name: 'to', type: 'Person[]' },
-            { name: 'contents', type: 'string' },
-          ],
-          Person: [
-            { name: 'name', type: 'string' },
-            { name: 'wallets', type: 'address[]' },
-          ],
-        },
       }),
       origin: 'https://happydapp.website/governance?futarchy=true',
     },
   },
-  fromAccount: MOCK_PRIMARY_IDENTITY,
+  fromAccount: primaryIdentity,
 };
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/srp-input/srp-input.js b/ui/components/app/srp-input/srp-input.js
index 7cde8bb454a1..c2f3b1bd0191 100644
--- a/ui/components/app/srp-input/srp-input.js
+++ b/ui/components/app/srp-input/srp-input.js
@@ -10,7 +10,6 @@ import Typography from '../../ui/typography';
 import ShowHideToggle from '../../ui/show-hide-toggle';
 import {
   FONT_WEIGHT,
-  TEXT_ALIGN,
   TYPOGRAPHY,
 } from '../../../helpers/constants/design-system';
 import { parseSecretRecoveryPhrase } from './parse-secret-recovery-phrase';
@@ -19,10 +18,6 @@ const { isValidMnemonic } = ethers.utils;
 
 const defaultNumberOfWords = 12;
 
-const hasUpperCase = (draftSrp) => {
-  return draftSrp !== draftSrp.toLowerCase();
-};
-
 export default function SrpInput({ onChange, srpText }) {
   const [srpError, setSrpError] = useState('');
   const [pasteFailed, setPasteFailed] = useState(false);
@@ -39,13 +34,11 @@ export default function SrpInput({ onChange, srpText }) {
   const onSrpChange = useCallback(
     (newDraftSrp) => {
       let newSrpError = '';
-      const joinedDraftSrp = newDraftSrp.join(' ').trim();
+      const joinedDraftSrp = newDraftSrp.join(' ');
 
       if (newDraftSrp.some((word) => word !== '')) {
         if (newDraftSrp.some((word) => word === '')) {
           newSrpError = t('seedPhraseReq');
-        } else if (hasUpperCase(joinedDraftSrp)) {
-          newSrpError = t('invalidSeedPhraseCaseSensitive');
         } else if (!isValidMnemonic(joinedDraftSrp)) {
           newSrpError = t('invalidSeedPhrase');
         }
@@ -131,11 +124,7 @@ export default function SrpInput({ onChange, srpText }) {
   return (
     <div className="import-srp__container">
       <label className="import-srp__srp-label">
-        <Typography
-          align={TEXT_ALIGN.LEFT}
-          variant={TYPOGRAPHY.H4}
-          fontWeight={FONT_WEIGHT.BOLD}
-        >
+        <Typography variant={TYPOGRAPHY.H4} fontWeight={FONT_WEIGHT.BOLD}>
           {srpText}
         </Typography>
       </label>
diff --git a/ui/components/app/srp-input/srp-input.scss b/ui/components/app/srp-input/srp-input.scss
index 5d971147b4ef..21f0a576bb69 100644
--- a/ui/components/app/srp-input/srp-input.scss
+++ b/ui/components/app/srp-input/srp-input.scss
@@ -2,28 +2,27 @@
   &__container {
     display: grid;
     grid-template-areas:
-      'title dropdown'
-      'paste-tip paste-tip'
-      'input input'
-      'error error'
-      'too-many-words-error too-many-words-error';
+      "title dropdown"
+      "paste-tip paste-tip"
+      "input input"
+      "error error"
+      "too-many-words-error too-many-words-error";
   }
 
   @media (max-width: 767px) {
     &__container {
       grid-template-areas:
-        'title'
-        'dropdown'
-        'paste-tip'
-        'input'
-        'error'
-        'too-many-words-error';
+        "title"
+        "dropdown"
+        "paste-tip"
+        "input"
+        "error"
+        "too-many-words-error";
     }
   }
 
   &__srp-label {
     grid-area: title;
-    text-align: center;
   }
 
   &__number-of-words-dropdown {
@@ -31,7 +30,7 @@
   }
 
   &__paste-tip {
-    margin: 24px 0;
+    margin-bottom: 8px;
     grid-area: paste-tip;
     width: auto;
     margin-left: auto;
diff --git a/ui/components/app/step-progress-bar/index.scss b/ui/components/app/step-progress-bar/index.scss
index b248cf69f0c7..7d37e2fae245 100644
--- a/ui/components/app/step-progress-bar/index.scss
+++ b/ui/components/app/step-progress-bar/index.scss
@@ -1,10 +1,8 @@
-$progress-bar-width: calc(100% - 34px); // 100% - (circle size + (circle border size * 2))
-$progress-bar-position-left: calc(-50% + 17px); // -50% + ((circle size / 2) + circle border size)
-
 .progressbar {
   counter-reset: step;
   display: flex;
-  justify-content: space-between;
+  justify-content: space-evenly;
+  width: 500px;
   margin: 0 auto;
 }
 
@@ -13,17 +11,14 @@ ul.two-steps {
 }
 
 .progressbar li {
-  @include H7;
-
   list-style-type: none;
+  width: 25%;
+  float: left;
+  font-size: 12px;
   position: relative;
   text-align: center;
   color: var(--color-text-alternative);
   z-index: 2;
-  align-items: center;
-  display: flex;
-  flex: 1;
-  flex-direction: column;
 }
 
 .progressbar li::before {
@@ -33,30 +28,32 @@ ul.two-steps {
   counter-increment: step;
   line-height: 30px;
   border: 2px solid var(--color-border-muted);
-  display: flex;
-  justify-content: center;
-  align-items: center;
+  display: block;
   text-align: center;
   margin: 0 auto 10px auto;
   border-radius: 50%;
   background-color: var(--color-background-default);
+  z-index: -1;
 }
 
 .progressbar li::after {
-  width: $progress-bar-width;
+  width: 100%;
   height: 2px;
   content: '';
   position: absolute;
   background-color: var(--color-background-alternative);
   top: 15px;
-  left: $progress-bar-position-left;
+  right: 77px;
+  z-index: -1;
 
   [dir='rtl'] & {
-    width: $progress-bar-width;
+    width: 100%;
     height: 2px;
     content: '';
     position: absolute;
     background-color: var(--color-background-alternative);
+    right: 77px;
+    z-index: -1;
   }
 }
 
@@ -107,11 +104,13 @@ ul.two-steps {
 }
 
 .progressbar li.two-steps::after {
+  width: 180px;
   height: 2px;
   content: '';
   position: absolute;
   background-color: var(--color-background-alternative);
   top: 15px;
+  right: 75px;
   z-index: -1;
 
   [dir='rtl'] & {
@@ -120,6 +119,7 @@ ul.two-steps {
     content: '';
     position: absolute;
     background-color: var(--color-background-alternative);
+    right: 75px;
     z-index: -1;
   }
 }
diff --git a/ui/components/app/step-progress-bar/step-progress-bar.js b/ui/components/app/step-progress-bar/step-progress-bar.js
index 71fe934b5ad8..88f49a82646b 100644
--- a/ui/components/app/step-progress-bar/step-progress-bar.js
+++ b/ui/components/app/step-progress-bar/step-progress-bar.js
@@ -19,10 +19,10 @@ export const twoStepStages = {
   PASSWORD_CREATE: 2,
 };
 
-export function ThreeStepProgressBar({ stage, ...boxProps }) {
+export function ThreeStepProgressBar({ stage }) {
   const t = useI18nContext();
   return (
-    <Box {...boxProps}>
+    <Box>
       <ul className="progressbar">
         <li
           className={classnames({
@@ -53,10 +53,10 @@ export function ThreeStepProgressBar({ stage, ...boxProps }) {
   );
 }
 
-export function TwoStepProgressBar({ stage, ...boxProps }) {
+export function TwoStepProgressBar({ stage }) {
   const t = useI18nContext();
   return (
-    <Box width={BLOCK_SIZES.FULL} {...boxProps}>
+    <Box margin={4} width={BLOCK_SIZES.FULL}>
       <ul className="progressbar two-steps">
         <li
           className={classnames({
@@ -81,10 +81,8 @@ export function TwoStepProgressBar({ stage, ...boxProps }) {
 
 ThreeStepProgressBar.propTypes = {
   stage: PropTypes.number,
-  ...Box.propTypes,
 };
 
 TwoStepProgressBar.propTypes = {
   stage: PropTypes.number,
-  ...Box.propTypes,
 };
diff --git a/ui/components/app/tab-bar/index.scss b/ui/components/app/tab-bar/index.scss
index be543a9cb23e..4329b5b5cc19 100644
--- a/ui/components/app/tab-bar/index.scss
+++ b/ui/components/app/tab-bar/index.scss
@@ -38,6 +38,7 @@
     &__content {
       padding: 12px 18px;
       display: flex;
+      flex: 1 1 auto;
       align-items: center;
       position: relative;
 
@@ -67,7 +68,6 @@
         justify-content: center;
         margin-inline-end: 16px;
         flex: 0 0 18px;
-        color: var(--color-icon-alternative);
 
         @media screen and (min-width: $break-large) {
           flex: 0 0 14px;
diff --git a/ui/components/app/token-cell/token-cell.js b/ui/components/app/token-cell/token-cell.js
index 5a771b0b59fd..9329769777cd 100644
--- a/ui/components/app/token-cell/token-cell.js
+++ b/ui/components/app/token-cell/token-cell.js
@@ -29,7 +29,7 @@ export default function TokenCell({
         rel="noopener noreferrer"
         target="_blank"
         onClick={(event) => event.stopPropagation()}
-        style={{ color: 'var(--color-warning-default)' }}
+        style={{ color: 'var(--color-secondary-default)' }}
       >
         {t('here')}
       </a>
diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
index 0436f28d15e5..94bda3be5318 100644
--- a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
+++ b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
@@ -14,9 +14,6 @@ export default {
       options: Object.keys(imageHash),
     },
   },
-  args: {
-    eventKey: Object.keys(imageHash)[0],
-  },
 };
 
 export const DefaultStory = (args) => <TransactionActivityLogIcon {...args} />;
diff --git a/ui/components/app/transaction-decoding/transaction-decoding.component.js b/ui/components/app/transaction-decoding/transaction-decoding.component.js
index d1a73ca9dc81..00b858d4f3e2 100644
--- a/ui/components/app/transaction-decoding/transaction-decoding.component.js
+++ b/ui/components/app/transaction-decoding/transaction-decoding.component.js
@@ -185,7 +185,7 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
         </details>
       </li>
     ) : (
-      <li className="solidity-value" key={`solidity-value-${index}`}>
+      <li className="solidity-value">
         <div className="solidity-named-item solidity-item">
           {typeClass !== 'array' && !Array.isArray(value) ? (
             <span className="param-name typography--color-black">{name}: </span>
@@ -202,7 +202,7 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
     if (loading) {
       return (
         <div className="tx-insight-loading">
-          <Spinner color="var(--color-warning-default)" />
+          <Spinner color="var(--color-secondary-default)" />
         </div>
       );
     }
@@ -239,6 +239,6 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
 }
 
 TransactionDecoding.propTypes = {
-  to: PropTypes.string,
+  to: PropTypes.string.isRequired,
   inputData: PropTypes.string.isRequired,
 };
diff --git a/ui/components/app/transaction-detail-item/index.scss b/ui/components/app/transaction-detail-item/index.scss
index a51cae46decb..c7a39c250dba 100644
--- a/ui/components/app/transaction-detail-item/index.scss
+++ b/ui/components/app/transaction-detail-item/index.scss
@@ -34,7 +34,7 @@
     margin-inline-start: 4px;
 
     path {
-      fill: var(--color-icon-alternative);
+      fill: var(--color-icon-default);
     }
   }
 
diff --git a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
index d3968679d10d..e82c78f1ab47 100644
--- a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
+++ b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
@@ -52,9 +52,7 @@ export default function TransactionDetailItem({
             color={COLORS.TEXT_DEFAULT}
             fontWeight={boldHeadings ? FONT_WEIGHT.BOLD : FONT_WEIGHT.NORMAL}
             variant={TYPOGRAPHY.H6}
-            marginTop={1}
-            marginBottom={1}
-            marginLeft={1}
+            margin={[1, 0, 1, 1]}
             boxProps={{ textAlign: TEXT_ALIGN.RIGHT }}
           >
             {detailTotal}
diff --git a/ui/components/app/transaction-icon/transaction-icon.js b/ui/components/app/transaction-icon/transaction-icon.js
index e87b8520af87..1036b853a040 100644
--- a/ui/components/app/transaction-icon/transaction-icon.js
+++ b/ui/components/app/transaction-icon/transaction-icon.js
@@ -17,9 +17,9 @@ import { captureSingleException } from '../../../store/actions';
 const ICON_MAP = {
   [TRANSACTION_GROUP_CATEGORIES.APPROVAL]: Approve,
   [TRANSACTION_GROUP_CATEGORIES.INTERACTION]: Interaction,
-  [TRANSACTION_GROUP_CATEGORIES.RECEIVE]: Receive,
   [TRANSACTION_GROUP_CATEGORIES.SEND]: Send,
   [TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST]: Sign,
+  [TRANSACTION_GROUP_CATEGORIES.RECEIVE]: Receive,
   [TRANSACTION_GROUP_CATEGORIES.SWAP]: Swap,
 };
 
@@ -29,13 +29,13 @@ const OK_COLOR = 'var(--color-primary-default)';
 
 const COLOR_MAP = {
   [TRANSACTION_GROUP_STATUSES.PENDING]: PENDING_COLOR,
-  [TRANSACTION_GROUP_STATUSES.CANCELLED]: FAIL_COLOR,
+  [TRANSACTION_STATUSES.UNAPPROVED]: PENDING_COLOR,
   [TRANSACTION_STATUSES.APPROVED]: PENDING_COLOR,
-  [TRANSACTION_STATUSES.DROPPED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.FAILED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.REJECTED]: FAIL_COLOR,
+  [TRANSACTION_GROUP_STATUSES.CANCELLED]: FAIL_COLOR,
+  [TRANSACTION_STATUSES.DROPPED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.SUBMITTED]: PENDING_COLOR,
-  [TRANSACTION_STATUSES.UNAPPROVED]: PENDING_COLOR,
 };
 
 export default function TransactionIcon({ status, category }) {
@@ -58,22 +58,22 @@ export default function TransactionIcon({ status, category }) {
 
 TransactionIcon.propTypes = {
   status: PropTypes.oneOf([
-    TRANSACTION_GROUP_STATUSES.CANCELLED,
     TRANSACTION_GROUP_STATUSES.PENDING,
+    TRANSACTION_STATUSES.UNAPPROVED,
     TRANSACTION_STATUSES.APPROVED,
-    TRANSACTION_STATUSES.CONFIRMED,
-    TRANSACTION_STATUSES.DROPPED,
     TRANSACTION_STATUSES.FAILED,
     TRANSACTION_STATUSES.REJECTED,
+    TRANSACTION_GROUP_STATUSES.CANCELLED,
+    TRANSACTION_STATUSES.DROPPED,
+    TRANSACTION_STATUSES.CONFIRMED,
     TRANSACTION_STATUSES.SUBMITTED,
-    TRANSACTION_STATUSES.UNAPPROVED,
   ]).isRequired,
   category: PropTypes.oneOf([
     TRANSACTION_GROUP_CATEGORIES.APPROVAL,
     TRANSACTION_GROUP_CATEGORIES.INTERACTION,
-    TRANSACTION_GROUP_CATEGORIES.RECEIVE,
     TRANSACTION_GROUP_CATEGORIES.SEND,
     TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST,
+    TRANSACTION_GROUP_CATEGORIES.RECEIVE,
     TRANSACTION_GROUP_CATEGORIES.SWAP,
   ]).isRequired,
 };
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index f65c82f63f7b..331885364b05 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -251,10 +251,7 @@ export default class TransactionListItemDetails extends PureComponent {
             <div className="transaction-list-item-details__cards-container">
               <TransactionBreakdown
                 nonce={transactionGroup.initialTransaction.txParams.nonce}
-                isTokenApprove={
-                  type === TRANSACTION_TYPES.TOKEN_METHOD_APPROVE ||
-                  type === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL
-                }
+                isTokenApprove={type === TRANSACTION_TYPES.TOKEN_METHOD_APPROVE}
                 transaction={transaction}
                 primaryCurrency={primaryCurrency}
                 className="transaction-list-item-details__transaction-breakdown"
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
index 18417627cdd2..4164de3a3092 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
@@ -6,7 +6,6 @@ import TransactionBreakdown from '../transaction-breakdown';
 import TransactionActivityLog from '../transaction-activity-log';
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
-import TransactionStatus from '../transaction-status/transaction-status.component';
 import TransactionListItemDetails from './transaction-list-item-details.component';
 
 describe('TransactionListItemDetails Component', () => {
@@ -41,7 +40,6 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
-        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -88,7 +86,6 @@ describe('TransactionListItemDetails Component', () => {
         showSpeedUp
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
-        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -130,7 +127,6 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
-        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -175,7 +171,6 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
-        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
index dc3775fb2acd..280cec0209b0 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
@@ -3,17 +3,18 @@ import { tryReverseResolveAddress } from '../../../store/actions';
 import {
   getAddressBook,
   getRpcPrefsForCurrentProvider,
-  getEnsResolutionByAddress,
 } from '../../../selectors';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import TransactionListItemDetails from './transaction-list-item-details.component';
 
 const mapStateToProps = (state, ownProps) => {
+  const { metamask } = state;
+  const { ensResolutionsByAddress } = metamask;
   const { recipientAddress, senderAddress } = ownProps;
   let recipientEns;
   if (recipientAddress) {
     const address = toChecksumHexAddress(recipientAddress);
-    recipientEns = getEnsResolutionByAddress(state, address);
+    recipientEns = ensResolutionsByAddress[address] || '';
   }
   const addressBook = getAddressBook(state);
 
diff --git a/ui/components/app/transaction-list-item/index.scss b/ui/components/app/transaction-list-item/index.scss
index f523714bdc4a..69413b1e107f 100644
--- a/ui/components/app/transaction-list-item/index.scss
+++ b/ui/components/app/transaction-list-item/index.scss
@@ -53,9 +53,15 @@
     margin: 0 4px;
   }
 
+  &__origin,
   &__address {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
+
+  &__origin {
+    /*rtl:ignore*/
+    direction: rtl;
+  }
 }
diff --git a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
index 156b9d8efe9b..26133341eb9e 100644
--- a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
@@ -14,7 +14,6 @@ import {
 
 import CancelButton from '../cancel-button';
 import { cancelSwapsSmartTransaction } from '../../../ducks/swaps/swaps';
-import SiteOrigin from '../../ui/site-origin';
 
 export default function SmartTransactionListItem({
   smartTransaction,
@@ -61,11 +60,9 @@ export default function SmartTransactionListItem({
               date={date}
               status={displayedStatusKey}
             />
-            <SiteOrigin
-              className="transaction-list-item__origin"
-              siteOrigin={subtitle}
-              title={subtitle}
-            />
+            <span className="transaction-list-item__origin" title={subtitle}>
+              {subtitle}
+            </span>
           </h3>
         }
       >
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 867d236f950a..5cc73bc032c4 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -39,7 +39,6 @@ import CancelSpeedupPopover from '../cancel-speedup-popover';
 import EditGasFeePopover from '../edit-gas-fee-popover';
 import EditGasPopover from '../edit-gas-popover';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import SiteOrigin from '../../ui/site-origin';
 
 function TransactionListItemInner({
   transactionGroup,
@@ -192,13 +191,16 @@ function TransactionListItemInner({
               date={date}
               status={displayedStatusKey}
             />
-            {subtitleContainsOrigin ? (
-              <SiteOrigin siteOrigin={subtitle} />
-            ) : (
-              <span className="transaction-list-item__address" title={subtitle}>
-                {subtitle}
-              </span>
-            )}
+            <span
+              className={
+                subtitleContainsOrigin
+                  ? 'transaction-list-item__origin'
+                  : 'transaction-list-item__address'
+              }
+              title={subtitle}
+            >
+              {subtitle}
+            </span>
           </h3>
         }
         rightContent={
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.stories.js b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
deleted file mode 100644
index 0d030310a291..000000000000
--- a/ui/components/app/transaction-list-item/transaction-list-item.stories.js
+++ /dev/null
@@ -1,210 +0,0 @@
-import React from 'react';
-import {
-  TRANSACTION_STATUSES,
-  TRANSACTION_TYPES,
-} from '../../../../shared/constants/transaction';
-import { MOCK_TRANSACTION_BY_TYPE } from '../../../../.storybook/initial-states/transactions';
-import TransactionListItem from '.';
-
-/**
- * @typedef {(import('../../selectors/transactions').TransactionGroup} TransactionGroup
- */
-
-/**
- * @param {Object} args
- * @returns {TransactionGroup}
- */
-const getMockTransactionGroup = (args) => {
-  const status = args['transactionGroup.primaryTransaction.status'];
-  const tx = {
-    ...args['transactionGroup.primaryTransaction'],
-    status,
-    submittedTime: args['transactionGroup.primaryTransaction.submittedTime'],
-  };
-
-  return {
-    hasCancelled: args['transactionGroup.hasCancelled'],
-    hasRetried: args['transactionGroup.hasRetried'],
-    nonce: '0x1',
-    initialTransaction: tx,
-    primaryTransaction: tx,
-    transactions: [tx],
-  };
-};
-
-/**
- * Transaction List Item Storybook Page
- *
- * Each page displays a different Transaction Type (TRANSACTION_TYPES)
- * except TRANSACTION_TYPES.CANCEL and TRANSACTION_TYPES.RETRY as these two types
- * are never initialTransactions
- */
-export default {
-  title: 'Components/App/TransactionListItem',
-  id: __filename,
-  argTypes: {
-    isEarliestNonce: { control: 'boolean' },
-    'transactionGroup.hasCancelled': { control: 'boolean' },
-    'transactionGroup.hasRetried': { control: 'boolean' },
-    'transactionGroup.primaryTransaction.status': {
-      options: Object.values(TRANSACTION_STATUSES)
-        .filter((status) => {
-          return status !== TRANSACTION_STATUSES.SIGNED;
-        })
-        .sort(),
-      control: { type: 'select' },
-    },
-    'transactionGroup.primaryTransaction.submittedTime': { control: 'number' },
-    'transactionGroup.primaryTransaction': { control: 'object' },
-  },
-  args: {
-    isEarliestNonce: true,
-    'transactionGroup.hasCancelled': false,
-    'transactionGroup.hasRetried': false,
-    'transactionGroup.primaryTransaction.status': TRANSACTION_STATUSES.PENDING,
-    'transactionGroup.primaryTransaction.submittedTime': 19999999999999,
-  },
-};
-
-const Template = (args) => {
-  const transactionGroup = getMockTransactionGroup(args);
-  return (
-    <TransactionListItem
-      transactionGroup={transactionGroup}
-      isEarliestNonce={args.isEarliestNonce}
-    />
-  );
-};
-
-export const ContractInteraction = Template.bind({});
-export const DeployContract = Template.bind({});
-export const EthDecrypt = Template.bind({});
-export const EthGetEncryptionPublicKey = Template.bind({});
-export const Incoming = Template.bind({});
-export const PersonalSign = Template.bind({});
-export const Sign = Template.bind({});
-export const SignTypeData = Template.bind({});
-export const SimpleSend = Template.bind({});
-export const Smart = Template.bind({});
-export const Swap = Template.bind({});
-export const SwapApproval = Template.bind({});
-export const TokenMethodApprove = Template.bind({});
-export const TokenMethodSafeTransferFrom = Template.bind({});
-export const TokenMethodTransfer = Template.bind({});
-export const TokenMethodTransferFrom = Template.bind({});
-
-ContractInteraction.storyName = 'contractInteraction';
-ContractInteraction.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.CONTRACT_INTERACTION],
-  },
-};
-
-DeployContract.storyName = 'contractDeployment';
-DeployContract.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.DEPLOY_CONTRACT],
-  },
-};
-
-EthDecrypt.storyName = 'eth_decrypt';
-EthDecrypt.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.ETH_DECRYPT],
-  },
-};
-
-EthGetEncryptionPublicKey.storyName = 'eth_getEncryptionPublicKey';
-EthGetEncryptionPublicKey.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[
-      TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY
-    ],
-  },
-};
-
-Incoming.storyName = 'incoming';
-Incoming.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.INCOMING],
-  },
-};
-
-PersonalSign.storyName = 'personal_sign';
-PersonalSign.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.PERSONAL_SIGN],
-  },
-};
-
-Sign.storyName = 'eth_sign';
-Sign.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIGN],
-  },
-};
-
-SignTypeData.storyName = 'eth_signTypedData';
-SignTypeData.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIGN_TYPED_DATA],
-  },
-};
-
-SimpleSend.storyName = 'simpleSend';
-SimpleSend.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIMPLE_SEND],
-  },
-};
-
-Smart.storyName = 'smart';
-Smart.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SMART],
-  },
-};
-
-Swap.storyName = 'swap';
-Swap.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SWAP],
-  },
-};
-
-SwapApproval.storyName = 'swapApproval';
-SwapApproval.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SWAP_APPROVAL],
-  },
-};
-
-TokenMethodApprove.storyName = 'approve';
-TokenMethodApprove.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_APPROVE],
-  },
-};
-
-TokenMethodSafeTransferFrom.storyName = 'safetransferfrom';
-TokenMethodSafeTransferFrom.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[
-      TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
-    ],
-  },
-};
-
-TokenMethodTransfer.storyName = 'transfer';
-TokenMethodTransfer.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER],
-  },
-};
-
-TokenMethodTransferFrom.storyName = 'transferfrom';
-TokenMethodTransferFrom.args = {
-  'transactionGroup.primaryTransaction': {
-    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM],
-  },
-};
diff --git a/ui/components/app/transaction-status/index.scss b/ui/components/app/transaction-status/index.scss
index 6212c0849579..55c22472cedd 100644
--- a/ui/components/app/transaction-status/index.scss
+++ b/ui/components/app/transaction-status/index.scss
@@ -14,7 +14,7 @@
 
   &--unapproved,
   &--pending {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
   }
 
   &--queued {
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
index 6c73d75768c6..ed2a56fab3e1 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import CurrencyDisplay from '../../ui/currency-display';
 import * as currencyHook from '../../../hooks/useCurrencyDisplay';
 import * as currencyPrefHook from '../../../hooks/useUserPreferencedCurrency';
-import UserPreferencedCurrencyDisplay from '.';
+import UserPreferencedCurrencyDisplay from './user-preferenced-currency-display.component';
 
 describe('UserPreferencedCurrencyDisplay Component', () => {
   describe('rendering', () => {
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index 26b0019b15e5..de3339b3e182 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -16,13 +16,13 @@ import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { showModal } from '../../../store/actions';
 import {
   isBalanceCached,
+  getSelectedAccount,
   getShouldShowFiat,
   getCurrentKeyring,
   getSwapsDefaultToken,
   getIsSwapsChain,
   getIsBuyableChain,
   getNativeCurrencyImage,
-  getSelectedAccountCachedBalance,
 } from '../../../selectors/selectors';
 import SwapIcon from '../../ui/icon/swap-icon.component';
 import BuyIcon from '../../ui/icon/overview-buy-icon.component';
@@ -32,9 +32,6 @@ import IconButton from '../../ui/icon-button';
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { EVENT } from '../../../../shared/constants/metametrics';
-import Spinner from '../../ui/spinner';
-import { startNewDraftTransaction } from '../../../ducks/send';
-import { ASSET_TYPES } from '../../../../shared/constants/transaction';
 import WalletOverview from './wallet-overview';
 
 const EthOverview = ({ className }) => {
@@ -46,7 +43,8 @@ const EthOverview = ({ className }) => {
   const usingHardwareWallet = isHardwareKeyring(keyring?.type);
   const balanceIsCached = useSelector(isBalanceCached);
   const showFiat = useSelector(getShouldShowFiat);
-  const balance = useSelector(getSelectedAccountCachedBalance);
+  const selectedAccount = useSelector(getSelectedAccount);
+  const { balance } = selectedAccount;
   const isSwapsChain = useSelector(getIsSwapsChain);
   const isBuyableChain = useSelector(getIsBuyableChain);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
@@ -54,7 +52,6 @@ const EthOverview = ({ className }) => {
 
   return (
     <WalletOverview
-      loading={!balance}
       balance={
         <Tooltip
           position="top"
@@ -63,28 +60,21 @@ const EthOverview = ({ className }) => {
         >
           <div className="eth-overview__balance">
             <div className="eth-overview__primary-container">
-              {balance ? (
-                <UserPreferencedCurrencyDisplay
-                  className={classnames('eth-overview__primary-balance', {
-                    'eth-overview__cached-balance': balanceIsCached,
-                  })}
-                  data-testid="eth-overview__primary-currency"
-                  value={balance}
-                  type={PRIMARY}
-                  ethNumberOfDecimals={4}
-                  hideTitle
-                />
-              ) : (
-                <Spinner
-                  color="var(--color-secondary-default)"
-                  className="loading-overlay__spinner"
-                />
-              )}
+              <UserPreferencedCurrencyDisplay
+                className={classnames('eth-overview__primary-balance', {
+                  'eth-overview__cached-balance': balanceIsCached,
+                })}
+                data-testid="eth-overview__primary-currency"
+                value={balance}
+                type={PRIMARY}
+                ethNumberOfDecimals={4}
+                hideTitle
+              />
               {balanceIsCached ? (
                 <span className="eth-overview__cached-star">*</span>
               ) : null}
             </div>
-            {showFiat && balance && (
+            {showFiat && (
               <UserPreferencedCurrencyDisplay
                 className={classnames({
                   'eth-overview__cached-secondary-balance': balanceIsCached,
@@ -133,11 +123,7 @@ const EthOverview = ({ className }) => {
                   legacy_event: true,
                 },
               });
-              dispatch(
-                startNewDraftTransaction({ type: ASSET_TYPES.NATIVE }),
-              ).then(() => {
-                history.push(SEND_ROUTE);
-              });
+              history.push(SEND_ROUTE);
             }}
           />
           <IconButton
diff --git a/ui/components/app/wallet-overview/index.scss b/ui/components/app/wallet-overview/index.scss
index 16526b518ab6..e408604d94ac 100644
--- a/ui/components/app/wallet-overview/index.scss
+++ b/ui/components/app/wallet-overview/index.scss
@@ -67,7 +67,7 @@
 
   &__cached-balance,
   &__cached-star {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
   }
 
   &__cached-secondary-balance {
diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js
index a02f0263e1df..23d8997d87c2 100644
--- a/ui/components/app/wallet-overview/token-overview.js
+++ b/ui/components/app/wallet-overview/token-overview.js
@@ -14,7 +14,7 @@ import {
 } from '../../../helpers/constants/routes';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
-import { startNewDraftTransaction } from '../../../ducks/send';
+import { updateSendAsset } from '../../../ducks/send';
 import { setSwapsFromToken } from '../../../ducks/swaps/swaps';
 import {
   getCurrentKeyring,
@@ -93,7 +93,7 @@ const TokenOverview = ({ className, token }) => {
               });
               try {
                 await dispatch(
-                  startNewDraftTransaction({
+                  updateSendAsset({
                     type: ASSET_TYPES.TOKEN,
                     details: token,
                   }),
diff --git a/ui/components/app/wallet-overview/wallet-overview.js b/ui/components/app/wallet-overview/wallet-overview.js
index 9265e31b08ea..6f5d1341d3e6 100644
--- a/ui/components/app/wallet-overview/wallet-overview.js
+++ b/ui/components/app/wallet-overview/wallet-overview.js
@@ -2,11 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-const WalletOverview = ({ balance, buttons, className, icon, loading }) => {
+const WalletOverview = ({ balance, buttons, className, icon }) => {
   return (
     <div className={classnames('wallet-overview', className)}>
       <div className="wallet-overview__balance">
-        {loading ? null : icon}
+        {icon}
         {balance}
       </div>
       <div className="wallet-overview__buttons">{buttons}</div>
@@ -19,7 +19,6 @@ WalletOverview.propTypes = {
   buttons: PropTypes.element.isRequired,
   className: PropTypes.string,
   icon: PropTypes.element.isRequired,
-  loading: PropTypes.bool,
 };
 
 WalletOverview.defaultProps = {
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 87670992f335..59b171102ea2 100644
--- a/ui/components/app/whats-new-popup/whats-new-popup.js
+++ b/ui/components/app/whats-new-popup/whats-new-popup.js
@@ -10,7 +10,7 @@ import Button from '../../ui/button';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography';
 import { updateViewedNotifications } from '../../../store/actions';
-import { getTranslatedUINotifications } from '../../../../shared/notifications';
+import { getTranslatedUINoficiations } from '../../../../shared/notifications';
 import { getSortedAnnouncementsToShow } from '../../../selectors';
 import {
   BUILD_QUOTE_ROUTE,
@@ -54,10 +54,6 @@ function getActionFunctionById(id, history) {
       updateViewedNotifications({ 12: true });
       history.push(EXPERIMENTAL_ROUTE);
     },
-    13: () => {
-      updateViewedNotifications({ 13: true });
-      history.push(`${EXPERIMENTAL_ROUTE}#show-custom-network`);
-    },
   };
 
   return actionFunctions[id];
@@ -241,7 +237,7 @@ export default function WhatsNewPopup({ onClose }) {
     >
       <div className="whats-new-popup__notifications">
         {notifications.map(({ id }, index) => {
-          const notification = getTranslatedUINotifications(t, locale)[id];
+          const notification = getTranslatedUINoficiations(t, locale)[id];
           const isLast = index === notifications.length - 1;
           // Display the swaps notification with full image
           return index === 0 || id === 1
diff --git a/ui/components/ui/alert/README.mdx b/ui/components/ui/alert/README.mdx
deleted file mode 100644
index 71981e0801cd..000000000000
--- a/ui/components/ui/alert/README.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import Alert from '.';
-
-# Alert
-
-Alert element used to notify the user about some information or warning.
-
-<Canvas>
-  <Story id="ui-components-ui-alert-alert-stories-js--default-alert" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={Alert} />
\ No newline at end of file
diff --git a/ui/components/ui/alert/alert.stories.js b/ui/components/ui/alert/alert.stories.js
deleted file mode 100644
index d99bfd3c5a09..000000000000
--- a/ui/components/ui/alert/alert.stories.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import Alert from '.';
-
-export default {
-  title: 'Components/UI/Alert',
-  id: __filename,
-  component: Alert,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    visible: {
-      control: 'boolean',
-    },
-    msg: {
-      control: 'text',
-    },
-  },
-};
-
-export const DefaultAlert = (args) => {
-  return <Alert {...args} />;
-};
-
-DefaultAlert.storyName = 'Default';
-DefaultAlert.args = {
-  visible: true,
-  msg: 'Alert',
-};
diff --git a/ui/components/ui/alert/index.js b/ui/components/ui/alert/index.js
index fe5d24ac6886..19a18126e69b 100644
--- a/ui/components/ui/alert/index.js
+++ b/ui/components/ui/alert/index.js
@@ -1,49 +1,56 @@
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import React, { useState, useEffect } from 'react';
-import { usePrevious } from '../../../hooks/usePrevious';
+import React, { Component } from 'react';
 import { MILLISECOND } from '../../../../shared/constants/time';
 
-function Alert(props) {
-  const [visible, setVisible] = useState(false);
-  const [className, setClassName] = useState('');
-  const lastVisible = usePrevious(props.visible);
+class Alert extends Component {
+  state = {
+    visible: false,
+    msg: false,
+    className: '',
+  };
+
+  UNSAFE_componentWillReceiveProps(nextProps) {
+    if (!this.props.visible && nextProps.visible) {
+      this.animateIn(nextProps.msg);
+    } else if (this.props.visible && !nextProps.visible) {
+      this.animateOut();
+    }
+  }
 
-  useEffect(() => {
-    const animateIn = () => {
-      setClassName('visible');
-      setVisible(true);
-    };
+  animateIn(msg) {
+    this.setState({
+      msg,
+      visible: true,
+      className: 'visible',
+    });
+  }
 
-    const animateOut = () => {
-      setClassName('hidden');
+  animateOut() {
+    this.setState({
+      msg: null,
+      className: 'hidden',
+    });
 
-      setTimeout((_) => {
-        setVisible(false);
-      }, MILLISECOND * 500);
-    };
+    setTimeout((_) => {
+      this.setState({ visible: false });
+    }, MILLISECOND * 500);
+  }
 
-    if (!lastVisible && props.visible) {
-      animateIn(props.msg);
-    } else if (lastVisible && !props.visible) {
-      animateOut();
+  render() {
+    if (this.state.visible) {
+      return (
+        <div className={classnames('global-alert', this.state.className)}>
+          <a className="msg">{this.state.msg}</a>
+        </div>
+      );
     }
-  }, [lastVisible, props.msg, props.visible]);
-
-  if (!visible) {
     return null;
   }
-
-  return (
-    <div className={classnames('global-alert', className)}>
-      <a className="msg">{props.msg}</a>
-    </div>
-  );
 }
 
 Alert.propTypes = {
   visible: PropTypes.bool.isRequired,
-  msg: PropTypes.string,
+  msg: PropTypes.string /* eslint-disable-line react/no-unused-prop-types */,
 };
-
 export default Alert;
diff --git a/ui/components/ui/alert/index.test.js b/ui/components/ui/alert/index.test.js
index 7689d6d83ed3..aae068be30a9 100644
--- a/ui/components/ui/alert/index.test.js
+++ b/ui/components/ui/alert/index.test.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import Alert from '.';
 
@@ -13,4 +14,27 @@ describe('Alert', () => {
     const alert = wrapper.find('.global-alert');
     expect(alert).toHaveLength(0);
   });
+
+  it('renders when visible in state is true, and message', () => {
+    const errorMessage = 'Error Message';
+
+    wrapper.setState({ visible: true, msg: errorMessage });
+
+    const alert = wrapper.find('.global-alert');
+    expect(alert).toHaveLength(1);
+
+    const errorText = wrapper.find('.msg');
+    expect(errorText.text()).toStrictEqual(errorMessage);
+  });
+
+  it('calls component method when componentWillReceiveProps is called', () => {
+    const animateInSpy = sinon.stub(wrapper.instance(), 'animateIn');
+    const animateOutSpy = sinon.stub(wrapper.instance(), 'animateOut');
+
+    wrapper.setProps({ visible: true });
+    expect(animateInSpy.calledOnce).toStrictEqual(true);
+
+    wrapper.setProps({ visible: false });
+    expect(animateOutSpy.calledOnce).toStrictEqual(true);
+  });
 });
diff --git a/ui/components/ui/box/README.mdx b/ui/components/ui/box/README.mdx
index 5a20734a7d4e..fe43d23804cd 100644
--- a/ui/components/ui/box/README.mdx
+++ b/ui/components/ui/box/README.mdx
@@ -14,127 +14,42 @@ Box is a utility component that can be used for layout or as a base for other UI
 
 ## Component API
 
-| Name            | Description                                                                                                                                                                                                                                                                             | Default            |
-| --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
-| children        | The children of the Box component. If `function` type will render the child as the Box node instead of a child of the Box                                                                                                                                                               | -                  |
-| className       | Additional className of the Box component                                                                                                                                                                                                                                               | -                  |
-| margin          | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
-| marginTop       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
-| marginBottom    | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
-| marginRight     | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
-| marginLeft      | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
-| padding         | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| paddingTop      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| paddingBottom   | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| paddingRight    | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| paddingLeft     | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| display         | [DISPLAY](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L125-L133) values or array of [DISPLAY](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L125-L133) values                 | -                  |
-| flexDirection   | [FLEX_DIRECTION](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L112-L117) values or array of [FLEX_DIRECTION](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L112-L117) values   | FLEX_DIRECTION.ROW |
-| flexWrap        | [FLEX_WRAP](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L119-L123) values or array of [FLEX_WRAP](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L119-L123) values             | -                  |
-| alignItems      | [ALIGN_ITEMS](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L95-L101) values or array of [ALIGN_ITEMS](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L95-L101) values           | -                  |
-| justifyContent  | [JUSTIFY_CONTENT](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L103-L110) values or array of [JUSTIFY_CONTENT](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L103-L110) values | -                  |
-| gap             | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| textAlign       | [TEXT_ALIGN](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L172-L178) values or array of [TEXT_ALIGN](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L172-L178) values           | -                  |
-| width           | [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values or array of [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values         | -                  |
-| height          | [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values or array of [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values         | -                  |
-| backgroundColor | COLORS values or array of COLORS values                                                                                                                                                                                                                                                 | -                  |
-| borderColor     | COLORS values or array of COLOR values                                                                                                                                                                                                                                                  | -                  |
-| borderWidth     | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
-| borderRadius    | [SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L74-L81) values or array of [SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L74-L81) values                         | -                  |
-| borderStyle     | [BORDER_STYLE](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L83-L88) values or array of [BORDER_STYLE](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L83-L88) values           | -                  |
+| Name            | Description                         | Default            |
+| --------------- | ----------------------------------- | ------------------ |
+| children        | node func                           | -                  |
+| flexDirection   | Object.values(FLEX_DIRECTION)       | FLEX_DIRECTION.ROW |
+| flexWrap        | Object.values(FLEX_WRAP)            | -                  |
+| gap             | 1,2,4,6,8                           | -                  |
+| margin          | 1,2,4,6,8 or array of numbers [1,2] | -                  |
+| marginTop       | 1,2,4,6,8                           | -                  |
+| marginBottom    | 1,2,4,6,8                           | -                  |
+| marginRight     | 1,2,4,6,8                           | -                  |
+| marginLeft      | 1,2,4,6,8                           | -                  |
+| padding         | 1,2,4,6,8 or array of numbers [1,2] | -                  |
+| paddingTop      | 1,2,4,6,8                           | -                  |
+| paddingBottom   | 1,2,4,6,8                           | -                  |
+| paddingRight    | 1,2,4,6,8                           | -                  |
+| paddingLeft     | 1,2,4,6,8                           | -                  |
+| borderColor     | Object.values(COLORS)               | -                  |
+| borderWidth     | number                              | -                  |
+| borderRadius    | Object.values(SIZES)                | -                  |
+| borderStyle     | Object.values(BORDER_STYLE)         | -                  |
+| alignItems      | Object.values(ALIGN_ITEMS)          | -                  |
+| justifyContent  | Object.values(JUSTIFY_CONTENT)      | -                  |
+| textAlign       | Object.values(TEXT_ALIGN)           | -                  |
+| display         | Object.values(DISPLAY)              | -                  |
+| width           | Object.values(BLOCK_SIZES)          | -                  |
+| height          | Object.values(BLOCK_SIZES)          | -                  |
+| backgroundColor | Object.values(COLORS)               | -                  |
+| className       | string                              |                    |
 
 ## Usage
 
 The following describes the props and example usage for this component.
 
-### Margin
-
-The margin props `margin`, `marginTop`, `marginRight`, `marginBottom`, and `marginLeft` can be used to set the margins of the `Box` component. All of the margin props accept [responsive props](#responsive-props) in the form of array props
-
-Accepted props are: `0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto` or array of these values
-
-<Canvas>
-  <Story id="ui-components-ui-box-box-stories-js--margin" />
-</Canvas>
-
-```jsx
-<Box margin={4} />
-<Box marginTop={4} />
-<Box marginRight={4} />
-<Box marginBottom={4} />
-<Box marginLeft={'auto'} />
-
-// Responsive props
-<Box margin={[4, 8]} />
-<Box marginTop={[4, 8]} />
-<Box marginRight={[4, 8]} />
-<Box marginBottom={[4, 8]} />
-<Box marginLeft={['auto', 8]} />
-```
-
-### Padding
-
-The padding props work very similarly to margin. The padding props `padding`, `paddingTop`, `paddingRight`, `paddingBottom`, and `paddingLeft` can be used to set the paddings of the `Box` component. All of the padding props accept [responsive props](#responsive-props) in the form of array props
-
-Accepted props are: `0, 1, 2, 4, 6, 8, 9, 10, 12` or array of these values
-
-<Canvas>
-  <Story id="ui-components-ui-box-box-stories-js--padding" />
-</Canvas>
-
-```jsx
-<Box padding={4} />
-<Box paddingTop={4} />
-<Box paddingRight={4} />
-<Box paddingBottom={4} />
-<Box paddingLeft={4} />
-
-// Responsive props
-<Box padding={[4, 8]} />
-<Box paddingTop={[4, 8]} />
-<Box paddingRight={[4, 8]} />
-<Box paddingBottom={[4, 8]} />
-<Box paddingLeft={[4, 8]} />
-```
-
-### Display
-
-The `display` prop can be used to set the display of the `Box` component. All of the display props accept [responsive props](#responsive-props) in the form of array props.
-
-Accepted props imported from the design system `DISPLAY` const are:
-
-- `DISPLAY.BLOCK`
-- `DISPLAY.FLEX`
-- `DISPLAY.GRID`
-- `DISPLAY.INLINE_BLOCK`
-- `DISPLAY.INLINE_FLEX`
-- `DISPLAY.INLINE_GRID`
-- `DISPLAY.INLINE`
-- `DISPLAY.LIST_ITEM`
-- `DISPLAY.NONE`
-
-or array of these values.
-
-```jsx
-import { DISPLAY } from '../../../helpers/constants/design-system';
-import Box from '../ui/box';
-
-
-
-<Box display={DISPLAY.BLOCK} />
-<Box display={DISPLAY.FLEX} />
-<Box display={DISPLAY.GRID} />
-<Box display={DISPLAY.INLINE_BLOCK} />
-<Box display={DISPLAY.INLINE_FLEX} />
-<Box display={DISPLAY.INLINE} />
-<Box display={DISPLAY.NONE} />
-```
-
 ### Background Color
 
-Use the `backgroundColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change background color. The `backgroundColor` prop accepts [responsive props](#responsive-props) in the form of array props.
-
-````jsx
+Use the `backgroundColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change background color.
 
 <Canvas>
   <Story id="ui-components-ui-box-box-stories-js--background-color" />
@@ -151,11 +66,11 @@ import Box from '../ui/box';
 <Box backgroundColor={COLORS.BACKGROUND_DEFAULT}>
   <Typography color={COLORS.TEXT_DEFAULT}>COLORS.BACKGROUND_DEFAULT</Typography>
 </Box>;
-````
+```
 
 ### Border Color
 
-Use the `borderColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change border color. The `borderColor` prop accepts [responsive props](#responsive-props) in the form of array props.
+Use the `borderColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change border color
 
 <Canvas>
   <Story id="ui-components-ui-box-box-stories-js--border-color" />
@@ -176,63 +91,3 @@ import Box from '../ui/box';
   <Typography color={COLORS.TEXT_DEFAULT}>COLORS.BORDER_DEFAULT</Typography>
 </Box>;
 ```
-
-### Responsive Props
-
-The box component provides a responsive props api in the form of array props. Array props are inspired by [styled-systems array props](https://styled-system.com/guides/array-props). The responsive props follow a mobile first methodology with the first item in the array applying the style to the base level size e.g. `0px` and up. The second item overwrites the first items styles at the next breakpoint.
-
-- All Box props accept the responsive props format
-- To skip a breakpoint use `null` as the skipped item's value e.g. `<Box display={['display', null, ;flex']} />`
-
-```
-// the responsive props
-<Box display={['block', 'flex']} />
-
-// is equivalent to the css
-.box {
-  display: block;
-
-  @media screen and (max-width: $breakpoint-sm) {
-    display: flex;
-  }
-}
-```
-
-<Canvas>
-  <Story id="ui-components-ui-box-box-stories-js--responsive-props" />
-</Canvas>
-
-```jsx
-import { COLORS } from '../../../helpers/constants/design-system';
-import Box from '../ui/box';
-
-<Box
-  padding={[2, 4]}
-  gap={[2, 4]}
-  display={['flex']}
-  flexDirection={['column', 'row']}
-  borderColor={COLORS.BORDER_DEFAULT}
->
-  <Box
-    padding={[4, 8]}
-    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-    borderColor={COLORS.BORDER_MUTED}
-  >
-    responsive
-  </Box>
-  <Box
-    padding={[4, 8]}
-    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-    borderColor={COLORS.BORDER_MUTED}
-  >
-    props
-  </Box>
-  <Box
-    padding={[4, 8]}
-    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-    borderColor={COLORS.BORDER_MUTED}
-  >
-    example
-  </Box>
-</Box>;
-```
diff --git a/ui/components/ui/box/box.js b/ui/components/ui/box/box.js
index 713b2d03f71c..73dbb37fe551 100644
--- a/ui/components/ui/box/box.js
+++ b/ui/components/ui/box/box.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import { memoize } from 'lodash';
 import {
   ALIGN_ITEMS,
   BLOCK_SIZES,
@@ -13,12 +12,26 @@ import {
   TEXT_ALIGN,
   FLEX_DIRECTION,
   FLEX_WRAP,
-  BREAKPOINTS,
 } from '../../../helpers/constants/design-system';
 
-const BASE_CLASS_NAME = 'box';
-const Sizes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
-export const BackgroundColors = [
+const ValidSize = PropTypes.oneOf([
+  0,
+  1,
+  2,
+  3,
+  4,
+  5,
+  6,
+  7,
+  8,
+  9,
+  10,
+  11,
+  12,
+  'auto',
+]);
+
+export const ValidBackgroundColors = [
   COLORS.BACKGROUND_DEFAULT,
   COLORS.BACKGROUND_ALTERNATIVE,
   COLORS.OVERLAY_DEFAULT,
@@ -54,7 +67,8 @@ export const BackgroundColors = [
   COLORS.TRANSPARENT,
   COLORS.LOCALHOST,
 ];
-export const BorderColors = [
+
+export const ValidBorderColors = [
   COLORS.BORDER_DEFAULT,
   COLORS.BORDER_MUTED,
   COLORS.PRIMARY_DEFAULT,
@@ -90,133 +104,55 @@ export const BorderColors = [
   COLORS.LOCALHOST,
 ];
 
-const ValidSize = PropTypes.oneOf(Sizes);
-const ValidSizeAndAuto = PropTypes.oneOf([...Sizes, 'auto']);
-const ValidBackgroundColors = PropTypes.oneOf(BackgroundColors);
-const ValidBorderColors = PropTypes.oneOf(BorderColors);
-
 const ArrayOfValidSizes = PropTypes.arrayOf(ValidSize);
 export const MultipleSizes = PropTypes.oneOfType([
   ValidSize,
   ArrayOfValidSizes,
 ]);
 
-const ArrayOfValidSizesAndAuto = PropTypes.arrayOf(ValidSizeAndAuto);
-export const MultipleSizesAndAuto = PropTypes.oneOfType([
-  ValidSizeAndAuto,
-  ArrayOfValidSizesAndAuto,
-]);
-
-const ArrayOfValidBorderColors = PropTypes.arrayOf(ValidBorderColors);
-export const MultipleBorderColors = PropTypes.oneOfType([
-  ValidBorderColors,
-  ArrayOfValidBorderColors,
-]);
-
-const ArrayOfValidBackgroundColors = PropTypes.arrayOf(ValidBackgroundColors);
-export const MultipleBackgroundColors = PropTypes.oneOfType([
-  ValidBackgroundColors,
-  ArrayOfValidBackgroundColors,
-]);
-
-function isValidSize(type, value) {
-  // Only margin types allow 'auto'
-  return (
-    typeof value === 'number' ||
-    ((type === 'margin' ||
-      type === 'margin-top' ||
-      type === 'margin-right' ||
-      type === 'margin-bottom' ||
-      type === 'margin-left') &&
-      value === 'auto')
-  );
+function isValidValue(type, value) {
+  // for now only margin type can have 'auto'
+  return typeof value === 'number' || (type === 'margin' && value === 'auto');
 }
 
-function isValidString(type, value) {
-  return typeof type === 'string' && typeof value === 'string';
-}
+function generateSizeClasses(baseClass, type, main, top, right, bottom, left) {
+  const arr = Array.isArray(main) ? main : [];
+  const singleDigit = Array.isArray(main) ? undefined : main;
+  if (Array.isArray(main) && ![2, 3, 4].includes(main.length)) {
+    throw new Error(
+      `Expected prop ${type} to have length between 2 and 4, received ${main.length}`,
+    );
+  }
 
-/**
- * Generate classnames
- * Generates classnames for different utility styles
- * Also accepts responsive props in the form of an array
- * Maps responsive props to mobile first breakpoints
- *
- * @param {string} type - The style declaration type "margin", "margin-top", "padding", "display" etc
- * @param {array || number || string} value - prop value being passed in array props are responsive props
- * @param {*} validatorFn - The validation function for each type of value
- * @returns
- */
+  const isHorizontalAndVertical = arr.length === 2;
+  const isTopHorizontalAndBottom = arr.length === 3;
+  const isAllFour = arr.length === 4;
+  const hasAtLeastTwo = arr.length >= 2;
+  const hasAtLeastThree = arr.length >= 3;
 
-const generateClassNames = memoize(
-  (type, value, validatorFn) => {
-    // if value does not exist return null
-    if (!value) {
-      return null;
-    }
-    const classesObject = {};
-    // if value is an array with single item e.g. marginTop={[1]}
-    const singleArrayItemProp =
-      Array.isArray(value) && value.length === 1 ? value[0] : undefined;
-    // if value single value e.g. marginTop={1}
-    const singleValueProp =
-      (!Array.isArray(value) && typeof value === 'string') ||
-      typeof value === 'number'
-        ? value
-        : undefined;
-    // single digit equals single value or single array item
-    const singleValue = singleValueProp || singleArrayItemProp;
-    // 0 is an acceptable value but is falsy in js
-    if (singleValue || singleValue === 0) {
-      // add base style without any breakpoint prefixes to classObject
-      classesObject[`${BASE_CLASS_NAME}--${type}-${singleValue}`] = validatorFn(
-        type,
-        singleValue,
-      );
-    } else {
-      // If array with more than one item
-      switch (value.length) {
-        case 4:
-          // add base/sm/md/lg
-          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
-            value[0] && validatorFn(type, value[0]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
-          ] = value[1] && validatorFn(type, value[1]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[2]}:${type}-${value[2]}`
-          ] = value[2] && validatorFn(type, value[2]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[3]}:${type}-${value[3]}`
-          ] = value[3] && validatorFn(type, value[3]);
-          break;
-        case 3:
-          // add base/sm/md
-          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
-            value[0] && validatorFn(type, value[0]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
-          ] = value[1] && validatorFn(type, value[1]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[2]}:${type}-${value[2]}`
-          ] = value[2] && validatorFn(type, value[2]);
-          break;
-        case 2:
-          // add base/sm
-          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
-            value[0] && validatorFn(type, value[0]);
-          classesObject[
-            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
-          ] = value[1] && validatorFn(type, value[1]);
-          break;
-        default:
-          console.log(`Invalid array prop length: ${value.length}`);
-      }
-    }
-    return classesObject;
-  },
-  (type, value) => [type, value],
-);
+  return {
+    [`${baseClass}--${type}-${singleDigit}`]: isValidValue(type, singleDigit),
+    [`${baseClass}--${type}-top-${top}`]: isValidValue(type, top),
+    [`${baseClass}--${type}-right-${right}`]: isValidValue(type, right),
+    [`${baseClass}--${type}-bottom-${bottom}`]: isValidValue(type, bottom),
+    [`${baseClass}--${type}-left-${left}`]: isValidValue(type, left),
+    // As long as an array of length >= 2 has been provided, the first number
+    // will always be for the top value.
+    [`${baseClass}--${type}-top-${arr?.[0]}`]: hasAtLeastTwo,
+    // As long as an array of length >= 2 has been provided, the second number
+    // will always be for the right value.
+    [`${baseClass}--${type}-right-${arr?.[1]}`]: hasAtLeastTwo,
+    // If an array has 2 values, the first number is the bottom value. If
+    // instead if has 3 or more values, the third number will be the bottom.
+    [`${baseClass}--${type}-bottom-${arr?.[2]}`]: hasAtLeastThree,
+    [`${baseClass}--${type}-bottom-${arr?.[0]}`]: isHorizontalAndVertical,
+    // If an array has 2 or 3 values, the second number will be the left value
+    [`${baseClass}--${type}-left-${arr?.[1]}`]:
+      isHorizontalAndVertical || isTopHorizontalAndBottom,
+    // If an array has 4 values, the fourth number is the left value
+    [`${baseClass}--${type}-left-${arr?.[3]}`]: isAllFour,
+  };
+}
 
 export default function Box({
   padding,
@@ -246,57 +182,56 @@ export default function Box({
   className,
   backgroundColor,
 }) {
-  const boxClassName = classnames(
-    BASE_CLASS_NAME,
-    className,
+  const boxClassName = classnames('box', className, {
+    // ---Borders---
+    // if borderWidth or borderColor is supplied w/o style, default to solid
+    'box--border-style-solid':
+      !borderStyle && (Boolean(borderWidth) || Boolean(borderColor)),
+    // if borderColor supplied w/o width, default to 1
+    'box--border-size-1': !borderWidth && Boolean(borderColor),
+    [`box--border-color-${borderColor}`]: Boolean(borderColor),
+    [`box--rounded-${borderRadius}`]: Boolean(borderRadius),
+    [`box--border-style-${borderStyle}`]: Boolean(borderStyle),
+    [`box--border-size-${borderWidth}`]: Boolean(borderWidth),
     // Margin
-    margin && generateClassNames('margin', margin, isValidSize),
-    marginTop && generateClassNames('margin-top', marginTop, isValidSize),
-    marginRight && generateClassNames('margin-right', marginRight, isValidSize),
-    marginBottom &&
-      generateClassNames('margin-bottom', marginBottom, isValidSize),
-    marginLeft && generateClassNames('margin-left', marginLeft, isValidSize),
+    ...generateSizeClasses(
+      'box',
+      'margin',
+      margin,
+      marginTop,
+      marginRight,
+      marginBottom,
+      marginLeft,
+    ),
     // Padding
-    padding && generateClassNames('padding', padding, isValidSize),
-    paddingTop && generateClassNames('padding-top', paddingTop, isValidSize),
-    paddingRight &&
-      generateClassNames('padding-right', paddingRight, isValidSize),
-    paddingBottom &&
-      generateClassNames('padding-bottom', paddingBottom, isValidSize),
-    paddingLeft && generateClassNames('padding-left', paddingLeft, isValidSize),
-    display && generateClassNames('display', display, isValidString),
-    gap && generateClassNames('gap', gap, isValidSize),
-    flexDirection &&
-      generateClassNames('flex-direction', flexDirection, isValidString),
-    flexWrap && generateClassNames('flex-wrap', flexWrap, isValidString),
-    justifyContent &&
-      generateClassNames('justify-content', justifyContent, isValidString),
-    alignItems && generateClassNames('align-items', alignItems, isValidString),
-    textAlign && generateClassNames('text-align', textAlign, isValidString),
-    width && generateClassNames('width', width, isValidString),
-    height && generateClassNames('height', height, isValidString),
-    backgroundColor &&
-      generateClassNames('background-color', backgroundColor, isValidString),
-    borderRadius && generateClassNames('rounded', borderRadius, isValidString),
-    borderStyle &&
-      generateClassNames('border-style', borderStyle, isValidString),
-    borderColor &&
-      generateClassNames('border-color', borderColor, isValidString),
-    borderWidth && generateClassNames('border-width', borderWidth, isValidSize),
-    {
-      // Auto applied classes
-      // ---Borders---
-      // if borderWidth or borderColor is supplied w/o style, default to solid
-      'box--border-style-solid':
-        !borderStyle && (Boolean(borderWidth) || Boolean(borderColor)),
-      // if borderColor supplied w/o width, default to 1
-      'box--border-width-1': !borderWidth && Boolean(borderColor),
-      // ---Flex/Grid alignment---
-      // if justifyContent or alignItems supplied w/o display, default to flex
-      'box--display-flex':
-        !display && (Boolean(justifyContent) || Boolean(alignItems)),
-    },
-  );
+    ...generateSizeClasses(
+      'box',
+      'padding',
+      padding,
+      paddingTop,
+      paddingRight,
+      paddingBottom,
+      paddingLeft,
+    ),
+    // ---Flex/Grid alignment---
+    // if justifyContent or alignItems supplied w/o display, default to flex
+    'box--display-flex':
+      !display && (Boolean(justifyContent) || Boolean(alignItems)),
+    [`box--justify-content-${justifyContent}`]: Boolean(justifyContent),
+    [`box--align-items-${alignItems}`]: Boolean(alignItems),
+    [`box--flex-direction-${flexDirection}`]: Boolean(flexDirection),
+    [`box--flex-wrap-${flexWrap}`]: Boolean(flexWrap),
+    // text align
+    [`box--text-align-${textAlign}`]: Boolean(textAlign),
+    // display
+    [`box--display-${display}`]: Boolean(display),
+    // width & height
+    [`box--width-${width}`]: Boolean(width),
+    [`box--height-${height}`]: Boolean(height),
+    // background
+    [`box--background-color-${backgroundColor}`]: Boolean(backgroundColor),
+    ...generateSizeClasses('box', 'gap', gap),
+  });
   // Apply Box styles to any other component using function pattern
   if (typeof children === 'function') {
     return children(boxClassName);
@@ -306,62 +241,29 @@ export default function Box({
 
 Box.propTypes = {
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  flexDirection: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(FLEX_DIRECTION)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(FLEX_DIRECTION))),
-  ]),
-  flexWrap: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(FLEX_WRAP)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(FLEX_WRAP))),
-  ]),
-  gap: MultipleSizes,
-  margin: MultipleSizesAndAuto,
-  marginTop: MultipleSizesAndAuto,
-  marginBottom: MultipleSizesAndAuto,
-  marginRight: MultipleSizesAndAuto,
-  marginLeft: MultipleSizesAndAuto,
+  flexDirection: PropTypes.oneOf(Object.values(FLEX_DIRECTION)),
+  flexWrap: PropTypes.oneOf(Object.values(FLEX_WRAP)),
+  gap: ValidSize,
+  margin: MultipleSizes,
+  marginTop: ValidSize,
+  marginBottom: ValidSize,
+  marginRight: ValidSize,
+  marginLeft: ValidSize,
   padding: MultipleSizes,
-  paddingTop: MultipleSizes,
-  paddingBottom: MultipleSizes,
-  paddingRight: MultipleSizes,
-  paddingLeft: MultipleSizes,
-  borderColor: MultipleBorderColors,
-  borderWidth: PropTypes.oneOfType([
-    PropTypes.number,
-    PropTypes.arrayOf(PropTypes.number),
-  ]),
-  borderRadius: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(SIZES)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(SIZES))),
-  ]),
-  borderStyle: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(BORDER_STYLE)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BORDER_STYLE))),
-  ]),
-  alignItems: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(ALIGN_ITEMS)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(ALIGN_ITEMS))),
-  ]),
-  justifyContent: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(JUSTIFY_CONTENT)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(JUSTIFY_CONTENT))),
-  ]),
-  textAlign: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(TEXT_ALIGN)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(TEXT_ALIGN))),
-  ]),
-  display: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(DISPLAY)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(DISPLAY))),
-  ]),
-  width: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(BLOCK_SIZES)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BLOCK_SIZES))),
-  ]),
-  height: PropTypes.oneOfType([
-    PropTypes.oneOf(Object.values(BLOCK_SIZES)),
-    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BLOCK_SIZES))),
-  ]),
-  backgroundColor: MultipleBackgroundColors,
+  paddingTop: ValidSize,
+  paddingBottom: ValidSize,
+  paddingRight: ValidSize,
+  paddingLeft: ValidSize,
+  borderColor: PropTypes.oneOf(Object.values(ValidBorderColors)),
+  borderWidth: PropTypes.number,
+  borderRadius: PropTypes.oneOf(Object.values(SIZES)),
+  borderStyle: PropTypes.oneOf(Object.values(BORDER_STYLE)),
+  alignItems: PropTypes.oneOf(Object.values(ALIGN_ITEMS)),
+  justifyContent: PropTypes.oneOf(Object.values(JUSTIFY_CONTENT)),
+  textAlign: PropTypes.oneOf(Object.values(TEXT_ALIGN)),
+  display: PropTypes.oneOf(Object.values(DISPLAY)),
+  width: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
+  height: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
+  backgroundColor: PropTypes.oneOf(Object.values(ValidBackgroundColors)),
   className: PropTypes.string,
 };
diff --git a/ui/components/ui/box/box.scss b/ui/components/ui/box/box.scss
index edafb9fcbbf8..e15c4979e753 100644
--- a/ui/components/ui/box/box.scss
+++ b/ui/components/ui/box/box.scss
@@ -15,16 +15,6 @@ $attributesToApplyExtraProperties: margin;
         #{$attribute}: utilities.get-spacing($size);
       }
     }
-    // breakpoint classes
-    @each $breakpoint, $min-width in $screen-sizes-map {
-      @each $size in design-system.$sizes-numeric {
-        @media screen and (min-width: $min-width) {
-          &--#{$breakpoint}\:#{$attribute}-#{$size} {
-            #{$attribute}: utilities.get-spacing($size);
-          }
-        }
-      }
-    }
 
     @each $size in design-system.$sizes-numeric {
       @each $direction in design-system.$directions {
@@ -32,16 +22,6 @@ $attributesToApplyExtraProperties: margin;
           #{$attribute}-#{$direction}: utilities.get-spacing($size);
         }
       }
-      // breakpoint classes
-      @each $breakpoint, $min-width in $screen-sizes-map {
-        @each $direction in design-system.$directions {
-          @media screen and (min-width: $min-width) {
-            &--#{$breakpoint}\:#{$attribute}-#{$direction}-#{$size} {
-              #{$attribute}-#{$direction}: utilities.get-spacing($size);
-            }
-          }
-        }
-      }
     }
 
     @if list.index($attributesToApplyExtraProperties, $attribute) {
@@ -49,85 +29,34 @@ $attributesToApplyExtraProperties: margin;
         &--#{$attribute}-#{$property} {
           #{$attribute}: $property;
         }
-      }
 
-      @each $property in $extraProperties {
         @each $direction in design-system.$directions {
           &--#{$attribute}-#{$direction}-#{$property} {
             #{$attribute}-#{$direction}: $property;
           }
         }
       }
-
-      // breakpoint classes
-      @each $breakpoint, $min-width in $screen-sizes-map {
-        @each $property in $extraProperties {
-          @media screen and (min-width: $min-width) {
-            &--#{$breakpoint}\:#{$attribute}-#{$property} {
-              #{$attribute}: $property;
-            }
-          }
-
-          @each $direction in design-system.$directions {
-            @media screen and (min-width: $min-width) {
-              &--#{$breakpoint}\:#{$attribute}-#{$direction}-#{$property} {
-                #{$attribute}-#{$direction}: $property;
-              }
-            }
-          }
-        }
-      }
     }
   }
 
   // Borders
   @each $size in design-system.$sizes-numeric {
-    &--border-width-#{$size} {
+    &--border-size-#{$size} {
       border-width: #{$size}px;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $size in design-system.$sizes-numeric {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:border-width-#{$size} {
-          border-width: #{$size}px;
-        }
-      }
-    }
-  }
-  // border-color
+
   @each $variant, $color in design-system.$color-map {
     &--border-color-#{$variant} {
       border-color: var($color);
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $variant, $color in design-system.$color-map {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:border-color-#{$variant} {
-          border-color: var($color);
-        }
-      }
-    }
-  }
-  // border-style
+
   @each $border-style in design-system.$border-style {
     &--border-style-#{$border-style} {
       border-style: $border-style;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $border-style in design-system.$border-style {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:border-style-#{$border-style} {
-          border-style: $border-style;
-        }
-      }
-    }
-  }
 
   &--rounded-none {
     border-radius: 0;
@@ -153,140 +82,45 @@ $attributesToApplyExtraProperties: margin;
     border-radius: 0.75rem;
   }
 
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:rounded-none {
-        border-radius: 0;
-      }
-
-      &--#{$breakpoint}\:rounded-xs {
-        border-radius: 0.125rem;
-      }
-
-      &--#{$breakpoint}\:rounded-sm {
-        border-radius: 0.25rem;
-      }
-
-      &--#{$breakpoint}\:rounded-md {
-        border-radius: 0.375rem;
-      }
-
-      &--#{$breakpoint}\:rounded-lg {
-        border-radius: 0.5rem;
-      }
-
-      &--#{$breakpoint}\:rounded-xl {
-        border-radius: 0.75rem;
-      }
-    }
-  }
-
   // Display and Flex/Grid alignment
   @each $display in design-system.$display {
     &--display-#{$display} {
       display: $display;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $display in design-system.$display {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:display-#{$display} {
-          display: $display;
-        }
-      }
-    }
-  }
 
   @each $alignment in design-system.$align-items {
     &--align-items-#{$alignment} {
       align-items: $alignment;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $alignment in design-system.$align-items {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:align-items-#{$alignment} {
-          align-items: $alignment;
-        }
-      }
-    }
-  }
 
   @each $justification in design-system.$justify-content {
     &--justify-content-#{$justification} {
       justify-content: $justification;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $justification in design-system.$justify-content {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:justify-content-#{$justification} {
-          justify-content: $justification;
-        }
-      }
-    }
-  }
 
   @each $direction in design-system.$flex-direction {
     &--flex-direction-#{$direction} {
       flex-direction: $direction;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $direction in design-system.$flex-direction {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:flex-direction-#{$direction} {
-          flex-direction: $direction;
-        }
-      }
-    }
-  }
 
   @each $wrap in design-system.$flex-wrap {
     &--flex-wrap-#{$wrap} {
       flex-wrap: $wrap;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $wrap in design-system.$flex-wrap {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:flex-wrap-#{$wrap} {
-          flex-wrap: $wrap;
-        }
-      }
-    }
-  }
 
   // Width and Height
   &--width-full {
     width: 100%;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:width-full {
-        width: 100%;
-      }
-    }
-  }
 
   &--height-full {
     height: 100%;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:height-full {
-        height: 100%;
-      }
-    }
-  }
 
   @each $fraction, $value in design-system.$fractions {
     &--width-#{$fraction} {
@@ -297,91 +131,30 @@ $attributesToApplyExtraProperties: margin;
       height: $value;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $fraction, $value in design-system.$fractions {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:width-#{$fraction} {
-          width: $value;
-        }
-        &--#{$breakpoint}\:height-#{$fraction} {
-          height: $value;
-        }
-      }
-    }
-  }
 
   &--height-screen {
     height: 100vh;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:height-screen {
-        height: 100vh;
-      }
-    }
-  }
 
   &--width-screen {
     width: 100vw;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:width-screen {
-        width: 100vw;
-      }
-    }
-  }
 
   &--height-max {
     height: max-content;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:height-max {
-        height: max-content;
-      }
-    }
-  }
 
   &--width-max {
     width: max-content;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:height-max {
-        height: max-content;
-      }
-    }
-  }
 
   &--height-min {
     height: min-content;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:height-min {
-        height: min-content;
-      }
-    }
-  }
 
   &--width-min {
     width: min-content;
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @media screen and (min-width: $min-width) {
-      &--#{$breakpoint}\:width-min {
-        width: min-content;
-      }
-    }
-  }
 
   // text
   @each $alignment in design-system.$text-align {
@@ -389,16 +162,6 @@ $attributesToApplyExtraProperties: margin;
       text-align: $alignment;
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $alignment in design-system.$text-align {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\:text-align-#{$alignment} {
-          text-align: $alignment;
-        }
-      }
-    }
-  }
 
   // background
   @each $variant, $color in design-system.$color-map {
@@ -406,14 +169,4 @@ $attributesToApplyExtraProperties: margin;
       background-color: var($color);
     }
   }
-  // breakpoint classes
-  @each $breakpoint, $min-width in $screen-sizes-map {
-    @each $variant, $color in design-system.$color-map {
-      @media screen and (min-width: $min-width) {
-        &--#{$breakpoint}\background-color-#{$variant} {
-          background-color: var($color);
-        }
-      }
-    }
-  }
 }
diff --git a/ui/components/ui/box/box.stories.js b/ui/components/ui/box/box.stories.js
index e30e97db8a50..7044e48e721a 100644
--- a/ui/components/ui/box/box.stories.js
+++ b/ui/components/ui/box/box.stories.js
@@ -6,17 +6,15 @@ import {
   COLORS,
   DISPLAY,
   JUSTIFY_CONTENT,
-  SIZES,
   TEXT_ALIGN,
-  FLEX_DIRECTION,
-  FLEX_WRAP,
 } from '../../../helpers/constants/design-system';
 
 import Typography from '../typography';
 
-import Box, { BackgroundColors, BorderColors } from './box';
+import Box from './box';
 
 import README from './README.mdx';
+import { ValidBackgroundColors, ValidBorderColors } from '.';
 
 const sizeKnobOptions = [undefined, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const marginSizeKnobOptions = [...sizeKnobOptions, 'auto'];
@@ -60,44 +58,18 @@ export default {
       table: { category: 'display' },
     },
     backgroundColor: {
-      options: BackgroundColors,
+      options: ValidBackgroundColors,
       control: 'select',
       table: {
         category: 'background',
       },
     },
-    borderStyle: {
-      options: Object.values(BORDER_STYLE),
-      control: 'select',
-      defaultValue: BORDER_STYLE.DASHED,
-      table: { category: 'border' },
-    },
-    borderWidth: {
-      options: sizeKnobOptions,
-      control: 'number',
-      table: { category: 'border' },
-    },
     borderColor: {
-      options: BorderColors,
+      options: ValidBorderColors,
       control: 'select',
       defaultValue: COLORS.BORDER_DEFAULT,
       table: { category: 'border' },
     },
-    borderRadius: {
-      options: Object.values(SIZES),
-      control: 'select',
-      table: { category: 'border' },
-    },
-    flexWrap: {
-      options: Object.values(FLEX_WRAP),
-      control: 'select',
-      table: { category: 'display' },
-    },
-    flexDirection: {
-      options: Object.values(FLEX_DIRECTION),
-      control: 'select',
-      table: { category: 'display' },
-    },
     justifyContent: {
       options: Object.values(JUSTIFY_CONTENT),
       control: 'select',
@@ -114,7 +86,7 @@ export default {
       options: Object.values(TEXT_ALIGN),
       control: 'select',
       defaultValue: TEXT_ALIGN.LEFT,
-      table: { category: 'text' },
+      table: { category: 'left' },
     },
     margin: {
       options: marginSizeKnobOptions,
@@ -166,6 +138,18 @@ export default {
       control: 'select',
       table: { category: 'padding' },
     },
+    borderStyle: {
+      options: Object.values(BORDER_STYLE),
+      control: 'select',
+      defaultValue: BORDER_STYLE.DASHED,
+      table: { category: 'border' },
+    },
+    borderWidth: {
+      options: sizeKnobOptions,
+      control: 'number',
+      defaultValue: 1,
+      table: { category: 'border' },
+    },
   },
 };
 
@@ -174,7 +158,7 @@ export const DefaultStory = (args) => {
   const children = [];
   for (let $i = 0; $i < items; $i++) {
     children.push(
-      <img key={$i} width={size} height={size} src="./images/eth_logo.svg" />,
+      <img width={size} height={size} src="./images/eth_logo.svg" />,
     );
   }
   return <Box {...rest}>{children}</Box>;
@@ -182,50 +166,6 @@ export const DefaultStory = (args) => {
 
 DefaultStory.storyName = 'Default';
 
-export const Margin = () => {
-  return (
-    <Box borderColor={COLORS.BORDER_MUTED}>
-      <Box
-        margin={2}
-        padding={4}
-        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-        borderColor={COLORS.BORDER_MUTED}
-      >
-        Static margin
-      </Box>
-      <Box
-        margin={[2, 4, 8, 12]}
-        padding={[4]}
-        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-        borderColor={COLORS.BORDER_MUTED}
-      >
-        Responsive margin changes based on breakpoint
-      </Box>
-    </Box>
-  );
-};
-
-export const Padding = () => {
-  return (
-    <Box borderColor={COLORS.BORDER_MUTED}>
-      <Box
-        padding={4}
-        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-        borderColor={COLORS.BORDER_MUTED}
-      >
-        Static padding
-      </Box>
-      <Box
-        padding={[4, 8, 12]}
-        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-        borderColor={COLORS.BORDER_MUTED}
-      >
-        Responsive padding changes based on breakpoint
-      </Box>
-    </Box>
-  );
-};
-
 export const BackgroundColor = () => {
   return (
     <>
@@ -363,46 +303,3 @@ export const BorderColor = () => {
     </>
   );
 };
-
-export const ResponsiveProps = () => {
-  return (
-    <>
-      <Typography boxProps={{ marginBottom: 4 }}>
-        Responsive props example. Stacks vertically on small screens and aligns
-        horizontally on large screens. Padding is also adjusted between small
-        and large screens
-      </Typography>
-      <Box
-        marginTop="auto"
-        marginBottom={[0]}
-        padding={[2, 4]}
-        gap={[2, 4]}
-        display={['flex', null, null, 'none']}
-        flexDirection={['column', 'row']}
-        borderColor={COLORS.BORDER_DEFAULT}
-      >
-        <Box
-          padding={[4, 8]}
-          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-          borderColor={COLORS.BORDER_MUTED}
-        >
-          responsive
-        </Box>
-        <Box
-          padding={[4, 8]}
-          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-          borderColor={COLORS.BORDER_MUTED}
-        >
-          props
-        </Box>
-        <Box
-          padding={[4, 8]}
-          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
-          borderColor={COLORS.BORDER_MUTED}
-        >
-          example
-        </Box>
-      </Box>
-    </>
-  );
-};
diff --git a/ui/components/ui/box/box.test.js b/ui/components/ui/box/box.test.js
deleted file mode 100644
index aabb49c32fa9..000000000000
--- a/ui/components/ui/box/box.test.js
+++ /dev/null
@@ -1,732 +0,0 @@
-import * as React from 'react';
-import { render } from '@testing-library/react';
-import {
-  BORDER_STYLE,
-  COLORS,
-  DISPLAY,
-  FLEX_DIRECTION,
-  FLEX_WRAP,
-  ALIGN_ITEMS,
-  JUSTIFY_CONTENT,
-  TEXT_ALIGN,
-  SIZES,
-  BLOCK_SIZES,
-} from '../../../helpers/constants/design-system';
-import Box from '.';
-
-describe('Box', () => {
-  it('should render the Box without crashing', () => {
-    const { getByText } = render(<Box>Box content</Box>);
-
-    expect(getByText('Box content')).toBeDefined();
-  });
-  describe('margin', () => {
-    it('should render the Box with the margin class', () => {
-      const { getByText } = render(<Box margin={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-1');
-    });
-    it('should render the Box with the margin auto class', () => {
-      const { getByText } = render(<Box margin="auto">Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-auto');
-    });
-    it('should render the Box with the responsive margin classes', () => {
-      const { getByText } = render(
-        <Box margin={[1, 'auto', 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--margin-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:margin-auto');
-      expect(getByText('Box content')).toHaveClass('box--md:margin-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:margin-4');
-    });
-    it('should render the Box with the marginTop class', () => {
-      const { getByText } = render(<Box marginTop={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-top-1');
-    });
-    it('should render the Box with the marginTop auto class', () => {
-      const { getByText } = render(<Box marginTop="auto">Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-top-auto');
-    });
-    it('should render the Box with the responsive marginTop classes', () => {
-      const { getByText } = render(
-        <Box marginTop={[1, 'auto', 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--margin-top-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:margin-top-auto');
-      expect(getByText('Box content')).toHaveClass('box--md:margin-top-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:margin-top-4');
-    });
-    it('should render the Box with the marginRight class', () => {
-      const { getByText } = render(<Box marginRight={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-right-1');
-    });
-    it('should render the Box with the marginRight auto class', () => {
-      const { getByText } = render(<Box marginRight="auto">Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-right-auto');
-    });
-    it('should render the Box with the responsive marginRight classes', () => {
-      const { getByText } = render(
-        <Box marginRight={[1, 'auto', 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--margin-right-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:margin-right-auto');
-      expect(getByText('Box content')).toHaveClass('box--md:margin-right-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:margin-right-4');
-    });
-    it('should render the Box with the marginBottom class', () => {
-      const { getByText } = render(<Box marginBottom={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-bottom-1');
-    });
-    it('should render the Box with the responsive marginBottom classes', () => {
-      const { getByText } = render(
-        <Box marginBottom={[1, 'auto', 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--margin-bottom-1');
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:margin-bottom-auto',
-      );
-      expect(getByText('Box content')).toHaveClass('box--md:margin-bottom-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:margin-bottom-4');
-    });
-    it('should render the Box with the marginLeft class', () => {
-      const { getByText } = render(<Box marginLeft={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--margin-left-1');
-    });
-    it('should render the Box with the responsive marginLeft classes', () => {
-      const { getByText } = render(
-        <Box marginLeft={[1, 'auto', 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--margin-left-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:margin-left-auto');
-      expect(getByText('Box content')).toHaveClass('box--md:margin-left-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:margin-left-4');
-    });
-  });
-
-  describe('padding', () => {
-    it('should render the Box with the padding class with singular value prop or one item array prop', () => {
-      const { getByText } = render(
-        <>
-          <Box padding={1}>Box content</Box>
-          <Box padding={[1]}>Box content one item array</Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--padding-1');
-      expect(getByText('Box content one item array')).toHaveClass(
-        'box--padding-1',
-      );
-    });
-    it('should render the Box with the responsive padding classes', () => {
-      const { getByText } = render(
-        <Box padding={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--padding-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:padding-2');
-      expect(getByText('Box content')).toHaveClass('box--md:padding-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:padding-4');
-    });
-    it('should render the Box with the paddingTop class', () => {
-      const { getByText } = render(<Box paddingTop={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--padding-top-1');
-    });
-    it('should render the Box with the responsive paddingTop classes', () => {
-      const { getByText } = render(
-        <Box paddingTop={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--padding-top-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:padding-top-2');
-      expect(getByText('Box content')).toHaveClass('box--md:padding-top-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:padding-top-4');
-    });
-    it('should render the Box with the paddingRight class', () => {
-      const { getByText } = render(<Box paddingRight={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--padding-right-1');
-    });
-    it('should render the Box with the responsive paddingRight classes', () => {
-      const { getByText } = render(
-        <Box paddingRight={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--padding-right-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:padding-right-2');
-      expect(getByText('Box content')).toHaveClass('box--md:padding-right-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:padding-right-4');
-    });
-    it('should render the Box with the paddingBottom class', () => {
-      const { getByText } = render(<Box paddingBottom={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--padding-bottom-1');
-    });
-    it('should render the Box with the responsive paddingBottom classes', () => {
-      const { getByText } = render(
-        <Box paddingBottom={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--padding-bottom-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:padding-bottom-2');
-      expect(getByText('Box content')).toHaveClass('box--md:padding-bottom-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:padding-bottom-4');
-    });
-    it('should render the Box with the paddingLeft class', () => {
-      const { getByText } = render(<Box paddingLeft={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--padding-left-1');
-    });
-    it('should render the Box with the responsive paddingLeft classes', () => {
-      const { getByText } = render(
-        <Box paddingLeft={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--padding-left-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:padding-left-2');
-      expect(getByText('Box content')).toHaveClass('box--md:padding-left-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:padding-left-4');
-    });
-  });
-  describe('border', () => {
-    it('should render the Box with the borderWidth class', () => {
-      const { getByText } = render(<Box borderWidth={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--border-width-1');
-    });
-    it('should render the Box with the responsive borderWidth classes', () => {
-      const { getByText } = render(
-        <Box borderWidth={[1, 2, 3, 4]}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--border-width-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:border-width-2');
-      expect(getByText('Box content')).toHaveClass('box--md:border-width-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:border-width-4');
-    });
-    it('should render the Box with the borderColor class', () => {
-      const { getByText } = render(
-        <Box borderColor={COLORS.BORDER_DEFAULT}>Box content</Box>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--border-color-border-default',
-      );
-    });
-    it('should render the Box with the responsive borderColor classes', () => {
-      const { getByText } = render(
-        <Box
-          borderColor={[
-            COLORS.BORDER_DEFAULT,
-            COLORS.ERROR_DEFAULT,
-            COLORS.INFO_DEFAULT,
-            COLORS.WARNING_DEFAULT,
-          ]}
-        >
-          Box content
-        </Box>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--border-color-border-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:border-color-error-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--md:border-color-info-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:border-color-warning-default',
-      );
-    });
-    it('should render the Box with a borderStyle class', () => {
-      const { getByText } = render(
-        <Box borderStyle={BORDER_STYLE.SOLID}>Box content</Box>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--border-style-solid');
-    });
-    it('should render the Box with the responsive borderStyle classes', () => {
-      const { getByText } = render(
-        <Box
-          borderStyle={[
-            BORDER_STYLE.SOLID,
-            BORDER_STYLE.DASHED,
-            BORDER_STYLE.NONE,
-            BORDER_STYLE.DOTTED,
-          ]}
-        >
-          Box content
-        </Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--border-style-solid');
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:border-style-dashed',
-      );
-      expect(getByText('Box content')).toHaveClass('box--md:border-style-none');
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:border-style-dotted',
-      );
-    });
-    it('should render the Box with the borderRadius class', () => {
-      const { getByText } = render(
-        <Box borderRadius={SIZES.XS}>Box content</Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--rounded-xs');
-    });
-    it('should render the Box with the responsive borderRadius classes', () => {
-      const { getByText } = render(
-        <Box borderRadius={[SIZES.XS, SIZES.SM, SIZES.MD, SIZES.LG]}>
-          Box content
-        </Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--rounded-xs');
-      expect(getByText('Box content')).toHaveClass('box--sm:rounded-sm');
-      expect(getByText('Box content')).toHaveClass('box--md:rounded-md');
-      expect(getByText('Box content')).toHaveClass('box--lg:rounded-lg');
-    });
-  });
-  describe('display, gap, flexDirection, flexWrap, alignItems, justifyContent', () => {
-    it('should render the Box with the display classes', () => {
-      const { getByText } = render(
-        <>
-          <Box display={DISPLAY.BLOCK}>Box display-block</Box>
-          <Box display={DISPLAY.FLEX}>Box display-flex</Box>
-          <Box display={DISPLAY.GRID}>Box display-grid</Box>
-          <Box display={DISPLAY.INLINE}>Box display-inline</Box>
-          <Box display={DISPLAY.INLINE_BLOCK}>Box display-inline-block</Box>
-          <Box display={DISPLAY.INLINE_FLEX}>Box display-inline-flex</Box>
-          <Box display={DISPLAY.INLINE_GRID}>Box display-inline-grid</Box>
-          <Box display={DISPLAY.LIST_ITEM}>Box display-list-item</Box>
-          <Box display={DISPLAY.NONE}>Box display-none</Box>
-        </>,
-      );
-
-      expect(getByText('Box display-block')).toHaveClass('box--display-block');
-      expect(getByText('Box display-flex')).toHaveClass('box--display-flex');
-      expect(getByText('Box display-grid')).toHaveClass('box--display-grid');
-      expect(getByText('Box display-inline')).toHaveClass(
-        'box--display-inline',
-      );
-      expect(getByText('Box display-inline-block')).toHaveClass(
-        'box--display-inline-block',
-      );
-      expect(getByText('Box display-inline-flex')).toHaveClass(
-        'box--display-inline-flex',
-      );
-      expect(getByText('Box display-inline-grid')).toHaveClass(
-        'box--display-inline-grid',
-      );
-      expect(getByText('Box display-list-item')).toHaveClass(
-        'box--display-list-item',
-      );
-    });
-    it('should render the Box with the responsive display classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            display={[DISPLAY.BLOCK, DISPLAY.FLEX, DISPLAY.GRID, DISPLAY.NONE]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--display-block');
-      expect(getByText('Box content')).toHaveClass('box--sm:display-flex');
-      expect(getByText('Box content')).toHaveClass('box--md:display-grid');
-      expect(getByText('Box content')).toHaveClass('box--lg:display-none');
-    });
-    it('should render the Box with the gap class', () => {
-      const { getByText } = render(<Box gap={1}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--gap-1');
-    });
-    it('should render the Box with the responsive gap classes', () => {
-      const { getByText } = render(<Box gap={[1, 2, 3, 4]}>Box content</Box>);
-
-      expect(getByText('Box content')).toHaveClass('box--gap-1');
-      expect(getByText('Box content')).toHaveClass('box--sm:gap-2');
-      expect(getByText('Box content')).toHaveClass('box--md:gap-3');
-      expect(getByText('Box content')).toHaveClass('box--lg:gap-4');
-    });
-    it('should render the Box with the flexDirection classes', () => {
-      const { getByText } = render(
-        <>
-          <Box flexDirection={FLEX_DIRECTION.ROW}>Box flex-direction-row</Box>
-          <Box flexDirection={FLEX_DIRECTION.ROW_REVERSE}>
-            Box flex-direction-row-reverse
-          </Box>
-          <Box flexDirection={FLEX_DIRECTION.COLUMN}>
-            Box flex-direction-column
-          </Box>
-          <Box flexDirection={FLEX_DIRECTION.COLUMN_REVERSE}>
-            Box flex-direction-column-reverse
-          </Box>
-        </>,
-      );
-
-      expect(getByText('Box flex-direction-row')).toHaveClass(
-        'box--flex-direction-row',
-      );
-      expect(getByText('Box flex-direction-row-reverse')).toHaveClass(
-        'box--flex-direction-row-reverse',
-      );
-      expect(getByText('Box flex-direction-column')).toHaveClass(
-        'box--flex-direction-column',
-      );
-      expect(getByText('Box flex-direction-column-reverse')).toHaveClass(
-        'box--flex-direction-column-reverse',
-      );
-    });
-    it('should render the Box with the responsive flexDirection classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            flexDirection={[
-              FLEX_DIRECTION.ROW,
-              FLEX_DIRECTION.ROW_REVERSE,
-              FLEX_DIRECTION.COLUMN,
-              FLEX_DIRECTION.COLUMN_REVERSE,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--flex-direction-row');
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:flex-direction-row-reverse',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--md:flex-direction-column',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:flex-direction-column-reverse',
-      );
-    });
-    it('should render the Box with the flexWrap classes', () => {
-      const { getByText } = render(
-        <>
-          <Box flexWrap={FLEX_WRAP.WRAP}>Box flex-wrap-wrap</Box>
-          <Box flexWrap={FLEX_WRAP.WRAP_REVERSE}>
-            Box flex-wrap-wrap-reverse
-          </Box>
-          <Box flexWrap={FLEX_WRAP.NO_WRAP}>Box flex-wrap-nowrap</Box>
-        </>,
-      );
-
-      expect(getByText('Box flex-wrap-wrap')).toHaveClass(
-        'box--flex-wrap-wrap',
-      );
-      expect(getByText('Box flex-wrap-wrap-reverse')).toHaveClass(
-        'box--flex-wrap-wrap-reverse',
-      );
-      expect(getByText('Box flex-wrap-nowrap')).toHaveClass(
-        'box--flex-wrap-nowrap',
-      );
-    });
-    it('should render the Box with the responsive flexWrap classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            flexWrap={[
-              FLEX_WRAP.WRAP,
-              FLEX_WRAP.WRAP_REVERSE,
-              FLEX_WRAP.NO_WRAP,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--flex-wrap-wrap');
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:flex-wrap-wrap-reverse',
-      );
-      expect(getByText('Box content')).toHaveClass('box--md:flex-wrap-nowrap');
-    });
-    it('should render the Box with the alignItems classes', () => {
-      const { getByText } = render(
-        <>
-          <Box alignItems={ALIGN_ITEMS.FLEX_START}>
-            Box align-items-flex-start
-          </Box>
-          <Box alignItems={ALIGN_ITEMS.FLEX_END}>Box align-items-flex-end</Box>
-          <Box alignItems={ALIGN_ITEMS.CENTER}>Box align-items-center</Box>
-          <Box alignItems={ALIGN_ITEMS.BASELINE}>Box align-items-baseline</Box>
-          <Box alignItems={ALIGN_ITEMS.STRETCH}>Box align-items-stretch</Box>
-        </>,
-      );
-
-      expect(getByText('Box align-items-flex-start')).toHaveClass(
-        'box--align-items-flex-start',
-      );
-      expect(getByText('Box align-items-flex-end')).toHaveClass(
-        'box--align-items-flex-end',
-      );
-      expect(getByText('Box align-items-center')).toHaveClass(
-        'box--align-items-center',
-      );
-      expect(getByText('Box align-items-baseline')).toHaveClass(
-        'box--align-items-baseline',
-      );
-      expect(getByText('Box align-items-stretch')).toHaveClass(
-        'box--align-items-stretch',
-      );
-    });
-    it('should render the Box with the responsive alignItems classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            alignItems={[
-              ALIGN_ITEMS.FLEX_START,
-              ALIGN_ITEMS.FLEX_END,
-              ALIGN_ITEMS.CENTER,
-              ALIGN_ITEMS.BASELINE,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--align-items-flex-start',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:align-items-flex-end',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--md:align-items-center',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:align-items-baseline',
-      );
-    });
-    it('should render the Box with the justifyContent classes', () => {
-      const { getByText } = render(
-        <>
-          <Box justifyContent={JUSTIFY_CONTENT.FLEX_START}>
-            Box justify-content-flex-start
-          </Box>
-          <Box justifyContent={JUSTIFY_CONTENT.FLEX_END}>
-            Box justify-content-flex-end
-          </Box>
-          <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
-            Box justify-content-center
-          </Box>
-          <Box justifyContent={JUSTIFY_CONTENT.SPACE_AROUND}>
-            Box justify-content-space-around
-          </Box>
-          <Box justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}>
-            Box justify-content-space-between
-          </Box>
-          <Box justifyContent={JUSTIFY_CONTENT.SPACE_EVENLY}>
-            Box justify-content-space-evenly
-          </Box>
-        </>,
-      );
-
-      expect(getByText('Box justify-content-flex-start')).toHaveClass(
-        'box--justify-content-flex-start',
-      );
-      expect(getByText('Box justify-content-flex-end')).toHaveClass(
-        'box--justify-content-flex-end',
-      );
-      expect(getByText('Box justify-content-center')).toHaveClass(
-        'box--justify-content-center',
-      );
-      expect(getByText('Box justify-content-space-around')).toHaveClass(
-        'box--justify-content-space-around',
-      );
-      expect(getByText('Box justify-content-space-between')).toHaveClass(
-        'box--justify-content-space-between',
-      );
-    });
-    it('should render the Box with the responsive justifyContent classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            justifyContent={[
-              JUSTIFY_CONTENT.FLEX_START,
-              JUSTIFY_CONTENT.FLEX_END,
-              JUSTIFY_CONTENT.CENTER,
-              JUSTIFY_CONTENT.SPACE_AROUND,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--justify-content-flex-start',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:justify-content-flex-end',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--md:justify-content-center',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:justify-content-space-around',
-      );
-    });
-  });
-  describe('textAlign', () => {
-    it('should render the Box with the textAlign auto class', () => {
-      const { getByText } = render(
-        <>
-          <Box textAlign={TEXT_ALIGN.LEFT}>Box left</Box>
-          <Box textAlign={TEXT_ALIGN.CENTER}>Box center</Box>
-          <Box textAlign={TEXT_ALIGN.RIGHT}>Box right</Box>
-          <Box textAlign={TEXT_ALIGN.JUSTIFY}>Box justify</Box>
-          <Box textAlign={TEXT_ALIGN.END}>Box end</Box>
-        </>,
-      );
-
-      expect(getByText('Box left')).toHaveClass('box--text-align-left');
-      expect(getByText('Box center')).toHaveClass('box--text-align-center');
-      expect(getByText('Box right')).toHaveClass('box--text-align-right');
-      expect(getByText('Box justify')).toHaveClass('box--text-align-justify');
-      expect(getByText('Box end')).toHaveClass('box--text-align-end');
-    });
-    it('should render the Box with the responsive textAlign classes', () => {
-      const { getByText } = render(
-        <Box
-          textAlign={[
-            TEXT_ALIGN.LEFT,
-            TEXT_ALIGN.CENTER,
-            TEXT_ALIGN.RIGHT,
-            TEXT_ALIGN.JUSTIFY,
-          ]}
-        >
-          Box content
-        </Box>,
-      );
-
-      expect(getByText('Box content')).toHaveClass('box--text-align-left');
-      expect(getByText('Box content')).toHaveClass('box--sm:text-align-center');
-      expect(getByText('Box content')).toHaveClass('box--md:text-align-right');
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:text-align-justify',
-      );
-    });
-  });
-  describe('background', () => {
-    it('should render the Box with the backgroundColor class', () => {
-      const { getByText } = render(
-        <Box backgroundColor={COLORS.BACKGROUND_DEFAULT}>Box content</Box>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--background-color-background-default',
-      );
-    });
-    it('should render the Box with the responsive backgroundColor classes', () => {
-      const { getByText } = render(
-        <Box
-          backgroundColor={[
-            COLORS.BACKGROUND_DEFAULT,
-            COLORS.ERROR_DEFAULT,
-            COLORS.INFO_DEFAULT,
-            COLORS.WARNING_DEFAULT,
-          ]}
-        >
-          Box content
-        </Box>,
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--background-color-background-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--sm:background-color-error-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--md:background-color-info-default',
-      );
-      expect(getByText('Box content')).toHaveClass(
-        'box--lg:background-color-warning-default',
-      );
-    });
-  });
-  describe('width, height', () => {
-    it('should render the Box with the width class', () => {
-      const { getByText } = render(
-        <>
-          <Box width={BLOCK_SIZES.HALF}>Box half</Box>
-          <Box width={BLOCK_SIZES.ONE_FOURTH}>Box one fourth</Box>
-          <Box width={BLOCK_SIZES.MAX}>Box max</Box>
-          <Box width={BLOCK_SIZES.MIN}>Box min</Box>
-        </>,
-      );
-      expect(getByText('Box half')).toHaveClass('box--width-1/2');
-      expect(getByText('Box one fourth')).toHaveClass('box--width-1/4');
-      expect(getByText('Box max')).toHaveClass('box--width-max');
-      expect(getByText('Box min')).toHaveClass('box--width-min');
-    });
-    it('should render the Box with the responsive width classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            width={[
-              BLOCK_SIZES.HALF,
-              BLOCK_SIZES.ONE_FOURTH,
-              BLOCK_SIZES.MAX,
-              BLOCK_SIZES.MIN,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--width-1/2');
-      expect(getByText('Box content')).toHaveClass('box--sm:width-1/4');
-      expect(getByText('Box content')).toHaveClass('box--md:width-max');
-      expect(getByText('Box content')).toHaveClass('box--lg:width-min');
-    });
-    it('should render the Box with the height class', () => {
-      const { getByText } = render(
-        <>
-          <Box height={BLOCK_SIZES.HALF}>Box half</Box>
-          <Box height={BLOCK_SIZES.ONE_FOURTH}>Box one fourth</Box>
-          <Box height={BLOCK_SIZES.MAX}>Box max</Box>
-          <Box height={BLOCK_SIZES.MIN}>Box min</Box>
-        </>,
-      );
-      expect(getByText('Box half')).toHaveClass('box--height-1/2');
-      expect(getByText('Box one fourth')).toHaveClass('box--height-1/4');
-      expect(getByText('Box max')).toHaveClass('box--height-max');
-      expect(getByText('Box min')).toHaveClass('box--height-min');
-    });
-    it('should render the Box with the responsive height classes', () => {
-      const { getByText } = render(
-        <>
-          <Box
-            height={[
-              BLOCK_SIZES.HALF,
-              BLOCK_SIZES.ONE_FOURTH,
-              BLOCK_SIZES.MAX,
-              BLOCK_SIZES.MIN,
-            ]}
-          >
-            Box content
-          </Box>
-        </>,
-      );
-      expect(getByText('Box content')).toHaveClass('box--height-1/2');
-      expect(getByText('Box content')).toHaveClass('box--sm:height-1/4');
-      expect(getByText('Box content')).toHaveClass('box--md:height-max');
-      expect(getByText('Box content')).toHaveClass('box--lg:height-min');
-    });
-  });
-});
diff --git a/ui/components/ui/box/index.js b/ui/components/ui/box/index.js
index 89a9055ffee7..e599a9a98022 100644
--- a/ui/components/ui/box/index.js
+++ b/ui/components/ui/box/index.js
@@ -1 +1,6 @@
-export { default, MultipleSizes, MultipleSizesAndAuto } from './box';
+export {
+  default,
+  MultipleSizes,
+  ValidBackgroundColors,
+  ValidBorderColors,
+} from './box';
diff --git a/ui/components/ui/breadcrumbs/README.mdx b/ui/components/ui/breadcrumbs/README.mdx
deleted file mode 100644
index 4c33afd0994d..000000000000
--- a/ui/components/ui/breadcrumbs/README.mdx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import Breadcrumbs from './breadcrumbs.component';
-
-
-# Breadcrumbs
-
-Breadcrumbs element is used to represent the current index out of total.
-
-<Canvas>
-  <Story id="ui-components-ui-breadcrumbs-breadcrumbs-stories-js--default-breadcrumbs" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={Breadcrumbs} />
\ No newline at end of file
diff --git a/ui/components/ui/breadcrumbs/breadcrumbs.stories.js b/ui/components/ui/breadcrumbs/breadcrumbs.stories.js
deleted file mode 100644
index 2478e82b109a..000000000000
--- a/ui/components/ui/breadcrumbs/breadcrumbs.stories.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import Breadcrumbs from './breadcrumbs.component';
-
-export default {
-  title: 'Components/UI/Breadcrumbs ',
-  id: __filename,
-  component: Breadcrumbs,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    currentIndex: {
-      control: 'number',
-    },
-    total: {
-      control: 'number',
-    },
-    className: { control: 'text' },
-  },
-};
-
-export const DefaultBreadcrumbs = (args) => {
-  return <Breadcrumbs {...args} />;
-};
-
-DefaultBreadcrumbs.storyName = 'Default';
-DefaultBreadcrumbs.args = {
-  currentIndex: 1,
-  total: 3,
-};
diff --git a/ui/components/ui/button-group/index.scss b/ui/components/ui/button-group/index.scss
index 00e0bd8cdfdb..bb77fc9f81a0 100644
--- a/ui/components/ui/button-group/index.scss
+++ b/ui/components/ui/button-group/index.scss
@@ -61,7 +61,7 @@
     }
 
     &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+      box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
     };
   }
 
diff --git a/ui/components/ui/button/buttons.scss b/ui/components/ui/button/buttons.scss
index b0be64bb77b3..e0ea6dcfadf2 100644
--- a/ui/components/ui/button/buttons.scss
+++ b/ui/components/ui/button/buttons.scss
@@ -194,7 +194,7 @@
 .btn-raised {
   color: var(--color-primary-default);
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.08);
   padding: 6px;
   height: initial;
   min-height: initial;
@@ -214,16 +214,12 @@ input[type="submit"][disabled] {
   transition: box-shadow cubic-bezier(0.6, -0.28, 0.735, 0.045) 200ms;
 
   &:hover {
-    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
   }
 
   &.btn-secondary {
     border: 1px solid var(--color-primary-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-primary-shadow);
-    }
-
     &--disabled,
     &[disabled] {
       border-color: var(--color-primary-disabled);
@@ -238,10 +234,6 @@ input[type="submit"][disabled] {
   &.btn-default {
     border: 1px solid var(--color-icon-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
-    }
-
     &--disabled,
     &[disabled] {
       border-color: var(--color-border-muted);
@@ -256,10 +248,6 @@ input[type="submit"][disabled] {
   &.btn-danger {
     border: 1px solid var(--color-error-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-error-shadow);
-    }
-
     &--disabled,
     &[disabled] {
       border-color: var(--color-error-disabled);
@@ -274,10 +262,6 @@ input[type="submit"][disabled] {
   &.btn-warning {
     border: 1px solid var(--color-warning-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
-    }
-
     &--disabled,
     &[disabled] {
       border-color: var(--color-warning-alternative);
@@ -292,10 +276,6 @@ input[type="submit"][disabled] {
   &.btn-primary {
     background-color: var(--color-primary-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-primary-shadow);
-    }
-
     &--disabled,
     &[disabled] {
       background-color: var(--color-primary-disabled);
@@ -309,10 +289,6 @@ input[type="submit"][disabled] {
   &.btn-danger-primary {
     background-color: var(--color-error-default);
 
-    &:hover {
-      box-shadow: var(--shadow-size-sm) var(--color-error-shadow);
-    }
-
     &--disabled,
     &[disabled] {
       background-color: var(--color-error-disabled);
diff --git a/ui/components/ui/callout/callout.scss b/ui/components/ui/callout/callout.scss
index 91f061324742..ae19d830470a 100644
--- a/ui/components/ui/callout/callout.scss
+++ b/ui/components/ui/callout/callout.scss
@@ -15,7 +15,7 @@
 
   &--dismissible {
     &#{$self}--first {
-      box-shadow: 0 -5px 5px -5px var(--color-shadow-default);
+      box-shadow: 0 -5px 5px -5px var(--color-overlay-default);
     }
   }
 
diff --git a/ui/components/ui/callout/callout.stories.js b/ui/components/ui/callout/callout.stories.js
index e631c71020ce..94ec67d92cf5 100644
--- a/ui/components/ui/callout/callout.stories.js
+++ b/ui/components/ui/callout/callout.stories.js
@@ -22,7 +22,7 @@ export default {
 };
 
 export const PersistentCallout = (args) => (
-  <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
+  <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
     <Box margin={2}>
       <Typography variant={TYPOGRAPHY.H4}>This is your private key:</Typography>
       <Typography variant={TYPOGRAPHY.H6}>
@@ -36,7 +36,7 @@ export const PersistentCallout = (args) => (
 export const DismissibleCallout = (args) => {
   const [dismissed, setDismissed] = useState(false);
   return (
-    <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
+    <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
       <Box margin={2}>
         <Typography variant={TYPOGRAPHY.H4}>
           This is your private key:
@@ -81,7 +81,7 @@ export const MultipleDismissibleCallouts = () => {
   };
 
   return (
-    <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
+    <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
       <Box margin={2}>
         <Typography variant={TYPOGRAPHY.H4}>
           This is your private key:
diff --git a/ui/components/ui/chip/chip.js b/ui/components/ui/chip/chip.js
index fa217e31d565..21b4fe13f4ef 100644
--- a/ui/components/ui/chip/chip.js
+++ b/ui/components/ui/chip/chip.js
@@ -3,7 +3,6 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { omit } from 'lodash';
 import Typography from '../typography';
-import UrlIcon from '../url-icon';
 import { COLORS, TYPOGRAPHY } from '../../../helpers/constants/design-system';
 
 export default function Chip({
@@ -15,11 +14,9 @@ export default function Chip({
   label,
   labelProps = {},
   leftIcon,
-  leftIconUrl = '',
   rightIcon,
   onClick,
   maxContent = true,
-  displayInlineBlock = false,
 }) {
   const onKeyPress = (event) => {
     if (event.key === 'Enter' && onClick) {
@@ -40,17 +37,11 @@ export default function Chip({
         [`chip--border-color-${borderColor}`]: true,
         [`chip--background-color-${backgroundColor}`]: true,
         'chip--max-content': maxContent,
-        'chip--display-inline-block': displayInlineBlock,
       })}
       role={isInteractive ? 'button' : undefined}
       tabIndex={isInteractive ? 0 : undefined}
     >
-      {leftIcon && !leftIconUrl ? (
-        <div className="chip__left-icon">{leftIcon}</div>
-      ) : null}
-      {leftIconUrl ? (
-        <UrlIcon className="chip__left-url-icon" url={leftIconUrl} />
-      ) : null}
+      {leftIcon ? <div className="chip__left-icon">{leftIcon}</div> : null}
       {children ?? (
         <Typography
           className="chip__label"
@@ -115,12 +106,4 @@ Chip.propTypes = {
    * max-content can overflow the parent's width and break designs
    */
   maxContent: PropTypes.bool,
-  /**
-   * Icon location
-   */
-  leftIconUrl: PropTypes.string,
-  /**
-   * Display or not the inline block
-   */
-  displayInlineBlock: PropTypes.bool,
 };
diff --git a/ui/components/ui/chip/chip.scss b/ui/components/ui/chip/chip.scss
index b0a430819037..7eba44619616 100644
--- a/ui/components/ui/chip/chip.scss
+++ b/ui/components/ui/chip/chip.scss
@@ -16,10 +16,6 @@
     align-items: center;
   }
 
-  &__left-url-icon {
-    margin-right: 8px;
-  };
-
   @each $variant, $color in design-system.$color-map {
     &--border-color-#{$variant} {
       border-color: var($color);
@@ -71,8 +67,4 @@
   &--max-content {
     width: max-content;
   }
-
-  &--display-inline-block {
-    display: inline-block;
-  }
 }
diff --git a/ui/components/ui/color-indicator/color-indicator.js b/ui/components/ui/color-indicator/color-indicator.js
index 455f7d53fa4b..00cf3932dc42 100644
--- a/ui/components/ui/color-indicator/color-indicator.js
+++ b/ui/components/ui/color-indicator/color-indicator.js
@@ -6,7 +6,7 @@ import { COLORS, SIZES } from '../../../helpers/constants/design-system';
 export default function ColorIndicator({
   size = SIZES.SM,
   type = 'outlined',
-  color = COLORS.ICON_MUTED,
+  color = COLORS.ICON_DEFAULT,
   borderColor,
   iconClassName,
 }) {
diff --git a/ui/components/ui/confusable/README.mdx b/ui/components/ui/confusable/README.mdx
deleted file mode 100644
index 126753ec20b1..000000000000
--- a/ui/components/ui/confusable/README.mdx
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import Confusable from './confusable.component';
-
-# Confusable
-
-Confusable allows to filter out any characters that look very similar to English language characters.
-
-<Canvas>
-  <Story id="ui-components-ui-confusable-confusable-stories-js--default-confusable" />
-</Canvas>
-
-## Component API
-
-| Name  | Description | Default |
-| ----- | ----------- | ------- |
-| input | string      | -       |
-
-## NonConfusable
-
-Not to detect emojis
-
-<Canvas>
-  <Story id="ui-components-ui-confusable-confusable-stories-js--non-confusable" />
-</Canvas>
diff --git a/ui/components/ui/confusable/confusable.stories.js b/ui/components/ui/confusable/confusable.stories.js
deleted file mode 100644
index e609f286f468..000000000000
--- a/ui/components/ui/confusable/confusable.stories.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import Confusable from './confusable.component';
-
-export default {
-  title: 'Components/UI/Confusable',
-  id: __filename,
-  component: Confusable,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    input: {
-      control: 'text',
-    },
-  },
-};
-
-export const DefaultConfusable = (args) => {
-  return <Confusable {...args} />;
-};
-
-export const NonConfusable = (args) => {
-  return <Confusable {...args} />;
-};
-
-DefaultConfusable.storyName = 'Default';
-DefaultConfusable.args = {
-  input: 'vita‍lik.eth',
-};
-
-NonConfusable.storyName = 'NonConfusable';
-NonConfusable.args = {
-  input: '👻.eth',
-};
diff --git a/ui/components/ui/definition-list/definition-list.js b/ui/components/ui/definition-list/definition-list.js
index 2d156081459a..05ca7b912417 100644
--- a/ui/components/ui/definition-list/definition-list.js
+++ b/ui/components/ui/definition-list/definition-list.js
@@ -7,7 +7,6 @@ import {
   SIZES,
   TYPOGRAPHY,
   FONT_WEIGHT,
-  OVERFLOW_WRAP,
 } from '../../../helpers/constants/design-system';
 import Tooltip from '../tooltip';
 
@@ -61,7 +60,6 @@ export default function DefinitionList({
               marginBottom: MARGIN_MAP[gapSize],
             }}
             className="definition-list__definition"
-            overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
             tag="dd"
           >
             {definition}
diff --git a/ui/components/ui/definition-list/definition-list.stories.js b/ui/components/ui/definition-list/definition-list.stories.js
index 702598ff5b48..e2d351b01b3b 100644
--- a/ui/components/ui/definition-list/definition-list.stories.js
+++ b/ui/components/ui/definition-list/definition-list.stories.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { object, select } from '@storybook/addon-knobs';
 import {
   COLORS,
   SIZES,
@@ -6,6 +7,11 @@ import {
 } from '../../../helpers/constants/design-system';
 import DefinitionList from './definition-list';
 
+export default {
+  title: 'Components/UI/DefinitionList',
+  id: __filename,
+};
+
 const basic = {
   term:
     'a word or phrase used to describe a thing or to express a concept, especially in a particular kind of language or branch of study.',
@@ -28,91 +34,39 @@ const tooltips = {
   Ticker: 'The currency symbol of the primary currency for this network',
 };
 
-export default {
-  title: 'Components/UI/DefinitionList',
-  id: __filename,
-  argTypes: {
-    dictionary: { control: 'object', name: 'Dictionary' },
-    gapSize: {
-      control: 'select',
-      name: 'Gap Size',
-      options: Object.values(SIZES),
-    },
-  },
-  args: {
-    dictionary: basic,
-    gapSize: SIZES.SM,
-  },
-};
-
-export const DefaultStory = (args) => (
-  <DefinitionList dictionary={args.dictionary} gapSize={args.gapSize} />
+export const DefaultStory = () => (
+  <DefinitionList
+    dictionary={object('dictionary', basic)}
+    gapSize={select('gapSize', SIZES, SIZES.SM)}
+  />
 );
 
 DefaultStory.storyName = 'Default';
 
-export const WithTooltips = (args) => (
+export const WithTooltips = () => (
   <DefinitionList
-    dictionary={args.dictionary}
-    tooltips={args.tooltips}
-    gapSize={args.gapSize}
+    dictionary={object('dictionary', advanced)}
+    tooltips={object('tooltips', tooltips)}
+    gapSize={select('gapSize', SIZES, SIZES.SM)}
   />
 );
 
-WithTooltips.args = {
-  dictionary: advanced,
-  tooltips,
-};
-WithTooltips.argTypes = {
-  tooltips: { control: 'object', name: 'Tooltips' },
-};
-
-export const WithTypographyControl = (args) => (
+export const WithTypographyControl = () => (
   <DefinitionList
-    dictionary={args.dictionary}
-    tooltips={args.tooltips}
-    gapSize={args.gapSize}
+    dictionary={object('dictionary', advanced)}
+    tooltips={object('tooltips', tooltips)}
+    gapSize={select('gapSize', SIZES, SIZES.SM)}
     termTypography={{
-      variant: args.termTypographyVariant,
-      color: args.termTypographyColor,
-      children: <div></div>,
+      variant: select('termTypography.variant', TYPOGRAPHY, TYPOGRAPHY.H6),
+      color: select('termTypography.color', COLORS, COLORS.TEXT_DEFAULT),
     }}
     definitionTypography={{
-      variant: args.definitionTypographyVariant,
-      color: args.definitionTypographyColor,
-      children: <div></div>,
+      variant: select(
+        'definitionTypography.variant',
+        TYPOGRAPHY,
+        TYPOGRAPHY.H6,
+      ),
+      color: select('definitionTypography.color', COLORS, COLORS.TEXT_DEFAULT),
     }}
   />
 );
-
-WithTypographyControl.args = {
-  dictionary: advanced,
-  termTypographyVariant: TYPOGRAPHY.H6,
-  termTypographyColor: COLORS.TEXT_DEFAULT,
-  definitionTypographyVariant: TYPOGRAPHY.H6,
-  definitionTypographyColor: COLORS.TEXT_DEFAULT,
-};
-
-WithTypographyControl.argTypes = {
-  tooltips,
-  termTypographyVariant: {
-    control: 'select',
-    name: 'Term Variant',
-    options: Object.values(TYPOGRAPHY),
-  },
-  termTypographyColor: {
-    control: 'select',
-    name: 'Term Color',
-    options: Object.values(COLORS),
-  },
-  definitionTypographyVariant: {
-    control: 'select',
-    name: 'Definition Variant',
-    options: Object.values(TYPOGRAPHY),
-  },
-  definitionTypographyColor: {
-    control: 'select',
-    name: 'Definition Color',
-    options: Object.values(COLORS),
-  },
-};
diff --git a/ui/components/ui/dialog/README.mdx b/ui/components/ui/dialog/README.mdx
deleted file mode 100644
index 6b21aa8407ce..000000000000
--- a/ui/components/ui/dialog/README.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import Dialog from '.';
-
-# Dialog
-
-Dialog element is to create popup dialogs
-
-<Canvas>
-  <Story id="ui-components-ui-dialog-dialog-stories-js--default-dialog" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={Dialog} />
diff --git a/ui/components/ui/dialog/dialog.stories.js b/ui/components/ui/dialog/dialog.stories.js
deleted file mode 100644
index 574c94f4fa4a..000000000000
--- a/ui/components/ui/dialog/dialog.stories.js
+++ /dev/null
@@ -1,30 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import Dialog from '.';
-
-export default {
-  title: 'Components/UI/Dialog',
-  id: __filename,
-  component: Dialog,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    children: {
-      control: 'text',
-    },
-    type: { control: 'text' },
-  },
-};
-
-export const DefaultDialog = (args) => {
-  return <Dialog {...args} />;
-};
-
-DefaultDialog.storyName = 'Default';
-DefaultDialog.args = {
-  type: 'error',
-  children: 'Dialog Box',
-};
diff --git a/ui/components/ui/dropdown/dropdown.scss b/ui/components/ui/dropdown/dropdown.scss
index 11d50976b2c4..7311bbac0386 100644
--- a/ui/components/ui/dropdown/dropdown.scss
+++ b/ui/components/ui/dropdown/dropdown.scss
@@ -1,7 +1,6 @@
 .dropdown {
   position: relative;
   display: inline-block;
-  height: 36px;
 
   &__select {
     appearance: none;
diff --git a/ui/components/ui/error-message/error-message.component.js b/ui/components/ui/error-message/error-message.component.js
index db8ce1da4885..dd1e16c5c3bc 100644
--- a/ui/components/ui/error-message/error-message.component.js
+++ b/ui/components/ui/error-message/error-message.component.js
@@ -1,14 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-/**
- * @deprecated - Please use ActionableMessage type danger
- * @see ActionableMessage
- * @param {Object} props
- * @param {string} props.errorMessage
- * @param {string} props.errorKey
- * @param {Object} context
- */
 const ErrorMessage = (props, context) => {
   const { errorMessage, errorKey } = props;
   const error = errorKey ? context.t(errorKey) : errorMessage;
diff --git a/ui/components/ui/export-text-container/README.mdx b/ui/components/ui/export-text-container/README.mdx
deleted file mode 100644
index bd57310b0283..000000000000
--- a/ui/components/ui/export-text-container/README.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import ExportTextContainer from '.';
-
-# ExportTextContainer
-
-The ExportTextContainer component enables to copy the input text or save it as a CSV File
-
-<Canvas>
-  <Story id="ui-components-ui-export-text-container-export-text-stories-js--default-export-text-container" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={ExportTextContainer} />
diff --git a/ui/components/ui/export-text-container/export-text.stories.js b/ui/components/ui/export-text-container/export-text.stories.js
deleted file mode 100644
index 2dfb4c257542..000000000000
--- a/ui/components/ui/export-text-container/export-text.stories.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import ExportTextContainer from '.';
-
-export default {
-  title: 'Components/UI/ExportTextContainer',
-  id: __filename,
-  component: ExportTextContainer,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    text: {
-      control: 'text',
-    },
-  },
-};
-
-export const DefaultExportTextContainer = (args) => {
-  return <ExportTextContainer {...args} />;
-};
-
-DefaultExportTextContainer.storyName = 'Default';
-
-DefaultExportTextContainer.args = {
-  text: ' Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
-};
diff --git a/ui/components/ui/form-field/form-field.stories.js b/ui/components/ui/form-field/form-field.stories.js
index 230ea00366ba..0c7d0c36f904 100644
--- a/ui/components/ui/form-field/form-field.stories.js
+++ b/ui/components/ui/form-field/form-field.stories.js
@@ -57,7 +57,7 @@ export const FormFieldWithTitleDetail = (args) => {
       <button
         style={{
           backgroundColor: clicked
-            ? 'var(--color-warning-default)'
+            ? 'var(--color-secondary-default)'
             : 'var(--color-background-alternative)',
         }}
         onClick={() => setClicked(!clicked)}
diff --git a/ui/components/ui/form-field/index.scss b/ui/components/ui/form-field/index.scss
index 224d82ad4222..c281b9034141 100644
--- a/ui/components/ui/form-field/index.scss
+++ b/ui/components/ui/form-field/index.scss
@@ -39,10 +39,10 @@
     border-radius: 6px;
     background-color: var(--color-background-default);
     color: var(--color-text-default);
-    border: 1px solid var(--color-border-default);
+    border: 2px solid var(--color-border-default);
 
     &:focus {
-      border: solid 1px var(--color-primary-default);
+      border: solid 2px var(--color-primary-default);
     }
 
     &--error {
diff --git a/ui/components/ui/hex-to-decimal/README.mdx b/ui/components/ui/hex-to-decimal/README.mdx
deleted file mode 100644
index 7f3748f66b93..000000000000
--- a/ui/components/ui/hex-to-decimal/README.mdx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-
-import HexToDecimal from './hex-to-decimal.component';
-
-# HexToDecimal
-
-The HexToDecimal component renders hex as a decimal
-
-<Canvas>
-  <Story id="ui-components-ui-hex-to-decimal-hex-to-decimal-stories-js--default-hex-to-decimal" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={HexToDecimal} />
diff --git a/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js b/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
deleted file mode 100644
index c2e5c8881f16..000000000000
--- a/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import React from 'react';
-import README from './README.mdx';
-import HexToDecimal from './hex-to-decimal.component';
-
-export default {
-  title: 'Components/UI/HexToDecimal',
-  id: __filename,
-  component: HexToDecimal,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argsTypes: {
-    text: {
-      control: 'text',
-    },
-    className: {
-      value: 'text',
-    },
-  },
-};
-
-export const DefaultHexToDecimal = (args) => {
-  return <HexToDecimal {...args} />;
-};
-
-DefaultHexToDecimal.storyName = 'Default';
-
-DefaultHexToDecimal.args = {
-  value: '0x3039',
-};
diff --git a/ui/components/ui/i18n-value/i18n-value.component.js b/ui/components/ui/i18n-value/i18n-value.component.js
new file mode 100644
index 000000000000..d321df7e9722
--- /dev/null
+++ b/ui/components/ui/i18n-value/i18n-value.component.js
@@ -0,0 +1,15 @@
+import PropTypes from 'prop-types';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+const I18nValue = ({ messageKey, options }) => {
+  const t = useI18nContext();
+  return t(messageKey, options);
+};
+
+I18nValue.propTypes = {
+  messageKey: PropTypes.string.isRequired,
+  options: PropTypes.array,
+};
+
+export default I18nValue;
diff --git a/ui/components/ui/i18n-value/index.js b/ui/components/ui/i18n-value/index.js
new file mode 100644
index 000000000000..190d57ab0987
--- /dev/null
+++ b/ui/components/ui/i18n-value/index.js
@@ -0,0 +1 @@
+export { default } from './i18n-value.component';
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.scss b/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
index cdbecf676e82..975404af0053 100644
--- a/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
@@ -1,5 +1,5 @@
 .icon-with-fallback {
   &__fallback {
-    color: var(--color-icon-alternative);
+    color: var(--color-icon-default);
   }
 }
diff --git a/ui/components/ui/icon/icon.stories.js b/ui/components/ui/icon/icon.stories.js
index 263ddd11b91e..2a2d5b3b684a 100644
--- a/ui/components/ui/icon/icon.stories.js
+++ b/ui/components/ui/icon/icon.stories.js
@@ -38,15 +38,13 @@ import IconPlus from './icon-plus';
 import IconEye from './icon-eye';
 import IconEyeSlash from './icon-eye-slash';
 import IconTokenSearch from './icon-token-search';
-import SearchIcon from './search-icon';
 
 const validColors = [
   'var(--color-icon-default)',
-  'var(--color-icon-alternative)',
   'var(--color-icon-muted)',
   'var(--color-overlay-inverse)',
   'var(--color-primary-default)',
-  'var(--color-warning-default)',
+  'var(--color-secondary-default)',
   'var(--color-error-default)',
   'var(--color-warning-default)',
   'var(--color-success-default)',
@@ -128,7 +126,6 @@ export const DefaultStory = (args) => (
         <IconItem Component={<IconSpeechBubbles {...args} />} />
         <IconItem Component={<IconCog {...args} />} />
         <IconItem Component={<IconTokenSearch {...args} />} />
-        <IconItem Component={<SearchIcon {...args} />} />
       </div>
     </Box>
     <Typography
diff --git a/ui/components/ui/icon/search-icon.js b/ui/components/ui/icon/search-icon.js
deleted file mode 100644
index a8d4c48bef46..000000000000
--- a/ui/components/ui/icon/search-icon.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const SearchIcon = ({
-  size = 24,
-  color = 'currentColor',
-  ariaLabel,
-  className,
-}) => (
-  <svg
-    width={size}
-    height={size}
-    fill={color}
-    className={className}
-    aria-label={ariaLabel}
-    xmlns="http://www.w3.org/2000/svg"
-    viewBox="0 0 512 512"
-  >
-    <path d="m235 427c-51 0-100-21-136-57-36-36-56-84-56-135 0-26 5-51 14-74 10-23 24-44 42-62 18-18 39-32 62-42 23-9 48-14 74-14 25 0 50 5 73 14 23 10 45 24 62 42 18 18 32 39 42 62 10 23 15 48 15 74 0 43-15 86-42 119l78 79c2 2 4 4 5 7 1 2 1 5 1 8 0 3 0 6-1 8-1 3-3 5-5 7-2 2-4 4-7 5-2 1-5 1-8 1-3 0-6 0-8-1-3-1-5-3-7-5l-79-78c-33 27-76 42-119 42z m0-43c82 0 149-67 149-149 0-83-67-150-149-150-83 0-150 67-150 150 0 82 67 149 150 149z" />
-  </svg>
-);
-
-SearchIcon.propTypes = {
-  /**
-   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
-   */
-  size: PropTypes.number,
-  /**
-   * The color of the icon accepts design token css variables
-   */
-  color: PropTypes.string,
-  /**
-   * An additional className to assign the Icon
-   */
-  className: PropTypes.string,
-  /**
-   * The aria-label of the icon for accessibility purposes
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default SearchIcon;
diff --git a/ui/components/ui/info-tooltip/index.scss b/ui/components/ui/info-tooltip/index.scss
index 7b4ed32fbed7..28beeebfc208 100644
--- a/ui/components/ui/info-tooltip/index.scss
+++ b/ui/components/ui/info-tooltip/index.scss
@@ -11,10 +11,58 @@
   }
 }
 
+.tippy-popper[x-placement^=top] .tippy-tooltip-info-theme [x-arrow],
+.tippy-popper[x-placement^=top] .tippy-tooltip-wideInfo-theme [x-arrow] {
+  border-top-color: var(--color-background-default);
+}
+
+.tippy-popper[x-placement^=right] .tippy-tooltip-info-theme [x-arrow],
+.tippy-popper[x-placement^=right] .tippy-tooltip-wideInfo-theme [x-arrow] {
+  border-right-color: var(--color-background-default);
+}
+
+.tippy-popper[x-placement^=left] .tippy-tooltip-info-theme [x-arrow],
+.tippy-popper[x-placement^=left] .tippy-tooltip-wideInfo-theme [x-arrow] {
+  border-left-color: var(--color-background-default);
+}
+
+.tippy-popper[x-placement^=bottom] .tippy-tooltip-info-theme [x-arrow],
+.tippy-popper[x-placement^=bottom] .tippy-tooltip-wideInfo-theme [x-arrow] {
+  border-bottom-color: var(--color-background-default);
+}
+
 .tippy-tooltip {
-  &#{&}-info-theme {
-    max-width: 200px;
+  &#{&}-info-theme,
+  &#{&}-wideInfo-theme {
+    background: var(--color-background-default);
+    color: var(--color-text-default);
+    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+    border-radius: 8px;
+    max-width: 203px;
     padding: 16px;
-    padding-bottom: 16px;
+    padding-bottom: 15px;
+
+    .tippy-tooltip-content {
+      @include H7;
+
+      text-align: left;
+      color: var(--color-text-alternative);
+
+      a {
+        color: var(--color-primary-default);
+      }
+
+      p {
+        margin-bottom: 12px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
+  }
+
+  &#{&}-wideInfo-theme {
+    max-width: 260px;
   }
 }
diff --git a/ui/components/ui/info-tooltip/info-tooltip.js b/ui/components/ui/info-tooltip/info-tooltip.js
index 0294636d001f..eaf9e568f048 100644
--- a/ui/components/ui/info-tooltip/info-tooltip.js
+++ b/ui/components/ui/info-tooltip/info-tooltip.js
@@ -16,7 +16,8 @@ export default function InfoTooltip({
   position = '',
   containerClassName,
   wrapperClassName,
-  iconFillColor = 'var(--color-icon-alternative)',
+  wide,
+  iconFillColor = 'var(--color-icon-default)',
 }) {
   return (
     <div className="info-tooltip">
@@ -31,7 +32,7 @@ export default function InfoTooltip({
         tooltipInnerClassName="info-tooltip__tooltip-content"
         tooltipArrowClassName={positionArrowClassMap[position]}
         html={contentText}
-        theme="tippy-tooltip-info"
+        theme={wide ? 'tippy-tooltip-wideInfo' : 'tippy-tooltip-info'}
       >
         <InfoTooltipIcon fillColor={iconFillColor} />
       </Tooltip>
@@ -48,6 +49,10 @@ InfoTooltip.propTypes = {
    * Shows position of the tooltip
    */
   position: PropTypes.oneOf(['top', 'left', 'bottom', 'right']),
+  /**
+   * Set if the tooltip wide
+   */
+  wide: PropTypes.bool,
   /**
    * Add custom CSS class for container
    */
diff --git a/ui/components/ui/info-tooltip/info-tooltip.stories.js b/ui/components/ui/info-tooltip/info-tooltip.stories.js
index c7c050e9b888..c77580bf6ff1 100644
--- a/ui/components/ui/info-tooltip/info-tooltip.stories.js
+++ b/ui/components/ui/info-tooltip/info-tooltip.stories.js
@@ -17,6 +17,7 @@ export default {
       control: 'select',
       options: ['top', 'left', 'bottom', 'right'],
     },
+    wide: { control: 'boolean' },
     containerClassName: { control: 'text' },
     wrapperClassName: { control: 'text' },
     iconFillColor: { control: 'text' },
diff --git a/ui/components/ui/jazzicon/jazzicon.component.js b/ui/components/ui/jazzicon/jazzicon.component.js
index f495d6c0d6b0..f5261f832499 100644
--- a/ui/components/ui/jazzicon/jazzicon.component.js
+++ b/ui/components/ui/jazzicon/jazzicon.component.js
@@ -15,6 +15,7 @@ export default class Jazzicon extends PureComponent {
     className: PropTypes.string,
     diameter: PropTypes.number,
     style: PropTypes.object,
+    useTokenDetection: PropTypes.bool,
     tokenList: PropTypes.object,
   };
 
@@ -47,8 +48,13 @@ export default class Jazzicon extends PureComponent {
   }
 
   appendJazzicon() {
-    const { address, diameter, tokenList } = this.props;
-    const image = iconFactory.iconForAddress(address, diameter, tokenList);
+    const { address, diameter, useTokenDetection, tokenList } = this.props;
+    const image = iconFactory.iconForAddress(
+      address,
+      diameter,
+      useTokenDetection,
+      tokenList,
+    );
     this.container.current.appendChild(image);
   }
 
diff --git a/ui/components/ui/loading-screen/index.scss b/ui/components/ui/loading-screen/index.scss
index 753d8a06e80d..f3bcd65bca88 100644
--- a/ui/components/ui/loading-screen/index.scss
+++ b/ui/components/ui/loading-screen/index.scss
@@ -1,5 +1,4 @@
 .loading-overlay {
-  top: 0;
   left: 0;
   z-index: 51;
   position: fixed;
@@ -21,12 +20,11 @@
 
   &__container {
     position: absolute;
-    top: 50%;
+    top: 33%;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    transform: translateY(-50%);
   }
 
   &__error-screen {
diff --git a/ui/components/ui/loading-screen/loading-screen.component.js b/ui/components/ui/loading-screen/loading-screen.component.js
index 08869b9fabe2..3d8ad9298b9c 100644
--- a/ui/components/ui/loading-screen/loading-screen.component.js
+++ b/ui/components/ui/loading-screen/loading-screen.component.js
@@ -35,7 +35,7 @@ class LoadingScreen extends Component {
         <div className="loading-overlay__container">
           {this.props.showLoadingSpinner && (
             <Spinner
-              color="var(--color-warning-default)"
+              color="var(--color-secondary-default)"
               className="loading-overlay__spinner"
             />
           )}
diff --git a/ui/components/ui/logo/logo-coinbasepay.js b/ui/components/ui/logo/logo-coinbasepay.js
deleted file mode 100644
index 2b23e7391a7c..000000000000
--- a/ui/components/ui/logo/logo-coinbasepay.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-const LogoCoinbasePay = ({
-  width = '100%',
-  className,
-  ariaLabel,
-  color = 'var(--color-text-default)',
-}) => {
-  return (
-    <svg
-      width={width}
-      viewBox="0 0 125 24"
-      xmlns="http://www.w3.org/2000/svg"
-      fill="none"
-      className={`logo-coinbasepay ${className}`}
-      aria-label={ariaLabel}
-    >
-      <path
-        d="M28.4278 4.10732C28.2105 4.09956 27.9938 4.13626 27.7911 4.21515C27.5885 4.29405 27.404 4.41349 27.2491 4.56615C27.0942 4.71882 26.9721 4.9015 26.8903 5.103C26.8085 5.3045 26.7686 5.52059 26.7732 5.73803C26.7913 6.1643 26.9734 6.56711 27.2815 6.86233C27.5895 7.15755 27.9996 7.32237 28.4263 7.32237C28.853 7.32237 29.2631 7.15755 29.5712 6.86233C29.8792 6.56711 30.0613 6.1643 30.0794 5.73803C30.0844 5.52074 30.0449 5.30471 29.9634 5.10322C29.8819 4.90172 29.7601 4.71901 29.6055 4.5663C29.4508 4.41359 29.2666 4.2941 29.064 4.21517C28.8615 4.13625 28.645 4.09955 28.4278 4.10732ZM84.799 8.47177C81.4928 8.47177 79.0661 10.9611 79.0661 14.2433C79.0661 17.7015 81.6657 19.997 84.8407 19.997C87.5238 19.997 89.6285 18.408 90.1651 16.1543H87.482C87.0945 17.141 86.1494 17.7015 84.8854 17.7015C83.2309 17.7015 81.9877 16.67 81.7075 14.8664H90.2277V13.8737C90.2277 10.6957 87.9113 8.47177 84.799 8.47177ZM81.8565 13.0211C82.265 11.4768 83.4246 10.7255 84.7542 10.7255C86.215 10.7255 87.33 11.5603 87.5894 13.0211H81.8565ZM19.0102 8.47177C18.2476 8.45519 17.4894 8.59283 16.7812 8.87644C16.0731 9.16005 15.4295 9.58378 14.8891 10.1222C14.3487 10.6607 13.9227 11.3027 13.6365 12.0099C13.3503 12.717 13.2099 13.4747 13.2238 14.2374C13.2238 17.5435 15.6922 19.9911 18.9983 19.9911C19.7652 20.0134 20.5287 19.8797 21.2423 19.5982C21.956 19.3166 22.6051 18.8929 23.1501 18.3529C23.6951 17.8129 24.1247 17.1678 24.4129 16.4568C24.7011 15.7458 24.8418 14.9836 24.8265 14.2165C24.8265 10.9551 22.3581 8.47177 19.0102 8.47177ZM19.0311 17.6151C17.1858 17.6151 15.8323 16.1751 15.8323 14.2433C15.8323 12.3115 17.1649 10.8567 19.0102 10.8567C20.8556 10.8567 22.2299 12.3145 22.2299 14.2463C22.2299 16.1781 20.8765 17.6091 19.0311 17.6091V17.6151ZM37.7917 8.47177C36.1163 8.47177 35.0222 9.15744 34.3782 10.1233V8.68045H31.8234V19.7764H34.3902V13.7455C34.3902 12.0492 35.4723 10.8567 37.0732 10.8567C38.5638 10.8567 39.4761 11.9091 39.4761 13.4325V19.7764H42.0518V13.2417C42.0399 10.4394 40.6029 8.47177 37.7917 8.47177ZM6.75461 10.8567C7.38882 10.8516 8.0076 11.0523 8.51819 11.4285C9.02879 11.8047 9.4037 12.3363 9.58673 12.9435H12.3115C11.8196 10.2813 9.62847 8.47177 6.77548 8.47177C6.0138 8.45681 5.25693 8.59565 4.55016 8.87999C3.84338 9.16433 3.20123 9.58832 2.66212 10.1266C2.12302 10.6649 1.69803 11.3064 1.4126 12.0127C1.12716 12.719 0.987147 13.4757 1.00093 14.2374C1.00093 17.5435 3.46935 19.9911 6.77548 19.9911C9.56586 19.9911 11.7988 18.2023 12.2907 15.5193H9.58673C9.41182 16.1287 9.04244 16.6642 8.5349 17.0442C8.02735 17.4242 7.40949 17.6278 6.77548 17.624C4.90628 17.624 3.59754 16.1841 3.59754 14.2523C3.59754 12.3205 4.87646 10.8567 6.75461 10.8567ZM25.5361 10.9849H27.1459V19.7764H29.7216V8.68045H25.548L25.5361 10.9849ZM66.2322 12.4755C66.2322 10.0727 64.7714 8.46283 61.6799 8.46283C58.7613 8.46283 57.1306 9.95342 56.8087 12.2191H59.3635C59.4917 11.3248 60.1774 10.6093 61.6382 10.6093C62.9469 10.6093 63.5908 11.1876 63.5908 11.8971C63.5908 12.8183 62.3984 13.0538 60.9525 13.2059C58.976 13.4205 56.5284 14.1002 56.5284 16.6819C56.5284 18.6793 58.019 19.9612 60.3712 19.9612C62.2165 19.9612 63.3762 19.1891 63.9486 17.9639C64.0321 19.0579 64.8429 19.7675 65.9877 19.7675H67.4783V17.472H66.2113L66.2322 12.4755ZM63.6982 15.2659C63.6982 16.7565 62.4103 17.8416 60.8452 17.8416C59.8793 17.8416 59.0565 17.4332 59.0565 16.5746C59.0565 15.4805 60.3652 15.1794 61.5666 15.0512C62.768 14.923 63.3553 14.6875 63.6922 14.1927L63.6982 15.2659ZM74.4751 13.1612L72.5851 12.8839C71.6907 12.7557 71.0408 12.4546 71.0408 11.7451C71.0408 10.973 71.8755 10.5854 73.0144 10.5854C74.2605 10.5854 75.0535 11.122 75.2264 12.0045H77.7157C77.4354 9.77157 75.7183 8.46283 73.0799 8.46283C70.3522 8.46283 68.5485 9.85802 68.5485 11.8316C68.5485 13.7216 69.741 14.8127 72.126 15.1586L74.0131 15.4388C74.9372 15.567 75.453 15.9307 75.453 16.6313C75.453 17.5107 74.5586 17.8744 73.3065 17.8744C71.7801 17.8744 70.9216 17.2514 70.7934 16.3093H68.2624C68.4979 18.4766 70.1942 20 73.2827 20C76.0969 20 77.9631 18.7121 77.9631 16.5001C77.9512 14.5176 76.5977 13.4861 74.4751 13.1642V13.1612ZM50.0265 8.47177C49.36 8.4623 48.6998 8.60194 48.0943 8.88048C47.4887 9.15901 46.9531 9.5694 46.5266 10.0816V4H43.9508V19.7764H46.4848V18.3097C46.9093 18.8394 47.4488 19.2656 48.0624 19.5559C48.676 19.8462 49.3477 19.993 50.0265 19.9851C53.1179 19.9851 55.4552 17.5375 55.4552 14.2314C55.4552 10.9253 53.0732 8.47177 50.0265 8.47177ZM49.6389 17.6151C47.7936 17.6151 46.4401 16.1751 46.4401 14.2433C46.4401 12.3115 47.8055 10.8567 49.6598 10.8567C51.5141 10.8567 52.8377 12.2936 52.8377 14.2463C52.8377 16.199 51.4843 17.6091 49.6389 17.6091V17.6151Z"
-        fill="#0052FF"
-      />
-      <path
-        d="M97.314 8.67746H102.111C104.496 8.67746 105.846 10.016 105.846 11.9568C105.846 13.8975 104.508 15.2689 102.111 15.2689H98.9864V19.7794H97.314V8.67746ZM104.15 11.8792C104.15 10.7911 103.455 10.1114 102.063 10.1114H98.9864V13.8379H102.063C103.449 13.8379 104.15 13.1582 104.15 12.0492V11.8792Z"
-        fill={color}
-      />
-      <path
-        d="M113.025 17.1172H108.055L107.077 19.7675H105.342L109.602 8.66556H111.51L115.815 19.7675H114.026L113.025 17.1172ZM108.577 15.6833H112.497L110.541 10.4483H110.509L108.577 15.6833Z"
-        fill={color}
-      />
-      <path
-        d="M118.543 15.4269L114.602 8.67746H116.429L119.381 13.7872H119.41L122.362 8.67746H124.174L120.215 15.4269V19.7794H118.543V15.4269Z"
-        fill={color}
-      />
-    </svg>
-  );
-};
-
-LogoCoinbasePay.propTypes = {
-  /**
-   * The width of the logo. Defaults to 100%
-   */
-  width: PropTypes.string,
-  /**
-   * The color of the logo defaults to var(--color-text-default)
-   */
-  color: PropTypes.string,
-  /**
-   * Additional className to add to the root svg
-   */
-  className: PropTypes.string,
-  /**
-   * Aria label to add to the logo component
-   */
-  ariaLabel: PropTypes.string,
-};
-
-export default LogoCoinbasePay;
diff --git a/ui/components/ui/logo/logo-coinbasepay.scss b/ui/components/ui/logo/logo-coinbasepay.scss
deleted file mode 100644
index 23f372dc8cec..000000000000
--- a/ui/components/ui/logo/logo-coinbasepay.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-[data-theme=dark] .logo-coinbasepay path {
-  fill: var(--color-text-default);
-}
diff --git a/ui/components/ui/logo/logo-wyre.js b/ui/components/ui/logo/logo-wyre.js
index 860a56bd4a74..fd8d22d6525c 100644
--- a/ui/components/ui/logo/logo-wyre.js
+++ b/ui/components/ui/logo/logo-wyre.js
@@ -1,34 +1,28 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const LogoWyre = ({ width = '100%', color = 'var(--color-text-default)' }) => {
+const LogoWyre = ({
+  width = '100%',
+  color = 'var(--color-text-default)',
+  className,
+  ariaLabel,
+}) => {
   return (
     <svg
       width={width}
-      viewBox="0 0 261 61"
-      fill="none"
+      fill={color}
+      className={className}
+      aria-label={ariaLabel}
+      viewBox="0 0 72 24"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <path
-        d="M126.836 10.6396L122.859 29.3287C122.696 30.0922 122.614 30.8707 122.614 31.6514V40.6187H118.34V32.1939C118.34 31.1775 118.2 30.1659 117.924 29.1875L112.714 10.6396H102.145L96.9868 29.0463C96.7113 30.0247 96.5712 31.0363 96.5706 32.0527V40.6001H92.2969V31.8223C92.2964 31.0419 92.2155 30.2635 92.0554 29.4997L88.0342 10.6396H77.3464V11.7545L87.2391 50.032H99.4284L104.739 31.1497C105.014 30.1662 105.155 29.1497 105.155 28.1284V20.1644H109.429V28.1061C109.428 29.1251 109.568 30.1394 109.845 31.1199L115.155 50.032H127.315L137.241 11.7545V10.6396H126.836Z"
-        fill={color}
-      />
-      <path
-        d="M260.142 28.8865C260.142 16.7752 252.917 9.73291 240.914 9.73291C230.88 9.73291 223.611 14.408 221.385 23.7692C221.277 24.2073 221.271 24.6642 221.366 25.1053C221.461 25.5464 221.655 25.96 221.933 26.3149C222.212 26.6698 222.568 26.9566 222.974 27.1536C223.38 27.3506 223.825 27.4527 224.276 27.452H229.137V31.7257H223.983C223.551 31.7254 223.125 31.819 222.733 32C222.341 32.181 221.994 32.4451 221.714 32.774C221.435 33.1028 221.23 33.4886 221.115 33.9044C221 34.3202 220.976 34.7561 221.047 35.1819C222.782 45.6803 230.337 50.9351 241.021 50.9351C253.255 50.9351 258.146 43.9374 259.387 38.5228V37.4079H249.755C249.156 39.816 246.745 42.789 240.836 42.789C234.849 42.789 231.385 38.7272 231.24 33.3832H260.138L260.142 28.8865ZM231.352 25.8429C231.805 21.5097 234.89 17.786 240.758 17.786C246.819 17.786 249.718 21.3982 249.792 25.8429H231.352Z"
-        fill={color}
-      />
-      <path
-        d="M212.172 10.4834C207.293 10.4834 203.87 15.203 202.138 20.1828H197.53C197.53 20.1828 201.51 15.2105 201.904 10.6395H191.164V50.0318H202.228V29.4884C202.228 22.5278 205.234 19.5176 211.332 19.5176H216.977V10.4834H212.172Z"
-        fill={color}
-      />
-      <path
-        d="M173.761 10.6396L166.488 31.0791C166.06 32.2803 165.842 33.5461 165.842 34.8213V40.6261H161.568V34.8176C161.568 33.5512 161.35 32.2942 160.925 31.1014L153.671 10.6619H142.151V11.7768L156.153 46.364L160.316 46.4049L158.424 51.4702L146.16 51.4367V60.876H157.989C160.087 60.8757 162.137 60.2515 163.878 59.0829C165.62 57.9142 166.975 56.2539 167.77 54.3131L185.014 11.7545V10.6396H173.761Z"
-        fill={color}
-      />
-      <path
-        d="M51.4405 30.2466L54.681 22.4759V14.4897H43.7478L46.442 8.0011V0H16.1769L6.10352e-05 39.0988V46.5313H11.1078L8.23898 53.4361V60.5862L34.2045 60.471H42.9711L61.5896 36.5828V30.2652L51.4405 30.2466ZM51.8938 21.9185L48.4228 30.2466H33.595L15.5191 53.4955H11.2343L26.2813 17.2769H51.8976L51.8938 21.9185ZM18.0424 2.78719H43.6548V7.44739L40.7301 14.4897L24.4306 14.5083L7.2542 39.1619H2.99158L18.0424 2.78719Z"
-        fill={color}
-      />
+      <path d="M14.797 0.229002L10.8 9.895C10.5262 10.5518 10.0638 11.1126 9.47122 11.5065C8.87863 11.9004 8.18256 12.1098 7.47098 12.108H0.0669861L4.06198 2.442C4.33585 1.78506 4.7984 1.22413 5.39117 0.830201C5.98395 0.436268 6.68027 0.227042 7.392 0.229002H14.797Z" />
+      <path d="M40.245 20.496C42.452 20.803 43.795 20.403 44.837 19.373C45.49 18.727 45.987 17.97 46.425 17.174C48.201 13.955 52.474 6.179 52.474 6.179H49.396L46.196 12.549L45.196 6.179H41.926V6.327L43.601 15.147C43.686 15.593 43.774 16.739 42.961 17.481C42.505 17.895 41.848 18.24 40.716 18.056L40.245 20.496Z" />
+      <path d="M37.793 6.179L34.817 12.868L34.737 12.861L34.334 6.345H31.093L27.934 12.869L27.853 12.842L27.718 6.179H24.617L25.234 16.864H28.59L31.842 9.892L31.918 9.905L32.434 16.864H35.812L40.698 6.179H37.793Z" />
+      <path d="M55.73 16.864H52.474C52.8223 15.1331 53.1632 13.4302 53.5038 11.7287C53.8722 9.8883 54.2403 8.04958 54.617 6.179H57.142V8.145C57.48 7.333 57.942 6.576 58.724 6.245C59.491 5.919 60.677 5.935 61.887 6.304C61.6525 6.75282 61.4456 7.17747 61.2344 7.61075L61.2333 7.61303L61.2325 7.61467C61.0148 8.06153 60.7925 8.51765 60.531 9.019C60.3778 8.98937 60.2298 8.9568 60.0849 8.92492C59.7898 8.85999 59.5073 8.79783 59.221 8.769C58.265 8.676 57.569 9.054 57.243 9.953C57.015 10.58 56.873 11.245 56.735 11.901C56.5068 12.9847 56.2899 14.0701 56.0714 15.1636L56.0711 15.165C55.9584 15.7289 55.8453 16.2949 55.73 16.864Z" />
+      <path d="M70.31 14.208H70.201C68.954 14.682 67.571 14.806 66.617 14.538C65.563 14.242 64.956 13.334 65.147 12.308C68.287 12.57 69.62 11.978 70.336 11.554C72.274 10.406 72.767 7.332 70.238 6.422C68.016 5.622 64.92 6.002 63.458 7.758C62.125 9.357 61.734 11.115 61.938 13.073C62.091 14.545 63.111 16.656 66.442 16.986C68.457 17.185 69.746 16.672 69.84 16.634L70.31 14.208ZM66.142 8.72C66.608 8.16 67.446 7.85 68.069 8.043C68.828 8.278 69.077 9.112 68.538 9.693C68.3444 9.89534 68.1074 10.0512 67.845 10.149C67.061 10.441 66.251 10.432 65.398 10.286C65.542 9.666 65.77 9.168 66.142 8.72Z" />
+      <path d="M4.97699 23.996H12.382C13.842 23.996 15.158 23.121 15.712 21.783L19.706 12.117L15.223 17.765C14.543 18.661 13.515 19.245 12.305 19.245H6.94098L4.97699 23.996Z" />
+      <path d="M2.52197 18.055H9.92697C11.387 18.055 12.703 17.18 13.257 15.842L17.251 6.177L12.768 11.824C12.088 12.72 11.06 13.304 9.84998 13.304H4.48596L2.52197 18.055Z" />
     </svg>
   );
 };
@@ -42,6 +36,14 @@ LogoWyre.propTypes = {
    * The color of the logo defaults to var(--color-text-default)
    */
   color: PropTypes.string,
+  /**
+   * Additional className to add to the root svg
+   */
+  className: PropTypes.string,
+  /**
+   * Aria label to add to the logo component
+   */
+  ariaLabel: PropTypes.string,
 };
 
 export default LogoWyre;
diff --git a/ui/components/ui/logo/logo.stories.js b/ui/components/ui/logo/logo.stories.js
index 9ee9001a3dbf..1867676ae002 100644
--- a/ui/components/ui/logo/logo.stories.js
+++ b/ui/components/ui/logo/logo.stories.js
@@ -7,7 +7,6 @@ import Card from '../card';
 import Box from '../box';
 import Typography from '../typography';
 
-import LogoCoinbasePay from './logo-coinbasepay';
 import LogoMoonPay from './logo-moonpay';
 import LogoWyre from './logo-wyre';
 import LogoTransak from './logo-transak';
@@ -69,7 +68,6 @@ export const DefaultStory = (args) => (
       gridTemplateColumns: 'repeat(auto-fill, 176px)',
     }}
   >
-    <LogoItem Component={<LogoCoinbasePay {...args} />} />
     <LogoItem Component={<LogoWyre {...args} />} />
     <LogoItem Component={<LogoTransak {...args} />} />
     <LogoItem Component={<LogoDepositEth {...args} />} />
diff --git a/ui/components/ui/menu/menu.scss b/ui/components/ui/menu/menu.scss
index 17e457d0cd30..221f26feb83d 100644
--- a/ui/components/ui/menu/menu.scss
+++ b/ui/components/ui/menu/menu.scss
@@ -3,7 +3,7 @@
     @include H6;
 
     background: var(--color-background-default);
-    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.214);
     border-radius: 8px;
     width: 225px;
     color: var(--color-text-default);
@@ -43,6 +43,6 @@
   &__icon {
     margin-right: 8px;
     grid-row: 1 / span 2;
-    color: var(--color-icon-alternative);
+    color: var(--color-icon-default);
   }
 }
diff --git a/ui/components/ui/metafox-logo/horizontal-logo.js b/ui/components/ui/metafox-logo/horizontal-logo.js
index 83940ef7414a..920f5d274b08 100644
--- a/ui/components/ui/metafox-logo/horizontal-logo.js
+++ b/ui/components/ui/metafox-logo/horizontal-logo.js
@@ -6,7 +6,7 @@ const LOGO_HEIGHT = 30;
 const TEXT_COLOR = 'var(--color-text-default)';
 const FLASK_PILL_BACKGROUND = 'var(--color-overlay-alternative)';
 const FLASK_PILL_TEXT = 'var(--color-overlay-inverse)';
-const BETA_PILL_BACKGROUND = 'var(--color-warning-default)';
+const BETA_PILL_BACKGROUND = 'var(--color-secondary-default)';
 const BETA_PIL_TEXT = 'var(--color-secondary-inverse)';
 
 export default function MetaFoxHorizontalLogo({ className }) {
diff --git a/ui/components/ui/nickname-popover/nickname-popover.stories.js b/ui/components/ui/nickname-popover/nickname-popover.stories.js
index c0d7fb04110f..9cf1921da0fc 100644
--- a/ui/components/ui/nickname-popover/nickname-popover.stories.js
+++ b/ui/components/ui/nickname-popover/nickname-popover.stories.js
@@ -1,54 +1,33 @@
 import React, { useState } from 'react';
+import { action } from '@storybook/addon-actions';
+import { text } from '@storybook/addon-knobs';
 import Button from '../button';
 import NicknamePopover from '.';
 
 export default {
   title: 'Components/UI/NicknamePopover',
   id: __filename,
-  argTypes: {
-    address: {
-      control: { type: 'text' },
-      name: 'Address',
-    },
-    onClosePopover: {
-      action: 'Close Nickname Popover',
-    },
-    onAdd: {
-      action: 'Add Nickname Popover',
-    },
-    onOpenPopover: {
-      action: 'Open Nickname Popover',
-    },
-  },
-  args: {
-    address: '0x5e6DaAD1BE117e26590F9eEcD509336ABFBe5966',
-  },
 };
 
-export const DefaultStory = (args) => {
+export const DefaultStory = () => {
   const [showNicknamePopover, setShowNicknamePopover] = useState(false);
 
   return (
-    <>
-      <Button
-        onClick={() => {
-          args.onOpenPopover();
-          setShowNicknamePopover(true);
-        }}
-      >
+    <div>
+      <Button onClick={() => setShowNicknamePopover(true)}>
         Open Nickname Popover
       </Button>
       {showNicknamePopover && (
         <NicknamePopover
-          address={args.address}
-          onClose={() => {
-            args.onClosePopover();
-            setShowNicknamePopover(false);
-          }}
-          onAdd={args.onAdd}
+          address={text(
+            'Address',
+            '0x5e6DaAD1BE117e26590F9eEcD509336ABFBe5966',
+          )}
+          onClose={() => setShowNicknamePopover(false)}
+          onAdd={action('add NicknamePopover')}
         />
       )}
-    </>
+    </div>
   );
 };
 
diff --git a/ui/components/ui/page-container/index.scss b/ui/components/ui/page-container/index.scss
index c15941abb660..0128b1d598be 100644
--- a/ui/components/ui/page-container/index.scss
+++ b/ui/components/ui/page-container/index.scss
@@ -1,7 +1,7 @@
 .page-container {
   width: 408px;
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   z-index: 25;
   display: flex;
   flex-flow: column;
diff --git a/ui/components/ui/page-container/page-container.component.js b/ui/components/ui/page-container/page-container.component.js
index d360bbc1b111..a7bee1fe6bb4 100644
--- a/ui/components/ui/page-container/page-container.component.js
+++ b/ui/components/ui/page-container/page-container.component.js
@@ -74,7 +74,9 @@ export default class PageContainer extends PureComponent {
     children = children.filter(Boolean);
     const { activeTabIndex } = this.state;
 
-    return (children[activeTabIndex] || children[0]).props.children;
+    return children[activeTabIndex]
+      ? children[activeTabIndex].props.children
+      : children.props.children;
   }
 
   renderContent() {
diff --git a/ui/components/ui/page-container/page-container.stories.js b/ui/components/ui/page-container/page-container.stories.js
deleted file mode 100644
index a18cf7f5d72e..000000000000
--- a/ui/components/ui/page-container/page-container.stories.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import PageContainer from '.';
-
-export default {
-  title: 'Components/UI/PageContainer',
-  id: __filename,
-  argTypes: {
-    backButtonString: {
-      control: 'text',
-    },
-    backButtonStyles: {
-      control: 'object',
-    },
-    headerCloseText: {
-      control: 'text',
-    },
-    onBackButtonClick: {
-      action: 'onBackButtonClick',
-    },
-    onClose: {
-      action: 'onClose',
-    },
-    showBackButton: {
-      control: 'boolean',
-    },
-    subtitle: {
-      control: 'text',
-    },
-    title: {
-      control: 'text',
-    },
-    defaultActiveTabIndex: {
-      control: 'number',
-    },
-    tabsComponent: {
-      control: 'node',
-    },
-    contentComponent: {
-      control: 'node',
-    },
-    cancelText: {
-      control: 'text',
-    },
-    disabled: {
-      control: 'boolean',
-    },
-    hideCancel: {
-      control: 'boolean',
-    },
-    onCancel: {
-      action: 'onCancel',
-    },
-    onSubmit: {
-      action: 'onSubmit',
-    },
-    submitText: {
-      control: 'text',
-    },
-  },
-};
-
-export const DefaultStory = (args) => (
-  <PageContainer {...args}>Page container</PageContainer>
-);
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index 99077d5dfacf..d51d02a31824 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -15,7 +15,7 @@
     position: absolute;
     width: 328px;
     max-height: 94vh;
-    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+    box-shadow: 0 4px 30px rgba(0, 0, 0, 0.25);
     border-radius: 10px;
     background: var(--color-background-default);
   }
@@ -104,6 +104,6 @@
     background: var(--color-background-default);
     position: absolute;
     transform: rotate(45deg);
-    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+    box-shadow: 0 4px 30px rgba(0, 0, 0, 0.25);
   }
 }
diff --git a/ui/components/ui/search-icon/index.js b/ui/components/ui/search-icon/index.js
new file mode 100644
index 000000000000..7583cbf6b4e7
--- /dev/null
+++ b/ui/components/ui/search-icon/index.js
@@ -0,0 +1 @@
+export { default } from './search-icon.component';
diff --git a/ui/components/ui/search-icon/search-icon.component.js b/ui/components/ui/search-icon/search-icon.component.js
new file mode 100644
index 000000000000..fd3d78081090
--- /dev/null
+++ b/ui/components/ui/search-icon/search-icon.component.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+export default function SearchIcon({ color }) {
+  return (
+    <svg height="20" width="20" xmlns="http://www.w3.org/2000/svg" fill={color}>
+      <g clipRule="evenodd" fillRule="evenodd">
+        <path d="M9.167 3.333a5.833 5.833 0 100 11.667 5.833 5.833 0 000-11.667zm-7.5 5.834a7.5 7.5 0 1115 0 7.5 7.5 0 01-15 0z" />
+        <path d="M13.286 13.286a.833.833 0 011.178 0l3.625 3.625a.833.833 0 11-1.178 1.178l-3.625-3.625a.833.833 0 010-1.178z" />
+      </g>
+    </svg>
+  );
+}
+
+SearchIcon.propTypes = {
+  /**
+   * Color of the icon should be a valid design system color and is required
+   */
+  color: PropTypes.string.isRequired,
+};
diff --git a/ui/components/ui/sender-to-recipient/index.scss b/ui/components/ui/sender-to-recipient/index.scss
index 9473f6ba29ad..e00d34c4cc1a 100644
--- a/ui/components/ui/sender-to-recipient/index.scss
+++ b/ui/components/ui/sender-to-recipient/index.scss
@@ -27,7 +27,7 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        border-bottom: 1px solid var(--color-border-muted);
+        border: 1px solid var(--color-border-default);
 
         &--sender {
           padding-right: 30px;
@@ -107,7 +107,7 @@
         justify-content: center;
         flex: 1;
         border-radius: 4px;
-        box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.08);
         padding: 6px;
         background: var(--color-background-default);
         cursor: pointer;
diff --git a/ui/components/ui/site-icon/site-icon.test.js b/ui/components/ui/site-icon/site-icon.test.js
index f1e793c3ba51..5c4efa156ba7 100644
--- a/ui/components/ui/site-icon/site-icon.test.js
+++ b/ui/components/ui/site-icon/site-icon.test.js
@@ -4,7 +4,6 @@ import SiteIcon from '.';
 
 describe('SiteIcon', () => {
   const args = {
-    size: 32,
     name: 'Snap name',
     icon: './images/eth_logo.svg',
     className: 'classname-test',
@@ -12,7 +11,7 @@ describe('SiteIcon', () => {
   };
 
   it('should render without crashing', () => {
-    const { getByText } = render(<SiteIcon size={32} name={args.name} />);
+    const { getByText } = render(<SiteIcon name={args.name} />);
     expect(getByText('S')).toBeDefined();
   });
 
diff --git a/ui/components/ui/site-origin/index.scss b/ui/components/ui/site-origin/index.scss
index 895e0f2ef5cd..2f0016e76e5f 100644
--- a/ui/components/ui/site-origin/index.scss
+++ b/ui/components/ui/site-origin/index.scss
@@ -1,13 +1,12 @@
 .site-origin {
-  overflow: hidden;
   max-width: 100%;
 
   .chip {
     max-width: 100%;
+  }
 
-    &__left-icon {
-      padding: 4px 0 4px 8px;
-    }
+  .chip__left-icon {
+    padding: 4px 0 4px 8px;
   }
 
   span {
@@ -18,6 +17,5 @@
 
     /*rtl:ignore*/
     direction: rtl;
-    max-width: 100%;
   }
 }
diff --git a/ui/components/ui/site-origin/site-origin.js b/ui/components/ui/site-origin/site-origin.js
index 78fee0e6bf9a..2dc545a68133 100644
--- a/ui/components/ui/site-origin/site-origin.js
+++ b/ui/components/ui/site-origin/site-origin.js
@@ -1,60 +1,22 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
 import Chip from '../chip';
 import IconWithFallback from '../icon-with-fallback';
 
-export default function SiteOrigin({
-  siteOrigin,
-  iconSrc,
-  iconName,
-  chip,
-  className,
-  title,
-}) {
+export default function SiteOrigin({ siteOrigin, iconSrc, iconName }) {
   return (
-    <div className={classnames('site-origin', className)} title={title}>
-      {chip ? (
-        <Chip
-          label={siteOrigin}
-          maxContent={false}
-          leftIcon={
-            <IconWithFallback icon={iconSrc} name={iconName} size={32} />
-          }
-        />
-      ) : (
-        <span>{siteOrigin}</span>
-      )}
+    <div className="site-origin">
+      <Chip
+        label={siteOrigin}
+        maxContent={false}
+        leftIcon={<IconWithFallback icon={iconSrc} name={iconName} size={32} />}
+      />
     </div>
   );
 }
 
 SiteOrigin.propTypes = {
-  /**
-   * The origin of the site generally the URL
-   */
   siteOrigin: PropTypes.string.isRequired,
-  /**
-   * Icon name is used for the fallback icon and will display the first letter of the string
-   * when iconSrc errors or is not provided.
-   */
   iconName: PropTypes.string,
-  /**
-   * The image src of the icon
-   */
   iconSrc: PropTypes.string,
-  /**
-   * Additional className added to the root html element
-   */
-  className: PropTypes.string,
-  /**
-   * title specifies extra information and is added to a title attribute added to the root html element
-   * It is most often shown as a tooltip text when the mouse moves over the element.
-   */
-  title: PropTypes.string,
-  /**
-   * Whether the SiteOrigin is displayed as a chip or plain text.
-   * if false iconSrc and iconName props will not be used.
-   */
-  chip: PropTypes.bool,
 };
diff --git a/ui/components/ui/site-origin/site-origin.stories.js b/ui/components/ui/site-origin/site-origin.stories.js
index 2604b5704526..53a11c190e7b 100644
--- a/ui/components/ui/site-origin/site-origin.stories.js
+++ b/ui/components/ui/site-origin/site-origin.stories.js
@@ -16,12 +16,6 @@ export default {
     iconName: {
       control: 'text',
     },
-    title: {
-      control: 'text',
-    },
-    chip: {
-      control: 'boolean',
-    },
   },
 };
 
@@ -31,8 +25,6 @@ DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
   siteOrigin: 'https://metamask.io',
-  title: 'https://metamask.io',
   iconName: 'MetaMask',
   iconSrc: './metamark.svg',
-  chip: true,
 };
diff --git a/ui/components/ui/slider/slider.component.js b/ui/components/ui/slider/slider.component.js
index 7861859a0ace..9061dee58bab 100644
--- a/ui/components/ui/slider/slider.component.js
+++ b/ui/components/ui/slider/slider.component.js
@@ -35,13 +35,13 @@ const styles = {
     backgroundColor: 'var(--color-primary-default)',
     border: '1px solid var(--color-border-muted)',
     boxSizing: 'border-box',
-    boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
+    boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
     '&:focus, &$active': {
       height: 20,
       width: 20,
       marginTop: -7,
       marginLeft: -7,
-      boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
+      boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
     },
     '&:hover': {
       height: 22,
@@ -49,7 +49,7 @@ const styles = {
       marginTop: -8,
       marginLeft: -8,
       border: 'none',
-      boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
+      boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
     },
   },
 };
diff --git a/ui/components/ui/spinner/spinner.stories.js b/ui/components/ui/spinner/spinner.stories.js
deleted file mode 100644
index a66074e1e708..000000000000
--- a/ui/components/ui/spinner/spinner.stories.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import Spinner from '.';
-
-export default {
-  title: 'Components/UI/Spinner',
-  id: __filename,
-  argTypes: {
-    className: {
-      control: 'text',
-    },
-    color: {
-      control: 'text',
-    },
-  },
-  args: {
-    color: 'var(--color-warning-default)',
-  },
-};
-
-export const DefaultStory = (args) => (
-  <div style={{ width: 100, height: 100 }}>
-    <Spinner {...args} />
-  </div>
-);
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/tabs/index.scss b/ui/components/ui/tabs/index.scss
index 96ccf695c2af..fd579d15d765 100644
--- a/ui/components/ui/tabs/index.scss
+++ b/ui/components/ui/tabs/index.scss
@@ -12,6 +12,6 @@
     background-color: var(--color-background-default);
     position: sticky;
     top: 0;
-    z-index: 2;
+    z-index: 1;
   }
 }
diff --git a/ui/components/ui/tabs/tabs.stories.js b/ui/components/ui/tabs/tabs.stories.js
index 0266eec6c5d7..cefd21b73898 100644
--- a/ui/components/ui/tabs/tabs.stories.js
+++ b/ui/components/ui/tabs/tabs.stories.js
@@ -1,48 +1,35 @@
 import React from 'react';
+import { text } from '@storybook/addon-knobs';
 import Tab from './tab/tab.component';
 import Tabs from './tabs.component';
 
 export default {
   title: 'Components/UI/Tabs',
   id: __filename,
-  argTypes: {
-    tabs: {
-      control: 'object',
-      name: 'Tabs',
-    },
-    defaultActiveTabName: {
-      control: {
-        type: 'text',
-      },
-    },
-    onTabClick: { action: 'onTabClick' },
-  },
-  args: {
-    tabs: [
-      { name: 'Tab A', content: 'Tab A Content' },
-      { name: 'Tab B', content: 'Tab B Content' },
-      { name: 'Tab C', content: 'Tab C Content' },
-    ],
-  },
 };
 
-function renderTab({ name, content }, index) {
+function renderTab(id) {
   return (
-    <Tab name={name} key={name + index}>
-      {content}
+    <Tab name={text(`Tab ${id} Name`, `Tab ${id}`)} key={id}>
+      {text(`Tab ${id} Contents`, `Contents of Tab ${id}`)}
     </Tab>
   );
 }
 
-export const DefaultStory = (args) => {
+export const TwoTabs = () => {
+  return <Tabs>{['A', 'B'].map(renderTab)}</Tabs>;
+};
+
+export const ManyTabs = () => {
+  return <Tabs>{['A', 'B', 'C', 'D', 'E'].map(renderTab)}</Tabs>;
+};
+
+export const SingleTab = () => {
   return (
-    <Tabs
-      defaultActiveTabName={args.defaultActiveTabName}
-      onTabClick={args.onTabClick}
-    >
-      {args.tabs.map((tabProps, i) => renderTab(tabProps, i))}
+    <Tabs>
+      <Tab name={text('Name', 'Single A')}>
+        {text('Contents', 'Contents of tab')}
+      </Tab>
     </Tabs>
   );
 };
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/text-field/index.scss b/ui/components/ui/text-field/index.scss
index 2626c345bf7a..a33cf5630034 100644
--- a/ui/components/ui/text-field/index.scss
+++ b/ui/components/ui/text-field/index.scss
@@ -2,9 +2,3 @@
 .MuiInputBase-input {
   color: var(--color-text-default) !important;
 }
-
-.MuiFormHelperText-root.Mui-error {
-  @include H7;
-
-  color: var(--color-error-default) !important;
-}
diff --git a/ui/components/ui/textarea/textarea.js b/ui/components/ui/textarea/textarea.js
index f08a01f8f008..e20f450522bc 100644
--- a/ui/components/ui/textarea/textarea.js
+++ b/ui/components/ui/textarea/textarea.js
@@ -38,7 +38,7 @@ const TextArea = ({
       borderColor={COLORS.BORDER_DEFAULT}
       borderRadius={SIZES.SM}
       borderStyle={BORDER_STYLE.SOLID}
-      padding={4}
+      padding={[4, 4]}
       width={BLOCK_SIZES.FULL}
       {...boxProps}
     >
diff --git a/ui/components/ui/token-input/token-input.component.js b/ui/components/ui/token-input/token-input.component.js
index 5f2cab05622c..3b8d2eefbe49 100644
--- a/ui/components/ui/token-input/token-input.component.js
+++ b/ui/components/ui/token-input/token-input.component.js
@@ -11,7 +11,6 @@ import {
 
 import { ETH } from '../../../helpers/constants/common';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
-import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 
 /**
  * Component that allows user to enter token values as a number, and props receive a converted
@@ -35,7 +34,6 @@ export default class TokenInput extends PureComponent {
       symbol: PropTypes.string,
     }).isRequired,
     tokenExchangeRates: PropTypes.object,
-    tokens: PropTypes.array.isRequired,
   };
 
   constructor(props) {
@@ -110,15 +108,10 @@ export default class TokenInput extends PureComponent {
       currentCurrency,
       hideConversion,
       token,
-      tokens,
     } = this.props;
     const { decimalValue } = this.state;
 
-    const existingToken = tokens.find(({ address }) =>
-      isEqualCaseInsensitive(address, token.address),
-    );
-
-    const tokenExchangeRate = tokenExchangeRates?.[existingToken?.address] ?? 0;
+    const tokenExchangeRate = tokenExchangeRates?.[token.address] || 0;
     let currency, numberOfDecimals;
 
     if (hideConversion) {
diff --git a/ui/components/ui/token-input/token-input.component.test.js b/ui/components/ui/token-input/token-input.component.test.js
index a7245c54eb23..ac8d55fe871e 100644
--- a/ui/components/ui/token-input/token-input.component.test.js
+++ b/ui/components/ui/token-input/token-input.component.test.js
@@ -28,15 +28,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
           />
         </Provider>,
         {
@@ -75,15 +66,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -119,15 +101,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -165,15 +138,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -213,15 +177,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             hideConversion
@@ -274,15 +229,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -327,15 +273,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -382,15 +319,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
           />
@@ -437,15 +365,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -485,15 +404,6 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
-            tokens={[
-              {
-                address: '0x1',
-                decimals: 4,
-                symbol: 'ABC',
-                image: null,
-                isERC721: false,
-              },
-            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
diff --git a/ui/components/ui/token-input/token-input.container.js b/ui/components/ui/token-input/token-input.container.js
index 98082a3db387..9f964feec655 100644
--- a/ui/components/ui/token-input/token-input.container.js
+++ b/ui/components/ui/token-input/token-input.container.js
@@ -5,14 +5,13 @@ import TokenInput from './token-input.component';
 
 const mapStateToProps = (state) => {
   const {
-    metamask: { currentCurrency, tokens },
+    metamask: { currentCurrency },
   } = state;
 
   return {
     currentCurrency,
     tokenExchangeRates: getTokenExchangeRates(state),
     hideConversion: !getShouldShowFiat(state),
-    tokens,
   };
 };
 
diff --git a/ui/components/ui/tooltip/index.scss b/ui/components/ui/tooltip/index.scss
index 8ae602e33f7b..fe1e5819a2c9 100644
--- a/ui/components/ui/tooltip/index.scss
+++ b/ui/components/ui/tooltip/index.scss
@@ -1,44 +1,30 @@
-.tippy-popper {
-  .tippy-tooltip.tippy-tooltip--mm-custom-theme {
-    background: var(--color-background-default);
-    color: var(--color-text-default);
-    box-shadow: var(--shadow-size-md) var(--color-shadow-default);
-    padding: 12px 16px;
-    padding-bottom: 11px;
-
-    .tippy-tooltip-content {
-      @include H7;
-
-      text-align: left;
-      color: var(--color-text-alternative);
-
-      a {
-        color: var(--color-primary-default);
-      }
-
-      p {
-        margin-bottom: 16px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-    }
+.tippy-tooltip.white-theme {
+  background: var(--color-background-default);
+  color: var(--color-text-default);
+  box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+  padding: 12px 16px;
+  padding-bottom: 11px;
+
+  .tippy-tooltip-content {
+    @include H7;
+
+    text-align: left;
+    color: var(--color-text-alternative);
   }
+}
 
-  &[x-placement^=top] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
-    border-top-color: var(--color-background-default);
-  }
+.tippy-popper[x-placement^=top] .white-theme [x-arrow] {
+  border-top-color: var(--color-background-default);
+}
 
-  &[x-placement^=right] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
-    border-right-color: var(--color-background-default);
-  }
+.tippy-popper[x-placement^=right] .white-theme [x-arrow] {
+  border-right-color: var(--color-background-default);
+}
 
-  &[x-placement^=left] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
-    border-left-color: var(--color-background-default);
-  }
+.tippy-popper[x-placement^=left] .white-theme [x-arrow] {
+  border-left-color: var(--color-background-default);
+}
 
-  &[x-placement^=bottom] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
-    border-bottom-color: var(--color-background-default);
-  }
+.tippy-popper[x-placement^=bottom] .white-theme [x-arrow] {
+  border-bottom-color: var(--color-background-default);
 }
diff --git a/ui/components/ui/tooltip/tooltip.js b/ui/components/ui/tooltip/tooltip.js
index b05a0acf1922..84afe57ed13e 100644
--- a/ui/components/ui/tooltip/tooltip.js
+++ b/ui/components/ui/tooltip/tooltip.js
@@ -82,7 +82,7 @@ export default class Tooltip extends PureComponent {
         style={style}
         title={disabled ? '' : title}
         trigger={trigger}
-        theme={`tippy-tooltip--mm-custom ${theme}`} // Required for correct theming
+        theme={theme}
         tabIndex={tabIndex || 0}
         tag={tag}
       >
diff --git a/ui/components/ui/tooltip/tooltip.stories.js b/ui/components/ui/tooltip/tooltip.stories.js
deleted file mode 100644
index cd60685a440f..000000000000
--- a/ui/components/ui/tooltip/tooltip.stories.js
+++ /dev/null
@@ -1,92 +0,0 @@
-import React from 'react';
-import Box from '../box/box';
-import Typography from '../typography/typography';
-import Tooltip from '.';
-
-export default {
-  title: 'Components/UI/Tooltip',
-  id: __filename,
-  argTypes: {
-    containerClassName: {
-      control: 'text',
-    },
-    disabled: {
-      control: 'boolean',
-    },
-    html: {
-      control: 'html',
-    },
-    interactive: {
-      control: 'boolean',
-    },
-    onHidden: {
-      action: 'onHidden',
-    },
-    position: {
-      control: 'select',
-      options: ['top', 'right', 'bottom', 'left'],
-    },
-    size: {
-      control: 'select',
-      options: ['small', 'regular', 'big'],
-    },
-    title: {
-      control: 'text',
-    },
-    trigger: {
-      control: 'any',
-    },
-    wrapperClassName: {
-      control: 'text',
-    },
-    style: {
-      control: 'object',
-    },
-    tabIndex: {
-      control: 'number',
-    },
-    tag: {
-      control: 'text',
-    },
-  },
-  args: {
-    position: 'top',
-    title: 'Title of the tooltip',
-    trigger: 'mouseenter',
-  },
-};
-
-export const DefaultStory = (args) => (
-  <Box display="flex">
-    <Typography>Hover over the info icon to see the tooltip</Typography>
-    <Tooltip {...args}>
-      <i
-        className="fa fa-sm fa-info-circle"
-        style={{ color: 'var(--color-icon-alternative)' }}
-      />
-    </Tooltip>
-  </Box>
-);
-
-DefaultStory.storyName = 'Default';
-
-export const HTML = (args) => (
-  <Box display="flex">
-    <Typography>This tooltips content is html</Typography>
-    <Tooltip {...args}>
-      <i
-        className="fa fa-sm fa-info-circle"
-        style={{ color: 'var(--color-icon-alternative)' }}
-      />
-    </Tooltip>
-  </Box>
-);
-
-HTML.args = {
-  interactive: true,
-  html: (
-    <Box>
-      And includes a <a href="#">link</a>
-    </Box>
-  ),
-};
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index d3342e4cb36c..55224a2953e8 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -9,7 +9,7 @@ import {
   TYPOGRAPHY,
   OVERFLOW_WRAP,
 } from '../../../helpers/constants/design-system';
-import Box, { MultipleSizesAndAuto } from '../box';
+import Box, { MultipleSizes } from '../box';
 
 const { H6, H7, H8, H9 } = TYPOGRAPHY;
 
@@ -58,11 +58,7 @@ export default function Typography({
   overflowWrap,
   title,
   tag,
-  margin,
-  marginTop = 1,
-  marginRight,
-  marginBottom = 1,
-  marginLeft,
+  margin = [1, 0],
   boxProps = {},
   className,
   children,
@@ -94,16 +90,7 @@ export default function Typography({
   }
 
   return (
-    <Box
-      {...{
-        margin,
-        marginTop,
-        marginRight,
-        marginBottom,
-        marginLeft,
-        ...boxProps,
-      }}
-    >
+    <Box margin={margin} {...boxProps}>
       {(boxClassName) => (
         <Tag
           className={classnames(boxClassName, computedClassName)}
@@ -151,13 +138,10 @@ Typography.propTypes = {
    */
   tag: PropTypes.oneOf(ValidTags),
   /**
-   * Adds margin to the Typography component should use valid size
+   * Adds margin to the Typography component should use valid sizes
+   * 1,2,4,6,8 or an array of those values
    */
-  margin: MultipleSizesAndAuto,
-  marginTop: MultipleSizesAndAuto,
-  marginBottom: MultipleSizesAndAuto,
-  marginRight: MultipleSizesAndAuto,
-  marginLeft: MultipleSizesAndAuto,
+  margin: MultipleSizes,
   /**
    * Used to pass any valid Box component props such as margin or padding
    * to the Typography component
diff --git a/ui/components/ui/ui-components.scss b/ui/components/ui/ui-components.scss
index 24cb6ddec9f6..52c0a8e95b1f 100644
--- a/ui/components/ui/ui-components.scss
+++ b/ui/components/ui/ui-components.scss
@@ -30,7 +30,6 @@
 @import 'list-item/index';
 @import 'loading-heartbeat/index';
 @import 'loading-indicator/loading-indicator';
-@import 'logo/logo-coinbasepay.scss';
 @import 'loading-screen/index';
 @import 'menu/menu';
 @import 'numeric-input/numeric-input';
diff --git a/ui/components/ui/update-nickname-popover/index.scss b/ui/components/ui/update-nickname-popover/index.scss
index 21a7736f4c07..a3684a68ffba 100644
--- a/ui/components/ui/update-nickname-popover/index.scss
+++ b/ui/components/ui/update-nickname-popover/index.scss
@@ -24,7 +24,7 @@
   }
 
   &__content {
-    padding: 0 18px 20px 18px;
+    padding: 0 20px 20px 20px;
     position: relative;
 
     &__indenticon {
diff --git a/ui/components/ui/update-nickname-popover/update-nickname-popover.js b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
index dc9804635685..3396d4fdce70 100644
--- a/ui/components/ui/update-nickname-popover/update-nickname-popover.js
+++ b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
@@ -12,18 +12,16 @@ import Identicon from '../identicon/identicon.component';
 import { getUseTokenDetection, getTokenList } from '../../../selectors';
 
 export default function UpdateNicknamePopover({
+  nickname,
   address,
-  nickname = '',
-  memo = '',
   onAdd,
+  memo,
   onClose,
 }) {
   const t = useContext(I18nContext);
 
-  const [nicknameInput, setNicknameInput] = useState(
-    nickname === null ? '' : nickname,
-  );
-  const [memoInput, setMemoInput] = useState(memo === null ? '' : memo);
+  const [nicknameInput, setNicknameInput] = useState(nickname);
+  const [memoInput, setMemoInput] = useState(memo);
 
   const handleNicknameChange = (event) => {
     setNicknameInput(event.target.value);
diff --git a/ui/components/ui/url-icon/index.scss b/ui/components/ui/url-icon/index.scss
index 3e4a2a11a069..7753d667eddb 100644
--- a/ui/components/ui/url-icon/index.scss
+++ b/ui/components/ui/url-icon/index.scss
@@ -4,7 +4,7 @@
   background-position: center;
   border-radius: 50%;
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 0 2px 4px 0 rgba($black, 0.24);
   flex: 0 0 auto;
   -moz-animation: fadein 1s;
 
diff --git a/ui/css/base-styles.scss b/ui/css/base-styles.scss
index 23e946a0fa21..3935c6dc1260 100644
--- a/ui/css/base-styles.scss
+++ b/ui/css/base-styles.scss
@@ -124,3 +124,4 @@ input.form-control {
 * {
   font-family: $font-family;
 }
+
diff --git a/ui/css/design-system/attributes.scss b/ui/css/design-system/attributes.scss
index fb8c14451e3d..3062fdb6e009 100644
--- a/ui/css/design-system/attributes.scss
+++ b/ui/css/design-system/attributes.scss
@@ -38,11 +38,11 @@ $fractions: (
 
 $sizes-numeric: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12;
 
-$sizes-strings: xs, sm, md, lg, xl;
+$sizes-strings: xs, sm, md, lg, xl, none;
 
 $border-style: solid, double, none, dashed, dotted;
 $directions: top, right, bottom, left;
-$display: block, flex, grid, inline-block, inline-grid, inline-flex, list-item, none;
+$display: block, grid, flex, inline-block, inline-grid, inline-flex, list-item;
 $text-align: left, right, center, justify, end;
 $overflow-wrap: normal, break-word;
 $font-weight: bold, normal, 100, 200, 300, 400, 500, 600, 700, 800, 900;
diff --git a/ui/css/design-system/breakpoints.scss b/ui/css/design-system/breakpoints.scss
index e911a0d68c24..80a4176b0e57 100644
--- a/ui/css/design-system/breakpoints.scss
+++ b/ui/css/design-system/breakpoints.scss
@@ -1,73 +1,6 @@
-@use "sass:map";
-
 /*
-Responsive breakpoints
-*/
-
-// Screen sizes
-$screen-sizes-map: (
-  'sm':  576px,
-  'md': 768px,
-  'lg': 1280px,
-);
-
-// Max width screen size
-$screen-sm-max: calc(#{map.get($screen-sizes-map, "sm")} - 1px);
-$screen-md-max: calc(#{map.get($screen-sizes-map, "md")} - 1px);
-$screen-lg-max: calc(#{map.get($screen-sizes-map, "lg")} - 1px);
-
-// Min width screen size
-$screen-sm-min: map.get($screen-sizes-map, "sm");
-$screen-md-min: map.get($screen-sizes-map, "md");
-$screen-lg-min: map.get($screen-sizes-map, "lg");
-
-// Max width media query mixins
-@mixin screen-sm-max {
-  @media screen and (max-width: $screen-sm-max) {
-    @content;
-  };
-}
-
-@mixin screen-md-max {
-  @media screen and (max-width: $screen-md-max) {
-    @content;
-  };
-}
-
-@mixin screen-lg-max {
-  @media screen and (max-width: $screen-lg-max) {
-    @content;
-  };
-}
-
-// Min width media query mixins
-@mixin screen-sm-min {
-  @media screen and (min-width: $screen-sm-min) {
-    @content;
-  };
-}
-
-@mixin screen-md-min {
-  @media screen and (min-width: $screen-md-min) {
-    @content;
-  };
-}
-
-@mixin screen-lg-min {
-  @media screen and (min-width: $screen-lg-min) {
-    @content;
-  };
-}
-
-/*
-DEPRECATED
+Responsive Breakpoints
 */
 $break-small: 575px;
 $break-midpoint: 780px;
 $break-large: 576px;
-
-$screen-sizes-map: (
-  'sm':  576px,
-  'md': 768px,
-  'lg': 1280px,
-);
diff --git a/ui/css/errors.scss b/ui/css/errors.scss
deleted file mode 100644
index 14daf4262ca0..000000000000
--- a/ui/css/errors.scss
+++ /dev/null
@@ -1,44 +0,0 @@
-.critical-error {
-  padding: 16px;
-  max-width: 600px;
-  margin: 0 auto;
-
-  &__alert {
-    color: var(--color-text-default);
-    background-color: var(--color-error-muted);
-    border: 1px solid var(--color-error-default);
-    border-radius: 8px;
-    padding: 16px;
-    display: flex;
-    flex-direction: column;
-    margin-bottom: 16px;
-
-    &__message {
-      margin-bottom: 16px;
-    }
-
-    &__button {
-      height: 40px;
-      border-radius: 20px;
-      padding-left: 16px;
-      padding-right: 16px;
-      background-color: var(--color-primary-default);
-      color: var(--color-primary-inverse);
-      border: 1px solid var(--color-primary-default);
-      margin: 0 auto;
-    }
-  }
-
-  &__paragraph {
-    color: var(--color-text-default);
-    text-align: center;
-
-    &__link {
-      color: var(--color-primary-default);
-
-      &:hover {
-        color: var(--color-primary-alternative);
-      }
-    }
-  }
-}
diff --git a/ui/css/index.scss b/ui/css/index.scss
index 4e3df4d23c45..bf9249706825 100644
--- a/ui/css/index.scss
+++ b/ui/css/index.scss
@@ -11,8 +11,6 @@
 @import '../components/app/app-components';
 @import '../components/ui/ui-components';
 @import '../pages/pages';
-@import './errors.scss';
-@import './loading.scss';
 
 /*
   ITCSS
diff --git a/ui/css/itcss/components/newui-sections.scss b/ui/css/itcss/components/newui-sections.scss
index 43ef900a94ac..28416809353f 100644
--- a/ui/css/itcss/components/newui-sections.scss
+++ b/ui/css/itcss/components/newui-sections.scss
@@ -63,7 +63,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
     width: 85vw;
     margin-bottom: 10vh;
     min-height: 90vh;
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   }
 }
 
@@ -71,7 +71,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
   .main-container {
     width: 80vw;
     min-height: 82vh;
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   }
 }
 
@@ -79,7 +79,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
   .main-container {
     width: 62vw;
     min-height: 82vh;
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   }
 }
 
diff --git a/ui/css/itcss/components/send.scss b/ui/css/itcss/components/send.scss
index bd02111adf82..787dd05bf5aa 100644
--- a/ui/css/itcss/components/send.scss
+++ b/ui/css/itcss/components/send.scss
@@ -15,7 +15,7 @@
 
 .send-screen-card {
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
   padding: 46px 40.5px 26px;
   position: relative;
   align-items: center;
@@ -49,7 +49,7 @@
   width: 70px;
   height: 70px;
   border: 1px solid var(--color-border-muted);
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2);
   position: absolute;
   top: -35px;
   z-index: 25;
@@ -184,7 +184,7 @@
   height: 307px;
   background-color: var(--color-background-default);
   opacity: 1;
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: var(--color-border-muted) 0 0 5px;
   z-index: 1050;
   padding: 13px 19px;
   border-radius: 4px;
@@ -200,7 +200,7 @@
   transform: rotate(45deg);
   left: 107px;
   top: 294px;
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 2px 2px 2px var(--color-border-muted);
 }
 
 .customize-gas-tooltip-container input[type='number']::-webkit-inner-spin-button {
@@ -326,7 +326,7 @@
     width: 498px;
     height: 605px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     padding: 46px 40.5px 26px;
     position: relative;
     align-items: center;
@@ -406,7 +406,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -440,6 +440,16 @@
     background-color: var(--color-background-default);
   }
 
+  &__send-arrow-icon {
+    @include H4;
+
+    color: var(--color-secondary-default);
+    transform: rotate(-45deg);
+    position: absolute;
+    top: -2px;
+    left: 0;
+  }
+
   &__arrow-background {
     background-color: var(--color-background-default);
     height: 14px;
@@ -519,7 +529,7 @@
     @include H7;
 
     left: 8px;
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
   }
 
   &__error-border {
@@ -617,7 +627,7 @@
       border: 1px solid var(--color-border-muted);
       border-radius: 4px;
       background-color: var(--color-background-default);
-      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+      box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11);
       margin-top: 11px;
       margin-left: -1px;
       overflow-y: scroll;
@@ -641,7 +651,7 @@
     }
 
     &__caret {
-      color: var(--color-icon-default);
+      color: var(--color-text-muted);
       padding: 0 10px;
     }
 
@@ -705,7 +715,7 @@
       border: 1px solid var(--color-border-muted);
       border-radius: 4px;
       background-color: var(--color-background-default);
-      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+      box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11);
       top: 65px;
       left: 0;
       box-sizing: content-box;
@@ -864,7 +874,7 @@
     border: 1px solid var(--color-border-muted);
     border-radius: 4px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14);
     display: flex;
     flex-flow: column;
 
diff --git a/ui/css/loading.scss b/ui/css/loading.scss
deleted file mode 100644
index 250be117cc19..000000000000
--- a/ui/css/loading.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.loading-logo {
-  width: 10rem;
-  height: 10rem;
-  align-self: center;
-  margin: 10rem 0 0 0;
-}
-
-.loading-spinner {
-  width: 2rem;
-  height: 2rem;
-  align-self: center;
-  margin-top: 1rem;
-}
diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss
index 21f7c44310c5..2d99683d901d 100644
--- a/ui/css/utilities/colors.scss
+++ b/ui/css/utilities/colors.scss
@@ -6,10 +6,10 @@
   --kovan: #9064ff;
   --rinkeby: #f6c343;
   --goerli: #3099f2;
-  --localhost: #bbc0c5;
+  --localhost: #29b6af;
   --flask-purple: #8b45b6;
 
   // DO NOT CHANGE
   // Required for the QR reader to work properly
-  --qr-code-white-background: #fff;
+  --qr-code-white-background: '#fff';
 }
diff --git a/ui/ducks/app/app.js b/ui/ducks/app/app.js
index 94c3bb6f203c..93267bd27993 100644
--- a/ui/ducks/app/app.js
+++ b/ui/ducks/app/app.js
@@ -60,7 +60,6 @@ export default function reduceApp(state = {}, action) {
     newCollectibleAddedMessage: '',
     sendInputCurrencySwitched: false,
     newTokensImported: '',
-    newCustomNetworkAdded: {},
     ...state,
   };
 
@@ -394,11 +393,6 @@ export default function reduceApp(state = {}, action) {
         ...appState,
         sendInputCurrencySwitched: !appState.sendInputCurrencySwitched,
       };
-    case actionConstants.SET_NEW_CUSTOM_NETWORK_ADDED:
-      return {
-        ...appState,
-        newCustomNetworkAdded: action.value,
-      };
     default:
       return appState;
   }
@@ -450,7 +444,3 @@ export function getLedgerTransportStatus(state) {
 export function toggleCurrencySwitch() {
   return { type: actionConstants.TOGGLE_CURRENCY_INPUT_SWITCH };
 }
-
-export function setNewCustomNetworkAdded(value) {
-  return { type: actionConstants.SET_NEW_CUSTOM_NETWORK_ADDED, value };
-}
diff --git a/ui/ducks/ens.js b/ui/ducks/ens.js
index c091dd1ba240..d2786f1d7ac4 100644
--- a/ui/ducks/ens.js
+++ b/ui/ducks/ens.js
@@ -1,15 +1,14 @@
 import { createSlice } from '@reduxjs/toolkit';
+import ENS from 'ethjs-ens';
 import log from 'loglevel';
 import networkMap from 'ethereum-ens-network-map';
 import { isConfusing } from 'unicode-confusables';
 import { isHexString } from 'ethereumjs-util';
-import { ethers } from 'ethers';
 
 import { getCurrentChainId } from '../selectors';
 import {
   CHAIN_ID_TO_NETWORK_ID_MAP,
   MAINNET_NETWORK_ID,
-  NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP,
 } from '../../shared/constants/network';
 import {
   CONFUSING_ENS_ERROR,
@@ -43,7 +42,7 @@ export const ensInitialState = initialState;
 
 const name = 'ENS';
 
-let provider = null;
+let ens = null;
 
 const slice = createSlice({
   name,
@@ -82,8 +81,6 @@ const slice = createSlice({
         if (isValidDomainName(address) && isConfusing(address)) {
           state.warning = CONFUSING_ENS_ERROR;
         }
-      } else {
-        state.error = ENS_NO_ADDRESS_FOR_NAME;
       }
     },
     enableEnsLookup: (state, action) => {
@@ -115,7 +112,7 @@ const slice = createSlice({
     builder.addCase(CHAIN_CHANGED, (state, action) => {
       if (action.payload !== state.currentChainId) {
         state.stage = 'UNINITIALIZED';
-        provider = null;
+        ens = null;
       }
     });
   },
@@ -138,18 +135,12 @@ export function initializeEnsSlice() {
     const state = getState();
     const chainId = getCurrentChainId(state);
     const network = CHAIN_ID_TO_NETWORK_ID_MAP[chainId];
-    const networkName = NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP[network];
-    const ensAddress = networkMap[network];
-    const networkIsSupported = Boolean(ensAddress);
+    const networkIsSupported = Boolean(networkMap[network]);
     if (networkIsSupported) {
-      provider = new ethers.providers.Web3Provider(global.ethereumProvider, {
-        chainId: parseInt(network, 10),
-        name: networkName,
-        ensAddress,
-      });
+      ens = new ENS({ provider: global.ethereumProvider, network });
       dispatch(enableEnsLookup(network));
     } else {
-      provider = null;
+      ens = null;
       dispatch(disableEnsLookup());
     }
   };
@@ -177,7 +168,7 @@ export function lookupEnsName(ensName) {
       let address;
       let error;
       try {
-        address = await provider.resolveName(trimmedEnsName);
+        address = await ens.lookup(trimmedEnsName);
       } catch (err) {
         error = err;
       }
diff --git a/ui/ducks/send/helpers.js b/ui/ducks/send/helpers.js
deleted file mode 100644
index 43d556c22c8c..000000000000
--- a/ui/ducks/send/helpers.js
+++ /dev/null
@@ -1,294 +0,0 @@
-import { addHexPrefix } from 'ethereumjs-util';
-import abi from 'human-standard-token-abi';
-import { GAS_LIMITS, MIN_GAS_LIMIT_HEX } from '../../../shared/constants/gas';
-import { CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../../../shared/constants/network';
-import {
-  ASSET_TYPES,
-  TRANSACTION_ENVELOPE_TYPES,
-} from '../../../shared/constants/transaction';
-import { readAddressAsContract } from '../../../shared/modules/contract-utils';
-import {
-  conversionUtil,
-  multiplyCurrencies,
-} from '../../../shared/modules/conversion.utils';
-import { ETH, GWEI } from '../../helpers/constants/common';
-import { calcTokenAmount } from '../../helpers/utils/token-util';
-import {
-  addGasBuffer,
-  generateERC20TransferData,
-  generateERC721TransferData,
-  getAssetTransferData,
-} from '../../pages/send/send.utils';
-import { getGasPriceInHexWei } from '../../selectors';
-import { estimateGas } from '../../store/actions';
-
-export async function estimateGasLimitForSend({
-  selectedAddress,
-  value,
-  gasPrice,
-  sendToken,
-  to,
-  data,
-  isNonStandardEthChain,
-  chainId,
-  gasLimit,
-  ...options
-}) {
-  let isSimpleSendOnNonStandardNetwork = false;
-
-  // blockGasLimit may be a falsy, but defined, value when we receive it from
-  // state, so we use logical or to fall back to MIN_GAS_LIMIT_HEX. Some
-  // network implementations check the gas parameter supplied to
-  // eth_estimateGas for validity. For this reason, we set token sends
-  // blockGasLimit default to a higher number. Note that the current gasLimit
-  // on a BLOCK is 15,000,000 and will be 30,000,000 on mainnet after London.
-  // Meanwhile, MIN_GAS_LIMIT_HEX is 0x5208.
-  let blockGasLimit = MIN_GAS_LIMIT_HEX;
-  if (options.blockGasLimit) {
-    blockGasLimit = options.blockGasLimit;
-  } else if (sendToken) {
-    blockGasLimit = GAS_LIMITS.BASE_TOKEN_ESTIMATE;
-  }
-
-  // The parameters below will be sent to our background process to estimate
-  // how much gas will be used for a transaction. That background process is
-  // located in tx-gas-utils.js in the transaction controller folder.
-  const paramsForGasEstimate = { from: selectedAddress, value, gasPrice };
-
-  if (sendToken) {
-    if (!to) {
-      // If no to address is provided, we cannot generate the token transfer
-      // hexData. hexData in a transaction largely dictates how much gas will
-      // be consumed by a transaction. We must use our best guess, which is
-      // represented in the gas shared constants.
-      return GAS_LIMITS.BASE_TOKEN_ESTIMATE;
-    }
-    paramsForGasEstimate.value = '0x0';
-
-    // We have to generate the erc20/erc721 contract call to transfer tokens in
-    // order to get a proper estimate for gasLimit.
-    paramsForGasEstimate.data = getAssetTransferData({
-      sendToken,
-      fromAddress: selectedAddress,
-      toAddress: to,
-      amount: value,
-    });
-
-    paramsForGasEstimate.to = sendToken.address;
-  } else {
-    if (!data) {
-      // eth.getCode will return the compiled smart contract code at the
-      // address. If this returns 0x, 0x0 or a nullish value then the address
-      // is an externally owned account (NOT a contract account). For these
-      // types of transactions the gasLimit will always be 21,000 or 0x5208
-      const { isContractAddress } = to
-        ? await readAddressAsContract(global.eth, to)
-        : {};
-      if (!isContractAddress && !isNonStandardEthChain) {
-        return GAS_LIMITS.SIMPLE;
-      } else if (!isContractAddress && isNonStandardEthChain) {
-        isSimpleSendOnNonStandardNetwork = true;
-      }
-    }
-
-    paramsForGasEstimate.data = data;
-
-    if (to) {
-      paramsForGasEstimate.to = to;
-    }
-
-    if (!value || value === '0') {
-      // TODO: Figure out what's going on here. According to eth_estimateGas
-      // docs this value can be zero, or undefined, yet we are setting it to a
-      // value here when the value is undefined or zero. For more context:
-      // https://github.com/MetaMask/metamask-extension/pull/6195
-      paramsForGasEstimate.value = '0xff';
-    }
-  }
-
-  if (!isSimpleSendOnNonStandardNetwork) {
-    // If we do not yet have a gasLimit, we must call into our background
-    // process to get an estimate for gasLimit based on known parameters.
-
-    paramsForGasEstimate.gas = addHexPrefix(
-      multiplyCurrencies(blockGasLimit, 0.95, {
-        multiplicandBase: 16,
-        multiplierBase: 10,
-        roundDown: '0',
-        toNumericBase: 'hex',
-      }),
-    );
-  }
-
-  // The buffer multipler reduces transaction failures by ensuring that the
-  // estimated gas is always sufficient. Without the multiplier, estimates
-  // for contract interactions can become inaccurate over time. This is because
-  // gas estimation is non-deterministic. The gas required for the exact same
-  // transaction call can change based on state of a contract or changes in the
-  // contracts environment (blockchain data or contracts it interacts with).
-  // Applying the 1.5 buffer has proven to be a useful guard against this non-
-  // deterministic behaviour.
-  //
-  // Gas estimation of simple sends should, however, be deterministic. As such
-  // no buffer is needed in those cases.
-  let bufferMultiplier = 1.5;
-  if (isSimpleSendOnNonStandardNetwork) {
-    bufferMultiplier = 1;
-  } else if (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId]) {
-    bufferMultiplier = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId];
-  }
-
-  try {
-    // Call into the background process that will simulate transaction
-    // execution on the node and return an estimate of gasLimit
-    const estimatedGasLimit = await estimateGas(paramsForGasEstimate);
-    const estimateWithBuffer = addGasBuffer(
-      estimatedGasLimit,
-      blockGasLimit,
-      bufferMultiplier,
-    );
-    return addHexPrefix(estimateWithBuffer);
-  } catch (error) {
-    const simulationFailed =
-      error.message.includes('Transaction execution error.') ||
-      error.message.includes(
-        'gas required exceeds allowance or always failing transaction',
-      ) ||
-      (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId] &&
-        error.message.includes('gas required exceeds allowance'));
-    if (simulationFailed) {
-      const estimateWithBuffer = addGasBuffer(
-        paramsForGasEstimate?.gas ?? gasLimit,
-        blockGasLimit,
-        bufferMultiplier,
-      );
-      return addHexPrefix(estimateWithBuffer);
-    }
-    throw error;
-  }
-}
-
-/**
- * Generates a txParams from the send slice.
- *
- * @param {import('.').SendState} sendState - the state of the send slice
- * @returns {import(
- *  '../../../shared/constants/transaction'
- * ).TxParams} A txParams object that can be used to create a transaction or
- *  update an existing transaction.
- */
-export function generateTransactionParams(sendState) {
-  const draftTransaction =
-    sendState.draftTransactions[sendState.currentTransactionUUID];
-  const txParams = {
-    // If the fromAccount has been specified we use that, if not we use the
-    // selected account.
-    from:
-      draftTransaction.fromAccount?.address ||
-      sendState.selectedAccount.address,
-    // gasLimit always needs to be set regardless of the asset being sent
-    // or the type of transaction.
-    gas: draftTransaction.gas.gasLimit,
-  };
-  switch (draftTransaction.asset.type) {
-    case ASSET_TYPES.TOKEN:
-      // When sending a token the to address is the contract address of
-      // the token being sent. The value is set to '0x0' and the data
-      // is generated from the recipient address, token being sent and
-      // amount.
-      txParams.to = draftTransaction.asset.details.address;
-      txParams.value = '0x0';
-      txParams.data = generateERC20TransferData({
-        toAddress: draftTransaction.recipient.address,
-        amount: draftTransaction.amount.value,
-        sendToken: draftTransaction.asset.details,
-      });
-      break;
-    case ASSET_TYPES.COLLECTIBLE:
-      // When sending a token the to address is the contract address of
-      // the token being sent. The value is set to '0x0' and the data
-      // is generated from the recipient address, token being sent and
-      // amount.
-      txParams.to = draftTransaction.asset.details.address;
-      txParams.value = '0x0';
-      txParams.data = generateERC721TransferData({
-        toAddress: draftTransaction.recipient.address,
-        fromAddress:
-          draftTransaction.fromAccount?.address ??
-          sendState.selectedAccount.address,
-        tokenId: draftTransaction.asset.details.tokenId,
-      });
-      break;
-    case ASSET_TYPES.NATIVE:
-    default:
-      // When sending native currency the to and value fields use the
-      // recipient and amount values and the data key is either null or
-      // populated with the user input provided in hex field.
-      txParams.to = draftTransaction.recipient.address;
-      txParams.value = draftTransaction.amount.value;
-      txParams.data = draftTransaction.userInputHexData ?? undefined;
-  }
-
-  // We need to make sure that we only include the right gas fee fields
-  // based on the type of transaction the network supports. We will also set
-  // the type param here.
-  if (sendState.eip1559support) {
-    txParams.type = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
-
-    txParams.maxFeePerGas = draftTransaction.gas.maxFeePerGas;
-    txParams.maxPriorityFeePerGas = draftTransaction.gas.maxPriorityFeePerGas;
-
-    if (!txParams.maxFeePerGas || txParams.maxFeePerGas === '0x0') {
-      txParams.maxFeePerGas = draftTransaction.gas.gasPrice;
-    }
-
-    if (
-      !txParams.maxPriorityFeePerGas ||
-      txParams.maxPriorityFeePerGas === '0x0'
-    ) {
-      txParams.maxPriorityFeePerGas = txParams.maxFeePerGas;
-    }
-  } else {
-    txParams.gasPrice = draftTransaction.gas.gasPrice;
-    txParams.type = TRANSACTION_ENVELOPE_TYPES.LEGACY;
-  }
-
-  return txParams;
-}
-
-/**
- * This method is used to keep the original logic from the gas.duck.js file
- * after receiving a gasPrice from eth_gasPrice. First, the returned gasPrice
- * was converted to GWEI, then it was converted to a Number, then in the send
- * duck (here) we would use getGasPriceInHexWei to get back to hexWei. Now that
- * we receive a GWEI estimate from the controller, we still need to do this
- * weird conversion to get the proper rounding.
- *
- * @param {string} gasPriceEstimate
- * @returns {string}
- */
-export function getRoundedGasPrice(gasPriceEstimate) {
-  const gasPriceInDecGwei = conversionUtil(gasPriceEstimate, {
-    numberOfDecimals: 9,
-    toDenomination: GWEI,
-    fromNumericBase: 'dec',
-    toNumericBase: 'dec',
-    fromCurrency: ETH,
-    fromDenomination: GWEI,
-  });
-  const gasPriceAsNumber = Number(gasPriceInDecGwei);
-  return getGasPriceInHexWei(gasPriceAsNumber);
-}
-
-export async function getERC20Balance(token, accountAddress) {
-  const contract = global.eth.contract(abi).at(token.address);
-  const usersToken = (await contract.balanceOf(accountAddress)) ?? null;
-  if (!usersToken) {
-    return '0x0';
-  }
-  const amount = calcTokenAmount(
-    usersToken.balance.toString(),
-    token.decimals,
-  ).toString(16);
-  return addHexPrefix(amount);
-}
diff --git a/ui/ducks/send/helpers.test.js b/ui/ducks/send/helpers.test.js
deleted file mode 100644
index 90b1bcb557cc..000000000000
--- a/ui/ducks/send/helpers.test.js
+++ /dev/null
@@ -1,163 +0,0 @@
-import { ethers } from 'ethers';
-import { GAS_LIMITS } from '../../../shared/constants/gas';
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-  TRANSACTION_ENVELOPE_TYPES,
-} from '../../../shared/constants/transaction';
-import { BURN_ADDRESS } from '../../../shared/modules/hexstring-utils';
-import { getInitialSendStateWithExistingTxState } from '../../../test/jest/mocks';
-import {
-  generateERC20TransferData,
-  generateERC721TransferData,
-} from '../../pages/send/send.utils';
-import { generateTransactionParams } from './helpers';
-
-describe('Send Slice Helpers', () => {
-  describe('generateTransactionParams', () => {
-    it('should generate a txParams for a token transfer', () => {
-      const tokenDetails = {
-        address: '0xToken',
-        symbol: 'SYMB',
-        decimals: 18,
-      };
-      const txParams = generateTransactionParams(
-        getInitialSendStateWithExistingTxState({
-          fromAccount: {
-            address: '0x00',
-          },
-          amount: {
-            value: '0x1',
-          },
-          asset: {
-            type: ASSET_TYPES.TOKEN,
-            balance: '0xaf',
-            details: tokenDetails,
-          },
-          recipient: {
-            address: BURN_ADDRESS,
-          },
-        }),
-      );
-      expect(txParams).toStrictEqual({
-        from: '0x00',
-        data: generateERC20TransferData({
-          toAddress: BURN_ADDRESS,
-          amount: '0x1',
-          sendToken: tokenDetails,
-        }),
-        to: '0xToken',
-        type: '0x0',
-        value: '0x0',
-        gas: '0x0',
-        gasPrice: '0x0',
-      });
-    });
-
-    it('should generate a txParams for a collectible transfer', () => {
-      const txParams = generateTransactionParams(
-        getInitialSendStateWithExistingTxState({
-          fromAccount: {
-            address: '0x00',
-          },
-          amount: {
-            value: '0x1',
-          },
-          asset: {
-            type: ASSET_TYPES.COLLECTIBLE,
-            balance: '0xaf',
-            details: {
-              address: '0xToken',
-              standard: TOKEN_STANDARDS.ERC721,
-              tokenId: ethers.BigNumber.from(15000).toString(),
-            },
-          },
-          recipient: {
-            address: BURN_ADDRESS,
-          },
-        }),
-      );
-      expect(txParams).toStrictEqual({
-        from: '0x00',
-        data: generateERC721TransferData({
-          toAddress: BURN_ADDRESS,
-          fromAddress: '0x00',
-          tokenId: ethers.BigNumber.from(15000).toString(),
-        }),
-        to: '0xToken',
-        type: '0x0',
-        value: '0x0',
-        gas: '0x0',
-        gasPrice: '0x0',
-      });
-    });
-
-    it('should generate a txParams for a native legacy transaction', () => {
-      const txParams = generateTransactionParams(
-        getInitialSendStateWithExistingTxState({
-          fromAccount: {
-            address: '0x00',
-          },
-          amount: {
-            value: '0x1',
-          },
-          asset: {
-            type: ASSET_TYPES.NATIVE,
-            balance: '0xaf',
-            details: null,
-          },
-          recipient: {
-            address: BURN_ADDRESS,
-          },
-        }),
-      );
-      expect(txParams).toStrictEqual({
-        from: '0x00',
-        data: undefined,
-        to: BURN_ADDRESS,
-        type: '0x0',
-        value: '0x1',
-        gas: '0x0',
-        gasPrice: '0x0',
-      });
-    });
-
-    it('should generate a txParams for a native fee market transaction', () => {
-      const txParams = generateTransactionParams({
-        ...getInitialSendStateWithExistingTxState({
-          fromAccount: {
-            address: '0x00',
-          },
-          amount: {
-            value: '0x1',
-          },
-          asset: {
-            type: ASSET_TYPES.NATIVE,
-            balance: '0xaf',
-            details: null,
-          },
-          recipient: {
-            address: BURN_ADDRESS,
-          },
-          gas: {
-            maxFeePerGas: '0x2',
-            maxPriorityFeePerGas: '0x1',
-            gasLimit: GAS_LIMITS.SIMPLE,
-          },
-          transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
-        }),
-        eip1559support: true,
-      });
-      expect(txParams).toStrictEqual({
-        from: '0x00',
-        data: undefined,
-        to: BURN_ADDRESS,
-        type: '0x2',
-        value: '0x1',
-        gas: GAS_LIMITS.SIMPLE,
-        maxFeePerGas: '0x2',
-        maxPriorityFeePerGas: '0x1',
-      });
-    });
-  });
-});
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index c90521e27b04..a812e34a1b18 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -1,8 +1,8 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
+import abi from 'human-standard-token-abi';
 import BigNumber from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
 import { debounce } from 'lodash';
-import { v4 as uuidv4 } from 'uuid';
 import {
   conversionGreaterThan,
   conversionUtil,
@@ -17,19 +17,26 @@ import {
   INVALID_RECIPIENT_ADDRESS_ERROR,
   INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR,
   KNOWN_RECIPIENT_ADDRESS_WARNING,
+  MIN_GAS_LIMIT_HEX,
   NEGATIVE_ETH_ERROR,
 } from '../../pages/send/send.constants';
 
 import {
+  addGasBuffer,
   calcGasTotal,
+  generateERC20TransferData,
+  generateERC721TransferData,
+  getAssetTransferData,
   isBalanceSufficient,
   isTokenBalanceSufficient,
 } from '../../pages/send/send.utils';
 import {
+  getAddressBookEntry,
   getAdvancedInlineGasShown,
   getCurrentChainId,
   getGasPriceInHexWei,
   getIsMainnet,
+  getSelectedAddress,
   getTargetAccount,
   getIsNonStandardEthChain,
   checkNetworkAndAccountSupports1559,
@@ -37,13 +44,11 @@ import {
   getTokenList,
   getAddressBookEntryOrAccountName,
   getIsMultiLayerFeeNetwork,
-  getEnsResolutionByAddress,
-  getSelectedAccount,
-  getSelectedAddress,
 } from '../../selectors';
 import {
   disconnectGasFeeEstimatePoller,
   displayWarning,
+  estimateGas,
   getGasFeeEstimatesAndStartPolling,
   hideLoadingIndication,
   showLoadingIndication,
@@ -69,8 +74,6 @@ import {
   calcTokenAmount,
   getTokenAddressParam,
   getTokenValueParam,
-  getTokenMetadata,
-  getTokenIdParam,
 } from '../../helpers/utils/token-util';
 import {
   checkExistingAddresses,
@@ -88,395 +91,262 @@ import { resetEnsResolution } from '../ens';
 import {
   isBurnAddress,
   isValidHexAddress,
-  toChecksumHexAddress,
 } from '../../../shared/modules/hexstring-utils';
-import {
-  isSmartContractAddress,
-  sumHexes,
-} from '../../helpers/utils/transactions.util';
+import { sumHexes } from '../../helpers/utils/transactions.util';
 import fetchEstimatedL1Fee from '../../helpers/utils/optimism/fetchEstimatedL1Fee';
 
-import { ETH } from '../../helpers/constants/common';
+import { CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../../../shared/constants/network';
+import {
+  ERC20,
+  ERC721,
+  ERC1155,
+  ETH,
+  GWEI,
+} from '../../helpers/constants/common';
 import {
   ASSET_TYPES,
-  TOKEN_STANDARDS,
   TRANSACTION_ENVELOPE_TYPES,
   TRANSACTION_TYPES,
 } from '../../../shared/constants/transaction';
+import { readAddressAsContract } from '../../../shared/modules/contract-utils';
 import { INVALID_ASSET_TYPE } from '../../helpers/constants/error-keys';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getValueFromWeiHex } from '../../helpers/utils/confirm-tx.util';
-import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
-import {
-  estimateGasLimitForSend,
-  generateTransactionParams,
-  getRoundedGasPrice,
-} from './helpers';
-// typedef import statements
-/**
- * @typedef {(
- *  import('immer/dist/internal').WritableDraft<SendState>
- * )} SendStateDraft
- * @typedef {(
- *  import('../../../shared/constants/transaction').AssetTypesString
- * )} AssetTypesString
- * @typedef {(
- *  import( '../../helpers/constants/common').TokenStandardStrings
- * )} TokenStandardStrings
- * @typedef {(
- *  import( '../../../shared/constants/tokens').TokenDetails
- * )} TokenDetails
- * @typedef {(
- *  import('../../../shared/constants/transaction').TransactionTypeString
- * )} TransactionTypeString
- * @typedef {(
- *  import('@metamask/controllers').LegacyGasPriceEstimate
- * )} LegacyGasPriceEstimate
- * @typedef {(
- *  import('@metamask/controllers').GasFeeEstimates
- * )} GasFeeEstimates
- * @typedef {(
- *  import('@metamask/controllers').EthGasPriceEstimate
- * )} EthGasPriceEstimate
- * @typedef {(
- *  import('@metamask/controllers').GasEstimateType
- * )} GasEstimateType
- * @typedef {(
- *  import('redux').AnyAction
- * )} AnyAction
- */
-
+// typedefs
 /**
- * @template R - Return type of the async function
- * @typedef {(
- *  import('redux-thunk').ThunkAction<R, MetaMaskState, unknown, AnyAction>
- * )} ThunkAction<R>
+ * @typedef {import('@reduxjs/toolkit').PayloadAction} PayloadAction
  */
 
-/**
- * This type will take a typical constant string mapped object and turn it into
- * a union type of the values.
- *
- * @template O - The object to make strings out of
- * @typedef {O[keyof O]} MapValuesToUnion<O>
- */
-
-/**
- * @typedef {Object} SendStateStages
- * @property {'ADD_RECIPIENT'} ADD_RECIPIENT - The user is selecting which
- *  address to send an asset to.
- * @property {'DRAFT'} DRAFT - The send form is shown for a transaction yet to
- *  be sent to the Transaction Controller.
- * @property {'EDIT'} EDIT - The send form is shown for a transaction already
- *  submitted to the Transaction Controller but not yet confirmed. This happens
- *  when a confirmation is shown for a transaction and the 'edit' button in the
- *  header is clicked.
- * @property {'INACTIVE'} INACTIVE - The send state is idle, and hasn't yet
- *  fetched required data for gasPrice and gasLimit estimations, etc.
- */
+const name = 'send';
 
 /**
  * The Stages that the send slice can be in
- *
- * @type {SendStateStages}
+ * 1. INACTIVE - The send state is idle, and hasn't yet fetched required
+ *  data for gasPrice and gasLimit estimations, etc.
+ * 2. ADD_RECIPIENT - The user is selecting which address to send an asset to
+ * 3. DRAFT - The send form is shown for a transaction yet to be sent to the
+ *  Transaction Controller.
+ * 4. EDIT - The send form is shown for a transaction already submitted to the
+ *  Transaction Controller but not yet confirmed. This happens when a
+ *  confirmation is shown for a transaction and the 'edit' button in the header
+ *  is clicked.
  */
 export const SEND_STAGES = {
+  INACTIVE: 'INACTIVE',
   ADD_RECIPIENT: 'ADD_RECIPIENT',
   DRAFT: 'DRAFT',
   EDIT: 'EDIT',
-  INACTIVE: 'INACTIVE',
 };
 
 /**
- * @typedef {Object} DraftTxStatus
- * @property {'INVALID'} INVALID - The transaction is invalid and cannot be
- *  submitted. There are a number of cases that would result in an invalid
- *  send state:
- *  1. The recipient is not yet defined
- *  2. The amount + gasTotal is greater than the user's balance when sending
- *     native currency
- *  3. The gasTotal is greater than the user's *native* balance
- *  4. The amount of sent asset is greater than the user's *asset* balance
- *  5. Gas price estimates failed to load entirely
- *  6. The gasLimit is less than 21000 (0x5208)
- * @property {'VALID'} VALID - The transaction is valid and can be submitted.
- */
-
-/**
- * The status of the send slice
+ * The status that the send slice can be in is either
+ * 1. VALID - the transaction is valid and can be submitted
+ * 2. INVALID - the transaction is invalid and cannot be submitted
  *
- * @type {DraftTxStatus}
+ * A number of cases would result in an invalid form
+ * 1. The recipient is not yet defined
+ * 2. The amount + gasTotal is greater than the user's balance when sending
+ *  native currency
+ * 3. The gasTotal is greater than the user's *native* balance
+ * 4. The amount of sent asset is greater than the user's *asset* balance
+ * 5. Gas price estimates failed to load entirely
+ * 6. The gasLimit is less than 21000 (0x5208)
  */
 export const SEND_STATUSES = {
-  INVALID: 'INVALID',
   VALID: 'VALID',
+  INVALID: 'INVALID',
 };
 
-/**
- * @typedef {Object} SendStateGasModes
- * @property {'BASIC'} BASIC - Shows the basic estimate slow/avg/fast buttons
- *  when on mainnet and the metaswaps API request is successful.
- * @property {'CUSTOM'} CUSTOM - Shows GasFeeDisplay component that is a read
- *  only display of the values the user has set in the advanced gas modal
- *  (stored in the gas duck under the customData key).
- * @property {'INLINE'} INLINE - Shows inline gasLimit/gasPrice fields when on
- *  any other network or metaswaps API fails and we use eth_gasPrice.
- */
-
 /**
  * Controls what is displayed in the send-gas-row component.
- *
- * @type {SendStateGasModes}
+ * 1. BASIC - Shows the basic estimate slow/avg/fast buttons when on mainnet
+ *  and the metaswaps API request is successful.
+ * 2. INLINE - Shows inline gasLimit/gasPrice fields when on any other network
+ *  or metaswaps API fails and we use eth_gasPrice
+ * 3. CUSTOM - Shows GasFeeDisplay component that is a read only display of the
+ *  values the user has set in the advanced gas modal (stored in the gas duck
+ *  under the customData key).
  */
 export const GAS_INPUT_MODES = {
   BASIC: 'BASIC',
-  CUSTOM: 'CUSTOM',
   INLINE: 'INLINE',
+  CUSTOM: 'CUSTOM',
 };
 
-/**
- * @typedef {Object} SendStateAmountModes
- * @property {'INPUT'} INPUT - the user provides the amount by typing in the
- *  field.
- * @property {'MAX'} MAX - The user selects the MAX button and amount is
- *  calculated based on balance - (amount + gasTotal).
- */
-
 /**
  * The modes that the amount field can be set by
- *
- * @type {SendStateAmountModes}
+ * 1. INPUT - the user provides the amount by typing in the field
+ * 2. MAX - The user selects the MAX button and amount is calculated based on
+ *  balance - (amount + gasTotal)
  */
 export const AMOUNT_MODES = {
   INPUT: 'INPUT',
   MAX: 'MAX',
 };
 
-/**
- * @typedef {Object} SendStateRecipientModes
- * @property {'CONTACT_LIST'} CONTACT_LIST - The user is displayed a list of
- *  their contacts and addresses they have recently send to.
- * @property {'MY_ACCOUNTS'} MY_ACCOUNTS - the user is displayed a list of
- *  their own accounts to send to.
- */
-
-/**
- * The type of recipient list that is displayed to user
- *
- * @type {SendStateRecipientModes}
- */
 export const RECIPIENT_SEARCH_MODES = {
-  CONTACT_LIST: 'CONTACT_LIST',
   MY_ACCOUNTS: 'MY_ACCOUNTS',
+  CONTACT_LIST: 'CONTACT_LIST',
 };
 
-/**
- * @typedef {Object} Account
- * @property {string} address - The hex address of the account.
- * @property {string} balance - Hex string representing the native asset
- *  balance of the account the transaction will be sent from.
- */
+async function estimateGasLimitForSend({
+  selectedAddress,
+  value,
+  gasPrice,
+  sendToken,
+  to,
+  data,
+  isNonStandardEthChain,
+  chainId,
+  gasLimit,
+  ...options
+}) {
+  let isSimpleSendOnNonStandardNetwork = false;
+
+  // blockGasLimit may be a falsy, but defined, value when we receive it from
+  // state, so we use logical or to fall back to MIN_GAS_LIMIT_HEX. Some
+  // network implementations check the gas parameter supplied to
+  // eth_estimateGas for validity. For this reason, we set token sends
+  // blockGasLimit default to a higher number. Note that the current gasLimit
+  // on a BLOCK is 15,000,000 and will be 30,000,000 on mainnet after London.
+  // Meanwhile, MIN_GAS_LIMIT_HEX is 0x5208.
+  let blockGasLimit = MIN_GAS_LIMIT_HEX;
+  if (options.blockGasLimit) {
+    blockGasLimit = options.blockGasLimit;
+  } else if (sendToken) {
+    blockGasLimit = GAS_LIMITS.BASE_TOKEN_ESTIMATE;
+  }
 
-/**
- * @typedef {Object} Amount
- * @property {string} [error] - Error to display for the amount field.
- * @property {string} value - A hex string representing the amount of the
- *  selected currency to send.
- */
+  // The parameters below will be sent to our background process to estimate
+  // how much gas will be used for a transaction. That background process is
+  // located in tx-gas-utils.js in the transaction controller folder.
+  const paramsForGasEstimate = { from: selectedAddress, value, gasPrice };
+
+  if (sendToken) {
+    if (!to) {
+      // if no to address is provided, we cannot generate the token transfer
+      // hexData. hexData in a transaction largely dictates how much gas will
+      // be consumed by a transaction. We must use our best guess, which is
+      // represented in the gas shared constants.
+      return GAS_LIMITS.BASE_TOKEN_ESTIMATE;
+    }
+    paramsForGasEstimate.value = '0x0';
+
+    // We have to generate the erc20/erc721 contract call to transfer tokens in
+    // order to get a proper estimate for gasLimit.
+    paramsForGasEstimate.data = getAssetTransferData({
+      sendToken,
+      fromAddress: selectedAddress,
+      toAddress: to,
+      amount: value,
+    });
 
-/**
- * @typedef {Object} Asset
- * @property {string} balance - A hex string representing the balance
- *  that the user holds of the asset that they are attempting to send.
- * @property {TokenDetails} [details] - An object that describes the
- *  selected asset in the case that the user is sending a token or collectibe.
- *  Will be null when asset.type is 'NATIVE'.
- * @property {string} [error] - Error to display when there is an issue
- *  with the asset.
- * @property {AssetTypesString} type - The type of asset that the user
- *  is attempting to send. Defaults to 'NATIVE' which represents the native
- *  asset of the chain. Can also be 'TOKEN' or 'COLLECTIBLE'.
- */
+    paramsForGasEstimate.to = sendToken.address;
+  } else {
+    if (!data) {
+      // eth.getCode will return the compiled smart contract code at the
+      // address. If this returns 0x, 0x0 or a nullish value then the address
+      // is an externally owned account (NOT a contract account). For these
+      // types of transactions the gasLimit will always be 21,000 or 0x5208
+      const { isContractAddress } = to
+        ? await readAddressAsContract(global.eth, to)
+        : {};
+      if (!isContractAddress && !isNonStandardEthChain) {
+        return GAS_LIMITS.SIMPLE;
+      } else if (!isContractAddress && isNonStandardEthChain) {
+        isSimpleSendOnNonStandardNetwork = true;
+      }
+    }
 
-/**
- * @typedef {Object} GasFees
- * @property {string} [error] - error to display for gas fields.
- * @property {string} gasLimit - maximum gas needed for tx.
- * @property {string} gasPrice - price in wei to pay per gas.
- * @property {string} gasTotal - maximum total price in wei to pay.
- * @property {string} maxFeePerGas - Maximum price in wei to pay per gas.
- * @property {string} maxPriorityFeePerGas - Maximum priority fee in wei to pay
- *  per gas.
- */
+    paramsForGasEstimate.data = data;
 
-/**
- * An object that describes the intended recipient of a transaction.
- *
- * @typedef {Object} Recipient
- * @property {string} address - The fully qualified address of the recipient.
- *  This is set after the recipient.userInput is validated, the userInput field
- *  is quickly updated to avoid delay between keystrokes and seeing the input
- *  field updated. After a debounce the address typed is validated and then the
- *  address field is updated. The address field is also set when the user
- *  selects a contact or account from the list, or an ENS resolution when
- *  typing ENS names.
- * @property {string} [error] - Error to display on the address field.
- * @property {string} nickname - The nickname that the user has added to their
- *  address book for the recipient.address.
- * @property {string} [warning] - Warning to display on the address field.
- */
+    if (to) {
+      paramsForGasEstimate.to = to;
+    }
 
-/**
- * @typedef {Object} DraftTransaction
- * @property {Amount} amount - An object containing information about the
- *  amount of currency to send.
- * @property {Asset} asset - An object that describes the asset that the user
- *  has selected to send.
- * @property {Account} [fromAccount] - The send flow is usually only relative to
- *  the currently selected account. When editing a transaction, however, the
- *  account may differ. In that case, the details of that account will be
- *  stored in this object within the draftTransaction.
- * @property {GasFees} gas - Details about the current gas settings
- * @property {Array<{event: string, timestamp: number}>} history - An array of
- *  entries that describe the user's journey through the send flow. This is
- *  sent to the controller for attaching to state logs for troubleshooting and
- *  support.
- * @property {string} [id] - If the transaction has already been added to the
- *  TransactionController this field will be populated with its id from the
- *  TransactionController state. This is required to be able to update the
- *  transaction in the controller.
- * @property {Recipient} recipient - An object that describes the intended
- *  recipient of the transaction.
- * @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
- *  submission.
- * @property {string} transactionType - Determines type of transaction being
- *  sent, defaulted to 0x0 (legacy).
- * @property {string} [userInputHexData] - When a user has enabled custom hex
- *  data field in advanced options, they can supply data to the field which is
- *  stored under this key.
- */
+    if (!value || value === '0') {
+      // TODO: Figure out what's going on here. According to eth_estimateGas
+      // docs this value can be zero, or undefined, yet we are setting it to a
+      // value here when the value is undefined or zero. For more context:
+      // https://github.com/MetaMask/metamask-extension/pull/6195
+      paramsForGasEstimate.value = '0xff';
+    }
+  }
 
-/**
- * @type {DraftTransaction}
- */
-export const draftTransactionInitialState = {
-  amount: {
-    error: null,
-    value: '0x0',
-  },
-  asset: {
-    balance: '0x0',
-    details: null,
-    error: null,
-    type: ASSET_TYPES.NATIVE,
-  },
-  fromAccount: null,
-  gas: {
-    error: null,
-    gasLimit: '0x0',
-    gasPrice: '0x0',
-    gasTotal: '0x0',
-    maxFeePerGas: '0x0',
-    maxPriorityFeePerGas: '0x0',
-  },
-  history: [],
-  id: null,
-  recipient: {
-    address: '',
-    error: null,
-    nickname: '',
-    warning: null,
-    recipientWarningAcknowledged: false,
-  },
-  status: SEND_STATUSES.VALID,
-  transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
-  userInputHexData: null,
-};
+  if (!isSimpleSendOnNonStandardNetwork) {
+    // If we do not yet have a gasLimit, we must call into our background
+    // process to get an estimate for gasLimit based on known parameters.
 
-/**
- * Describes the state tree of the send slice
- *
- * @typedef {Object} SendState
- * @property {MapValuesToUnion<SendStateAmountModes>} amountMode - Describe
- *  whether the user has manually input an amount or if they have selected max
- *  to send the maximum amount of the selected currency.
- * @property {string} currentTransactionUUID - The UUID of the transaction
- *  currently being modified by the send flow. This UUID is generated upon
- *  initialization of the send flow, any previous UUIDs are discarded at
- *  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 {Object.<string, DraftTransaction>} draftTransactions - An object keyed
- *  by UUID with draftTransactions as the values.
- * @property {boolean} eip1559support - tracks whether the current network
- *  supports EIP 1559 transactions.
- * @property {boolean} gasEstimateIsLoading - Indicates whether the gas
- *  estimate is loading.
- * @property {string} [gasEstimatePollToken] - String token identifying a
- *  listener for polling on the gasFeeController
- * @property {boolean} gasIsSetInModal - true if the user set custom gas in the
- *  custom gas modal
- * @property {string} gasLimitMinimum - minimum supported gasLimit.
- * @property {string} gasPriceEstimate - Expected price in wei necessary to
- *  pay per gas used for a transaction to be included in a reasonable timeframe.
- *  Comes from the GasFeeController.
- * @property {string} gasTotalForLayer1 -  Layer 1 gas fee total on multi-layer
- *  fee networks
- * @property {string} recipientInput - The user input of the recipient
- *  which is updated quickly to avoid delays in the UI reflecting manual entry
- *  of addresses.
- * @property {MapValuesToUnion<SendStateRecipientModes>} recipientMode -
- *  Describes which list of recipients the user is shown on the add recipient
- *  screen. When this key is set to 'MY_ACCOUNTS' the user is shown the list of
- *  accounts they own. When it is 'CONTACT_LIST' the user is shown the list of
- *  contacts they have saved in MetaMask and any addresses they have recently
- *  sent to.
- * @property {Account} selectedAccount - The currently selected account in
- *  MetaMask. Native balance and address will be pulled from this account if a
- *  fromAccount is not specified in the draftTransaction object. During an edit
- *  the fromAccount is specified.
- * @property {MapValuesToUnion<SendStateStages>} stage - The stage of the
- *  send flow that the user has progressed to. Defaults to 'INACTIVE' which
- *  results in the send screen not being shown.
- */
+    paramsForGasEstimate.gas = addHexPrefix(
+      multiplyCurrencies(blockGasLimit, 0.95, {
+        multiplicandBase: 16,
+        multiplierBase: 10,
+        roundDown: '0',
+        toNumericBase: 'hex',
+      }),
+    );
+  }
 
-/**
- * @type {SendState}
- */
-export const initialState = {
-  amountMode: AMOUNT_MODES.INPUT,
-  currentTransactionUUID: null,
-  draftTransactions: {},
-  eip1559support: false,
-  gasEstimateIsLoading: true,
-  gasEstimatePollToken: null,
-  gasIsSetInModal: false,
-  gasPriceEstimate: '0x0',
-  gasLimitMinimum: GAS_LIMITS.SIMPLE,
-  gasTotalForLayer1: '0x0',
-  recipientMode: RECIPIENT_SEARCH_MODES.CONTACT_LIST,
-  recipientInput: '',
-  selectedAccount: {
-    address: null,
-    balance: '0x0',
-  },
-  stage: SEND_STAGES.INACTIVE,
-};
+  // The buffer multipler reduces transaction failures by ensuring that the
+  // estimated gas is always sufficient. Without the multiplier, estimates
+  // for contract interactions can become inaccurate over time. This is because
+  // gas estimation is non-deterministic. The gas required for the exact same
+  // transaction call can change based on state of a contract or changes in the
+  // contracts environment (blockchain data or contracts it interacts with).
+  // Applying the 1.5 buffer has proven to be a useful guard against this non-
+  // deterministic behaviour.
+  //
+  // Gas estimation of simple sends should, however, be deterministic. As such
+  // no buffer is needed in those cases.
+  let bufferMultiplier = 1.5;
+  if (isSimpleSendOnNonStandardNetwork) {
+    bufferMultiplier = 1;
+  } else if (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId]) {
+    bufferMultiplier = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId];
+  }
 
-/**
- * TODO: We really need to start creating the metamask state type, and the
- * entire state tree of redux. Would be *extremely* valuable in future
- * typescript conversions. The metamask key is typed as an object on purpose
- * here because I cannot go so far in this work as to type that entire object.
- *
- * @typedef {Object} MetaMaskState
- * @property {SendState} send - The state of the send flow.
- * @property {Object} metamask - The state of the metamask store.
- */
+  try {
+    // call into the background process that will simulate transaction
+    // execution on the node and return an estimate of gasLimit
+    const estimatedGasLimit = await estimateGas(paramsForGasEstimate);
+    const estimateWithBuffer = addGasBuffer(
+      estimatedGasLimit,
+      blockGasLimit,
+      bufferMultiplier,
+    );
+    return addHexPrefix(estimateWithBuffer);
+  } catch (error) {
+    const simulationFailed =
+      error.message.includes('Transaction execution error.') ||
+      error.message.includes(
+        'gas required exceeds allowance or always failing transaction',
+      ) ||
+      (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId] &&
+        error.message.includes('gas required exceeds allowance'));
+    if (simulationFailed) {
+      const estimateWithBuffer = addGasBuffer(
+        paramsForGasEstimate?.gas ?? gasLimit,
+        blockGasLimit,
+        bufferMultiplier,
+      );
+      return addHexPrefix(estimateWithBuffer);
+    }
+    throw error;
+  }
+}
 
-const name = 'send';
+export async function getERC20Balance(token, accountAddress) {
+  const contract = global.eth.contract(abi).at(token.address);
+  const usersToken = (await contract.balanceOf(accountAddress)) ?? null;
+  if (!usersToken) {
+    return '0x0';
+  }
+  const amount = calcTokenAmount(
+    usersToken.balance.toString(),
+    token.decimals,
+  ).toString(16);
+  return addHexPrefix(amount);
+}
 
 // After modification of specific fields in specific circumstances we must
 // recompute the gasLimit estimate to be as accurate as possible. the cases
@@ -500,27 +370,25 @@ export const computeEstimatedGasLimit = createAsyncThunk(
   async (_, thunkApi) => {
     const state = thunkApi.getState();
     const { send, metamask } = state;
-    const draftTransaction =
-      send.draftTransactions[send.currentTransactionUUID];
     const unapprovedTxs = getUnapprovedTxs(state);
     const isMultiLayerFeeNetwork = getIsMultiLayerFeeNetwork(state);
-    const transaction = unapprovedTxs[draftTransaction.id];
+    const transaction = unapprovedTxs[send.draftTransaction.id];
     const isNonStandardEthChain = getIsNonStandardEthChain(state);
     const chainId = getCurrentChainId(state);
 
-    let gasTotalForLayer1;
+    let layer1GasTotal;
     if (isMultiLayerFeeNetwork) {
-      gasTotalForLayer1 = await fetchEstimatedL1Fee(global.eth, {
+      layer1GasTotal = await fetchEstimatedL1Fee(global.eth, {
         txParams: {
-          gasPrice: draftTransaction.gas.gasPrice,
-          gas: draftTransaction.gas.gasLimit,
-          to: draftTransaction.recipient.address?.toLowerCase(),
+          gasPrice: send.gas.gasPrice,
+          gas: send.gas.gasLimit,
+          to: send.recipient.address?.toLowerCase(),
           value:
-            send.amountMode === AMOUNT_MODES.MAX
-              ? send.selectedAccount.balance
+            send.amount.mode === 'MAX'
+              ? send.account.balance
               : send.amount.value,
-          from: send.selectedAccount.address,
-          data: draftTransaction.userInputHexData,
+          from: send.account.address,
+          data: send.draftTransaction.userInputHexData,
           type: '0x0',
         },
       });
@@ -532,21 +400,21 @@ export const computeEstimatedGasLimit = createAsyncThunk(
       !transaction.userEditedGasLimit
     ) {
       const gasLimit = await estimateGasLimitForSend({
-        gasPrice: draftTransaction.gas.gasPrice,
+        gasPrice: send.gas.gasPrice,
         blockGasLimit: metamask.currentBlockGasLimit,
         selectedAddress: metamask.selectedAddress,
-        sendToken: draftTransaction.asset.details,
-        to: draftTransaction.recipient.address?.toLowerCase(),
-        value: draftTransaction.amount.value,
-        data: draftTransaction.userInputHexData,
+        sendToken: send.asset.details,
+        to: send.recipient.address?.toLowerCase(),
+        value: send.amount.value,
+        data: send.draftTransaction.userInputHexData,
         isNonStandardEthChain,
         chainId,
-        gasLimit: draftTransaction.gas.gasLimit,
+        gasLimit: send.gas.gasLimit,
       });
       await thunkApi.dispatch(setCustomGasLimit(gasLimit));
       return {
         gasLimit,
-        gasTotalForLayer1,
+        layer1GasTotal,
       };
     }
     return null;
@@ -554,18 +422,28 @@ export const computeEstimatedGasLimit = createAsyncThunk(
 );
 
 /**
- * @typedef {Object} Asset
- * @property {AssetTypesString} type - The type of asset that the user
- *  is attempting to send. Defaults to 'NATIVE' which represents the native
- *  asset of the chain. Can also be 'TOKEN' or 'COLLECTIBLE'.
- * @property {string} balance - A hex string representing the balance
- *  that the user holds of the asset that they are attempting to send.
- * @property {TokenDetails} [details] - An object that describes the
- *  selected asset in the case that the user is sending a token or collectibe.
- *  Will be null when asset.type is 'NATIVE'.
- * @property {string} [error] - Error to display when there is an issue
- *  with the asset.
- */
+ * This method is used to keep the original logic from the gas.duck.js file
+ * after receiving a gasPrice from eth_gasPrice. First, the returned gasPrice
+ * was converted to GWEI, then it was converted to a Number, then in the send
+ * duck (here) we would use getGasPriceInHexWei to get back to hexWei. Now that
+ * we receive a GWEI estimate from the controller, we still need to do this
+ * weird conversion to get the proper rounding.
+ *
+ * @param {T} gasPriceEstimate
+ * @returns
+ */
+function getRoundedGasPrice(gasPriceEstimate) {
+  const gasPriceInDecGwei = conversionUtil(gasPriceEstimate, {
+    numberOfDecimals: 9,
+    toDenomination: GWEI,
+    fromNumericBase: 'dec',
+    toNumericBase: 'dec',
+    fromCurrency: ETH,
+    fromDenomination: GWEI,
+  });
+  const gasPriceAsNumber = Number(gasPriceInDecGwei);
+  return getGasPriceInHexWei(gasPriceAsNumber);
+}
 
 /**
  * Responsible for initializing required state for the send slice.
@@ -579,43 +457,34 @@ export const computeEstimatedGasLimit = createAsyncThunk(
  */
 export const initializeSendState = createAsyncThunk(
   'send/initializeSendState',
-  async ({ chainHasChanged = false } = {}, thunkApi) => {
-    /**
-     * @typedef {Object} ReduxState
-     * @property {Object} metamask - Half baked type for the MetaMask object
-     * @property {SendState} send - the send state
-     */
-
-    /**
-     * @type {ReduxState}
-     */
+  async (_, thunkApi) => {
     const state = thunkApi.getState();
     const isNonStandardEthChain = getIsNonStandardEthChain(state);
     const chainId = getCurrentChainId(state);
     const eip1559support = checkNetworkAndAccountSupports1559(state);
-    const account = getSelectedAccount(state);
-    const { send: sendState, metamask } = state;
-    const draftTransaction =
-      sendState.draftTransactions[sendState.currentTransactionUUID];
-
-    // If the draft transaction is not present, then this action has been
-    // dispatched out of sync with the intended flow. This is not always a bug.
-    // For instance, in the actions.js file we dispatch this action anytime the
-    // chain changes.
-    if (!draftTransaction) {
-      thunkApi.rejectWithValue(
-        'draftTransaction not found, possibly not on send flow',
-      );
-    }
+    const {
+      send: { asset, stage, recipient, amount, draftTransaction },
+      metamask,
+    } = state;
+
+    // First determine the correct from address. For new sends this is always
+    // the currently selected account and switching accounts switches the from
+    // address. If editing an existing transaction (by clicking 'edit' on the
+    // send page), the fromAddress is always the address from the txParams.
+    const fromAddress =
+      stage === SEND_STAGES.EDIT
+        ? draftTransaction.txParams.from
+        : metamask.selectedAddress;
+    // We need the account's balance which is calculated from cachedBalances in
+    // the getMetaMaskAccounts selector. getTargetAccount consumes this
+    // selector and returns the account at the specified address.
+    const account = getTargetAccount(state, fromAddress);
 
     // Default gasPrice to 1 gwei if all estimation fails, this is only used
     // for gasLimit estimation and won't be set directly in state. Instead, we
     // will return the gasFeeEstimates and gasEstimateType so that the reducer
     // can set the appropriate gas fees in state.
-    let gasPrice =
-      sendState.stage === SEND_STAGES.EDIT
-        ? draftTransaction.gas.gasPrice
-        : '0x1';
+    let gasPrice = '0x1';
     let gasEstimatePollToken = null;
 
     // Instruct the background process that polling for gas prices should begin
@@ -627,62 +496,83 @@ export const initializeSendState = createAsyncThunk(
       metamask: { gasFeeEstimates, gasEstimateType },
     } = thunkApi.getState();
 
-    if (sendState.stage !== SEND_STAGES.EDIT) {
-      // Because we are only interested in getting a gasLimit estimation we only
-      // need to worry about gasPrice. So we use maxFeePerGas as gasPrice if we
-      // have a fee market estimation.
-      if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
-        gasPrice = getGasPriceInHexWei(gasFeeEstimates.medium);
-      } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
-        gasPrice = getRoundedGasPrice(gasFeeEstimates.gasPrice);
-      } else if (gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET) {
-        gasPrice = getGasPriceInHexWei(
-          gasFeeEstimates.medium.suggestedMaxFeePerGas,
-        );
-      } else {
-        gasPrice = gasFeeEstimates.gasPrice
-          ? getRoundedGasPrice(gasFeeEstimates.gasPrice)
-          : '0x0';
-      }
+    // Because we are only interested in getting a gasLimit estimation we only
+    // need to worry about gasPrice. So we use maxFeePerGas as gasPrice if we
+    // have a fee market estimation.
+    if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
+      gasPrice = getGasPriceInHexWei(gasFeeEstimates.medium);
+    } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
+      gasPrice = getRoundedGasPrice(gasFeeEstimates.gasPrice);
+    } else if (gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET) {
+      gasPrice = getGasPriceInHexWei(
+        gasFeeEstimates.medium.suggestedMaxFeePerGas,
+      );
+    } else {
+      gasPrice = gasFeeEstimates.gasPrice
+        ? getRoundedGasPrice(gasFeeEstimates.gasPrice)
+        : '0x0';
     }
 
     // Set a basic gasLimit in the event that other estimation fails
-    let { gasLimit } = draftTransaction.gas;
+    let gasLimit =
+      asset.type === ASSET_TYPES.TOKEN || asset.type === ASSET_TYPES.COLLECTIBLE
+        ? GAS_LIMITS.BASE_TOKEN_ESTIMATE
+        : GAS_LIMITS.SIMPLE;
     if (
       gasEstimateType !== GAS_ESTIMATE_TYPES.NONE &&
-      sendState.stage !== SEND_STAGES.EDIT &&
-      draftTransaction.recipient.address
+      stage !== SEND_STAGES.EDIT &&
+      recipient.address
     ) {
-      gasLimit =
-        draftTransaction.asset.type === ASSET_TYPES.TOKEN ||
-        draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
-          ? GAS_LIMITS.BASE_TOKEN_ESTIMATE
-          : GAS_LIMITS.SIMPLE;
       // Run our estimateGasLimit logic to get a more accurate estimation of
       // required gas. If this value isn't nullish, set it as the new gasLimit
       const estimatedGasLimit = await estimateGasLimitForSend({
         gasPrice,
         blockGasLimit: metamask.currentBlockGasLimit,
-        selectedAddress:
-          draftTransaction.fromAccount?.address ??
-          sendState.selectedAccount.address,
-        sendToken: draftTransaction.asset.details,
-        to: draftTransaction.recipient.address.toLowerCase(),
-        value: draftTransaction.amount.value,
+        selectedAddress: fromAddress,
+        sendToken: asset.details,
+        to: recipient.address.toLowerCase(),
+        value: amount.value,
         data: draftTransaction.userInputHexData,
         isNonStandardEthChain,
         chainId,
       });
       gasLimit = estimatedGasLimit || gasLimit;
     }
-    // We have to keep the gas slice in sync with the send slice state
+    // We have to keep the gas slice in sync with the draft send transaction
     // so that it'll be initialized correctly if the gas modal is opened.
     await thunkApi.dispatch(setCustomGasLimit(gasLimit));
+    // We must determine the balance of the asset that the transaction will be
+    // sending. This is done by referencing the native balance on the account
+    // for native assets, and calling the balanceOf method on the ERC20
+    // contract for token sends.
+    let { balance } = account;
+    if (asset.type === ASSET_TYPES.TOKEN) {
+      if (asset.details === null) {
+        // If we're sending a token but details have not been provided we must
+        // abort and set the send slice into invalid status.
+        throw new Error(
+          'Send slice initialized as token send without token details',
+        );
+      }
+      balance = await getERC20Balance(asset.details, fromAddress);
+    }
+
+    if (asset.type === ASSET_TYPES.COLLECTIBLE) {
+      if (asset.details === null) {
+        // If we're sending a collectible but details have not been provided we must
+        // abort and set the send slice into invalid status.
+        throw new Error(
+          'Send slice initialized as collectibles send without token details',
+        );
+      }
+      balance = '0x1';
+    }
     return {
-      account,
+      address: fromAddress,
+      nativeBalance: account.balance,
+      assetBalance: balance,
       chainId: getCurrentChainId(state),
       tokens: getTokens(state),
-      chainHasChanged,
       gasFeeEstimates,
       gasEstimateType,
       gasLimit,
@@ -695,145 +585,243 @@ export const initializeSendState = createAsyncThunk(
   },
 );
 
-// Action Payload Typedefs
-/**
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<string>
- * )} SimpleStringPayload
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<MapValuesToUnion<SendStateAmountModes>>
- * )} SendStateAmountModePayload
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction['asset']>
- * )} UpdateAssetPayload
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<Partial<
- *   Pick<DraftTransaction['recipient'], 'address' | 'nickname'>>
- *  >
- * )} updateRecipientPayload
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<SendState['recipientMode']>
- * )} UpdateRecipientModePayload
- */
-
-/**
- * @typedef {Object} GasFeeUpdateParams
- * @property {TransactionTypeString} transactionType - The transaction type
- * @property {string} [maxFeePerGas] - The maximum amount in hex wei to pay
- *  per gas on a FEE_MARKET transaction.
- * @property {string} [maxPriorityFeePerGas] - The maximum amount in hex
- *  wei to pay per gas as an incentive to miners on a FEE_MARKET
- *  transaction.
- * @property {string} [gasPrice] - The amount in hex wei to pay per gas on
- *  a LEGACY transaction.
- * @property {boolean} [isAutomaticUpdate] - true if the update is the
- *  result of a gas estimate update from the controller.
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<GasFeeUpdateParams>
- * )} GasFeeUpdatePayload
- */
-
-/**
- * @typedef {Object} GasEstimateUpdateParams
- * @property {GasEstimateType} gasEstimateType - The type of gas estimation
- *  provided by the controller.
- * @property {(
- *  EthGasPriceEstimate | LegacyGasPriceEstimate | GasFeeEstimates
- * )} gasFeeEstimates - The gas fee estimates provided by the controller.
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<GasEstimateUpdateParams>
- * )} GasEstimateUpdatePayload
- */
-
-/**
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction['asset']>
- * )} UpdateAssetPayload
- * @typedef {(
- *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction>
- * )} DraftTransactionPayload
- */
+export const initialState = {
+  // which stage of the send flow is the user on
+  stage: SEND_STAGES.INACTIVE,
+  // status of the send slice, either VALID or INVALID
+  status: SEND_STATUSES.VALID,
+  // Determines type of transaction being sent, defaulted to 0x0 (legacy)
+  transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+  // tracks whether the current network supports EIP 1559 transactions
+  eip1559support: false,
+  account: {
+    // from account address, defaults to selected account. will be the account
+    // the original transaction was sent from in the case of the EDIT stage
+    address: null,
+    // balance of the from account
+    balance: '0x0',
+  },
+  gas: {
+    // indicate whether the gas estimate is loading
+    isGasEstimateLoading: true,
+    // String token identifying a listener for polling on the gasFeeController
+    gasEstimatePollToken: null,
+    // has the user set custom gas in the custom gas modal
+    isCustomGasSet: false,
+    // maximum gas needed for tx
+    gasLimit: '0x0',
+    // price in wei to pay per gas
+    gasPrice: '0x0',
+    // maximum price in wei to pay per gas
+    maxFeePerGas: '0x0',
+    // maximum priority fee in wei to pay per gas
+    maxPriorityFeePerGas: '0x0',
+    // expected price in wei necessary to pay per gas used for a transaction
+    // to be included in a reasonable timeframe. Comes from GasFeeController.
+    gasPriceEstimate: '0x0',
+    // maximum total price in wei to pay
+    gasTotal: '0x0',
+    // minimum supported gasLimit
+    minimumGasLimit: GAS_LIMITS.SIMPLE,
+    // error to display for gas fields
+    error: null,
+  },
+  amount: {
+    // The mode to use when determining new amounts. For INPUT mode the
+    // provided payload is always used. For MAX it is calculated based on avail
+    // asset balance
+    mode: AMOUNT_MODES.INPUT,
+    // Current value of the transaction, how much of the asset are we sending
+    value: '0x0',
+    // error to display for amount field
+    error: null,
+  },
+  asset: {
+    // type can be either NATIVE such as ETH or TOKEN for ERC20 tokens
+    type: ASSET_TYPES.NATIVE,
+    // the balance the user holds at the from address for this asset
+    balance: '0x0',
+    // In the case of tokens, the address, decimals and symbol of the token
+    // will be included in details
+    details: null,
+    // error to display when there is an issue with the asset
+    error: null,
+  },
+  draftTransaction: {
+    // The metamask internal id of the transaction. Only populated in the EDIT
+    // stage.
+    id: null,
+    // The hex encoded data provided by the user who has enabled hex data field
+    // in advanced settings
+    userInputHexData: null,
+    // The txParams that should be submitted to the network once this
+    // transaction is confirmed. This object is computed on every write to the
+    // slice of fields that would result in the txParams changing
+    txParams: {
+      to: '',
+      from: '',
+      data: undefined,
+      value: '0x0',
+      gas: '0x0',
+      gasPrice: '0x0',
+      type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+    },
+  },
+  recipient: {
+    // Defines which mode to use for searching for matches in the input field
+    mode: RECIPIENT_SEARCH_MODES.CONTACT_LIST,
+    // Partial, not yet validated, entry into the address field. Used to share
+    // user input amongst the AddRecipient and EnsInput components.
+    userInput: '',
+    // The address of the recipient
+    address: '',
+    // The nickname stored in the user's address book for the recipient address
+    nickname: '',
+    // Error to display on the address field
+    error: null,
+    // Warning to display on the address field
+    warning: null,
+  },
+  multiLayerFees: {
+    // Layer 1 gas fee total on multi-layer fee networks
+    layer1GasTotal: '0x0',
+  },
+  history: [],
+};
 
 const slice = createSlice({
   name,
   initialState,
   reducers: {
+    addHistoryEntry: (state, action) => {
+      state.history.push({
+        entry: action.payload,
+        timestamp: Date.now(),
+      });
+    },
     /**
-     * Adds a new draft transaction to state, first generating a new UUID for
-     * the transaction and setting that as the currentTransactionUUID. If the
-     * draft has an id property set, the stage is set to EDIT.
+     * update current amount.value in state and run post update validation of
+     * the amount field and the send state. Recomputes the draftTransaction
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {DraftTransactionPayload} action - An action with payload that is
-     *  a new draft transaction that will be added to state.
-     * @returns {void}
+     * @param state
+     * @param action
      */
-    addNewDraft: (state, action) => {
-      state.currentTransactionUUID = uuidv4();
-      state.draftTransactions[state.currentTransactionUUID] = action.payload;
-      if (action.payload.id) {
-        state.stage = SEND_STAGES.EDIT;
-      } else {
-        state.stage = SEND_STAGES.ADD_RECIPIENT;
+    updateSendAmount: (state, action) => {
+      state.amount.value = addHexPrefix(action.payload);
+      // Once amount has changed, validate the field
+      slice.caseReducers.validateAmountField(state);
+      if (state.asset.type === ASSET_TYPES.NATIVE) {
+        // if sending the native asset the amount being sent will impact the
+        // gas field as well because the gas validation takes into
+        // consideration the available balance minus amount sent before
+        // checking if there is enough left to cover the gas fee.
+        slice.caseReducers.validateGasField(state);
       }
+      // validate send state
+      slice.caseReducers.validateSendState(state);
     },
     /**
-     * Adds an entry, with timestamp, to the draftTransaction history.
+     * computes the maximum amount of asset that can be sent and then calls
+     * the updateSendAmount action above with the computed value, which will
+     * revalidate the field and form and recomputes the draftTransaction
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - An action with payload that is
-     *  a string to be added to the history of the draftTransaction
-     * @returns {void}
+     * @param state
      */
-    addHistoryEntry: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      if (draftTransaction) {
-        draftTransaction.history.push({
-          entry: action.payload,
-          timestamp: Date.now(),
+    updateAmountToMax: (state) => {
+      let amount = '0x0';
+      if (state.asset.type === ASSET_TYPES.TOKEN) {
+        const decimals = state.asset.details?.decimals ?? 0;
+        const multiplier = Math.pow(10, Number(decimals));
+
+        amount = multiplyCurrencies(state.asset.balance, multiplier, {
+          toNumericBase: 'hex',
+          multiplicandBase: 16,
+          multiplierBase: 10,
         });
+      } else {
+        const _gasTotal = sumHexes(
+          state.gas.gasTotal || '0x0',
+          state.multiLayerFees?.layer1GasTotal || '0x0',
+        );
+        amount = subtractCurrencies(
+          addHexPrefix(state.asset.balance),
+          addHexPrefix(_gasTotal),
+          {
+            toNumericBase: 'hex',
+            aBase: 16,
+            bBase: 16,
+          },
+        );
+      }
+      slice.caseReducers.updateSendAmount(state, {
+        payload: amount,
+      });
+      // draftTransaction update happens in updateSendAmount
+    },
+    /**
+     * updates the draftTransaction.userInputHexData state key and then
+     * recomputes the draftTransaction if the user is currently sending the
+     * native asset. When sending ERC20 assets, this is unnecessary because the
+     * hex data used in the transaction will be that for interacting with the
+     * ERC20 contract
+     *
+     * @param state
+     * @param action
+     */
+    updateUserInputHexData: (state, action) => {
+      state.draftTransaction.userInputHexData = action.payload;
+      if (state.asset.type === ASSET_TYPES.NATIVE) {
+        slice.caseReducers.updateDraftTransaction(state);
       }
     },
+    /**
+     * Initiates the edit transaction flow by setting the stage to 'EDIT' and
+     * then pulling the details of the previously submitted transaction from
+     * the action payload. It also computes a new draftTransaction that will be
+     * used when updating the transaction in the provider
+     *
+     * @param state
+     * @param action
+     */
+    editTransaction: (state, action) => {
+      state.stage = SEND_STAGES.EDIT;
+      state.gas.gasLimit = action.payload.gasLimit;
+      state.gas.gasPrice = action.payload.gasPrice;
+      state.amount.value = action.payload.amount;
+      state.gas.error = null;
+      state.amount.error = null;
+      state.asset.error = null;
+      state.recipient.address = action.payload.address;
+      state.recipient.nickname = action.payload.nickname;
+      state.draftTransaction.id = action.payload.id;
+      state.draftTransaction.txParams.from = action.payload.from;
+      state.draftTransaction.userInputHexData = action.payload.data;
+      slice.caseReducers.updateDraftTransaction(state);
+    },
     /**
      * gasTotal is computed based on gasPrice and gasLimit and set in state
      * recomputes the maximum amount if the current amount mode is 'MAX' and
      * sending the native token. ERC20 assets max amount is unaffected by
      * gasTotal so does not need to be recomputed. Finally, validates the gas
-     * field and send state.
+     * field and send state, then updates the draft transaction.
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
+     * @param state
      */
     calculateGasTotal: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
       // use maxFeePerGas as the multiplier if working with a FEE_MARKET transaction
       // otherwise use gasPrice
-      if (
-        draftTransaction.transactionType ===
-        TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
-      ) {
-        draftTransaction.gas.gasTotal = addHexPrefix(
-          calcGasTotal(
-            draftTransaction.gas.gasLimit,
-            draftTransaction.gas.maxFeePerGas,
-          ),
+      if (state.transactionType === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
+        state.gas.gasTotal = addHexPrefix(
+          calcGasTotal(state.gas.gasLimit, state.gas.maxFeePerGas),
         );
       } else {
-        draftTransaction.gas.gasTotal = addHexPrefix(
-          calcGasTotal(
-            draftTransaction.gas.gasLimit,
-            draftTransaction.gas.gasPrice,
-          ),
+        state.gas.gasTotal = addHexPrefix(
+          calcGasTotal(state.gas.gasLimit, state.gas.gasPrice),
         );
       }
       if (
-        state.amountMode === AMOUNT_MODES.MAX &&
-        draftTransaction.asset.type === ASSET_TYPES.NATIVE
+        state.amount.mode === AMOUNT_MODES.MAX &&
+        state.asset.type === ASSET_TYPES.NATIVE
       ) {
         slice.caseReducers.updateAmountToMax(state);
       }
@@ -843,133 +831,57 @@ const slice = createSlice({
       slice.caseReducers.validateSendState(state);
     },
     /**
-     * Clears all drafts from send state and drops the currentTransactionUUID.
-     * This is an important first step before adding a new draft transaction to
-     * avoid possible collision.
+     * sets the provided gasLimit in state and then recomputes the gasTotal.
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
+     * @param state
+     * @param action
      */
-    clearPreviousDrafts: (state) => {
-      state.currentTransactionUUID = null;
-      state.draftTransactions = {};
+    updateGasLimit: (state, action) => {
+      state.gas.gasLimit = addHexPrefix(action.payload);
+      slice.caseReducers.calculateGasTotal(state);
     },
     /**
-     * Clears the send state by setting it to the initial value
-     *
-     * @returns {SendState}
-     */
-    resetSendState: () => initialState,
-    /**
-     * sets the amount mode to the provided value as long as it is one of the
-     * supported modes (MAX|INPUT)
+     * Sets the appropriate gas fees in state and determines and sets the
+     * appropriate transactionType based on gas fee fields received.
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SendStateAmountModePayload} action - The amount mode
-     *  to set the state to.
-     * @returns {void}
+     * @param state
+     * @param action
      */
-    updateAmountMode: (state, action) => {
-      if (Object.values(AMOUNT_MODES).includes(action.payload)) {
-        state.amountMode = action.payload;
-      }
-    },
-    /**
-     * computes the maximum amount of asset that can be sent and then calls
-     * the updateSendAmount action above with the computed value, which will
-     * revalidate the field and form.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
-    updateAmountToMax: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      let amount = '0x0';
-      if (draftTransaction.asset.type === ASSET_TYPES.TOKEN) {
-        const decimals = draftTransaction.asset.details?.decimals ?? 0;
-        const multiplier = Math.pow(10, Number(decimals));
-
-        amount = multiplyCurrencies(
-          draftTransaction.asset.balance,
-          multiplier,
-          {
-            toNumericBase: 'hex',
-            multiplicandBase: 16,
-            multiplierBase: 10,
-          },
-        );
-      } else {
-        const _gasTotal = sumHexes(
-          draftTransaction.gas.gasTotal || '0x0',
-          state.gasTotalForLayer1 || '0x0',
-        );
-        amount = subtractCurrencies(
-          addHexPrefix(draftTransaction.asset.balance),
-          addHexPrefix(_gasTotal),
-          {
-            toNumericBase: 'hex',
-            aBase: 16,
-            bBase: 16,
-          },
-        );
-      }
-      slice.caseReducers.updateSendAmount(state, {
-        payload: amount,
-      });
-    },
-    /**
-     * Updates the currently selected asset
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {UpdateAssetPayload} action - The asset to set in the
-     *  draftTransaction.
-     * @returns {void}
-     */
-    updateAsset: (state, action) => {
-      const { asset, initialAssetSet } = action.payload;
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-
-      draftTransaction.asset.type = asset.type;
-      draftTransaction.asset.balance = asset.balance;
-      draftTransaction.asset.error = asset.error;
-
+    updateGasFees: (state, action) => {
       if (
-        draftTransaction.asset.type === ASSET_TYPES.TOKEN ||
-        draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
+        action.payload.transactionType === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
       ) {
-        draftTransaction.asset.details = asset.details;
+        state.gas.maxFeePerGas = addHexPrefix(action.payload.maxFeePerGas);
+        state.gas.maxPriorityFeePerGas = addHexPrefix(
+          action.payload.maxPriorityFeePerGas,
+        );
+        state.transactionType = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
       } else {
-        // clear the details object when sending native currency
-        draftTransaction.asset.details = null;
-        if (draftTransaction.recipient.error === CONTRACT_ADDRESS_ERROR) {
-          // Errors related to sending tokens to their own contract address
-          // are no longer valid when sending native currency.
-          draftTransaction.recipient.error = null;
+        // Until we remove the old UI we don't want to automatically update
+        // gasPrice if the user has already manually changed the field value.
+        // When receiving a new estimate the isAutomaticUpdate property will be
+        // on the payload (and set to true). If isAutomaticUpdate is true,
+        // then we check if the previous estimate was '0x0' or if the previous
+        // gasPrice equals the previous gasEstimate. if either of those cases
+        // are true then we update the gasPrice otherwise we skip it because
+        // it indicates the user has ejected from the estimates by modifying
+        // the field.
+        if (
+          action.payload.isAutomaticUpdate !== true ||
+          state.gas.gasPriceEstimate === '0x0' ||
+          state.gas.gasPrice === state.gas.gasPriceEstimate
+        ) {
+          state.gas.gasPrice = addHexPrefix(action.payload.gasPrice);
         }
+        state.transactionType = TRANSACTION_ENVELOPE_TYPES.LEGACY;
       }
-      // 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);
-      } else if (initialAssetSet === false) {
-        slice.caseReducers.updateSendAmount(state, { payload: '0x0' });
-      }
-      // validate send state
-      slice.caseReducers.validateSendState(state);
+      slice.caseReducers.calculateGasTotal(state);
     },
     /**
      * Sets the appropriate gas fees in state after receiving new estimates.
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {GasEstimateUpdatePayload)} action - The gas fee update payload
-     * @returns {void}
+     * @param state
+     * @param action
      */
     updateGasFeeEstimates: (state, action) => {
       const { gasFeeEstimates, gasEstimateType } = action.payload;
@@ -1013,434 +925,385 @@ const slice = createSlice({
           break;
       }
       // Record the latest gasPriceEstimate for future comparisons
-      state.gasPriceEstimate = addHexPrefix(gasPriceEstimate);
+      state.gas.gasPriceEstimate = addHexPrefix(gasPriceEstimate);
     },
     /**
-     * Sets the appropriate gas fees in state and determines and sets the
-     * appropriate transactionType based on gas fee fields received.
+     * sets the layer 1 fees total (for a multi-layer fee network)
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {GasFeeUpdatePayload} action - The gas fees to update with
-     * @returns {void}
+     * @param state
+     * @param action
      */
-    updateGasFees: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      if (draftTransaction) {
-        if (
-          action.payload.transactionType ===
-          TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
-        ) {
-          draftTransaction.gas.maxFeePerGas = addHexPrefix(
-            action.payload.maxFeePerGas,
-          );
-          draftTransaction.gas.maxPriorityFeePerGas = addHexPrefix(
-            action.payload.maxPriorityFeePerGas,
-          );
-          draftTransaction.transactionType =
-            TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
-        } else {
-          // Until we remove the old UI we don't want to automatically update
-          // gasPrice if the user has already manually changed the field value.
-          // When receiving a new estimate the isAutomaticUpdate property will be
-          // on the payload (and set to true). If isAutomaticUpdate is true,
-          // then we check if the previous estimate was '0x0' or if the previous
-          // gasPrice equals the previous gasEstimate. if either of those cases
-          // are true then we update the gasPrice otherwise we skip it because
-          // it indicates the user has ejected from the estimates by modifying
-          // the field.
-          if (
-            action.payload.isAutomaticUpdate !== true ||
-            state.gasPriceEstimate === '0x0' ||
-            draftTransaction.gas.gasPrice === state.gasPriceEstimate
-          ) {
-            draftTransaction.gas.gasPrice = addHexPrefix(
-              action.payload.gasPrice,
-            );
-          }
-          draftTransaction.transactionType = TRANSACTION_ENVELOPE_TYPES.LEGACY;
-        }
-        slice.caseReducers.calculateGasTotal(state);
+    updateLayer1Fees: (state, action) => {
+      state.multiLayerFees.layer1GasTotal = action.payload;
+      if (
+        state.amount.mode === AMOUNT_MODES.MAX &&
+        state.asset.type === ASSET_TYPES.NATIVE
+      ) {
+        slice.caseReducers.updateAmountToMax(state);
       }
     },
     /**
-     * sets the provided gasLimit in state and then recomputes the gasTotal.
+     * sets the amount mode to the provided value as long as it is one of the
+     * supported modes (MAX|INPUT)
      *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - The
-     *  gasLimit in hex to set in state.
-     * @returns {void}
+     * @param state
+     * @param action
      */
-    updateGasLimit: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      if (draftTransaction) {
-        draftTransaction.gas.gasLimit = addHexPrefix(action.payload);
-        slice.caseReducers.calculateGasTotal(state);
+    updateAmountMode: (state, action) => {
+      if (Object.values(AMOUNT_MODES).includes(action.payload)) {
+        state.amount.mode = action.payload;
       }
     },
-    /**
-     * sets the layer 1 fees total (for a multi-layer fee network)
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - the
-     *  gasTotalForLayer1 to set in hex wei.
-     * @returns {void}
-     */
-    updateLayer1Fees: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      state.gasTotalForLayer1 = action.payload;
+    updateAsset: (state, action) => {
+      state.asset.type = action.payload.type;
+      state.asset.balance = action.payload.balance;
+      state.asset.error = action.payload.error;
       if (
-        state.amountMode === AMOUNT_MODES.MAX &&
-        draftTransaction.asset.type === ASSET_TYPES.NATIVE
+        state.asset.type === ASSET_TYPES.TOKEN ||
+        state.asset.type === ASSET_TYPES.COLLECTIBLE
       ) {
+        state.asset.details = action.payload.details;
+      } else {
+        // clear the details object when sending native currency
+        state.asset.details = null;
+        if (state.recipient.error === CONTRACT_ADDRESS_ERROR) {
+          // Errors related to sending tokens to their own contract address
+          // are no longer valid when sending native currency.
+          state.recipient.error = null;
+        }
+
+        if (state.recipient.warning === KNOWN_RECIPIENT_ADDRESS_WARNING) {
+          // Warning related to sending tokens to a known contract address
+          // are no longer valid when sending native currency.
+          state.recipient.warning = null;
+        }
+      }
+      // 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.amount.mode === AMOUNT_MODES.MAX) {
         slice.caseReducers.updateAmountToMax(state);
+      } else {
+        slice.caseReducers.updateSendAmount(state, { payload: '0x0' });
       }
+      // validate send state
+      slice.caseReducers.validateSendState(state);
     },
-    /**
-     * Updates the recipient of the draftTransaction
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {updateRecipientPayload} action - The recipient to set in the
-     *  draftTransaction.
-     * @returns {void}
-     */
     updateRecipient: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.recipient.error = null;
-      state.recipientInput = '';
-      draftTransaction.recipient.address = action.payload.address ?? '';
-      draftTransaction.recipient.nickname = action.payload.nickname ?? '';
-
-      if (draftTransaction.recipient.address === '') {
+      state.recipient.error = null;
+      state.recipient.userInput = '';
+      state.recipient.address = action.payload.address ?? '';
+      state.recipient.nickname = action.payload.nickname ?? '';
+
+      if (state.recipient.address === '') {
         // If address is null we are clearing the recipient and must return
         // to the ADD_RECIPIENT stage.
         state.stage = SEND_STAGES.ADD_RECIPIENT;
       } else {
-        // if an address is provided and an id exists, we progress to the EDIT
-        // stage, otherwise we progress to the DRAFT stage. We also reset the
-        // search mode for recipient search.
+        // if and address is provided and an id exists on the draft transaction,
+        // we progress to the EDIT stage, otherwise we progress to the DRAFT
+        // stage. We also reset the search mode for recipient search.
         state.stage =
-          draftTransaction.id === null ? SEND_STAGES.DRAFT : SEND_STAGES.EDIT;
-        state.recipientMode = RECIPIENT_SEARCH_MODES.CONTACT_LIST;
+          state.draftTransaction.id === null
+            ? SEND_STAGES.DRAFT
+            : SEND_STAGES.EDIT;
+        state.recipient.mode = RECIPIENT_SEARCH_MODES.CONTACT_LIST;
       }
 
       // validate send state
       slice.caseReducers.validateSendState(state);
     },
-    /**
-     * Clears the user input and changes the recipient search mode to the
-     * specified value
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {UpdateRecipientModePayload} action - The mode to set the
-     *  recipient search to
-     * @returns {void}
-     */
-    updateRecipientSearchMode: (state, action) => {
-      state.recipientInput = '';
-      state.recipientMode = action.payload;
-    },
+    updateDraftTransaction: (state) => {
+      // We keep a copy of txParams in state that could be submitted to the
+      // network if the form state is valid.
+      if (state.status === SEND_STATUSES.VALID) {
+        // We don't/shouldn't modify the from address when editing an
+        // existing transaction.
+        if (state.stage !== SEND_STAGES.EDIT) {
+          state.draftTransaction.txParams.from = state.account.address;
+        }
 
-    updateRecipientWarning: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.recipient.warning = action.payload;
-    },
+        // gasLimit always needs to be set regardless of the asset being sent
+        // or the type of transaction.
+        state.draftTransaction.txParams.gas = state.gas.gasLimit;
+        switch (state.asset.type) {
+          case ASSET_TYPES.TOKEN:
+            // When sending a token the to address is the contract address of
+            // the token being sent. The value is set to '0x0' and the data
+            // is generated from the recipient address, token being sent and
+            // amount.
+            state.draftTransaction.txParams.to = state.asset.details.address;
+            state.draftTransaction.txParams.value = '0x0';
+            state.draftTransaction.txParams.data = generateERC20TransferData({
+              toAddress: state.recipient.address,
+              amount: state.amount.value,
+              sendToken: state.asset.details,
+            });
+            break;
+          case ASSET_TYPES.COLLECTIBLE:
+            // When sending a token the to address is the contract address of
+            // the token being sent. The value is set to '0x0' and the data
+            // is generated from the recipient address, token being sent and
+            // amount.
+            state.draftTransaction.txParams.to = state.asset.details.address;
+            state.draftTransaction.txParams.value = '0x0';
+            state.draftTransaction.txParams.data = generateERC721TransferData({
+              toAddress: state.recipient.address,
+              fromAddress: state.account.address,
+              tokenId: state.asset.details.tokenId,
+            });
+            break;
+          case ASSET_TYPES.NATIVE:
+          default:
+            // When sending native currency the to and value fields use the
+            // recipient and amount values and the data key is either null or
+            // populated with the user input provided in hex field.
+            state.draftTransaction.txParams.to = state.recipient.address;
+            state.draftTransaction.txParams.value = state.amount.value;
+            state.draftTransaction.txParams.data =
+              state.draftTransaction.userInputHexData ?? undefined;
+        }
 
-    updateDraftTransactionStatus: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.status = action.payload;
-    },
+        // We need to make sure that we only include the right gas fee fields
+        // based on the type of transaction the network supports. We will also set
+        // the type param here. We must delete the opposite fields to avoid
+        // stale data in txParams.
+        if (state.eip1559support) {
+          state.draftTransaction.txParams.type =
+            TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
 
-    acknowledgeRecipientWarning: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.recipient.recipientWarningAcknowledged = true;
-      slice.caseReducers.validateSendState(state);
-    },
+          state.draftTransaction.txParams.maxFeePerGas = state.gas.maxFeePerGas;
+          state.draftTransaction.txParams.maxPriorityFeePerGas =
+            state.gas.maxPriorityFeePerGas;
 
-    /**
-     * Updates the value of the recipientInput key with what the user has
-     * typed into the recipient input field in the UI.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - the value the user has typed into
-     *  the recipient field.
-     * @returns {void}
-     */
+          if (
+            !state.draftTransaction.txParams.maxFeePerGas ||
+            state.draftTransaction.txParams.maxFeePerGas === '0x0'
+          ) {
+            state.draftTransaction.txParams.maxFeePerGas = state.gas.gasPrice;
+          }
+
+          if (
+            !state.draftTransaction.txParams.maxPriorityFeePerGas ||
+            state.draftTransaction.txParams.maxPriorityFeePerGas === '0x0'
+          ) {
+            state.draftTransaction.txParams.maxPriorityFeePerGas =
+              state.draftTransaction.txParams.maxFeePerGas;
+          }
+
+          delete state.draftTransaction.txParams.gasPrice;
+        } else {
+          delete state.draftTransaction.txParams.maxFeePerGas;
+          delete state.draftTransaction.txParams.maxPriorityFeePerGas;
+
+          state.draftTransaction.txParams.gasPrice = state.gas.gasPrice;
+          state.draftTransaction.txParams.type =
+            TRANSACTION_ENVELOPE_TYPES.LEGACY;
+        }
+      }
+    },
+    useDefaultGas: (state) => {
+      // Show the default gas price/limit fields in the send page
+      state.gas.isCustomGasSet = false;
+    },
+    useCustomGas: (state) => {
+      // Show the gas fees set in the custom gas modal (state.gas.customData)
+      state.gas.isCustomGasSet = true;
+    },
     updateRecipientUserInput: (state, action) => {
       // Update the value in state to match what the user is typing into the
       // input field
-      state.recipientInput = action.payload;
+      state.recipient.userInput = action.payload;
     },
-    /**
-     * update current amount.value in state and run post update validation of
-     * the amount field and the send state.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - The hex string to be set as the
-     *  amount value.
-     * @returns {void}
-     */
-    updateSendAmount: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.amount.value = addHexPrefix(action.payload);
-      // Once amount has changed, validate the field
-      slice.caseReducers.validateAmountField(state);
-      if (draftTransaction.asset.type === ASSET_TYPES.NATIVE) {
-        // if sending the native asset the amount being sent will impact the
-        // gas field as well because the gas validation takes into
-        // consideration the available balance minus amount sent before
-        // checking if there is enough left to cover the gas fee.
-        slice.caseReducers.validateGasField(state);
+    validateRecipientUserInput: (state, action) => {
+      const { asset, recipient } = state;
+
+      if (
+        recipient.mode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS ||
+        recipient.userInput === '' ||
+        recipient.userInput === null
+      ) {
+        recipient.error = null;
+        recipient.warning = null;
+      } else {
+        const isSendingToken =
+          asset.type === ASSET_TYPES.TOKEN ||
+          asset.type === ASSET_TYPES.COLLECTIBLE;
+        const { chainId, tokens, tokenAddressList } = action.payload;
+        if (
+          isBurnAddress(recipient.userInput) ||
+          (!isValidHexAddress(recipient.userInput, {
+            mixedCaseUseChecksum: true,
+          }) &&
+            !isValidDomainName(recipient.userInput))
+        ) {
+          recipient.error = isDefaultMetaMaskChain(chainId)
+            ? INVALID_RECIPIENT_ADDRESS_ERROR
+            : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;
+        } else if (
+          isSendingToken &&
+          isOriginContractAddress(recipient.userInput, asset.details.address)
+        ) {
+          recipient.error = CONTRACT_ADDRESS_ERROR;
+        } else {
+          recipient.error = null;
+        }
+        if (
+          isSendingToken &&
+          isValidHexAddress(recipient.userInput) &&
+          (tokenAddressList.find((address) =>
+            isEqualCaseInsensitive(address, recipient.userInput),
+          ) ||
+            checkExistingAddresses(recipient.userInput, tokens))
+        ) {
+          recipient.warning = KNOWN_RECIPIENT_ADDRESS_WARNING;
+        } else {
+          recipient.warning = null;
+        }
       }
-      // validate send state
-      slice.caseReducers.validateSendState(state);
     },
-    /**
-     * updates the userInputHexData state key
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @param {SimpleStringPayload} action - The hex string to be set as the
-     *  userInputHexData value.
-     * @returns {void}
-     */
-    updateUserInputHexData: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-      draftTransaction.userInputHexData = action.payload;
-    },
-    /**
-     * Updates the gasIsSetInModal property to true which results in showing
-     * the gas fees from the custom gas modal in the send page.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
-    useCustomGas: (state) => {
-      state.gasIsSetInModal = true;
-    },
-    /**
-     * Updates the gasIsSetInModal property to false which results in showing
-     * the default gas price/limit fields in the send page.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
-    useDefaultGas: (state) => {
-      state.gasIsSetInModal = false;
+    updateRecipientSearchMode: (state, action) => {
+      state.recipient.userInput = '';
+      state.recipient.mode = action.payload;
     },
-    /**
-     * Checks for the validity of the draftTransactions selected amount to send
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
+    resetSendState: () => initialState,
     validateAmountField: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
       switch (true) {
         // set error to INSUFFICIENT_FUNDS_ERROR if the account balance is lower
         // than the total price of the transaction inclusive of gas fees.
-        case draftTransaction.asset.type === ASSET_TYPES.NATIVE &&
+        case state.asset.type === ASSET_TYPES.NATIVE &&
           !isBalanceSufficient({
-            amount: draftTransaction.amount.value,
-            balance: draftTransaction.asset.balance,
-            gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
+            amount: state.amount.value,
+            balance: state.asset.balance,
+            gasTotal: state.gas.gasTotal ?? '0x0',
           }):
-          draftTransaction.amount.error = INSUFFICIENT_FUNDS_ERROR;
+          state.amount.error = INSUFFICIENT_FUNDS_ERROR;
           break;
         // set error to INSUFFICIENT_FUNDS_ERROR if the token balance is lower
         // than the amount of token the user is attempting to send.
-        case draftTransaction.asset.type === ASSET_TYPES.TOKEN &&
+        case state.asset.type === ASSET_TYPES.TOKEN &&
           !isTokenBalanceSufficient({
-            tokenBalance: draftTransaction.asset.balance ?? '0x0',
-            amount: draftTransaction.amount.value,
-            decimals: draftTransaction.asset.details.decimals,
+            tokenBalance: state.asset.balance ?? '0x0',
+            amount: state.amount.value,
+            decimals: state.asset.details.decimals,
           }):
-          draftTransaction.amount.error = INSUFFICIENT_TOKENS_ERROR;
+          state.amount.error = INSUFFICIENT_TOKENS_ERROR;
           break;
         // if the amount is negative, set error to NEGATIVE_ETH_ERROR
         // TODO: change this to NEGATIVE_ERROR and remove the currency bias.
         case conversionGreaterThan(
           { value: 0, fromNumericBase: 'dec' },
-          { value: draftTransaction.amount.value, fromNumericBase: 'hex' },
+          { value: state.amount.value, fromNumericBase: 'hex' },
         ):
-          draftTransaction.amount.error = NEGATIVE_ETH_ERROR;
+          state.amount.error = NEGATIVE_ETH_ERROR;
           break;
         // If none of the above are true, set error to null
         default:
-          draftTransaction.amount.error = null;
+          state.amount.error = null;
       }
     },
-    /**
-     * Checks if the user has enough funds to cover the cost of gas, always
-     * uses the native currency and does not take into account the amount
-     * being sent. If the user has enough to cover cost of gas but not gas
-     * + amount then the error will be displayed on the amount field.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
     validateGasField: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
+      // Checks if the user has enough funds to cover the cost of gas, always
+      // uses the native currency and does not take into account the amount
+      // being sent. If the user has enough to cover cost of gas but not gas
+      // + amount then the error will be displayed on the amount field.
       const insufficientFunds = !isBalanceSufficient({
         amount:
-          draftTransaction.asset.type === ASSET_TYPES.NATIVE
-            ? draftTransaction.amount.value
-            : '0x0',
-        balance:
-          draftTransaction.fromAccount?.balance ??
-          state.selectedAccount.balance,
-        gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
+          state.asset.type === ASSET_TYPES.NATIVE ? state.amount.value : '0x0',
+        balance: state.account.balance,
+        gasTotal: state.gas.gasTotal ?? '0x0',
       });
 
-      draftTransaction.gas.error = insufficientFunds
-        ? INSUFFICIENT_FUNDS_ERROR
-        : null;
-    },
-    validateRecipientUserInput: (state, action) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
-
-      if (draftTransaction) {
-        if (
-          state.recipientMode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS ||
-          state.recipientInput === '' ||
-          state.recipientInput === null
-        ) {
-          draftTransaction.recipient.error = null;
-          draftTransaction.recipient.warning = null;
-        } else {
-          const {
-            chainId,
-            tokens,
-            tokenAddressList,
-            isProbablyAnAssetContract,
-          } = action.payload;
-
-          if (
-            isBurnAddress(state.recipientInput) ||
-            (!isValidHexAddress(state.recipientInput, {
-              mixedCaseUseChecksum: true,
-            }) &&
-              !isValidDomainName(state.recipientInput))
-          ) {
-            draftTransaction.recipient.error = isDefaultMetaMaskChain(chainId)
-              ? INVALID_RECIPIENT_ADDRESS_ERROR
-              : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;
-          } else if (
-            isOriginContractAddress(
-              state.recipientInput,
-              draftTransaction.asset?.details?.address,
-            )
-          ) {
-            draftTransaction.recipient.error = CONTRACT_ADDRESS_ERROR;
-          } else {
-            draftTransaction.recipient.error = null;
-          }
-          if (
-            (isValidHexAddress(state.recipientInput) &&
-              (tokenAddressList.find((address) =>
-                isEqualCaseInsensitive(address, state.recipientInput),
-              ) ||
-                checkExistingAddresses(state.recipientInput, tokens))) ||
-            isProbablyAnAssetContract
-          ) {
-            draftTransaction.recipient.warning = KNOWN_RECIPIENT_ADDRESS_WARNING;
-          } else {
-            draftTransaction.recipient.warning = null;
-          }
-        }
-      }
-      slice.caseReducers.validateSendState(state);
+      state.gas.error = insufficientFunds ? INSUFFICIENT_FUNDS_ERROR : null;
     },
-    /**
-     * Checks if the draftTransaction is currently valid. The following list of
-     * cases from the switch statement in this function describe when the
-     * transaction is invalid. Please keep this comment updated.
-     *
-     * case 1: State is invalid when amount field has an error.
-     * case 2: State is invalid when gas field has an error.
-     * case 3: State is invalid when asset field has an error.
-     * case 4: State is invalid if asset type is a token and the token details
-     *  are unknown.
-     * case 5: State is invalid if no recipient has been added.
-     * case 6: State is invalid if the send state is uninitialized.
-     * case 7: State is invalid if gas estimates are loading.
-     * case 8: State is invalid if gasLimit is less than the gasLimitMinimum.
-     *
-     * @param {SendStateDraft} state - A writable draft of the send state to be
-     *  updated.
-     * @returns {void}
-     */
     validateSendState: (state) => {
-      const draftTransaction =
-        state.draftTransactions[state.currentTransactionUUID];
       switch (true) {
-        case Boolean(draftTransaction.amount.error):
-        case Boolean(draftTransaction.gas.error):
-        case Boolean(draftTransaction.asset.error):
-        case draftTransaction.asset.type === ASSET_TYPES.TOKEN &&
-          draftTransaction.asset.details === null:
+        // 1 + 2. State is invalid when either gas or amount or asset fields have errors
+        // 3. State is invalid if asset type is a token and the token details
+        //  are unknown.
+        // 4. State is invalid if no recipient has been added
+        // 5. State is invalid if the send state is uninitialized
+        // 6. State is invalid if gas estimates are loading
+        // 7. State is invalid if gasLimit is less than the minimumGasLimit
+        // 8. State is invalid if the selected asset is a ERC721
+        case Boolean(state.amount.error):
+        case Boolean(state.gas.error):
+        case Boolean(state.asset.error):
+        case state.asset.type === ASSET_TYPES.TOKEN &&
+          state.asset.details === null:
         case state.stage === SEND_STAGES.ADD_RECIPIENT:
         case state.stage === SEND_STAGES.INACTIVE:
-        case state.gasEstimateIsLoading:
-        case new BigNumber(draftTransaction.gas.gasLimit, 16).lessThan(
-          new BigNumber(state.gasLimitMinimum),
+        case state.gas.isGasEstimateLoading:
+        case new BigNumber(state.gas.gasLimit, 16).lessThan(
+          new BigNumber(state.gas.minimumGasLimit),
         ):
-          draftTransaction.status = SEND_STATUSES.INVALID;
-          break;
-        case draftTransaction.recipient.warning === 'loading':
-        case draftTransaction.recipient.warning ===
-          KNOWN_RECIPIENT_ADDRESS_WARNING &&
-          draftTransaction.recipient.recipientWarningAcknowledged === false:
-          draftTransaction.status = SEND_STATUSES.INVALID;
+          state.status = SEND_STATUSES.INVALID;
           break;
         default:
-          draftTransaction.status = SEND_STATUSES.VALID;
+          state.status = SEND_STATUSES.VALID;
+          // Recompute the draftTransaction object
+          slice.caseReducers.updateDraftTransaction(state);
       }
     },
   },
   extraReducers: (builder) => {
     builder
+      .addCase(QR_CODE_DETECTED, (state, action) => {
+        // When data is received from the QR Code Scanner we set the recipient
+        // as long as a valid address can be pulled from the data. If an
+        // address is pulled but it is invalid, we display an error.
+        const qrCodeData = action.value;
+        if (qrCodeData) {
+          if (qrCodeData.type === 'address') {
+            const scannedAddress = qrCodeData.values.address.toLowerCase();
+            if (
+              isValidHexAddress(scannedAddress, { allowNonPrefixed: false })
+            ) {
+              if (state.recipient.address !== scannedAddress) {
+                slice.caseReducers.updateRecipient(state, {
+                  payload: { address: scannedAddress },
+                });
+              }
+            } else {
+              state.recipient.error = INVALID_RECIPIENT_ADDRESS_ERROR;
+            }
+          }
+        }
+      })
+      .addCase(SELECTED_ACCOUNT_CHANGED, (state, action) => {
+        // If we are on the edit flow the account we are keyed into will be the
+        // original 'from' account, which may differ from the selected account
+        if (state.stage !== SEND_STAGES.EDIT) {
+          // This event occurs when the user selects a new account from the
+          // account menu, or the currently active account's balance updates.
+          state.account.balance = action.payload.account.balance;
+          state.account.address = action.payload.account.address;
+          // We need to update the asset balance if the asset is the native
+          // network asset. Once we update the balance we recompute error state.
+          if (state.asset.type === ASSET_TYPES.NATIVE) {
+            state.asset.balance = action.payload.account.balance;
+          }
+          slice.caseReducers.validateAmountField(state);
+          slice.caseReducers.validateGasField(state);
+          slice.caseReducers.validateSendState(state);
+        }
+      })
       .addCase(ACCOUNT_CHANGED, (state, action) => {
         // If we are on the edit flow then we need to watch for changes to the
         // current account.address in state and keep balance updated
         // appropriately
         if (
           state.stage === SEND_STAGES.EDIT &&
-          action.payload.account.address === state.selectedAccount.address
+          action.payload.account.address === state.account.address
         ) {
           // This event occurs when the user's account details update due to
           // background state changes. If the account that is being updated is
           // the current from account on the edit flow we need to update
           // the balance for the account and revalidate the send state.
-          state.selectedAccount.balance = action.payload.account.balance;
+          state.account.balance = action.payload.account.balance;
           // We need to update the asset balance if the asset is the native
           // network asset. Once we update the balance we recompute error state.
-          const draftTransaction =
-            state.draftTransactions[state.currentTransactionUUID];
-          if (draftTransaction?.asset.type === ASSET_TYPES.NATIVE) {
-            draftTransaction.asset.balance = action.payload.account.balance;
+          if (state.asset.type === ASSET_TYPES.NATIVE) {
+            state.asset.balance = action.payload.account.balance;
           }
           slice.caseReducers.validateAmountField(state);
           slice.caseReducers.validateGasField(state);
@@ -1452,87 +1315,35 @@ const slice = createSlice({
         // to check to see if an entry exists for the current address or if the
         // entry changed.
         const { addressBook } = action.payload;
-        const draftTransaction =
-          state.draftTransactions[state.currentTransactionUUID];
-        if (
-          draftTransaction &&
-          addressBook[draftTransaction.recipient.address]?.name
-        ) {
-          draftTransaction.recipient.nickname =
-            addressBook[draftTransaction.recipient.address].name;
+        if (addressBook[state.recipient.address]?.name) {
+          state.recipient.nickname = addressBook[state.recipient.address].name;
         }
       })
-      .addCase(computeEstimatedGasLimit.pending, (state) => {
-        // When we begin to fetch gasLimit we should indicate we are loading
-        // a gas estimate.
-        state.gasEstimateIsLoading = true;
-      })
-      .addCase(computeEstimatedGasLimit.fulfilled, (state, action) => {
-        // When we receive a new gasLimit from the computeEstimatedGasLimit
-        // thunk we need to update our gasLimit in the slice. We call into the
-        // caseReducer updateGasLimit to tap into the appropriate follow up
-        // checks and gasTotal calculation. First set gasEstimateIsLoading to
-        // false.
-        state.gasEstimateIsLoading = false;
-        if (action.payload?.gasLimit) {
-          slice.caseReducers.updateGasLimit(state, {
-            payload: action.payload.gasLimit,
-          });
-        }
-        if (action.payload?.gasTotalForLayer1) {
-          slice.caseReducers.updateLayer1Fees(state, {
-            payload: action.payload.gasTotalForLayer1,
-          });
-        }
-      })
-      .addCase(computeEstimatedGasLimit.rejected, (state) => {
-        // If gas estimation fails, we should set the loading state to false,
-        // because it is no longer loading
-        state.gasEstimateIsLoading = false;
-      })
-      .addCase(GAS_FEE_ESTIMATES_UPDATED, (state, action) => {
-        // When the gasFeeController updates its gas fee estimates we need to
-        // update and validate state based on those new values
-        slice.caseReducers.updateGasFeeEstimates(state, {
-          payload: action.payload,
-        });
-      })
-      .addCase(initializeSendState.pending, (state) => {
-        // when we begin initializing state, which can happen when switching
-        // chains even after loading the send flow, we set gasEstimateIsLoading
-        // as initialization will trigger a fetch for gasPrice estimates.
-        state.gasEstimateIsLoading = true;
+      .addCase(initializeSendState.pending, (state) => {
+        // when we begin initializing state, which can happen when switching
+        // chains even after loading the send flow, we set
+        // gas.isGasEstimateLoading as initialization will trigger a fetch
+        // for gasPrice estimates.
+        state.gas.isGasEstimateLoading = true;
       })
       .addCase(initializeSendState.fulfilled, (state, action) => {
         // writes the computed initialized state values into the slice and then
         // calculates slice validity using the caseReducers.
         state.eip1559support = action.payload.eip1559support;
-        state.selectedAccount.address = action.payload.account.address;
-        state.selectedAccount.balance = action.payload.account.balance;
-        const draftTransaction =
-          state.draftTransactions[state.currentTransactionUUID];
-        draftTransaction.gas.gasLimit = action.payload.gasLimit;
+        state.account.address = action.payload.address;
+        state.account.balance = action.payload.nativeBalance;
+        state.asset.balance = action.payload.assetBalance;
+        state.gas.gasLimit = action.payload.gasLimit;
         slice.caseReducers.updateGasFeeEstimates(state, {
           payload: {
             gasFeeEstimates: action.payload.gasFeeEstimates,
             gasEstimateType: action.payload.gasEstimateType,
           },
         });
-        draftTransaction.gas.gasTotal = action.payload.gasTotal;
-        state.gasEstimatePollToken = action.payload.gasEstimatePollToken;
-        if (action.payload.chainHasChanged) {
-          // If the state was reinitialized as a result of the user changing
-          // the network from the network dropdown, then the selected asset is
-          // no longer valid and should be set to the native asset for the
-          // network.
-          draftTransaction.asset.type = ASSET_TYPES.NATIVE;
-          draftTransaction.asset.balance =
-            draftTransaction.fromAccount?.balance ??
-            state.selectedAccount.balance;
-          draftTransaction.asset.details = null;
-        }
+        state.gas.gasTotal = action.payload.gasTotal;
+        state.gas.gasEstimatePollToken = action.payload.gasEstimatePollToken;
         if (action.payload.gasEstimatePollToken) {
-          state.gasEstimateIsLoading = false;
+          state.gas.isGasEstimateLoading = false;
         }
         if (state.stage !== SEND_STAGES.INACTIVE) {
           slice.caseReducers.validateRecipientUserInput(state, {
@@ -1544,59 +1355,48 @@ const slice = createSlice({
             },
           });
         }
+        state.stage =
+          state.stage === SEND_STAGES.INACTIVE
+            ? SEND_STAGES.ADD_RECIPIENT
+            : state.stage;
         slice.caseReducers.validateAmountField(state);
         slice.caseReducers.validateGasField(state);
         slice.caseReducers.validateSendState(state);
       })
-      .addCase(SELECTED_ACCOUNT_CHANGED, (state, action) => {
-        // If we are on the edit flow the account we are keyed into will be the
-        // original 'from' account, which may differ from the selected account
-        if (state.stage !== SEND_STAGES.EDIT) {
-          // This event occurs when the user selects a new account from the
-          // account menu, or the currently active account's balance updates.
-          state.selectedAccount.balance = action.payload.account.balance;
-          state.selectedAccount.address = action.payload.account.address;
-          const draftTransaction =
-            state.draftTransactions[state.currentTransactionUUID];
-          // This action will occur even when we aren't on the send flow, which
-          // is okay as it keeps the selectedAccount details up to date. We do
-          // not need to validate anything if there isn't a current draft
-          // transaction. If there is, we need to update the asset balance if
-          // the asset is set to the native network asset, and then validate
-          // the transaction.
-          if (draftTransaction) {
-            if (draftTransaction?.asset.type === ASSET_TYPES.NATIVE) {
-              draftTransaction.asset.balance = action.payload.account.balance;
-            }
-            slice.caseReducers.validateAmountField(state);
-            slice.caseReducers.validateGasField(state);
-            slice.caseReducers.validateSendState(state);
-          }
-        }
+      .addCase(computeEstimatedGasLimit.pending, (state) => {
+        // When we begin to fetch gasLimit we should indicate we are loading
+        // a gas estimate.
+        state.gas.isGasEstimateLoading = true;
       })
-      .addCase(QR_CODE_DETECTED, (state, action) => {
-        // When data is received from the QR Code Scanner we set the recipient
-        // as long as a valid address can be pulled from the data. If an
-        // address is pulled but it is invalid, we display an error.
-        const qrCodeData = action.value;
-        const draftTransaction =
-          state.draftTransactions[state.currentTransactionUUID];
-        if (qrCodeData && draftTransaction) {
-          if (qrCodeData.type === 'address') {
-            const scannedAddress = qrCodeData.values.address.toLowerCase();
-            if (
-              isValidHexAddress(scannedAddress, { allowNonPrefixed: false })
-            ) {
-              if (draftTransaction.recipient.address !== scannedAddress) {
-                slice.caseReducers.updateRecipient(state, {
-                  payload: { address: scannedAddress },
-                });
-              }
-            } else {
-              draftTransaction.recipient.error = INVALID_RECIPIENT_ADDRESS_ERROR;
-            }
-          }
+      .addCase(computeEstimatedGasLimit.fulfilled, (state, action) => {
+        // When we receive a new gasLimit from the computeEstimatedGasLimit
+        // thunk we need to update our gasLimit in the slice. We call into the
+        // caseReducer updateGasLimit to tap into the appropriate follow up
+        // checks and gasTotal calculation. First set isGasEstimateLoading to
+        // false.
+        state.gas.isGasEstimateLoading = false;
+        if (action.payload?.gasLimit) {
+          slice.caseReducers.updateGasLimit(state, {
+            payload: action.payload.gasLimit,
+          });
         }
+        if (action.payload?.layer1GasTotal) {
+          slice.caseReducers.updateLayer1Fees(state, {
+            payload: action.payload.layer1GasTotal,
+          });
+        }
+      })
+      .addCase(computeEstimatedGasLimit.rejected, (state) => {
+        // If gas estimation fails, we should set the loading state to false,
+        // because it is no longer loading
+        state.gas.isGasEstimateLoading = false;
+      })
+      .addCase(GAS_FEE_ESTIMATES_UPDATED, (state, action) => {
+        // When the gasFeeController updates its gas fee estimates we need to
+        // update and validate state based on those new values
+        slice.caseReducers.updateGasFeeEstimates(state, {
+          payload: action.payload,
+        });
       });
   },
 });
@@ -1612,161 +1412,12 @@ const {
   validateRecipientUserInput,
   updateRecipientSearchMode,
   addHistoryEntry,
-  acknowledgeRecipientWarning,
 } = actions;
 
-export {
-  useDefaultGas,
-  useCustomGas,
-  updateGasLimit,
-  addHistoryEntry,
-  acknowledgeRecipientWarning,
-};
+export { useDefaultGas, useCustomGas, updateGasLimit, addHistoryEntry };
 
 // Action Creators
 
-/**
- * This method is for usage when validating user input so that validation
- * is only run after a delay in typing of 300ms. Usage at callsites requires
- * passing in both the dispatch method and the payload to dispatch, which makes
- * it only applicable for use within action creators.
- */
-const debouncedValidateRecipientUserInput = debounce(
-  (dispatch, payload, resolve) => {
-    dispatch(
-      addHistoryEntry(
-        `sendFlow - user typed ${payload.userInput} into recipient input field`,
-      ),
-    );
-    dispatch(validateRecipientUserInput(payload));
-    resolve();
-  },
-  300,
-);
-
-/**
- * Begins a new draft transaction, derived from the txParams of an existing
- * transaction in the TransactionController. This action will first clear out
- * the previous draft transactions and currentTransactionUUID from state. This
- * action is one of the two entry points into the send flow. NOTE: You must
- * route to the send page *after* dispatching this action resolves to ensure
- * that the draftTransaction is properly created.
- *
- * @param {AssetTypesString} assetType - The type of asset the transaction
- *  being edited was sending. The details of the asset will be retrieved from
- *  the transaction data in state.
- * @param {string} transactionId - The id of the transaction being edited.
- * @returns {ThunkAction<void>}
- */
-export function editExistingTransaction(assetType, transactionId) {
-  return async (dispatch, getState) => {
-    await dispatch(actions.clearPreviousDrafts());
-    const state = getState();
-    const unapprovedTransactions = getUnapprovedTxs(state);
-    const transaction = unapprovedTransactions[transactionId];
-    const account = getTargetAccount(state, transaction.txParams.from);
-
-    if (assetType === ASSET_TYPES.NATIVE) {
-      await dispatch(
-        actions.addNewDraft({
-          ...draftTransactionInitialState,
-          id: transactionId,
-          fromAccount: account,
-          gas: {
-            ...draftTransactionInitialState.gas,
-            gasLimit: transaction.txParams.gas,
-            gasPrice: transaction.txParams.gasPrice,
-          },
-          userInputHexData: transaction.txParams.data,
-          recipient: {
-            ...draftTransactionInitialState.recipient,
-            address: transaction.txParams.to,
-            nickname:
-              getAddressBookEntryOrAccountName(state, transaction.txParams.to)
-                ?.name ?? '',
-          },
-          amount: {
-            ...draftTransactionInitialState.amount,
-            value: transaction.txParams.value,
-          },
-          history: [
-            `sendFlow - user clicked edit on transaction with id ${transactionId}`,
-          ],
-        }),
-      );
-      await dispatch(
-        updateSendAsset(
-          { type: ASSET_TYPES.NATIVE },
-          { initialAssetSet: true },
-        ),
-      );
-    } else {
-      const tokenData = parseStandardTokenTransactionData(
-        transaction.txParams.data,
-      );
-      const tokenAmountInDec =
-        assetType === ASSET_TYPES.TOKEN ? getTokenValueParam(tokenData) : '1';
-      const address = getTokenAddressParam(tokenData);
-      const nickname =
-        getAddressBookEntryOrAccountName(state, address)?.name ?? '';
-
-      const tokenAmountInHex = addHexPrefix(
-        conversionUtil(tokenAmountInDec, {
-          fromNumericBase: 'dec',
-          toNumericBase: 'hex',
-        }),
-      );
-
-      await dispatch(
-        actions.addNewDraft({
-          ...draftTransactionInitialState,
-          id: transactionId,
-          fromAccount: account,
-          gas: {
-            ...draftTransactionInitialState.gas,
-            gasLimit: transaction.txParams.gas,
-            gasPrice: transaction.txParams.gasPrice,
-          },
-          userInputHexData: transaction.txParams.data,
-          recipient: {
-            ...draftTransactionInitialState.recipient,
-            address,
-            nickname,
-          },
-          amount: {
-            ...draftTransactionInitialState.amount,
-            value: tokenAmountInHex,
-          },
-          history: [
-            `sendFlow - user clicked edit on transaction with id ${transactionId}`,
-          ],
-        }),
-      );
-
-      await dispatch(
-        updateSendAsset(
-          {
-            type: assetType,
-            details: {
-              address: transaction.txParams.to,
-              ...(assetType === ASSET_TYPES.COLLECTIBLE
-                ? {
-                    tokenId:
-                      getTokenIdParam(tokenData) ??
-                      getTokenValueParam(tokenData),
-                  }
-                : {}),
-            },
-          },
-          { initialAssetSet: true },
-        ),
-      );
-    }
-
-    await dispatch(initializeSendState());
-  };
-}
-
 /**
  * This method is a temporary placeholder to support the old UI in both the
  * gas modal and the send flow. Soon we won't need to modify gasPrice from the
@@ -1777,7 +1428,6 @@ export function editExistingTransaction(assetType, transactionId) {
  *
  * @deprecated - don't extend the usage of this temporary method
  * @param {string} gasPrice - new gas price in hex wei
- * @returns {ThunkAction<void>}
  */
 export function updateGasPrice(gasPrice) {
   return (dispatch) => {
@@ -1793,137 +1443,45 @@ export function updateGasPrice(gasPrice) {
   };
 }
 
-/**
- * Updates the recipient in state based on the input provided, and then will
- * recompute gas limit when sending a TOKEN asset type. Changing the recipient
- * address results in hex data changing because the recipient address is
- * encoded in the data instead of being in the 'to' field. The to field in a
- * token send will always be the token contract address.
- * If no nickname is provided, the address book state will be checked to see if
- * a nickname for the passed address has already been saved. This ensures the
- * (temporary) send state recipient nickname is consistent with the address book
- * nickname which has already been persisted to state.
- *
- * @param {Object} recipient - Recipient information
- * @param {string} recipient.address - hex address to send the transaction to
- * @param {string} [recipient.nickname] - Alias for the address to display
- *  to the user
- * @returns {ThunkAction<void>}
- */
-export function updateRecipient({ address, nickname }) {
-  return async (dispatch, getState) => {
-    // Do not addHistoryEntry here as this is called from a number of places
-    // each with significance to the user and transaction history.
-    const state = getState();
-    const nicknameFromAddressBookEntryOrAccountName =
-      getAddressBookEntryOrAccountName(state, address) ?? '';
-    await dispatch(
-      actions.updateRecipient({
-        address,
-        nickname: nickname || nicknameFromAddressBookEntryOrAccountName,
-      }),
-    );
-    await dispatch(computeEstimatedGasLimit());
-  };
-}
-
-/**
- * This method is called to update the user's input into the ENS input field.
- * Once the field is updated, the field will be validated using a debounced
- * version of the validateRecipientUserInput action. This way validation only
- * occurs once the user has stopped typing.
- *
- * @param {string} userInput - the value that the user is typing into the field
- */
-export function updateRecipientUserInput(userInput) {
+export function resetSendState() {
   return async (dispatch, getState) => {
-    dispatch(actions.updateRecipientWarning('loading'));
-    dispatch(actions.updateDraftTransactionStatus(SEND_STATUSES.INVALID));
-    await dispatch(actions.updateRecipientUserInput(userInput));
     const state = getState();
-    const draftTransaction =
-      state[name].draftTransactions[state[name].currentTransactionUUID];
-    const sendingAddress =
-      draftTransaction.fromAccount?.address ??
-      state[name].selectedAccount.address ??
-      getSelectedAddress(state);
-    const chainId = getCurrentChainId(state);
-    const tokens = getTokens(state);
-    const useTokenDetection = getUseTokenDetection(state);
-    const tokenMap = getTokenList(state);
-    const tokenAddressList = Object.keys(tokenMap);
-
-    const inputIsValidHexAddress = isValidHexAddress(userInput);
-    let isProbablyAnAssetContract = false;
-    if (inputIsValidHexAddress) {
-      const smartContractAddress = await isSmartContractAddress(userInput);
-      if (smartContractAddress) {
-        const { symbol, decimals } =
-          getTokenMetadata(userInput, tokenMap) || {};
-
-        isProbablyAnAssetContract = symbol && decimals !== undefined;
-
-        if (!isProbablyAnAssetContract) {
-          try {
-            const { standard } = await getTokenStandardAndDetails(
-              userInput,
-              sendingAddress,
-            );
-            isProbablyAnAssetContract = Boolean(standard);
-          } catch (e) {
-            console.log(e);
-          }
-        }
-      }
-    }
+    dispatch(actions.resetSendState());
 
-    return new Promise((resolve) => {
-      debouncedValidateRecipientUserInput(
-        dispatch,
-        {
-          userInput,
-          chainId,
-          tokens,
-          useTokenDetection,
-          tokenAddressList,
-          isProbablyAnAssetContract,
-        },
-        resolve,
+    if (state[name].gas.gasEstimatePollToken) {
+      await disconnectGasFeeEstimatePoller(
+        state[name].gas.gasEstimatePollToken,
       );
-    });
+      removePollingTokenFromAppState(state[name].gas.gasEstimatePollToken);
+    }
   };
 }
-
 /**
  * Updates the amount the user intends to send and performs side effects.
  * 1. If the current mode is MAX change to INPUT
  * 2. If sending a token, recompute the gasLimit estimate
  *
  * @param {string} amount - hex string representing value
- * @returns {ThunkAction<void>}
  */
 export function updateSendAmount(amount) {
   return async (dispatch, getState) => {
     const state = getState();
-    const { metamask } = state;
-    const draftTransaction =
-      state[name].draftTransactions[state[name].currentTransactionUUID];
     let logAmount = amount;
-    if (draftTransaction.asset.type === ASSET_TYPES.TOKEN) {
+    if (state[name].asset.type === ASSET_TYPES.TOKEN) {
       const multiplier = Math.pow(
         10,
-        Number(draftTransaction.asset.details?.decimals || 0),
+        Number(state[name].asset.details?.decimals || 0),
       );
       const decimalValueString = conversionUtil(addHexPrefix(amount), {
         fromNumericBase: 'hex',
         toNumericBase: 'dec',
-        toCurrency: draftTransaction.asset.details?.symbol,
+        toCurrency: state[name].asset.details?.symbol,
         conversionRate: multiplier,
         invertConversionRate: true,
       });
 
       logAmount = `${Number(decimalValueString) ? decimalValueString : ''} ${
-        draftTransaction.asset.details?.symbol
+        state[name].asset.details?.symbol
       }`;
     } else {
       const ethValue = getValueFromWeiHex({
@@ -1931,19 +1489,28 @@ export function updateSendAmount(amount) {
         toCurrency: ETH,
         numberOfDecimals: 8,
       });
-      logAmount = `${ethValue} ${metamask?.provider?.ticker || ETH}`;
+      logAmount = `${ethValue} ${ETH}`;
     }
     await dispatch(
       addHistoryEntry(`sendFlow - user set amount to ${logAmount}`),
     );
     await dispatch(actions.updateSendAmount(amount));
-    if (state[name].amountMode === AMOUNT_MODES.MAX) {
+    if (state.send.amount.mode === AMOUNT_MODES.MAX) {
       await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
     }
     await dispatch(computeEstimatedGasLimit());
   };
 }
 
+/**
+ * Defines the shape for the details input parameter for updateSendAsset
+ *
+ * @typedef {Object} TokenDetails
+ * @property {string} address - The contract address for the ERC20 token.
+ * @property {string} decimals - The number of token decimals.
+ * @property {string} symbol - The asset symbol to display.
+ */
+
 /**
  * updates the asset to send to one of NATIVE or TOKEN and ensures that the
  * asset balance is set. If sending a TOKEN also updates the asset details
@@ -1953,178 +1520,154 @@ export function updateSendAmount(amount) {
  * @param {Object} payload - action payload
  * @param {string} payload.type - type of asset to send
  * @param {TokenDetails} [payload.details] - ERC20 details if sending TOKEN asset
- * @returns {ThunkAction<void>}
  */
-export function updateSendAsset(
-  { type, details: providedDetails },
-  { initialAssetSet = false } = {},
-) {
+export function updateSendAsset({ type, details }) {
   return async (dispatch, getState) => {
+    dispatch(addHistoryEntry(`sendFlow - user set asset type to ${type}`));
+    dispatch(
+      addHistoryEntry(
+        `sendFlow - user set asset symbol to ${details?.symbol ?? 'undefined'}`,
+      ),
+    );
+    dispatch(
+      addHistoryEntry(
+        `sendFlow - user set asset address to ${
+          details?.address ?? 'undefined'
+        }`,
+      ),
+    );
     const state = getState();
-    const draftTransaction =
-      state[name].draftTransactions[state[name].currentTransactionUUID];
-    const sendingAddress =
-      draftTransaction.fromAccount?.address ??
-      state[name].selectedAccount.address ??
-      getSelectedAddress(state);
-    const account = getTargetAccount(state, sendingAddress);
-    if (type === ASSET_TYPES.NATIVE) {
-      const unapprovedTxs = getUnapprovedTxs(state);
-      const unapprovedTx = unapprovedTxs?.[draftTransaction.id];
-
-      await dispatch(
-        addHistoryEntry(
-          `sendFlow - user set asset of type ${
-            ASSET_TYPES.NATIVE
-          } with symbol ${state.metamask.provider?.ticker ?? ETH}`,
-        ),
-      );
-      await dispatch(
-        actions.updateAsset({
-          asset: {
-            type,
-            details: null,
-            balance: account.balance,
-            error: null,
-          },
-          initialAssetSet,
-        }),
-      );
+    let { balance, error } = state.send.asset;
+    const userAddress = state.send.account.address ?? getSelectedAddress(state);
+    if (type === ASSET_TYPES.TOKEN) {
+      if (details) {
+        if (details.standard === undefined) {
+          await dispatch(showLoadingIndication());
+          const { standard } = await getTokenStandardAndDetails(
+            details.address,
+            userAddress,
+          );
+          if (
+            process.env.COLLECTIBLES_V1 &&
+            (standard === ERC721 || standard === ERC1155)
+          ) {
+            await dispatch(hideLoadingIndication());
+            dispatch(
+              showModal({
+                name: 'CONVERT_TOKEN_TO_NFT',
+                tokenAddress: details.address,
+              }),
+            );
+            error = INVALID_ASSET_TYPE;
+            throw new Error(error);
+          }
+          details.standard = standard;
+        }
 
-      // This is meant to handle cases where we are editing an unapprovedTx from the background state
-      // and its type is a token method. In such a case, the hex data will be the necessary hex data
-      // for calling the contract transfer method.
-      // Now that we are updating the transaction to be a send of a native asset type, we should
-      // set the hex data of the transaction being editing to be empty.
-      // then the user will not want to send any hex data now that they have change the
-      if (
-        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
-        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
-      ) {
-        await dispatch(actions.updateUserInputHexData(''));
+        // if changing to a token, get the balance from the network. The asset
+        // overview page and asset list on the wallet overview page contain
+        // send buttons that call this method before initialization occurs.
+        // When this happens we don't yet have an account.address so default to
+        // the currently active account. In addition its possible for the balance
+        // check to take a decent amount of time, so we display a loading
+        // indication so that that immediate feedback is displayed to the user.
+        if (details.standard === ERC20) {
+          error = null;
+          balance = await getERC20Balance(details, userAddress);
+        }
+        await dispatch(hideLoadingIndication());
       }
-    } else {
-      await dispatch(showLoadingIndication());
-      const details = {
-        ...providedDetails,
-        ...(await getTokenStandardAndDetails(
-          providedDetails.address,
-          sendingAddress,
-          providedDetails.tokenId,
-        )),
-      };
-      await dispatch(hideLoadingIndication());
-
-      const asset = {
-        type,
-        details,
-        error: null,
-      };
-
-      if (details.standard === TOKEN_STANDARDS.ERC20) {
-        asset.balance = addHexPrefix(
-          calcTokenAmount(details.balance, details.decimals).toString(16),
+    } else if (type === ASSET_TYPES.COLLECTIBLE) {
+      let isCurrentOwner = true;
+      try {
+        isCurrentOwner = await isCollectibleOwner(
+          getSelectedAddress(state),
+          details.address,
+          details.tokenId,
         );
+      } catch (err) {
+        if (err.message.includes('Unable to verify ownership.')) {
+          // this would indicate that either our attempts to verify ownership failed because of network issues,
+          // or, somehow a token has been added to collectibles state with an incorrect chainId.
+        } else {
+          // Any other error is unexpected and should be surfaced.
+          dispatch(displayWarning(err.message));
+        }
+      }
 
-        await dispatch(
-          addHistoryEntry(
-            `sendFlow - user set asset to ERC20 token with symbol ${details.symbol} and address ${details.address}`,
-          ),
+      if (details.standard === undefined) {
+        const { standard } = await getTokenStandardAndDetails(
+          details.address,
+          userAddress,
         );
-      } else if (
-        details.standard === TOKEN_STANDARDS.ERC1155 &&
-        type === ASSET_TYPES.COLLECTIBLE
-      ) {
-        throw new Error('Sends of ERC1155 tokens are not currently supported');
-      } else if (
-        details.standard === TOKEN_STANDARDS.ERC1155 ||
-        details.standard === TOKEN_STANDARDS.ERC721
-      ) {
-        if (type === ASSET_TYPES.TOKEN && process.env.COLLECTIBLES_V1) {
-          dispatch(
-            showModal({
-              name: 'CONVERT_TOKEN_TO_NFT',
-              tokenAddress: details.address,
-            }),
-          );
-          asset.error = INVALID_ASSET_TYPE;
-          throw new Error(INVALID_ASSET_TYPE);
-        } else {
-          let isCurrentOwner = true;
-          try {
-            isCurrentOwner = await isCollectibleOwner(
-              sendingAddress,
-              details.address,
-              details.tokenId,
-            );
-          } catch (err) {
-            if (err.message.includes('Unable to verify ownership.')) {
-              // this would indicate that either our attempts to verify ownership failed because of network issues,
-              // or, somehow a token has been added to collectibles state with an incorrect chainId.
-            } else {
-              // Any other error is unexpected and should be surfaced.
-              dispatch(displayWarning(err.message));
-            }
-          }
+        details.standard = standard;
+      }
 
-          if (isCurrentOwner) {
-            asset.error = null;
-            asset.balance = '0x1';
-          } else {
-            throw new Error(
-              'Send slice initialized as collectible send with a collectible not currently owned by the select account',
-            );
-          }
-          await dispatch(
-            addHistoryEntry(
-              `sendFlow - user set asset to NFT with tokenId ${details.tokenId} and address ${details.address}`,
-            ),
-          );
-        }
+      if (details.standard === ERC1155) {
+        throw new Error('Sends of ERC1155 tokens are not currently supported');
       }
 
-      await dispatch(actions.updateAsset({ asset, initialAssetSet }));
-    }
-    if (initialAssetSet === false) {
-      await dispatch(computeEstimatedGasLimit());
+      if (isCurrentOwner) {
+        error = null;
+        balance = '0x1';
+      } else {
+        throw new Error(
+          'Send slice initialized as collectible send with a collectible not currently owned by the select account',
+        );
+      }
+    } else {
+      error = null;
+      // if changing to native currency, get it from the account key in send
+      // state which is kept in sync when accounts change.
+      balance = state.send.account.balance;
     }
+    // update the asset in state which will re-run amount and gas validation
+    await dispatch(actions.updateAsset({ type, details, balance, error }));
+    await dispatch(computeEstimatedGasLimit());
   };
 }
 
 /**
- * When a user has enabled hex data field in advanced settings they will be
- * able to supply hex data on a transaction. This method updates the user
- * supplied data. Note, when sending native assets this will result in
- * recomputing estimated gasLimit. When sending a ERC20 asset this is not done
- * because the data sent in the transaction will be determined by the asset,
- * recipient and value, NOT what the user has supplied.
+ * This method is for usage when validating user input so that validation
+ * is only run after a delay in typing of 300ms. Usage at callsites requires
+ * passing in both the dispatch method and the payload to dispatch, which makes
+ * it only applicable for use within action creators.
+ */
+const debouncedValidateRecipientUserInput = debounce((dispatch, payload) => {
+  dispatch(
+    addHistoryEntry(
+      `sendFlow - user typed ${payload.userInput} into recipient input field`,
+    ),
+  );
+  dispatch(validateRecipientUserInput(payload));
+}, 300);
+
+/**
+ * This method is called to update the user's input into the ENS input field.
+ * Once the field is updated, the field will be validated using a debounced
+ * version of the validateRecipientUserInput action. This way validation only
+ * occurs once the user has stopped typing.
  *
- * @param {string} hexData - hex encoded string representing transaction data.
- * @returns {ThunkAction<void>}
+ * @param {string} userInput - the value that the user is typing into the field
  */
-export function updateSendHexData(hexData) {
+export function updateRecipientUserInput(userInput) {
   return async (dispatch, getState) => {
-    await dispatch(
-      addHistoryEntry(`sendFlow - user added custom hexData ${hexData}`),
-    );
-
-    await dispatch(actions.updateUserInputHexData(hexData));
+    await dispatch(actions.updateRecipientUserInput(userInput));
     const state = getState();
-    const draftTransaction =
-      state[name].draftTransactions[state[name].currentTransactionUUID];
-    if (draftTransaction.asset.type === ASSET_TYPES.NATIVE) {
-      await dispatch(computeEstimatedGasLimit());
-    }
+    const chainId = getCurrentChainId(state);
+    const tokens = getTokens(state);
+    const useTokenDetection = getUseTokenDetection(state);
+    const tokenAddressList = Object.keys(getTokenList(state));
+    debouncedValidateRecipientUserInput(dispatch, {
+      userInput,
+      chainId,
+      tokens,
+      useTokenDetection,
+      tokenAddressList,
+    });
   };
 }
-
-/**
- * Sets the recipient search mode to show a list of the user's contacts and
- * recently interacted with addresses.
- *
- * @returns {ThunkAction<void>}
- */
+
 export function useContactListForRecipientSearch() {
   return (dispatch) => {
     dispatch(
@@ -2136,11 +1679,6 @@ export function useContactListForRecipientSearch() {
   };
 }
 
-/**
- * Sets the recipient search mode to show a list of the user's own accounts.
- *
- * @returns {ThunkAction<void>}
- */
 export function useMyAccountsForRecipientSearch() {
   return (dispatch) => {
     dispatch(
@@ -2153,9 +1691,40 @@ export function useMyAccountsForRecipientSearch() {
 }
 
 /**
- * Clears out the recipient user input, ENS resolution and recipient validation.
+ * Updates the recipient in state based on the input provided, and then will
+ * recompute gas limit when sending a TOKEN asset type. Changing the recipient
+ * address results in hex data changing because the recipient address is
+ * encoded in the data instead of being in the 'to' field. The to field in a
+ * token send will always be the token contract address.
+ * If no nickname is provided, the address book state will be checked to see if
+ * a nickname for the passed address has already been saved. This ensures the
+ * (temporary) send state recipient nickname is consistent with the address book
+ * nickname which has already been persisted to state.
  *
- * @returns {ThunkAction<void>}
+ * @param {Object} recipient - Recipient information
+ * @param {string} recipient.address - hex address to send the transaction to
+ * @param {string} [recipient.nickname] - Alias for the address to display
+ *  to the user
+ */
+export function updateRecipient({ address, nickname }) {
+  return async (dispatch, getState) => {
+    // Do not addHistoryEntry here as this is called from a number of places
+    // each with significance to the user and transaction history.
+    const state = getState();
+    const nicknameFromAddressBookEntryOrAccountName =
+      getAddressBookEntryOrAccountName(state, address) ?? '';
+    await dispatch(
+      actions.updateRecipient({
+        address,
+        nickname: nickname || nicknameFromAddressBookEntryOrAccountName,
+      }),
+    );
+    await dispatch(computeEstimatedGasLimit());
+  };
+}
+
+/**
+ * Clears out the recipient user input, ENS resolution and recipient validation.
  */
 export function resetRecipientInput() {
   return async (dispatch) => {
@@ -2168,20 +1737,47 @@ export function resetRecipientInput() {
 }
 
 /**
- * Resets the entire send state tree to the initial state. It also disconnects
- * polling from the gas controller if the token is present in state.
+ * When a user has enabled hex data field in advanced settings they will be
+ * able to supply hex data on a transaction. This method updates the user
+ * supplied data. Note, when sending native assets this will result in
+ * recomputing estimated gasLimit. When sending a ERC20 asset this is not done
+ * because the data sent in the transaction will be determined by the asset,
+ * recipient and value, NOT what the user has supplied.
  *
- * @returns {ThunkAction<void>}
+ * @param {string} hexData - hex encoded string representing transaction data.
  */
-export function resetSendState() {
+export function updateSendHexData(hexData) {
   return async (dispatch, getState) => {
+    await dispatch(
+      addHistoryEntry(`sendFlow - user added custom hexData ${hexData}`),
+    );
+    await dispatch(actions.updateUserInputHexData(hexData));
     const state = getState();
-    dispatch(actions.resetSendState());
+    if (state.send.asset.type === ASSET_TYPES.NATIVE) {
+      await dispatch(computeEstimatedGasLimit());
+    }
+  };
+}
 
-    if (state[name].gasEstimatePollToken) {
-      await disconnectGasFeeEstimatePoller(state[name].gasEstimatePollToken);
-      removePollingTokenFromAppState(state[name].gasEstimatePollToken);
+/**
+ * Toggles the amount.mode between INPUT and MAX modes.
+ * As a result, the amount.value will change to either '0x0' when moving from
+ * MAX to INPUT, or to the maximum allowable amount based on current asset when
+ * moving from INPUT to MAX.
+ */
+export function toggleSendMaxMode() {
+  return async (dispatch, getState) => {
+    const state = getState();
+    if (state.send.amount.mode === AMOUNT_MODES.MAX) {
+      await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
+      await dispatch(actions.updateSendAmount('0x0'));
+      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode off`));
+    } else {
+      await dispatch(actions.updateAmountMode(AMOUNT_MODES.MAX));
+      await dispatch(actions.updateAmountToMax());
+      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode on`));
     }
+    await dispatch(computeEstimatedGasLimit());
   };
 }
 
@@ -2192,16 +1788,16 @@ export function resetSendState() {
  * will create the transaction in state (by way of the various global provider
  * constructs) which will eventually (and fairly quickly from user perspective)
  * result in a confirmation window being displayed for the transaction.
- *
- * @returns {ThunkAction<void>}
  */
 export function signTransaction() {
   return async (dispatch, getState) => {
     const state = getState();
-    const { stage, eip1559support } = state[name];
-    const txParams = generateTransactionParams(state[name]);
-    const draftTransaction =
-      state[name].draftTransactions[state[name].currentTransactionUUID];
+    const {
+      asset,
+      stage,
+      draftTransaction: { id, txParams },
+      eip1559support,
+    } = state[name];
     if (stage === SEND_STAGES.EDIT) {
       // When dealing with the edit flow there is already a transaction in
       // state that we must update, this branch is responsible for that logic.
@@ -2209,7 +1805,7 @@ export function signTransaction() {
       // merge in the modified txParams. Once the transaction has been modified
       // we can send that to the background to update the transaction in state.
       const unapprovedTxs = getUnapprovedTxs(state);
-      const unapprovedTx = unapprovedTxs[draftTransaction.id];
+      const unapprovedTx = unapprovedTxs[id];
       // We only update the tx params that can be changed via the edit flow UX
       const eip1559OnlyTxParamsToUpdate = {
         data: txParams.data,
@@ -2228,30 +1824,20 @@ export function signTransaction() {
           eip1559support ? eip1559OnlyTxParamsToUpdate : txParams,
         ),
       };
-
       await dispatch(
         addHistoryEntry(
           `sendFlow - user clicked next and transaction should be updated in controller`,
         ),
       );
-      await dispatch(
-        updateTransactionSendFlowHistory(
-          draftTransaction.id,
-          draftTransaction.history,
-        ),
-      );
-      await dispatch(
-        updateEditableParams(draftTransaction.id, editingTx.txParams),
-      );
-      await dispatch(
-        updateTransactionGasFees(draftTransaction.id, editingTx.txParams),
-      );
+      await dispatch(updateTransactionSendFlowHistory(id, state[name].history));
+      dispatch(updateEditableParams(id, editingTx.txParams));
+      dispatch(updateTransactionGasFees(id, editingTx.txParams));
     } else {
       let transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
 
-      if (draftTransaction.asset.type !== ASSET_TYPES.NATIVE) {
+      if (asset.type !== ASSET_TYPES.NATIVE) {
         transactionType =
-          draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
+          asset.type === ASSET_TYPES.COLLECTIBLE
             ? TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM
             : TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER;
       }
@@ -2265,168 +1851,155 @@ export function signTransaction() {
         addUnapprovedTransactionAndRouteToConfirmationPage(
           txParams,
           transactionType,
-          draftTransaction.history,
+          state[name].history,
         ),
       );
     }
   };
 }
 
-/**
- * Toggles the amount.mode between INPUT and MAX modes.
- * As a result, the amount.value will change to either '0x0' when moving from
- * MAX to INPUT, or to the maximum allowable amount based on current asset when
- * moving from INPUT to MAX.
- *
- * @returns {ThunkAction<void>}
- */
-export function toggleSendMaxMode() {
+export function editTransaction(
+  assetType,
+  transactionId,
+  tokenData,
+  assetDetails,
+) {
   return async (dispatch, getState) => {
     const state = getState();
-    if (state[name].amountMode === AMOUNT_MODES.MAX) {
-      await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
-      await dispatch(actions.updateSendAmount('0x0'));
-      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode off`));
-    } else {
-      await dispatch(actions.updateAmountMode(AMOUNT_MODES.MAX));
-      await dispatch(actions.updateAmountToMax());
-      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode on`));
-    }
-    await dispatch(computeEstimatedGasLimit());
-  };
-}
-
-/**
- * Begins a new draft transaction, clearing out the previous draft transactions
- * from state, and clearing the currentTransactionUUID. This action is one of
- * the two entry points into the send flow. NOTE: You must route to the send
- * page *after* dispatching this action resolves to ensure that the
- * draftTransaction is properly created.
- *
- * @param {Pick<Asset, 'type' | 'details'>} asset - A partial asset
- *  object containing at least the asset type. If specifying a non-native asset
- *  then the asset details must be included with at least the address.
- * @returns {ThunkAction<void>}
- */
-export function startNewDraftTransaction(asset) {
-  return async (dispatch) => {
-    await dispatch(actions.clearPreviousDrafts());
-
     await dispatch(
-      actions.addNewDraft({
-        ...draftTransactionInitialState,
-        history: [`sendFlow - User started new draft transaction`],
-      }),
+      addHistoryEntry(
+        `sendFlow - user clicked edit on transaction with id ${transactionId}`,
+      ),
     );
+    const unapprovedTransactions = getUnapprovedTxs(state);
+    const transaction = unapprovedTransactions[transactionId];
+    const { txParams } = transaction;
+    if (assetType === ASSET_TYPES.NATIVE) {
+      const {
+        data,
+        from,
+        gas: gasLimit,
+        gasPrice,
+        to: address,
+        value: amount,
+      } = txParams;
+      const nickname = getAddressBookEntry(state, address)?.name ?? '';
+      await dispatch(
+        actions.editTransaction({
+          data,
+          id: transactionId,
+          gasLimit,
+          gasPrice,
+          from,
+          amount,
+          address,
+          nickname,
+        }),
+      );
+    } else if (!tokenData || !assetDetails) {
+      throw new Error(
+        `send/editTransaction dispatched with assetType 'TOKEN' but missing assetData or assetDetails parameter`,
+      );
+    } else if (assetType === ASSET_TYPES.TOKEN) {
+      const {
+        data,
+        from,
+        to: tokenAddress,
+        gas: gasLimit,
+        gasPrice,
+      } = txParams;
+      const tokenAmountInDec = getTokenValueParam(tokenData);
+      const address = getTokenAddressParam(tokenData);
+      const nickname = getAddressBookEntry(state, address)?.name ?? '';
 
-    await dispatch(
-      updateSendAsset({
-        type: asset.type ?? ASSET_TYPES.NATIVE,
-        details: asset.details,
-      }),
-    );
+      const tokenAmountInHex = addHexPrefix(
+        conversionUtil(tokenAmountInDec, {
+          fromNumericBase: 'dec',
+          toNumericBase: 'hex',
+        }),
+      );
 
-    await dispatch(initializeSendState());
-  };
-}
+      await dispatch(
+        updateSendAsset({
+          type: ASSET_TYPES.TOKEN,
+          details: { ...assetDetails, address: tokenAddress },
+        }),
+      );
 
-// Selectors
-/**
- * The following typedef is a shortcut for typing selectors below. It uses a
- * generic type, T, so that each selector can specify it's return type.
- *
- * @template T
- * @typedef {(state: MetaMaskState) => T} Selector
- */
+      await dispatch(
+        actions.editTransaction({
+          data,
+          id: transactionId,
+          gasLimit,
+          gasPrice,
+          from,
+          amount: tokenAmountInHex,
+          address,
+          nickname,
+        }),
+      );
+    } else if (assetType === ASSET_TYPES.COLLECTIBLE) {
+      const {
+        data,
+        from,
+        to: tokenAddress,
+        gas: gasLimit,
+        gasPrice,
+      } = txParams;
+      const address = getTokenAddressParam(tokenData);
+      const nickname = getAddressBookEntry(state, address)?.name ?? '';
 
-/**
- * Selector that returns the current draft transaction's UUID.
- *
- * @type {Selector<string>}
- */
-export function getCurrentTransactionUUID(state) {
-  return state[name].currentTransactionUUID;
-}
+      await dispatch(
+        updateSendAsset({
+          type: ASSET_TYPES.COLLECTIBLE,
+          details: { ...assetDetails, address: tokenAddress },
+        }),
+      );
 
-/**
- * Selector that returns the current draft transaction.
- *
- * @type {Selector<DraftTransaction>}
- */
-export function getCurrentDraftTransaction(state) {
-  return state[name].draftTransactions[getCurrentTransactionUUID(state)] ?? {};
+      await dispatch(
+        actions.editTransaction({
+          data,
+          id: transactionId,
+          gasLimit,
+          gasPrice,
+          from,
+          amount: '0x1',
+          address,
+          nickname,
+        }),
+      );
+    }
+  };
 }
 
-/**
- * Selector that returns true if a draft transaction exists.
- *
- * @type {Selector<boolean>}
- */
-export function getDraftTransactionExists(state) {
-  const draftTransaction = getCurrentDraftTransaction(state);
-  if (Object.keys(draftTransaction).length === 0) {
-    return false;
-  }
-  return true;
-}
+// Selectors
 
 // Gas selectors
-
-/**
- * Selector that returns the current draft transaction's gasLimit.
- *
- * @type {Selector<?string>}
- */
 export function getGasLimit(state) {
-  return getCurrentDraftTransaction(state).gas?.gasLimit;
+  return state[name].gas.gasLimit;
 }
 
-/**
- * Selector that returns the current draft transaction's gasPrice.
- *
- * @type {Selector<?string>}
- */
 export function getGasPrice(state) {
-  return getCurrentDraftTransaction(state).gas?.gasPrice;
+  return state[name].gas.gasPrice;
 }
 
-/**
- * Selector that returns the current draft transaction's gasTotal.
- *
- * @type {Selector<?string>}
- */
 export function getGasTotal(state) {
-  return getCurrentDraftTransaction(state).gas?.gasTotal;
+  return state[name].gas.gasTotal;
 }
 
-/**
- * Selector that returns the error, if present, for the gas fields.
- *
- * @type {Selector<?string>}
- */
 export function gasFeeIsInError(state) {
-  return Boolean(getCurrentDraftTransaction(state).gas?.error);
+  return Boolean(state[name].gas.error);
 }
 
-/**
- * Selector that returns the minimum gasLimit for the current network.
- *
- * @type {Selector<string>}
- */
 export function getMinimumGasLimitForSend(state) {
-  return state[name].gasLimitMinimum;
+  return state[name].gas.minimumGasLimit;
 }
 
-/**
- * Selector that returns the current draft transaction's gasLimit.
- *
- * @type {Selector<MapValuesToUnion<SendStateGasModes>>}
- */
 export function getGasInputMode(state) {
   const isMainnet = getIsMainnet(state);
   const gasEstimateType = getGasEstimateType(state);
   const showAdvancedGasFields = getAdvancedInlineGasShown(state);
-  if (state[name].gasIsSetInModal) {
+  if (state[name].gas.isCustomGasSet) {
     return GAS_INPUT_MODES.CUSTOM;
   }
   if ((!isMainnet && !process.env.IN_TEST) || showAdvancedGasFields) {
@@ -2446,207 +2019,84 @@ export function getGasInputMode(state) {
 }
 
 // Asset Selectors
-/**
- * Selector that returns the asset the current draft transaction is sending.
- *
- * @type {Selector<?Asset>}
- */
 export function getSendAsset(state) {
-  return getCurrentDraftTransaction(state).asset;
+  return state[name].asset;
 }
 
-/**
- * Selector that returns the contract address of the non-native asset that
- * the current transaction is sending, if it exists.
- *
- * @type {Selector<?string>}
- */
 export function getSendAssetAddress(state) {
   return getSendAsset(state)?.details?.address;
 }
 
-/**
- * Selector that returns a boolean value describing whether the currently
- * selected asset is sendable, based upon the standard of the token.
- *
- * @type {Selector<boolean>}
- */
 export function getIsAssetSendable(state) {
-  if (getSendAsset(state)?.type === ASSET_TYPES.NATIVE) {
+  if (state[name].asset.type === ASSET_TYPES.NATIVE) {
     return true;
   }
-  return getSendAsset(state)?.details?.isERC721 === false;
+  return state[name].asset.details.isERC721 === false;
 }
 
-/**
- * Selector that returns the asset error if it exists.
- *
- * @type {Selector<?string>}
- */
 export function getAssetError(state) {
-  return getSendAsset(state).error;
+  return state[name].asset.error;
 }
 
 // Amount Selectors
-/**
- * Selector that returns the amount that current draft transaction is sending.
- *
- * @type {Selector<?string>}
- */
 export function getSendAmount(state) {
-  return getCurrentDraftTransaction(state).amount?.value;
+  return state[name].amount.value;
 }
 
-/**
- * Selector that returns true if the user has enough native asset balance to
- * cover the cost of the transaction.
- *
- * @type {Selector<boolean>}
- */
 export function getIsBalanceInsufficient(state) {
-  return (
-    getCurrentDraftTransaction(state).gas?.error === INSUFFICIENT_FUNDS_ERROR
-  );
+  return state[name].gas.error === INSUFFICIENT_FUNDS_ERROR;
 }
-
-/**
- * Selector that returns the amoung send mode, either MAX or INPUT.
- *
- * @type {Selector<boolean>}
- */
 export function getSendMaxModeState(state) {
-  return state[name].amountMode === AMOUNT_MODES.MAX;
+  return state[name].amount.mode === AMOUNT_MODES.MAX;
 }
 
-/**
- * Selector that returns the current draft transaction's data field.
- *
- * @type {Selector<?string>}
- */
 export function getSendHexData(state) {
-  return getCurrentDraftTransaction(state).userInputHexData;
+  return state[name].draftTransaction.userInputHexData;
 }
 
-/**
- * Selector that returns the current draft transaction's id, if present.
- *
- * @type {Selector<?string>}
- */
 export function getDraftTransactionID(state) {
-  return getCurrentDraftTransaction(state).id;
+  return state[name].draftTransaction.id;
 }
 
-/**
- * Selector that returns true if there is an error on the amount field.
- *
- * @type {Selector<boolean>}
- */
 export function sendAmountIsInError(state) {
-  return Boolean(getCurrentDraftTransaction(state).amount?.error);
+  return Boolean(state[name].amount.error);
 }
 
 // Recipient Selectors
-/**
- * Selector that returns the current draft transaction's recipient.
- *
- * @type {Selector<DraftTransaction['recipient']>}
- */
-export function getRecipient(state) {
-  const draft = getCurrentDraftTransaction(state);
-  if (!draft.recipient) {
-    return {
-      address: '',
-      nickname: '',
-      error: null,
-      warning: null,
-    };
-  }
-  const checksummedAddress = toChecksumHexAddress(draft.recipient.address);
-  if (state.metamask.ensResolutionsByAddress) {
-    return {
-      ...draft.recipient,
-      nickname:
-        draft.recipient.nickname ||
-        getEnsResolutionByAddress(state, checksummedAddress),
-    };
-  }
-  return draft.recipient;
-}
 
-/**
- * Selector that returns the addres of the current draft transaction's
- * recipient.
- *
- * @type {Selector<?string>}
- */
 export function getSendTo(state) {
-  return getRecipient(state)?.address;
+  return state[name].recipient.address;
 }
 
-/**
- * Selector that returns true if the current recipientMode is MY_ACCOUNTS
- *
- * @type {Selector<boolean>}
- */
 export function getIsUsingMyAccountForRecipientSearch(state) {
-  return state[name].recipientMode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS;
+  return state[name].recipient.mode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS;
 }
 
-/**
- * Selector that returns the value that the user has typed into the recipient
- * input field.
- *
- * @type {Selector<?string>}
- */
 export function getRecipientUserInput(state) {
-  return state[name].recipientInput;
+  return state[name].recipient.userInput;
 }
 
-export function getRecipientWarningAcknowledgement(state) {
-  return (
-    getCurrentDraftTransaction(state).recipient?.recipientWarningAcknowledged ??
-    false
-  );
+export function getRecipient(state) {
+  return state[name].recipient;
 }
 
 // Overall validity and stage selectors
 
-/**
- * Selector that returns the gasFee and amount errors, if they exist.
- *
- * @type {Selector<{ gasFee?: string, amount?: string}>}
- */
 export function getSendErrors(state) {
   return {
-    gasFee: getCurrentDraftTransaction(state).gas?.error,
-    amount: getCurrentDraftTransaction(state).amount?.error,
+    gasFee: state.send.gas.error,
+    amount: state.send.amount.error,
   };
 }
 
-/**
- * Selector that returns true if the stage is anything except INACTIVE
- *
- * @type {Selector<boolean>}
- */
 export function isSendStateInitialized(state) {
   return state[name].stage !== SEND_STAGES.INACTIVE;
 }
 
-/**
- * Selector that returns true if the current draft transaction is valid and in
- * a sendable state.
- *
- * @type {Selector<boolean>}
- */
 export function isSendFormInvalid(state) {
-  return getCurrentDraftTransaction(state).status === SEND_STATUSES.INVALID;
+  return state[name].status === SEND_STATUSES.INVALID;
 }
 
-/**
- * Selector that returns the current stage of the send flow
- *
- * @type {Selector<MapValuesToUnion<SendStateStages>>}
- */
 export function getSendStage(state) {
   return state[name].stage;
 }
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index 9dd31a67c2bf..a8466753bbda 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -17,20 +17,11 @@ import {
 import { GAS_ESTIMATE_TYPES, GAS_LIMITS } from '../../../shared/constants/gas';
 import {
   ASSET_TYPES,
-  TOKEN_STANDARDS,
   TRANSACTION_ENVELOPE_TYPES,
+  TRANSACTION_TYPES,
 } from '../../../shared/constants/transaction';
 import * as Actions from '../../store/actions';
 import { setBackgroundConnection } from '../../../test/jest';
-import {
-  generateERC20TransferData,
-  generateERC721TransferData,
-} from '../../pages/send/send.utils';
-import { BURN_ADDRESS } from '../../../shared/modules/hexstring-utils';
-import {
-  getInitialSendStateWithExistingTxState,
-  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-} from '../../../test/jest/mocks';
 import sendReducer, {
   initialState,
   initializeSendState,
@@ -48,6 +39,7 @@ import sendReducer, {
   SEND_STAGES,
   AMOUNT_MODES,
   RECIPIENT_SEARCH_MODES,
+  editTransaction,
   getGasLimit,
   getGasPrice,
   getGasTotal,
@@ -74,7 +66,6 @@ import sendReducer, {
   getSendStage,
   updateGasPrice,
 } from './send';
-import { draftTransactionInitialState, editExistingTransaction } from '.';
 
 const mockStore = createMockStore([thunk]);
 
@@ -87,11 +78,6 @@ jest.mock('./send', () => {
   };
 });
 
-jest.mock('lodash', () => ({
-  ...jest.requireActual('lodash'),
-  debounce: (fn) => fn,
-}));
-
 setBackgroundConnection({
   addPollingTokenToAppState: jest.fn(),
   addUnapprovedTransaction: jest.fn((_w, _x, _y, _z, cb) => {
@@ -100,27 +86,13 @@ setBackgroundConnection({
   updateTransactionSendFlowHistory: jest.fn((_x, _y, cb) => cb(null)),
 });
 
-const getTestUUIDTx = (state) => state.draftTransactions['test-uuid'];
-
 describe('Send Slice', () => {
   let getTokenStandardAndDetailsStub;
-  let addUnapprovedTransactionAndRouteToConfirmationPageStub;
   beforeEach(() => {
     jest.useFakeTimers();
     getTokenStandardAndDetailsStub = jest
       .spyOn(Actions, 'getTokenStandardAndDetails')
-      .mockImplementation(() =>
-        Promise.resolve({
-          standard: 'ERC20',
-          balance: '0x0',
-          symbol: 'SYMB',
-          decimals: 18,
-        }),
-      );
-    addUnapprovedTransactionAndRouteToConfirmationPageStub = jest.spyOn(
-      Actions,
-      'addUnapprovedTransactionAndRouteToConfirmationPage',
-    );
+      .mockImplementation(() => Promise.resolve({ standard: 'ERC20' }));
     jest
       .spyOn(Actions, 'estimateGas')
       .mockImplementation(() => Promise.resolve('0x0'));
@@ -142,130 +114,11 @@ describe('Send Slice', () => {
   });
 
   describe('Reducers', () => {
-    describe('addNewDraft', () => {
-      it('should add new draft transaction and set currentTransactionUUID', () => {
-        const action = {
-          type: 'send/addNewDraft',
-          payload: { ...draftTransactionInitialState, id: 4 },
-        };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
-        const uuid = result.currentTransactionUUID;
-        const draft = result.draftTransactions[uuid];
-        expect(draft.id).toStrictEqual(4);
-      });
-    });
-    describe('addHistoryEntry', () => {
-      it('should append a history item to the current draft transaction, including timestamp', () => {
-        const action = {
-          type: 'send/addHistoryEntry',
-          payload: 'test entry',
-        };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
-        const draft = getTestUUIDTx(result);
-        const latestHistory = draft.history[draft.history.length - 1];
-        expect(latestHistory.timestamp).toBeDefined();
-        expect(latestHistory.entry).toStrictEqual('test entry');
-      });
-    });
-    describe('calculateGasTotal', () => {
-      it('should set gasTotal to maxFeePerGax * gasLimit for FEE_MARKET transaction', () => {
-        const action = {
-          type: 'send/calculateGasTotal',
-        };
-        const result = sendReducer(
-          getInitialSendStateWithExistingTxState({
-            gas: {
-              gasPrice: '0x1',
-              maxFeePerGas: '0x2',
-              gasLimit: GAS_LIMITS.SIMPLE,
-            },
-            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
-          }),
-          action,
-        );
-        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
-        const draft = getTestUUIDTx(result);
-        expect(draft.gas.gasTotal).toStrictEqual(`0xa410`);
-      });
-
-      it('should set gasTotal to gasPrice * gasLimit for non FEE_MARKET transaction', () => {
-        const action = {
-          type: 'send/calculateGasTotal',
-        };
-        const result = sendReducer(
-          getInitialSendStateWithExistingTxState({
-            gas: {
-              gasPrice: '0x1',
-              maxFeePerGas: '0x2',
-              gasLimit: GAS_LIMITS.SIMPLE,
-            },
-          }),
-          action,
-        );
-        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
-        const draft = getTestUUIDTx(result);
-        expect(draft.gas.gasTotal).toStrictEqual(GAS_LIMITS.SIMPLE);
-      });
-
-      it('should call updateAmountToMax if amount mode is max', () => {
-        const action = {
-          type: 'send/calculateGasTotal',
-        };
-        const result = sendReducer(
-          {
-            ...getInitialSendStateWithExistingTxState({
-              asset: { balance: '0xffff' },
-              gas: {
-                gasPrice: '0x1',
-                gasLimit: GAS_LIMITS.SIMPLE,
-              },
-              recipient: {
-                address: '0x00',
-              },
-            }),
-            selectedAccount: {
-              balance: '0xffff',
-              address: '0x00',
-            },
-            gasEstimateIsLoading: false,
-            amountMode: AMOUNT_MODES.MAX,
-            stage: SEND_STAGES.DRAFT,
-          },
-          action,
-        );
-        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
-        const draft = getTestUUIDTx(result);
-        expect(draft.amount.value).toStrictEqual('0xadf7');
-        expect(draft.status).toStrictEqual(SEND_STATUSES.VALID);
-      });
-    });
-    describe('resetSendState', () => {
-      it('should set the state back to a blank slate matching the initialState object', () => {
-        const action = {
-          type: 'send/resetSendState',
-        };
-
-        const result = sendReducer({}, action);
-
-        expect(result).toStrictEqual(initialState);
-      });
-    });
     describe('updateSendAmount', () => {
       it('should', async () => {
         const action = { type: 'send/updateSendAmount', payload: '0x1' };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-        expect(getTestUUIDTx(result).amount.value).toStrictEqual('0x1');
+        const result = sendReducer(initialState, action);
+        expect(result.amount.value).toStrictEqual('0x1');
       });
     });
 
@@ -279,19 +132,17 @@ describe('Send Slice', () => {
             balance: '0x56bc75e2d63100000', // 100000000000000000000
           },
           gas: {
-            gasLimit: GAS_LIMITS.SIMPLE, // 21000
+            gasLimit: '0x5208', // 21000
             gasTotal: '0x1319718a5000', // 21000000000000
-            minimumGasLimit: GAS_LIMITS.SIMPLE,
+            minimumGasLimit: '0x5208',
           },
         };
 
-        const state = getInitialSendStateWithExistingTxState(maxAmountState);
+        const state = { ...initialState, ...maxAmountState };
         const action = { type: 'send/updateAmountToMax' };
         const result = sendReducer(state, action);
 
-        expect(getTestUUIDTx(result).amount.value).toStrictEqual(
-          '0x56bc74b13f185b000',
-        ); // 99999979000000000000
+        expect(result.amount.value).toStrictEqual('0x56bc74b13f185b000'); // 99999979000000000000
       });
     });
 
@@ -305,22 +156,17 @@ describe('Send Slice', () => {
             maxPriorityFeePerGas: '0x1',
           },
         };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-
-        const draftTransaction = getTestUUIDTx(result);
+        const result = sendReducer(initialState, action);
 
-        expect(draftTransaction.gas.maxFeePerGas).toStrictEqual(
+        expect(result.gas.maxFeePerGas).toStrictEqual(
           action.payload.maxFeePerGas,
         );
 
-        expect(draftTransaction.gas.maxPriorityFeePerGas).toStrictEqual(
+        expect(result.gas.maxPriorityFeePerGas).toStrictEqual(
           action.payload.maxPriorityFeePerGas,
         );
 
-        expect(draftTransaction.transactionType).toBe(
+        expect(result.transactionType).toBe(
           TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
         );
       });
@@ -333,19 +179,10 @@ describe('Send Slice', () => {
             gasPrice: '0x1',
           },
         };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-
-        const draftTransaction = getTestUUIDTx(result);
+        const result = sendReducer(initialState, action);
 
-        expect(draftTransaction.gas.gasPrice).toStrictEqual(
-          action.payload.gasPrice,
-        );
-        expect(draftTransaction.transactionType).toBe(
-          TRANSACTION_ENVELOPE_TYPES.LEGACY,
-        );
+        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
+        expect(result.transactionType).toBe(TRANSACTION_ENVELOPE_TYPES.LEGACY);
       });
     });
 
@@ -355,59 +192,59 @@ describe('Send Slice', () => {
           type: 'send/updateUserInputHexData',
           payload: 'TestData',
         };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-        const draftTransaction = getTestUUIDTx(result);
+        const result = sendReducer(initialState, action);
 
-        expect(draftTransaction.userInputHexData).toStrictEqual(action.payload);
+        expect(result.draftTransaction.userInputHexData).toStrictEqual(
+          action.payload,
+        );
       });
     });
 
     describe('updateGasLimit', () => {
       const action = {
         type: 'send/updateGasLimit',
-        payload: GAS_LIMITS.SIMPLE, // 21000
+        payload: '0x5208', // 21000
       };
 
       it('should', () => {
         const result = sendReducer(
           {
-            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            ...initialState,
             stage: SEND_STAGES.DRAFT,
-            gasEstimateIsLoading: false,
+            gas: { ...initialState.gas, isGasEstimateLoading: false },
           },
           action,
         );
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.gas.gasLimit).toStrictEqual(action.payload);
+        expect(result.gas.gasLimit).toStrictEqual(action.payload);
+        expect(result.draftTransaction.txParams.gas).toStrictEqual(
+          action.payload,
+        );
       });
 
       it('should recalculate gasTotal', () => {
-        const gasState = getInitialSendStateWithExistingTxState({
+        const gasState = {
+          ...initialState,
           gas: {
             gasLimit: '0x0',
             gasPrice: '0x3b9aca00', // 1000000000
           },
-        });
+        };
 
         const result = sendReducer(gasState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.gas.gasLimit).toStrictEqual(action.payload);
-        expect(draftTransaction.gas.gasPrice).toStrictEqual('0x3b9aca00');
-        expect(draftTransaction.gas.gasTotal).toStrictEqual('0x1319718a5000'); // 21000000000000
+        expect(result.gas.gasLimit).toStrictEqual(action.payload);
+        expect(result.gas.gasPrice).toStrictEqual(gasState.gas.gasPrice);
+        expect(result.gas.gasTotal).toStrictEqual('0x1319718a5000'); // 21000000000000
       });
     });
 
     describe('updateAmountMode', () => {
       it('should change to INPUT amount mode', () => {
         const emptyAmountModeState = {
-          amountMode: '',
+          amount: {
+            mode: '',
+          },
         };
 
         const action = {
@@ -416,7 +253,7 @@ describe('Send Slice', () => {
         };
         const result = sendReducer(emptyAmountModeState, action);
 
-        expect(result.amountMode).toStrictEqual(action.payload);
+        expect(result.amount.mode).toStrictEqual(action.payload);
       });
 
       it('should change to MAX amount mode', () => {
@@ -424,12 +261,9 @@ describe('Send Slice', () => {
           type: 'send/updateAmountMode',
           payload: AMOUNT_MODES.MAX,
         };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.amountMode).toStrictEqual(action.payload);
+        expect(result.amount.mode).toStrictEqual(action.payload);
       });
 
       it('should', () => {
@@ -437,103 +271,104 @@ describe('Send Slice', () => {
           type: 'send/updateAmountMode',
           payload: 'RANDOM',
         };
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.amountMode).not.toStrictEqual(action.payload);
+        expect(result.amount.mode).not.toStrictEqual(action.payload);
       });
     });
 
     describe('updateAsset', () => {
       it('should update asset type and balance from respective action payload', () => {
-        const updateAssetState = getInitialSendStateWithExistingTxState({
+        const updateAssetState = {
+          ...initialState,
           asset: {
             type: 'old type',
             balance: 'old balance',
           },
-        });
+        };
 
         const action = {
           type: 'send/updateAsset',
           payload: {
-            asset: {
-              type: 'new type',
-              balance: 'new balance',
-            },
+            type: 'new type',
+            balance: 'new balance',
           },
         };
 
         const result = sendReducer(updateAssetState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.asset.type).toStrictEqual(
-          action.payload.asset.type,
-        );
-        expect(draftTransaction.asset.balance).toStrictEqual(
-          action.payload.asset.balance,
-        );
+        expect(result.asset.type).toStrictEqual(action.payload.type);
+        expect(result.asset.balance).toStrictEqual(action.payload.balance);
       });
 
       it('should nullify old contract address error when asset types is not TOKEN', () => {
-        const recipientErrorState = getInitialSendStateWithExistingTxState({
+        const recipientErrorState = {
+          ...initialState,
           recipient: {
             error: CONTRACT_ADDRESS_ERROR,
           },
           asset: {
             type: ASSET_TYPES.TOKEN,
           },
-        });
+        };
 
         const action = {
           type: 'send/updateAsset',
           payload: {
-            asset: {
-              type: 'New Type',
-            },
+            type: 'New Type',
           },
         };
 
         const result = sendReducer(recipientErrorState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).not.toStrictEqual(
-          CONTRACT_ADDRESS_ERROR,
+        expect(result.recipient.error).not.toStrictEqual(
+          recipientErrorState.recipient.error,
         );
-        expect(draftTransaction.recipient.error).toBeNull();
+        expect(result.recipient.error).toBeNull();
       });
 
-      it('should update asset type and details to TOKEN payload', () => {
+      it('should nullify old known address error when asset types is not TOKEN', () => {
+        const recipientErrorState = {
+          ...initialState,
+          recipient: {
+            warning: KNOWN_RECIPIENT_ADDRESS_WARNING,
+          },
+          asset: {
+            type: ASSET_TYPES.TOKEN,
+          },
+        };
+
         const action = {
           type: 'send/updateAsset',
           payload: {
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {
-                address: '0xTokenAddress',
-                decimals: 0,
-                symbol: 'TKN',
-              },
-            },
+            type: 'New Type',
           },
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
+        const result = sendReducer(recipientErrorState, action);
+
+        expect(result.recipient.warning).not.toStrictEqual(
+          recipientErrorState.recipient.warning,
         );
+        expect(result.recipient.warning).toBeNull();
+      });
 
-        const draftTransaction = getTestUUIDTx(result);
+      it('should update asset type and details to TOKEN payload', () => {
+        const action = {
+          type: 'send/updateAsset',
+          payload: {
+            type: ASSET_TYPES.TOKEN,
+            details: {
+              address: '0xTokenAddress',
+              decimals: 0,
+              symbol: 'TKN',
+            },
+          },
+        };
 
-        expect(draftTransaction.asset.type).toStrictEqual(
-          action.payload.asset.type,
-        );
-        expect(draftTransaction.asset.details).toStrictEqual(
-          action.payload.asset.details,
-        );
+        const result = sendReducer(initialState, action);
+        expect(result.asset.type).toStrictEqual(action.payload.type);
+        expect(result.asset.details).toStrictEqual(action.payload.details);
       });
     });
 
@@ -546,17 +381,207 @@ describe('Send Slice', () => {
           },
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
-
-        const draftTransaction = getTestUUIDTx(result);
+        const result = sendReducer(initialState, action);
 
         expect(result.stage).toStrictEqual(SEND_STAGES.DRAFT);
-        expect(draftTransaction.recipient.address).toStrictEqual(
-          action.payload.address,
-        );
+        expect(result.recipient.address).toStrictEqual(action.payload.address);
+      });
+    });
+
+    describe('updateDraftTransaction', () => {
+      describe('with LEGACY transactions', () => {
+        it('should properly set fields', () => {
+          const detailsForDraftTransactionState = {
+            ...initialState,
+            status: SEND_STATUSES.VALID,
+            transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+            account: {
+              address: '0xCurrentAddress',
+            },
+            asset: {
+              type: '',
+            },
+            recipient: {
+              address: '0xRecipientAddress',
+            },
+            amount: {
+              value: '0x1',
+            },
+            gas: {
+              gasPrice: '0x3b9aca00', // 1000000000
+              gasLimit: '0x5208', // 21000
+            },
+          };
+
+          const action = {
+            type: 'send/updateDraftTransaction',
+          };
+
+          const result = sendReducer(detailsForDraftTransactionState, action);
+
+          expect(result.draftTransaction.txParams.to).toStrictEqual(
+            detailsForDraftTransactionState.recipient.address,
+          );
+          expect(result.draftTransaction.txParams.value).toStrictEqual(
+            detailsForDraftTransactionState.amount.value,
+          );
+          expect(result.draftTransaction.txParams.gas).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasLimit,
+          );
+          expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasPrice,
+          );
+        });
+
+        it('should update the draftTransaction txParams recipient to token address when asset is type TOKEN', () => {
+          const detailsForDraftTransactionState = {
+            ...initialState,
+            status: SEND_STATUSES.VALID,
+            transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+            account: {
+              address: '0xCurrentAddress',
+            },
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {
+                address: '0xTokenAddress',
+              },
+            },
+            amount: {
+              value: '0x1',
+            },
+            gas: {
+              gasPrice: '0x3b9aca00', // 1000000000
+              gasLimit: '0x5208', // 21000
+            },
+          };
+
+          const action = {
+            type: 'send/updateDraftTransaction',
+          };
+
+          const result = sendReducer(detailsForDraftTransactionState, action);
+
+          expect(result.draftTransaction.txParams.to).toStrictEqual(
+            detailsForDraftTransactionState.asset.details.address,
+          );
+          expect(result.draftTransaction.txParams.value).toStrictEqual('0x0');
+          expect(result.draftTransaction.txParams.gas).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasLimit,
+          );
+          expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasPrice,
+          );
+          expect(result.draftTransaction.txParams.data).toStrictEqual(
+            '0xa9059cbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
+          );
+        });
+      });
+
+      describe('with FEE_MARKET transactions', () => {
+        it('should properly set fields', () => {
+          const detailsForDraftTransactionState = {
+            ...initialState,
+            status: SEND_STATUSES.VALID,
+            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
+            account: {
+              address: '0xCurrentAddress',
+            },
+            asset: {
+              type: '',
+            },
+            recipient: {
+              address: '0xRecipientAddress',
+            },
+            amount: {
+              value: '0x1',
+            },
+            gas: {
+              maxFeePerGas: '0x2540be400', // 10 GWEI
+              maxPriorityFeePerGas: '0x3b9aca00', // 1 GWEI
+              gasLimit: '0x5208', // 21000
+            },
+            eip1559support: true,
+          };
+
+          const action = {
+            type: 'send/updateDraftTransaction',
+          };
+
+          const result = sendReducer(detailsForDraftTransactionState, action);
+
+          expect(result.draftTransaction.txParams.to).toStrictEqual(
+            detailsForDraftTransactionState.recipient.address,
+          );
+          expect(result.draftTransaction.txParams.value).toStrictEqual(
+            detailsForDraftTransactionState.amount.value,
+          );
+          expect(result.draftTransaction.txParams.gas).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasLimit,
+          );
+          expect(result.draftTransaction.txParams.gasPrice).toBeUndefined();
+          expect(result.draftTransaction.txParams.maxFeePerGas).toStrictEqual(
+            detailsForDraftTransactionState.gas.maxFeePerGas,
+          );
+          expect(
+            result.draftTransaction.txParams.maxPriorityFeePerGas,
+          ).toStrictEqual(
+            detailsForDraftTransactionState.gas.maxPriorityFeePerGas,
+          );
+        });
+
+        it('should update the draftTransaction txParams recipient to token address when asset is type TOKEN', () => {
+          const detailsForDraftTransactionState = {
+            ...initialState,
+            status: SEND_STATUSES.VALID,
+            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
+            account: {
+              address: '0xCurrentAddress',
+            },
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {
+                address: '0xTokenAddress',
+              },
+            },
+            amount: {
+              value: '0x1',
+            },
+            gas: {
+              maxFeePerGas: '0x2540be400', // 10 GWEI
+              maxPriorityFeePerGas: '0x3b9aca00', // 1 GWEI
+              gasLimit: '0x5208', // 21000
+            },
+            eip1559support: true,
+          };
+
+          const action = {
+            type: 'send/updateDraftTransaction',
+          };
+
+          const result = sendReducer(detailsForDraftTransactionState, action);
+
+          expect(result.draftTransaction.txParams.to).toStrictEqual(
+            detailsForDraftTransactionState.asset.details.address,
+          );
+          expect(result.draftTransaction.txParams.value).toStrictEqual('0x0');
+          expect(result.draftTransaction.txParams.gas).toStrictEqual(
+            detailsForDraftTransactionState.gas.gasLimit,
+          );
+
+          expect(result.draftTransaction.txParams.maxFeePerGas).toStrictEqual(
+            detailsForDraftTransactionState.gas.maxFeePerGas,
+          );
+          expect(
+            result.draftTransaction.txParams.maxPriorityFeePerGas,
+          ).toStrictEqual(
+            detailsForDraftTransactionState.gas.maxPriorityFeePerGas,
+          );
+          expect(result.draftTransaction.txParams.gasPrice).toBeUndefined();
+          expect(result.draftTransaction.txParams.data).toStrictEqual(
+            '0xa9059cbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
+          );
+        });
       });
     });
 
@@ -566,12 +591,9 @@ describe('Send Slice', () => {
           type: 'send/useDefaultGas',
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.gasIsSetInModal).toStrictEqual(false);
+        expect(result.gas.isCustomGasSet).toStrictEqual(false);
       });
     });
 
@@ -581,12 +603,9 @@ describe('Send Slice', () => {
           type: 'send/useCustomGas',
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.gasIsSetInModal).toStrictEqual(true);
+        expect(result.gas.isCustomGasSet).toStrictEqual(true);
       });
     });
 
@@ -597,32 +616,21 @@ describe('Send Slice', () => {
           payload: 'user input',
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.recipientInput).toStrictEqual(action.payload);
+        expect(result.recipient.userInput).toStrictEqual(action.payload);
       });
     });
 
     describe('validateRecipientUserInput', () => {
       it('should set recipient error and warning to null when user input is', () => {
         const noUserInputState = {
-          ...getInitialSendStateWithExistingTxState({
-            recipient: {
-              error: 'someError',
-              warning: 'someWarning',
-            },
-            amount: {},
-            gas: {
-              gasLimit: '0x0',
-              minimumGasLimit: '0x0',
-            },
-            asset: {},
-          }),
-          recipientInput: '',
-          recipientMode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
+          recipient: {
+            mode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
+            userInput: '',
+            error: 'someError',
+            warning: 'someWarning',
+          },
         };
 
         const action = {
@@ -631,16 +639,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(noUserInputState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).toBeNull();
-        expect(draftTransaction.recipient.warning).toBeNull();
+        expect(result.recipient.error).toBeNull();
+        expect(result.recipient.warning).toBeNull();
       });
 
       it('should error with an invalid address error when user input is not a valid hex string', () => {
         const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0xValidateError',
+          ...initialState,
+          recipient: {
+            userInput: '0xValidateError',
+          },
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -654,18 +662,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).toStrictEqual(
-          'invalidAddressRecipient',
-        );
+        expect(result.recipient.error).toStrictEqual('invalidAddressRecipient');
       });
 
       // TODO: Expectation might change in the future
       it('should error with an invalid network error when user input is not a valid hex string on a non default network', () => {
         const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0xValidateError',
+          ...initialState,
+          recipient: {
+            userInput: '0xValidateError',
+          },
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -679,17 +685,17 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).toStrictEqual(
+        expect(result.recipient.error).toStrictEqual(
           'invalidAddressRecipientNotEthNetwork',
         );
       });
 
       it('should error with invalid address recipient when the user inputs the burn address', () => {
         const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0x0000000000000000000000000000000000000000',
+          ...initialState,
+          recipient: {
+            userInput: '0x0000000000000000000000000000000000000000',
+          },
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -703,140 +709,68 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).toStrictEqual(
-          'invalidAddressRecipient',
-        );
+        expect(result.recipient.error).toStrictEqual('invalidAddressRecipient');
       });
 
       it('should error with same address recipient as a token', () => {
         const tokenAssetTypeState = {
-          ...getInitialSendStateWithExistingTxState({
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {
-                address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-              },
+          ...initialState,
+          asset: {
+            type: ASSET_TYPES.TOKEN,
+            details: {
+              address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
             },
-          }),
-          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        };
-
-        const action = {
-          type: 'send/validateRecipientUserInput',
-          payload: {
-            chainId: '0x4',
-            tokens: [],
-            useTokenDetection: true,
-            tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'],
           },
-        };
-
-        const result = sendReducer(tokenAssetTypeState, action);
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.error).toStrictEqual(
-          'contractAddressError',
-        );
-      });
-
-      it('should set a warning when sending to a token address in the token address list', () => {
-        const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        };
-
-        const action = {
-          type: 'send/validateRecipientUserInput',
-          payload: {
-            chainId: '0x4',
-            tokens: [],
-            useTokenDetection: true,
-            tokenAddressList: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
+          recipient: {
+            userInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
           },
         };
 
-        const result = sendReducer(tokenAssetTypeState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.warning).toStrictEqual(
-          KNOWN_RECIPIENT_ADDRESS_WARNING,
-        );
-      });
-
-      it('should set a warning when sending to a token address in the token list', () => {
-        const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        };
-
         const action = {
           type: 'send/validateRecipientUserInput',
           payload: {
             chainId: '0x4',
-            tokens: [{ address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc' }],
+            tokens: [],
             useTokenDetection: true,
-            tokenAddressList: [],
+            tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'],
           },
         };
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.warning).toStrictEqual(
-          KNOWN_RECIPIENT_ADDRESS_WARNING,
-        );
+        expect(result.recipient.error).toStrictEqual('contractAddressError');
       });
+    });
 
-      it('should set a warning when sending to an address that is probably a token contract', () => {
-        const tokenAssetTypeState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-        };
-
+    describe('updateRecipientSearchMode', () => {
+      it('should', () => {
         const action = {
-          type: 'send/validateRecipientUserInput',
-          payload: {
-            chainId: '0x4',
-            tokens: [{ address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }],
-            useTokenDetection: true,
-            tokenAddressList: ['0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'],
-            isProbablyAnAssetContract: true,
-          },
+          type: 'send/updateRecipientSearchMode',
+          payload: 'a-random-string',
         };
 
-        const result = sendReducer(tokenAssetTypeState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
+        const result = sendReducer(initialState, action);
 
-        expect(draftTransaction.recipient.warning).toStrictEqual(
-          KNOWN_RECIPIENT_ADDRESS_WARNING,
-        );
+        expect(result.recipient.mode).toStrictEqual(action.payload);
       });
     });
 
-    describe('updateRecipientSearchMode', () => {
+    describe('resetSendState', () => {
       it('should', () => {
         const action = {
-          type: 'send/updateRecipientSearchMode',
-          payload: 'a-random-string',
+          type: 'send/resetSendState',
         };
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer({}, action);
 
-        expect(result.recipientMode).toStrictEqual(action.payload);
+        expect(result).toStrictEqual(initialState);
       });
     });
 
     describe('validateAmountField', () => {
       it('should error with insufficient funds when amount asset value plust gas is higher than asset balance', () => {
-        const nativeAssetState = getInitialSendStateWithExistingTxState({
+        const nativeAssetState = {
+          ...initialState,
           amount: {
             value: '0x6fc23ac0', // 1875000000
           },
@@ -847,7 +781,7 @@ describe('Send Slice', () => {
           gas: {
             gasTotal: '0x8f0d180', // 150000000
           },
-        });
+        };
 
         const action = {
           type: 'send/validateAmountField',
@@ -855,15 +789,12 @@ describe('Send Slice', () => {
 
         const result = sendReducer(nativeAssetState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.amount.error).toStrictEqual(
-          INSUFFICIENT_FUNDS_ERROR,
-        );
+        expect(result.amount.error).toStrictEqual(INSUFFICIENT_FUNDS_ERROR);
       });
 
       it('should error with insufficient tokens when amount value of tokens is higher than asset balance of token', () => {
-        const tokenAssetState = getInitialSendStateWithExistingTxState({
+        const tokenAssetState = {
+          ...initialState,
           amount: {
             value: '0x77359400', // 2000000000
           },
@@ -874,7 +805,7 @@ describe('Send Slice', () => {
               decimals: 0,
             },
           },
-        });
+        };
 
         const action = {
           type: 'send/validateAmountField',
@@ -882,19 +813,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.amount.error).toStrictEqual(
-          INSUFFICIENT_TOKENS_ERROR,
-        );
+        expect(result.amount.error).toStrictEqual(INSUFFICIENT_TOKENS_ERROR);
       });
 
       it('should error negative value amount', () => {
-        const negativeAmountState = getInitialSendStateWithExistingTxState({
+        const negativeAmountState = {
+          ...initialState,
           amount: {
             value: '-1',
           },
-        });
+        };
 
         const action = {
           type: 'send/validateAmountField',
@@ -902,13 +830,12 @@ describe('Send Slice', () => {
 
         const result = sendReducer(negativeAmountState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.amount.error).toStrictEqual(NEGATIVE_ETH_ERROR);
+        expect(result.amount.error).toStrictEqual(NEGATIVE_ETH_ERROR);
       });
 
       it('should not error for positive value amount', () => {
-        const otherState = getInitialSendStateWithExistingTxState({
+        const otherState = {
+          ...initialState,
           amount: {
             error: 'someError',
             value: '1',
@@ -916,135 +843,119 @@ describe('Send Slice', () => {
           asset: {
             type: '',
           },
-        });
+        };
 
         const action = {
           type: 'send/validateAmountField',
         };
 
         const result = sendReducer(otherState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.amount.error).toBeNull();
+        expect(result.amount.error).toBeNull();
       });
     });
 
     describe('validateGasField', () => {
       it('should error when total amount of gas is higher than account balance', () => {
-        const gasFieldState = getInitialSendStateWithExistingTxState({
+        const gasFieldState = {
+          ...initialState,
           account: {
             balance: '0x0',
           },
           gas: {
             gasTotal: '0x1319718a5000', // 21000000000000
           },
-        });
+        };
 
         const action = {
           type: 'send/validateGasField',
         };
 
         const result = sendReducer(gasFieldState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.gas.error).toStrictEqual(
-          INSUFFICIENT_FUNDS_ERROR,
-        );
+        expect(result.gas.error).toStrictEqual(INSUFFICIENT_FUNDS_ERROR);
       });
     });
 
     describe('validateSendState', () => {
       it('should set `INVALID` send state status when amount error is present', () => {
-        const amountErrorState = getInitialSendStateWithExistingTxState({
+        const amountErrorState = {
+          ...initialState,
           amount: {
             error: 'Some Amount Error',
           },
-        });
+        };
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(amountErrorState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
+        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when gas error is present', () => {
-        const gasErrorState = getInitialSendStateWithExistingTxState({
+        const gasErrorState = {
+          ...initialState,
           gas: {
             error: 'Some Amount Error',
           },
-        });
+        };
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(gasErrorState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
+        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when asset type is `TOKEN` without token details present', () => {
-        const assetErrorState = getInitialSendStateWithExistingTxState({
+        const assetErrorState = {
+          ...initialState,
           asset: {
             type: ASSET_TYPES.TOKEN,
           },
-        });
+        };
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(assetErrorState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
+        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when gasLimit is under the minimumGasLimit', () => {
-        const gasLimitErroState = getInitialSendStateWithExistingTxState({
+        const gasLimitErroState = {
+          ...initialState,
           gas: {
             gasLimit: '0x5207',
-            minimumGasLimit: GAS_LIMITS.SIMPLE,
+            minimumGasLimit: '0x5208',
           },
-        });
+        };
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(gasLimitErroState, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
+        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `VALID` send state status when conditionals have not been met', () => {
         const validSendStatusState = {
-          ...getInitialSendStateWithExistingTxState({
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {
-                address: '0x000',
-              },
-            },
-            gas: {
-              gasLimit: GAS_LIMITS.SIMPLE,
-            },
-          }),
+          ...initialState,
           stage: SEND_STAGES.DRAFT,
-          gasEstimateIsLoading: false,
-          minimumGasLimit: GAS_LIMITS.SIMPLE,
+          asset: {
+            type: ASSET_TYPES.TOKEN,
+            details: {
+              address: '0x000',
+            },
+          },
+          gas: {
+            isGasEstimateLoading: false,
+            gasLimit: '0x5208',
+            minimumGasLimit: '0x5208',
+          },
         };
 
         const action = {
@@ -1053,20 +964,19 @@ describe('Send Slice', () => {
 
         const result = sendReducer(validSendStatusState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.VALID);
+        expect(result.status).toStrictEqual(SEND_STATUSES.VALID);
       });
     });
   });
 
   describe('extraReducers/externalReducers', () => {
     describe('QR Code Detected', () => {
-      const qrCodestate = getInitialSendStateWithExistingTxState({
+      const qrCodestate = {
+        ...initialState,
         recipient: {
           address: '0xAddress',
         },
-      });
+      };
 
       it('should set the recipient address to the scanned address value if they are not equal', () => {
         const action = {
@@ -1080,10 +990,7 @@ describe('Send Slice', () => {
         };
 
         const result = sendReducer(qrCodestate, action);
-
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.address).toStrictEqual(
+        expect(result.recipient.address).toStrictEqual(
           action.value.values.address,
         );
       });
@@ -1101,10 +1008,10 @@ describe('Send Slice', () => {
 
         const result = sendReducer(qrCodestate, badQRAddressAction);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.recipient.address).toStrictEqual('0xAddress');
-        expect(draftTransaction.recipient.error).toStrictEqual(
+        expect(result.recipient.address).toStrictEqual(
+          qrCodestate.recipient.address,
+        );
+        expect(result.recipient.error).toStrictEqual(
           INVALID_RECIPIENT_ADDRESS_ERROR,
         );
       });
@@ -1113,8 +1020,8 @@ describe('Send Slice', () => {
     describe('Selected Address Changed', () => {
       it('should update selected account address and balance on non-edit stages', () => {
         const olderState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          selectedAccount: {
+          ...initialState,
+          account: {
             balance: '0x0',
             address: '0xAddress',
           },
@@ -1132,10 +1039,10 @@ describe('Send Slice', () => {
 
         const result = sendReducer(olderState, action);
 
-        expect(result.selectedAccount.balance).toStrictEqual(
+        expect(result.account.balance).toStrictEqual(
           action.payload.account.balance,
         );
-        expect(result.selectedAccount.address).toStrictEqual(
+        expect(result.account.address).toStrictEqual(
           action.payload.account.address,
         );
       });
@@ -1144,9 +1051,9 @@ describe('Send Slice', () => {
     describe('Account Changed', () => {
       it('should', () => {
         const accountsChangedState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          ...initialState,
           stage: SEND_STAGES.EDIT,
-          selectedAccount: {
+          account: {
             address: '0xAddress',
             balance: '0x0',
           },
@@ -1164,16 +1071,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(accountsChangedState, action);
 
-        expect(result.selectedAccount.balance).toStrictEqual(
+        expect(result.account.balance).toStrictEqual(
           action.payload.account.balance,
         );
       });
 
       it(`should not edit account balance if action payload address is not the same as state's address`, () => {
         const accountsChangedState = {
-          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          ...initialState,
           stage: SEND_STAGES.EDIT,
-          selectedAccount: {
+          account: {
             address: '0xAddress',
             balance: '0x0',
           },
@@ -1190,10 +1097,10 @@ describe('Send Slice', () => {
         };
 
         const result = sendReducer(accountsChangedState, action);
-        expect(result.selectedAccount.address).not.toStrictEqual(
+        expect(result.account.address).not.toStrictEqual(
           action.payload.account.address,
         );
-        expect(result.selectedAccount.balance).not.toStrictEqual(
+        expect(result.account.balance).not.toStrictEqual(
           action.payload.account.balance,
         );
       });
@@ -1266,7 +1173,7 @@ describe('Send Slice', () => {
               },
             },
           },
-          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          send: initialState,
           gas: {
             basicEstimateStatus: 'LOADING',
             basicEstimatesStatus: {
@@ -1294,15 +1201,14 @@ describe('Send Slice', () => {
     describe('Set Basic Gas Estimate Data', () => {
       it('should recalculate gas based off of average basic estimate data', () => {
         const gasState = {
-          ...getInitialSendStateWithExistingTxState({
-            gas: {
-              gasPrice: '0x0',
-              gasLimit: GAS_LIMITS.SIMPLE,
-              gasTotal: '0x0',
-            },
-          }),
-          minimumGasLimit: GAS_LIMITS.SIMPLE,
-          gasPriceEstimate: '0x0',
+          ...initialState,
+          gas: {
+            gasPrice: '0x0',
+            gasPriceEstimate: '0x0',
+            gasLimit: '0x5208',
+            gasTotal: '0x0',
+            minimumGasLimit: '0x5208',
+          },
         };
 
         const action = {
@@ -1317,11 +1223,9 @@ describe('Send Slice', () => {
 
         const result = sendReducer(gasState, action);
 
-        const draftTransaction = getTestUUIDTx(result);
-
-        expect(draftTransaction.gas.gasPrice).toStrictEqual('0x3b9aca00'); // 1000000000
-        expect(draftTransaction.gas.gasLimit).toStrictEqual(GAS_LIMITS.SIMPLE);
-        expect(draftTransaction.gas.gasTotal).toStrictEqual('0x1319718a5000');
+        expect(result.gas.gasPrice).toStrictEqual('0x3b9aca00'); // 1000000000
+        expect(result.gas.gasLimit).toStrictEqual(gasState.gas.gasLimit);
+        expect(result.gas.gasTotal).toStrictEqual('0x1319718a5000');
       });
     });
   });
@@ -1330,11 +1234,11 @@ describe('Send Slice', () => {
     describe('updateGasPrice', () => {
       it('should update gas price and update draft transaction with validated state', async () => {
         const store = mockStore({
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasPrice: undefined,
             },
-          }),
+          },
         });
 
         const newGasPrice = '0x0';
@@ -1362,6 +1266,17 @@ describe('Send Slice', () => {
     });
 
     describe('UpdateSendAmount', () => {
+      const defaultSendAmountState = {
+        send: {
+          amount: {
+            mode: undefined,
+          },
+          asset: {
+            type: '',
+          },
+        },
+      };
+
       it('should create an action to update send amount', async () => {
         const sendState = {
           metamask: {
@@ -1371,7 +1286,8 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          ...defaultSendAmountState.send,
+          send: {
             asset: {
               details: {},
             },
@@ -1384,8 +1300,10 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
-          }),
+            draftTransaction: {
+              userInputHexData: '',
+            },
+          },
         };
         const store = mockStore(sendState);
 
@@ -1424,7 +1342,8 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          ...defaultSendAmountState.send,
+          send: {
             asset: {
               details: {},
             },
@@ -1437,8 +1356,10 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
-          }),
+            draftTransaction: {
+              userInputHexData: '',
+            },
+          },
         };
 
         const store = mockStore(sendState);
@@ -1476,7 +1397,8 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          ...defaultSendAmountState.send,
+          send: {
             asset: {
               type: ASSET_TYPES.TOKEN,
               details: {},
@@ -1490,8 +1412,10 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
-          }),
+            draftTransaction: {
+              userInputHexData: '',
+            },
+          },
         };
 
         const store = mockStore(tokenAssetTypeSendState);
@@ -1518,38 +1442,28 @@ describe('Send Slice', () => {
           blockGasLimit: '',
           selectedAddress: '',
           provider: {
-            chainId: RINKEBY_CHAIN_ID,
-          },
-          cachedBalances: {
-            [RINKEBY_CHAIN_ID]: {
-              '0xAddress': '0x0',
-            },
-          },
-          accounts: {
-            '0xAddress': {
-              address: '0xAddress',
-            },
+            chainId: '0x1',
           },
         },
         send: {
-          ...getInitialSendStateWithExistingTxState({
-            asset: {
-              type: '',
-              details: {},
-            },
-            gas: {
-              gasPrice: '',
-            },
-            recipient: {
-              address: '',
-            },
-            amount: {
-              value: '',
-            },
+          account: {
+            balance: '',
+          },
+          asset: {
+            type: '',
+            details: {},
+          },
+          gas: {
+            gasPrice: '',
+          },
+          recipient: {
+            address: '',
+          },
+          amount: {
+            value: '',
+          },
+          draftTransaction: {
             userInputHexData: '',
-          }),
-          selectedAccount: {
-            address: '0xAddress',
           },
         },
       };
@@ -1558,47 +1472,48 @@ describe('Send Slice', () => {
         const store = mockStore(defaultSendAssetState);
 
         const newSendAsset = {
-          type: ASSET_TYPES.NATIVE,
+          type: '',
+          details: {
+            address: '',
+            symbol: '',
+            decimals: '',
+          },
         };
 
         await store.dispatch(updateSendAsset(newSendAsset));
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(4);
-
+        expect(actionResult).toHaveLength(6);
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset of type NATIVE with symbol ETH',
+          payload: 'sendFlow - user set asset type to ',
         });
-        expect(actionResult[1].type).toStrictEqual('send/updateAsset');
-        expect(actionResult[1].payload).toStrictEqual({
-          asset: {
-            type: ASSET_TYPES.NATIVE,
-            balance: '0x0',
-            error: null,
-            details: null,
-          },
-          initialAssetSet: false,
+        expect(actionResult[1]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset symbol to ',
+        });
+        expect(actionResult[2]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset address to ',
         });
 
-        expect(actionResult[2].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual('send/updateAsset');
+        expect(actionResult[3].payload).toStrictEqual({
+          ...newSendAsset,
+          balance: '',
+          error: null,
+        });
+
+        expect(actionResult[4].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[3].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
       });
 
       it('should create actions for updateSendAsset with tokens', async () => {
-        getTokenStandardAndDetailsStub.mockImplementation(() =>
-          Promise.resolve({
-            standard: 'ERC20',
-            balance: '0x0',
-            symbol: 'TokenSymbol',
-            decimals: 18,
-          }),
-        );
         global.eth = {
           contract: sinon.stub().returns({
             at: sinon.stub().returns({
@@ -1621,33 +1536,31 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(6);
-        expect(actionResult[0].type).toStrictEqual('SHOW_LOADING_INDICATION');
-        expect(actionResult[1].type).toStrictEqual('HIDE_LOADING_INDICATION');
+        expect(actionResult).toHaveLength(8);
+        expect(actionResult[0]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
+        });
+        expect(actionResult[1]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset symbol to tokenSymbol',
+        });
         expect(actionResult[2]).toMatchObject({
           type: 'send/addHistoryEntry',
-          payload: `sendFlow - user set asset to ERC20 token with symbol TokenSymbol and address tokenAddress`,
+          payload: 'sendFlow - user set asset address to tokenAddress',
         });
-        expect(actionResult[3].payload).toStrictEqual({
-          asset: {
-            type: ASSET_TYPES.TOKEN,
-            details: {
-              address: 'tokenAddress',
-              symbol: 'TokenSymbol',
-              decimals: 18,
-              standard: 'ERC20',
-              balance: '0x0',
-            },
-            balance: '0x0',
-            error: null,
-          },
-          initialAssetSet: false,
+        expect(actionResult[3].type).toStrictEqual('SHOW_LOADING_INDICATION');
+        expect(actionResult[4].type).toStrictEqual('HIDE_LOADING_INDICATION');
+        expect(actionResult[5].payload).toStrictEqual({
+          ...newSendAsset,
+          balance: '0x0',
+          error: null,
         });
 
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[6].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[5].type).toStrictEqual(
+        expect(actionResult[7].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
       });
@@ -1655,7 +1568,7 @@ describe('Send Slice', () => {
       it('should show ConvertTokenToNFT modal and throw "invalidAssetType" error when token passed in props is an ERC721 or ERC1155', async () => {
         process.env.COLLECTIBLES_V1 = true;
         getTokenStandardAndDetailsStub.mockImplementation(() =>
-          Promise.resolve({ standard: 'ERC1155', balance: '0x1' }),
+          Promise.resolve({ standard: 'ERC1155' }),
         );
         const store = mockStore(defaultSendAssetState);
 
@@ -1672,10 +1585,22 @@ describe('Send Slice', () => {
           store.dispatch(updateSendAsset(newSendAsset)),
         ).rejects.toThrow('invalidAssetType');
         const actionResult = store.getActions();
-        expect(actionResult).toHaveLength(3);
-        expect(actionResult[0].type).toStrictEqual('SHOW_LOADING_INDICATION');
-        expect(actionResult[1].type).toStrictEqual('HIDE_LOADING_INDICATION');
-        expect(actionResult[2]).toStrictEqual({
+        expect(actionResult).toHaveLength(6);
+        expect(actionResult[0]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
+        });
+        expect(actionResult[1]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset symbol to tokenSymbol',
+        });
+        expect(actionResult[2]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset address to tokenAddress',
+        });
+        expect(actionResult[3].type).toStrictEqual('SHOW_LOADING_INDICATION');
+        expect(actionResult[4].type).toStrictEqual('HIDE_LOADING_INDICATION');
+        expect(actionResult[5]).toStrictEqual({
           payload: {
             name: 'CONVERT_TOKEN_TO_NFT',
             tokenAddress: 'tokenAddress',
@@ -1719,10 +1644,11 @@ describe('Send Slice', () => {
             },
           },
         },
-        send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
       };
 
       it('should create actions for updateRecipientUserInput and checks debounce for validation', async () => {
+        const clock = sinon.useFakeTimers();
+
         const store = mockStore(updateRecipientUserInputState);
         const newUserRecipientInput = 'newUserRecipientInput';
 
@@ -1730,35 +1656,29 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(5);
-
+        expect(actionResult).toHaveLength(1);
         expect(actionResult[0].type).toStrictEqual(
-          'send/updateRecipientWarning',
+          'send/updateRecipientUserInput',
         );
-        expect(actionResult[0].payload).toStrictEqual('loading');
+        expect(actionResult[0].payload).toStrictEqual(newUserRecipientInput);
 
-        expect(actionResult[1].type).toStrictEqual(
-          'send/updateDraftTransactionStatus',
-        );
+        clock.tick(300); // debounce
 
-        expect(actionResult[2].type).toStrictEqual(
-          'send/updateRecipientUserInput',
-        );
-        expect(actionResult[2].payload).toStrictEqual(newUserRecipientInput);
+        const actionResultAfterDebounce = store.getActions();
+        expect(actionResultAfterDebounce).toHaveLength(3);
 
-        expect(actionResult[3]).toMatchObject({
+        expect(actionResultAfterDebounce[1]).toMatchObject({
           type: 'send/addHistoryEntry',
           payload: `sendFlow - user typed ${newUserRecipientInput} into recipient input field`,
         });
 
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResultAfterDebounce[2].type).toStrictEqual(
           'send/validateRecipientUserInput',
         );
-        expect(actionResult[4].payload).toStrictEqual({
+        expect(actionResultAfterDebounce[2].payload).toStrictEqual({
           chainId: '',
           tokens: [],
           useTokenDetection: true,
-          isProbablyAnAssetContract: false,
           userInput: newUserRecipientInput,
           tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'],
         });
@@ -1846,7 +1766,9 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
+            draftTransaction: {
+              userInputHexData: '',
+            },
           },
         };
 
@@ -1905,7 +1827,9 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
+            draftTransaction: {
+              userInputHexData: '',
+            },
           },
         };
 
@@ -1957,7 +1881,9 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            userInputHexData: '',
+            draftTransaction: {
+              userInputHexData: '',
+            },
           },
         };
 
@@ -2015,7 +1941,22 @@ describe('Send Slice', () => {
               },
             },
           },
-          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          send: {
+            asset: {
+              type: '',
+            },
+            recipient: {
+              address: 'Address',
+              nickname: 'NickName',
+            },
+            gas: {
+              gasPrice: '0x1',
+            },
+            amount: {
+              value: '0x1',
+            },
+            draftTransaction: {},
+          },
         };
 
         const store = mockStore(updateRecipientState);
@@ -2023,36 +1964,24 @@ describe('Send Slice', () => {
         await store.dispatch(resetRecipientInput());
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(11);
+        expect(actionResult).toHaveLength(7);
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
           payload: 'sendFlow - user cleared recipient input',
         });
         expect(actionResult[1].type).toStrictEqual(
-          'send/updateRecipientWarning',
-        );
-        expect(actionResult[2].type).toStrictEqual(
-          'send/updateDraftTransactionStatus',
-        );
-
-        expect(actionResult[3].type).toStrictEqual(
           'send/updateRecipientUserInput',
         );
-        expect(actionResult[4].payload).toStrictEqual(
-          'sendFlow - user typed  into recipient input field',
-        );
-        expect(actionResult[5].type).toStrictEqual(
-          'send/validateRecipientUserInput',
-        );
-        expect(actionResult[6].type).toStrictEqual('send/updateRecipient');
-        expect(actionResult[7].type).toStrictEqual(
+        expect(actionResult[1].payload).toStrictEqual('');
+        expect(actionResult[2].type).toStrictEqual('send/updateRecipient');
+        expect(actionResult[3].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[8].type).toStrictEqual(
+        expect(actionResult[4].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
-        expect(actionResult[9].type).toStrictEqual('ENS/resetEnsResolution');
-        expect(actionResult[10].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual('ENS/resetEnsResolution');
+        expect(actionResult[6].type).toStrictEqual(
           'send/validateRecipientUserInput',
         );
       });
@@ -2060,11 +1989,11 @@ describe('Send Slice', () => {
 
     describe('UpdateSendHexData', () => {
       const sendHexDataState = {
-        send: getInitialSendStateWithExistingTxState({
+        send: {
           asset: {
             type: '',
           },
-        }),
+        },
       };
 
       it('should create action to update hexData', async () => {
@@ -2106,7 +2035,9 @@ describe('Send Slice', () => {
               mode: '',
               value: '',
             },
-            userInputHexData: '',
+            draftTransaction: {
+              userInputHexData: '',
+            },
           },
           metamask: {
             provider: {
@@ -2136,26 +2067,26 @@ describe('Send Slice', () => {
         );
       });
 
-      it('should create actions to toggle off max mode when send amount mode is max', async () => {
+      it('should create actions to toggle off  max mode when send amount mode is max', async () => {
         const sendMaxModeState = {
           send: {
-            ...getInitialSendStateWithExistingTxState({
-              asset: {
-                type: ASSET_TYPES.TOKEN,
-                details: {},
-              },
-              gas: {
-                gasPrice: '',
-              },
-              recipient: {
-                address: '',
-              },
-              amount: {
-                value: '',
-              },
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {},
+            },
+            gas: {
+              gasPrice: '',
+            },
+            recipient: {
+              address: '',
+            },
+            amount: {
+              mode: AMOUNT_MODES.MAX,
+              value: '',
+            },
+            draftTransaction: {
               userInputHexData: '',
-            }),
-            amountMode: AMOUNT_MODES.MAX,
+            },
           },
           metamask: {
             provider: {
@@ -2187,15 +2118,14 @@ describe('Send Slice', () => {
 
     describe('SignTransaction', () => {
       const signTransactionState = {
-        send: getInitialSendStateWithExistingTxState({
-          id: 1,
+        send: {
           asset: {},
+          stage: '',
+          draftTransaction: {},
           recipient: {},
           amount: {},
-          gas: {
-            gasLimit: GAS_LIMITS.SIMPLE,
-          },
-        }),
+          account: {},
+        },
       };
 
       it('should show confirm tx page when no other conditions for signing have been met', async () => {
@@ -2214,61 +2144,6 @@ describe('Send Slice', () => {
         expect(actionResult[1].type).toStrictEqual('SHOW_CONF_TX_PAGE');
       });
 
-      describe('with token transfers', () => {
-        it('should pass the correct transaction parameters to addUnapprovedTransactionAndRouteToConfirmationPage', async () => {
-          const tokenTransferTxState = {
-            metamask: {
-              unapprovedTxs: {
-                1: {
-                  id: 1,
-                  txParams: {
-                    value: 'oldTxValue',
-                  },
-                },
-              },
-            },
-            send: {
-              ...getInitialSendStateWithExistingTxState({
-                id: 1,
-                asset: {
-                  details: {
-                    address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
-                  },
-                  type: 'TOKEN',
-                },
-                recipient: {
-                  address: '4F90e18605Fd46F9F9Fab0e225D88e1ACf5F5324',
-                },
-                amount: {
-                  value: '0x1',
-                },
-              }),
-              stage: SEND_STAGES.DRAFT,
-              selectedAccount: {
-                address: '0x6784e8507A1A46443f7bDc8f8cA39bdA92A675A6',
-              },
-            },
-          };
-
-          jest.mock('../../store/actions.js');
-
-          const store = mockStore(tokenTransferTxState);
-
-          await store.dispatch(signTransaction());
-
-          expect(
-            addUnapprovedTransactionAndRouteToConfirmationPageStub.mock
-              .calls[0][0].data,
-          ).toStrictEqual(
-            '0xa9059cbb0000000000000000000000004f90e18605fd46f9f9fab0e225d88e1acf5f53240000000000000000000000000000000000000000000000000000000000000001',
-          );
-          expect(
-            addUnapprovedTransactionAndRouteToConfirmationPageStub.mock
-              .calls[0][0].to,
-          ).toStrictEqual('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
-        });
-      });
-
       it('should create actions for updateTransaction rejecting', async () => {
         const editStageSignTxState = {
           metamask: {
@@ -2284,6 +2159,12 @@ describe('Send Slice', () => {
           send: {
             ...signTransactionState.send,
             stage: SEND_STAGES.EDIT,
+            draftTransaction: {
+              id: 1,
+              txParams: {
+                value: 'newTxValue',
+              },
+            },
           },
         };
 
@@ -2310,12 +2191,10 @@ describe('Send Slice', () => {
       });
     });
 
-    describe('editExistingTransaction', () => {
+    describe('editTransaction', () => {
       it('should set up the appropriate state for editing a native asset transaction', async () => {
         const editTransactionState = {
           metamask: {
-            gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
-            gasFeeEstimates: {},
             provider: {
               chainId: RINKEBY_CHAIN_ID,
             },
@@ -2324,18 +2203,6 @@ describe('Send Slice', () => {
               [RINKEBY_CHAIN_ID]: {},
             },
             identities: {},
-            accounts: {
-              '0xAddress': {
-                address: '0xAddress',
-                balance: '0x0',
-              },
-            },
-            cachedBalances: {
-              [RINKEBY_CHAIN_ID]: {
-                '0xAddress': '0x0',
-              },
-            },
-            tokenList: {},
             unapprovedTxs: {
               1: {
                 id: 1,
@@ -2351,100 +2218,62 @@ describe('Send Slice', () => {
             },
           },
           send: {
-            // We are going to remove this transaction as a part of the flow,
-            // but we need this stub to have the fromAccount because for our
-            // action checker the state isn't actually modified after each
-            // action is ran.
-            ...getInitialSendStateWithExistingTxState({
-              id: 1,
-              fromAccount: {
-                address: '0xAddress',
-              },
-            }),
+            asset: {
+              type: '',
+            },
+            recipient: {
+              address: 'Address',
+              nickname: 'NickName',
+            },
           },
         };
 
         const store = mockStore(editTransactionState);
 
-        await store.dispatch(editExistingTransaction(ASSET_TYPES.NATIVE, 1));
+        await store.dispatch(editTransaction(ASSET_TYPES.NATIVE, 1));
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(7);
+        expect(actionResult).toHaveLength(2);
         expect(actionResult[0]).toMatchObject({
-          type: 'send/clearPreviousDrafts',
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user clicked edit on transaction with id 1',
         });
-        expect(actionResult[1]).toStrictEqual({
-          type: 'send/addNewDraft',
-          payload: {
-            amount: {
-              value: '0xde0b6b3a7640000',
-              error: null,
-            },
-            asset: {
-              balance: '0x0',
-              details: null,
-              error: null,
-              type: ASSET_TYPES.NATIVE,
-            },
-            fromAccount: {
-              address: '0xAddress',
-              balance: '0x0',
-            },
-            gas: {
-              error: null,
-              gasLimit: GAS_LIMITS.SIMPLE,
-              gasPrice: '0x3b9aca00',
-              gasTotal: '0x0',
-              maxFeePerGas: '0x0',
-              maxPriorityFeePerGas: '0x0',
-            },
-            history: ['sendFlow - user clicked edit on transaction with id 1'],
-            id: 1,
-            recipient: {
-              address: '0xRecipientAddress',
-              error: null,
-              nickname: '',
-              warning: null,
-              recipientWarningAcknowledged: false,
-            },
-            status: SEND_STATUSES.VALID,
-            transactionType: '0x0',
-            userInputHexData: '',
-          },
+        expect(actionResult[1].type).toStrictEqual('send/editTransaction');
+        expect(actionResult[1].payload).toStrictEqual({
+          address: '0xRecipientAddress',
+          amount: '0xde0b6b3a7640000',
+          data: '',
+          from: '0xAddress',
+          gasLimit: GAS_LIMITS.SIMPLE,
+          gasPrice: '0x3b9aca00',
+          id: 1,
+          nickname: '',
         });
 
         const action = actionResult[1];
 
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
+        expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
+        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
 
-        const draftTransaction =
-          result.draftTransactions[result.currentTransactionUUID];
+        expect(result.amount.value).toStrictEqual(action.payload.amount);
 
-        expect(draftTransaction.gas.gasLimit).toStrictEqual(
-          action.payload.gas.gasLimit,
+        expect(result.draftTransaction.txParams.to).toStrictEqual(
+          action.payload.address,
         );
-        expect(draftTransaction.gas.gasPrice).toStrictEqual(
-          action.payload.gas.gasPrice,
+        expect(result.draftTransaction.txParams.value).toStrictEqual(
+          action.payload.amount,
         );
-
-        expect(draftTransaction.amount.value).toStrictEqual(
-          action.payload.amount.value,
+        expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
+          action.payload.gasPrice,
+        );
+        expect(result.draftTransaction.txParams.gas).toStrictEqual(
+          action.payload.gasLimit,
         );
       });
 
       it('should set up the appropriate state for editing a collectible asset transaction', async () => {
-        getTokenStandardAndDetailsStub.mockImplementation(() =>
-          Promise.resolve({
-            standard: 'ERC721',
-            balance: '0x1',
-            address: '0xCollectibleAddress',
-          }),
-        );
         const editTransactionState = {
           metamask: {
             blockGasLimit: '0x3a98',
@@ -2457,29 +2286,13 @@ describe('Send Slice', () => {
               [RINKEBY_CHAIN_ID]: {},
             },
             identities: {},
-            accounts: {
-              '0xAddress': {
-                address: '0xAddress',
-                balance: '0x0',
-              },
-            },
-            cachedBalances: {
-              [RINKEBY_CHAIN_ID]: {
-                '0xAddress': '0x0',
-              },
-            },
-            tokenList: {},
             unapprovedTxs: {
               1: {
                 id: 1,
                 txParams: {
-                  data: generateERC721TransferData({
-                    toAddress: BURN_ADDRESS,
-                    fromAddress: '0xAddress',
-                    tokenId: ethers.BigNumber.from(15000).toString(),
-                  }),
+                  data: '',
                   from: '0xAddress',
-                  to: '0xCollectibleAddress',
+                  to: '0xTokenAddress',
                   gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
                   gasPrice: '0x3b9aca00', // 1000000000
                   value: '0x0',
@@ -2488,12 +2301,26 @@ describe('Send Slice', () => {
             },
           },
           send: {
-            ...getInitialSendStateWithExistingTxState({
-              id: 1,
-              test: 'wow',
-              gas: { gasLimit: GAS_LIMITS.SIMPLE },
-            }),
-            stage: SEND_STAGES.EDIT,
+            account: {
+              address: '0xAddress',
+              balance: '0x0',
+            },
+            asset: {
+              type: '',
+            },
+            gas: {
+              gasPrice: '',
+            },
+            amount: {
+              value: '',
+            },
+            draftTransaction: {
+              userInputHexData: '',
+            },
+            recipient: {
+              address: 'Address',
+              nickname: 'NickName',
+            },
           },
         };
 
@@ -2509,109 +2336,90 @@ describe('Send Slice', () => {
         const store = mockStore(editTransactionState);
 
         await store.dispatch(
-          editExistingTransaction(ASSET_TYPES.COLLECTIBLE, 1),
+          editTransaction(
+            ASSET_TYPES.COLLECTIBLE,
+            1,
+            {
+              name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
+              args: {
+                _to: '0xRecipientAddress',
+                _value: ethers.BigNumber.from(15000),
+              },
+            },
+            {
+              address: '0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
+              description: 'A test NFT dispensed from faucet.paradigm.xyz.',
+              image:
+                'https://ipfs.io/ipfs/bafybeifvwitulq6elvka2hoqhwixfhgb42l4aiukmtrw335osetikviuuu',
+              name: 'MultiFaucet Test NFT',
+              standard: 'ERC721',
+              tokenId: '26847',
+            },
+          ),
         );
         const actionResult = store.getActions();
         expect(actionResult).toHaveLength(9);
         expect(actionResult[0]).toMatchObject({
-          type: 'send/clearPreviousDrafts',
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user clicked edit on transaction with id 1',
         });
-        expect(actionResult[1]).toStrictEqual({
-          type: 'send/addNewDraft',
-          payload: {
-            amount: {
-              error: null,
-              value: '0x1',
-            },
-            asset: {
-              balance: '0x0',
-              details: null,
-              error: null,
-              type: ASSET_TYPES.NATIVE,
-            },
-            fromAccount: {
-              address: '0xAddress',
-              balance: '0x0',
-            },
-            gas: {
-              error: null,
-              gasLimit: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
-              gasPrice: '0x3b9aca00',
-              gasTotal: '0x0',
-              maxFeePerGas: '0x0',
-              maxPriorityFeePerGas: '0x0',
-            },
-            history: ['sendFlow - user clicked edit on transaction with id 1'],
-            id: 1,
-            recipient: {
-              address: BURN_ADDRESS,
-              error: null,
-              nickname: '',
-              warning: null,
-              recipientWarningAcknowledged: false,
-            },
-            status: SEND_STATUSES.VALID,
-            transactionType: '0x0',
-            userInputHexData:
-              editTransactionState.metamask.unapprovedTxs[1].txParams.data,
-          },
+        expect(actionResult[1]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: `sendFlow - user set asset type to ${ASSET_TYPES.COLLECTIBLE}`,
+        });
+        expect(actionResult[2]).toMatchObject({
+          type: 'send/addHistoryEntry',
+          payload: 'sendFlow - user set asset symbol to undefined',
         });
-        expect(actionResult[2].type).toStrictEqual('SHOW_LOADING_INDICATION');
-        expect(actionResult[3].type).toStrictEqual('HIDE_LOADING_INDICATION');
-        expect(actionResult[4]).toStrictEqual({
+        expect(actionResult[3]).toMatchObject({
           type: 'send/addHistoryEntry',
-          payload:
-            'sendFlow - user set asset to NFT with tokenId 15000 and address 0xCollectibleAddress',
+          payload: 'sendFlow - user set asset address to 0xTokenAddress',
         });
-        expect(actionResult[5]).toStrictEqual({
-          type: 'send/updateAsset',
-          payload: {
-            asset: {
-              balance: '0x1',
-              details: {
-                address: '0xCollectibleAddress',
-                balance: '0x1',
-                standard: TOKEN_STANDARDS.ERC721,
-                tokenId: '15000',
-              },
-              error: null,
-              type: ASSET_TYPES.COLLECTIBLE,
-            },
-            initialAssetSet: true,
+        expect(actionResult[4].type).toStrictEqual('send/updateAsset');
+        expect(actionResult[4].payload).toStrictEqual({
+          balance: '0x1',
+          type: ASSET_TYPES.COLLECTIBLE,
+          error: null,
+          details: {
+            address: '0xTokenAddress',
+            description: 'A test NFT dispensed from faucet.paradigm.xyz.',
+            image:
+              'https://ipfs.io/ipfs/bafybeifvwitulq6elvka2hoqhwixfhgb42l4aiukmtrw335osetikviuuu',
+            name: 'MultiFaucet Test NFT',
+            standard: 'ERC721',
+            tokenId: '26847',
           },
         });
+        expect(actionResult[5].type).toStrictEqual(
+          'send/computeEstimatedGasLimit/pending',
+        );
         expect(actionResult[6].type).toStrictEqual(
-          'send/initializeSendState/pending',
+          'metamask/gas/SET_CUSTOM_GAS_LIMIT',
         );
-        expect(actionResult[7]).toStrictEqual({
-          type: 'metamask/gas/SET_CUSTOM_GAS_LIMIT',
-          value: GAS_LIMITS.SIMPLE,
-        });
-        expect(actionResult[8].type).toStrictEqual(
-          'send/initializeSendState/fulfilled',
+        expect(actionResult[7].type).toStrictEqual(
+          'send/computeEstimatedGasLimit/fulfilled',
         );
+        expect(actionResult[8].type).toStrictEqual('send/editTransaction');
+        const action = actionResult[8];
 
-        const action = actionResult[1];
-
-        const result = sendReducer(
-          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          action,
-        );
+        const result = sendReducer(initialState, action);
 
-        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
+        expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
+        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
 
-        const draftTransaction =
-          result.draftTransactions[result.currentTransactionUUID];
+        expect(result.amount.value).toStrictEqual(action.payload.amount);
 
-        expect(draftTransaction.gas.gasLimit).toStrictEqual(
-          action.payload.gas.gasLimit,
+        expect(result.draftTransaction.txParams.to).toStrictEqual(
+          action.payload.address,
         );
-        expect(draftTransaction.gas.gasPrice).toStrictEqual(
-          action.payload.gas.gasPrice,
+        expect(result.draftTransaction.txParams.value).toStrictEqual(
+          action.payload.amount,
         );
-
-        expect(draftTransaction.amount.value).toStrictEqual(
-          action.payload.amount.value,
+        expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
+          action.payload.gasPrice,
+        );
+        expect(result.draftTransaction.txParams.gas).toStrictEqual(
+          action.payload.gasLimit,
         );
       });
     });
@@ -2624,46 +2432,16 @@ describe('Send Slice', () => {
           provider: {
             chainId: RINKEBY_CHAIN_ID,
           },
-          tokens: [
-            {
-              address: '0xTokenAddress',
-              symbol: 'SYMB',
-            },
-          ],
-          tokenList: {
-            '0xTokenAddress': {
-              symbol: 'SYMB',
-              address: '0xTokenAddress',
-            },
-          },
+          tokens: [],
           addressBook: {
             [RINKEBY_CHAIN_ID]: {},
           },
           identities: {},
-          accounts: {
-            '0xAddress': {
-              address: '0xAddress',
-              balance: '0x0',
-            },
-          },
-          cachedBalances: {
-            [RINKEBY_CHAIN_ID]: {
-              '0xAddress': '0x0',
-            },
-          },
           unapprovedTxs: {
             1: {
               id: 1,
               txParams: {
-                data: generateERC20TransferData({
-                  toAddress: BURN_ADDRESS,
-                  amount: '0x3a98',
-                  sendToken: {
-                    address: '0xTokenAddress',
-                    symbol: 'SYMB',
-                    decimals: 18,
-                  },
-                }),
+                data: '',
                 from: '0xAddress',
                 to: '0xTokenAddress',
                 gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
@@ -2674,18 +2452,26 @@ describe('Send Slice', () => {
           },
         },
         send: {
-          ...getInitialSendStateWithExistingTxState({
-            id: 1,
-            recipient: {
-              address: 'Address',
-              nickname: 'NickName',
-            },
-          }),
-          selectedAccount: {
+          account: {
             address: '0xAddress',
             balance: '0x0',
           },
-          stage: SEND_STAGES.EDIT,
+          asset: {
+            type: '',
+          },
+          gas: {
+            gasPrice: '',
+          },
+          amount: {
+            value: '',
+          },
+          draftTransaction: {
+            userInputHexData: '',
+          },
+          recipient: {
+            address: 'Address',
+            nickname: 'NickName',
+          },
         },
       };
 
@@ -2700,104 +2486,94 @@ describe('Send Slice', () => {
 
       const store = mockStore(editTransactionState);
 
-      await store.dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, 1));
+      await store.dispatch(
+        editTransaction(
+          ASSET_TYPES.TOKEN,
+          1,
+          {
+            name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+            args: {
+              _to: '0xRecipientAddress',
+              _value: ethers.BigNumber.from(15000),
+            },
+          },
+          { address: '0xAddress', symbol: 'SYMB', decimals: 18 },
+        ),
+      );
       const actionResult = store.getActions();
 
-      expect(actionResult).toHaveLength(9);
-      expect(actionResult[0].type).toStrictEqual('send/clearPreviousDrafts');
-      expect(actionResult[1]).toStrictEqual({
-        type: 'send/addNewDraft',
-        payload: {
-          amount: {
-            error: null,
-            value: '0x3a98',
-          },
-          asset: {
-            balance: '0x0',
-            details: null,
-            error: null,
-            type: ASSET_TYPES.NATIVE,
-          },
-          fromAccount: {
-            address: '0xAddress',
-            balance: '0x0',
-          },
-          gas: {
-            error: null,
-            gasLimit: '0x186a0',
-            gasPrice: '0x3b9aca00',
-            gasTotal: '0x0',
-            maxFeePerGas: '0x0',
-            maxPriorityFeePerGas: '0x0',
-          },
-          history: ['sendFlow - user clicked edit on transaction with id 1'],
-          id: 1,
-          recipient: {
-            address: BURN_ADDRESS,
-            error: null,
-            warning: null,
-            nickname: '',
-            recipientWarningAcknowledged: false,
-          },
-          status: SEND_STATUSES.VALID,
-          transactionType: '0x0',
-          userInputHexData:
-            editTransactionState.metamask.unapprovedTxs[1].txParams.data,
-        },
+      expect(actionResult).toHaveLength(11);
+      expect(actionResult[0]).toMatchObject({
+        type: 'send/addHistoryEntry',
+        payload: 'sendFlow - user clicked edit on transaction with id 1',
       });
-      expect(actionResult[2].type).toStrictEqual('SHOW_LOADING_INDICATION');
-      expect(actionResult[3].type).toStrictEqual('HIDE_LOADING_INDICATION');
-      expect(actionResult[4]).toMatchObject({
+      expect(actionResult[1]).toMatchObject({
         type: 'send/addHistoryEntry',
-        payload:
-          'sendFlow - user set asset to ERC20 token with symbol SYMB and address 0xTokenAddress',
+        payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
       });
-      expect(actionResult[5]).toStrictEqual({
-        type: 'send/updateAsset',
-        payload: {
-          asset: {
-            balance: '0x0',
-            type: ASSET_TYPES.TOKEN,
-            error: null,
-            details: {
-              balance: '0x0',
-              address: '0xTokenAddress',
-              decimals: 18,
-              symbol: 'SYMB',
-              standard: 'ERC20',
-            },
-          },
-          initialAssetSet: true,
+      expect(actionResult[2]).toMatchObject({
+        type: 'send/addHistoryEntry',
+        payload: 'sendFlow - user set asset symbol to SYMB',
+      });
+      expect(actionResult[3]).toMatchObject({
+        type: 'send/addHistoryEntry',
+        payload: 'sendFlow - user set asset address to 0xTokenAddress',
+      });
+      expect(actionResult[4].type).toStrictEqual('SHOW_LOADING_INDICATION');
+      expect(actionResult[5].type).toStrictEqual('HIDE_LOADING_INDICATION');
+      expect(actionResult[6].type).toStrictEqual('send/updateAsset');
+      expect(actionResult[6].payload).toStrictEqual({
+        balance: '0x0',
+        type: ASSET_TYPES.TOKEN,
+        error: null,
+        details: {
+          address: '0xTokenAddress',
+          decimals: 18,
+          symbol: 'SYMB',
+          standard: 'ERC20',
         },
       });
-      expect(actionResult[6].type).toStrictEqual(
-        'send/initializeSendState/pending',
-      );
       expect(actionResult[7].type).toStrictEqual(
-        'metamask/gas/SET_CUSTOM_GAS_LIMIT',
+        'send/computeEstimatedGasLimit/pending',
       );
       expect(actionResult[8].type).toStrictEqual(
-        'send/initializeSendState/fulfilled',
+        'metamask/gas/SET_CUSTOM_GAS_LIMIT',
       );
+      expect(actionResult[9].type).toStrictEqual(
+        'send/computeEstimatedGasLimit/fulfilled',
+      );
+      expect(actionResult[10].type).toStrictEqual('send/editTransaction');
+      expect(actionResult[10].payload).toStrictEqual({
+        address: '0xrecipientaddress', // getting address from tokenData does .toLowerCase
+        amount: '0x3a98',
+        data: '',
+        from: '0xAddress',
+        gasLimit: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
+        gasPrice: '0x3b9aca00',
+        id: 1,
+        nickname: '',
+      });
 
-      const action = actionResult[1];
+      const action = actionResult[10];
 
-      const result = sendReducer(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, action);
+      const result = sendReducer(initialState, action);
 
-      expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
+      expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
+      expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
 
-      const draftTransaction =
-        result.draftTransactions[result.currentTransactionUUID];
+      expect(result.amount.value).toStrictEqual(action.payload.amount);
 
-      expect(draftTransaction.gas.gasLimit).toStrictEqual(
-        action.payload.gas.gasLimit,
+      expect(result.draftTransaction.txParams.to).toStrictEqual(
+        action.payload.address,
       );
-      expect(draftTransaction.gas.gasPrice).toStrictEqual(
-        action.payload.gas.gasPrice,
+      expect(result.draftTransaction.txParams.value).toStrictEqual(
+        action.payload.amount,
       );
-
-      expect(draftTransaction.amount.value).toStrictEqual(
-        action.payload.amount.value,
+      expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
+        action.payload.gasPrice,
+      );
+      expect(result.draftTransaction.txParams.gas).toStrictEqual(
+        action.payload.gasLimit,
       );
     });
   });
@@ -2805,44 +2581,36 @@ describe('Send Slice', () => {
   describe('selectors', () => {
     describe('gas selectors', () => {
       it('has a selector that gets gasLimit', () => {
-        expect(
-          getGasLimit({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe('0x0');
+        expect(getGasLimit({ send: initialState })).toBe('0x0');
       });
 
       it('has a selector that gets gasPrice', () => {
-        expect(
-          getGasPrice({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe('0x0');
+        expect(getGasPrice({ send: initialState })).toBe('0x0');
       });
 
       it('has a selector that gets gasTotal', () => {
-        expect(
-          getGasTotal({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe('0x0');
+        expect(getGasTotal({ send: initialState })).toBe('0x0');
       });
 
       it('has a selector to determine if gas fee is in error', () => {
-        expect(
-          gasFeeIsInError({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(false);
+        expect(gasFeeIsInError({ send: initialState })).toBe(false);
         expect(
           gasFeeIsInError({
-            send: getInitialSendStateWithExistingTxState({
+            send: {
+              ...initialState,
               gas: {
+                ...initialState.gas,
                 error: 'yes',
               },
-            }),
+            },
           }),
         ).toBe(true);
       });
 
       it('has a selector that gets minimumGasLimit', () => {
-        expect(
-          getMinimumGasLimitForSend({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
-        ).toBe(GAS_LIMITS.SIMPLE);
+        expect(getMinimumGasLimitForSend({ send: initialState })).toBe(
+          GAS_LIMITS.SIMPLE,
+        );
       });
 
       describe('getGasInputMode selector', () => {
@@ -2912,7 +2680,7 @@ describe('Send Slice', () => {
           process.env.IN_TEST = false;
         });
 
-        it('returns CUSTOM if gasIsSetInModal is true', () => {
+        it('returns CUSTOM if isCustomGasSet is true', () => {
           expect(
             getGasInputMode({
               metamask: {
@@ -2920,8 +2688,11 @@ describe('Send Slice', () => {
                 featureFlags: { advancedInlineGas: true },
               },
               send: {
-                ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-                gasIsSetInModal: true,
+                ...initialState,
+                gas: {
+                  ...initialState.send,
+                  isCustomGasSet: true,
+                },
               },
             }),
           ).toBe(GAS_INPUT_MODES.CUSTOM);
@@ -2931,39 +2702,38 @@ describe('Send Slice', () => {
 
     describe('asset selectors', () => {
       it('has a selector to get the asset', () => {
-        expect(
-          getSendAsset({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toMatchObject(
-          getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).asset,
+        expect(getSendAsset({ send: initialState })).toMatchObject(
+          initialState.asset,
         );
       });
 
       it('has a selector to get the asset address', () => {
         expect(
           getSendAssetAddress({
-            send: getInitialSendStateWithExistingTxState({
+            send: {
+              ...initialState,
               asset: {
                 balance: '0x0',
                 details: { address: '0x0' },
                 type: ASSET_TYPES.TOKEN,
               },
-            }),
+            },
           }),
         ).toBe('0x0');
       });
 
       it('has a selector that determines if asset is sendable based on ERC721 status', () => {
-        expect(
-          getIsAssetSendable({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(true);
+        expect(getIsAssetSendable({ send: initialState })).toBe(true);
         expect(
           getIsAssetSendable({
-            send: getInitialSendStateWithExistingTxState({
+            send: {
+              ...initialState,
               asset: {
+                ...initialState,
                 type: ASSET_TYPES.TOKEN,
                 details: { isERC721: true },
               },
-            }),
+            },
           }),
         ).toBe(false);
       });
@@ -2971,77 +2741,71 @@ describe('Send Slice', () => {
 
     describe('amount selectors', () => {
       it('has a selector to get send amount', () => {
-        expect(
-          getSendAmount({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe('0x0');
+        expect(getSendAmount({ send: initialState })).toBe('0x0');
       });
 
       it('has a selector to get if there is an insufficient funds error', () => {
+        expect(getIsBalanceInsufficient({ send: initialState })).toBe(false);
         expect(
           getIsBalanceInsufficient({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
-        ).toBe(false);
-        expect(
-          getIsBalanceInsufficient({
-            send: getInitialSendStateWithExistingTxState({
-              gas: { error: INSUFFICIENT_FUNDS_ERROR },
-            }),
+            send: {
+              ...initialState,
+              gas: { ...initialState.gas, error: INSUFFICIENT_FUNDS_ERROR },
+            },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get max mode state', () => {
-        expect(
-          getSendMaxModeState({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(false);
+        expect(getSendMaxModeState({ send: initialState })).toBe(false);
         expect(
           getSendMaxModeState({
             send: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-              amountMode: AMOUNT_MODES.MAX,
+              ...initialState,
+              amount: { ...initialState.amount, mode: AMOUNT_MODES.MAX },
             },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get the draft transaction ID', () => {
+        expect(getDraftTransactionID({ send: initialState })).toBeNull();
         expect(
           getDraftTransactionID({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
-        ).toBeNull();
-        expect(
-          getDraftTransactionID({
-            send: getInitialSendStateWithExistingTxState({
-              id: 'ID',
-            }),
+            send: {
+              ...initialState,
+              draftTransaction: {
+                ...initialState.draftTransaction,
+                id: 'ID',
+              },
+            },
           }),
         ).toBe('ID');
       });
 
       it('has a selector to get the user entered hex data', () => {
-        expect(
-          getSendHexData({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBeNull();
+        expect(getSendHexData({ send: initialState })).toBeNull();
         expect(
           getSendHexData({
-            send: getInitialSendStateWithExistingTxState({
-              userInputHexData: '0x0',
-            }),
+            send: {
+              ...initialState,
+              draftTransaction: {
+                ...initialState.draftTransaction,
+                userInputHexData: '0x0',
+              },
+            },
           }),
         ).toBe('0x0');
       });
 
       it('has a selector to get if there is an amount error', () => {
-        expect(
-          sendAmountIsInError({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(false);
+        expect(sendAmountIsInError({ send: initialState })).toBe(false);
         expect(
           sendAmountIsInError({
-            send: getInitialSendStateWithExistingTxState({
-              amount: { error: 'any' },
-            }),
+            send: {
+              ...initialState,
+              amount: { ...initialState.amount, error: 'any' },
+            },
           }),
         ).toBe(true);
       });
@@ -3049,98 +2813,85 @@ describe('Send Slice', () => {
 
     describe('recipient selectors', () => {
       it('has a selector to get recipient address', () => {
+        expect(getSendTo({ send: initialState })).toBe('');
         expect(
           getSendTo({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-            metamask: { ensResolutionsByAddress: {} },
-          }),
-        ).toBe('');
-        expect(
-          getSendTo({
-            send: getInitialSendStateWithExistingTxState({
-              recipient: { address: '0xb' },
-            }),
-            metamask: { ensResolutionsByAddress: {} },
+            send: {
+              ...initialState,
+              recipient: { ...initialState.recipient, address: '0xb' },
+            },
           }),
         ).toBe('0xb');
       });
 
       it('has a selector to check if using the my accounts option for recipient selection', () => {
         expect(
-          getIsUsingMyAccountForRecipientSearch({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
+          getIsUsingMyAccountForRecipientSearch({ send: initialState }),
         ).toBe(false);
         expect(
           getIsUsingMyAccountForRecipientSearch({
             send: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-              recipientMode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
+              ...initialState,
+              recipient: {
+                ...initialState.recipient,
+                mode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
+              },
             },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get recipient user input in input field', () => {
-        expect(
-          getRecipientUserInput({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
-        ).toBe('');
+        expect(getRecipientUserInput({ send: initialState })).toBe('');
         expect(
           getRecipientUserInput({
             send: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-              recipientInput: 'domain.eth',
+              ...initialState,
+              recipient: {
+                ...initialState.recipient,
+                userInput: 'domain.eth',
+              },
             },
           }),
         ).toBe('domain.eth');
       });
 
       it('has a selector to get recipient state', () => {
-        expect(
-          getRecipient({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-            metamask: { ensResolutionsByAddress: {} },
-          }),
-        ).toMatchObject(
-          getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).recipient,
+        expect(getRecipient({ send: initialState })).toMatchObject(
+          initialState.recipient,
         );
       });
     });
 
     describe('send validity selectors', () => {
       it('has a selector to get send errors', () => {
-        expect(
-          getSendErrors({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toMatchObject({
+        expect(getSendErrors({ send: initialState })).toMatchObject({
           gasFee: null,
           amount: null,
         });
         expect(
           getSendErrors({
-            send: getInitialSendStateWithExistingTxState({
+            send: {
+              ...initialState,
               gas: {
+                ...initialState.gas,
                 error: 'gasFeeTest',
               },
               amount: {
+                ...initialState.amount,
                 error: 'amountTest',
               },
-            }),
+            },
           }),
         ).toMatchObject({ gasFee: 'gasFeeTest', amount: 'amountTest' });
       });
 
       it('has a selector to get send state initialization status', () => {
-        expect(
-          isSendStateInitialized({
-            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          }),
-        ).toBe(false);
+        expect(isSendStateInitialized({ send: initialState })).toBe(false);
         expect(
           isSendStateInitialized({
             send: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              ...initialState,
               stage: SEND_STATUSES.ADD_RECIPIENT,
             },
           }),
@@ -3148,28 +2899,19 @@ describe('Send Slice', () => {
       });
 
       it('has a selector to get send state validity', () => {
-        expect(
-          isSendFormInvalid({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(false);
+        expect(isSendFormInvalid({ send: initialState })).toBe(false);
         expect(
           isSendFormInvalid({
-            send: getInitialSendStateWithExistingTxState({
-              status: SEND_STATUSES.INVALID,
-            }),
+            send: { ...initialState, status: SEND_STATUSES.INVALID },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get send stage', () => {
-        expect(
-          getSendStage({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
-        ).toBe(SEND_STAGES.INACTIVE);
+        expect(getSendStage({ send: initialState })).toBe(SEND_STAGES.INACTIVE);
         expect(
           getSendStage({
-            send: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-              stage: SEND_STAGES.ADD_RECIPIENT,
-            },
+            send: { ...initialState, stage: SEND_STAGES.ADD_RECIPIENT },
           }),
         ).toBe(SEND_STAGES.ADD_RECIPIENT);
       });
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 30a3b65b9f58..fc75375baf7d 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -31,6 +31,7 @@ import {
   updateSmartTransaction,
   setSmartTransactionsRefreshInterval,
   fetchSmartTransactionFees,
+  estimateSmartTransactionsGas,
   cancelSmartTransaction,
   getTransactions,
 } from '../../store/actions';
@@ -80,7 +81,6 @@ import {
   SWAP_FAILED_ERROR,
   SWAPS_FETCH_ORDER_CONFLICT,
   ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS,
-  SLIPPAGE,
 } from '../../../shared/constants/swaps';
 import {
   TRANSACTION_TYPES,
@@ -109,7 +109,7 @@ const initialState = {
   fromTokenInputValue: '',
   fromTokenError: null,
   isFeatureFlagLoaded: false,
-  maxSlippage: SLIPPAGE.DEFAULT,
+  maxSlippage: 3,
   quotesFetchStartTime: null,
   reviewSwapClickedTimestamp: null,
   topAssets: {},
@@ -734,7 +734,7 @@ export const fetchQuotesAndSetQuoteState = (
         token_to: toTokenSymbol,
         request_type: balanceError ? 'Quote' : 'Order',
         slippage: maxSlippage,
-        custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
+        custom_slippage: maxSlippage !== 2,
         is_hardware_wallet: hardwareWalletUsed,
         hardware_wallet_type: hardwareWalletType,
         stx_enabled: smartTransactionsEnabled,
@@ -788,7 +788,7 @@ export const fetchQuotesAndSetQuoteState = (
             token_to: toTokenSymbol,
             request_type: balanceError ? 'Quote' : 'Order',
             slippage: maxSlippage,
-            custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
+            custom_slippage: maxSlippage !== 2,
             is_hardware_wallet: hardwareWalletUsed,
             hardware_wallet_type: hardwareWalletType,
             stx_enabled: smartTransactionsEnabled,
@@ -813,7 +813,7 @@ export const fetchQuotesAndSetQuoteState = (
             ),
             request_type: balanceError ? 'Quote' : 'Order',
             slippage: maxSlippage,
-            custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
+            custom_slippage: maxSlippage !== 2,
             response_time: Date.now() - fetchStartTime,
             best_quote_source: newSelectedQuote.aggregator,
             available_quotes: Object.values(fetchedQuotes)?.length,
@@ -923,44 +923,36 @@ export const signAndSendSwapsSmartTransaction = ({
 
     const approveTxParams = getApproveTxParams(state);
     let approvalTxUuid;
-    let updatedApproveTxParams;
     try {
       if (approveTxParams) {
-        updatedApproveTxParams = {
+        const updatedApproveTxParams = {
           ...approveTxParams,
           value: '0x0',
         };
-      }
-      const fees = await dispatch(
-        fetchSwapsSmartTransactionFees(
-          unsignedTransaction,
-          updatedApproveTxParams,
-        ),
-      );
-      if (!fees) {
-        log.error('"fetchSwapsSmartTransactionFees" failed');
-        dispatch(setSwapsSTXSubmitLoading(false));
-        dispatch(setCurrentSmartTransactionsError(stxErrorTypes.UNAVAILABLE));
-        return;
-      }
-      if (approveTxParams) {
+        const smartTransactionApprovalFees = await dispatch(
+          fetchSwapsSmartTransactionFees(updatedApproveTxParams),
+        );
         updatedApproveTxParams.gas = `0x${decimalToHex(
-          fees.approvalTxFees?.gasLimit || 0,
+          smartTransactionApprovalFees?.gasLimit || 0,
         )}`;
         approvalTxUuid = await dispatch(
           signAndSendSmartTransaction({
             unsignedTransaction: updatedApproveTxParams,
-            smartTransactionFees: fees.approvalTxFees,
+            smartTransactionFees: smartTransactionApprovalFees,
           }),
         );
       }
+
+      const smartTransactionFees = await dispatch(
+        fetchSwapsSmartTransactionFees(unsignedTransaction),
+      );
       unsignedTransaction.gas = `0x${decimalToHex(
-        fees.tradeTxFees?.gasLimit || 0,
+        smartTransactionFees?.gasLimit || 0,
       )}`;
       const uuid = await dispatch(
         signAndSendSmartTransaction({
           unsignedTransaction,
-          smartTransactionFees: fees.tradeTxFees,
+          smartTransactionFees,
         }),
       );
 
@@ -1312,17 +1304,37 @@ export function fetchMetaSwapsGasPriceEstimates() {
   };
 }
 
-export function fetchSwapsSmartTransactionFees(
+export function fetchSwapsSmartTransactionFees(unsignedTransaction) {
+  return async (dispatch, getState) => {
+    const {
+      swaps: { isFeatureFlagLoaded },
+    } = getState();
+    try {
+      return await dispatch(fetchSmartTransactionFees(unsignedTransaction));
+    } catch (e) {
+      if (e.message.startsWith('Fetch error:') && isFeatureFlagLoaded) {
+        const errorObj = parseSmartTransactionsError(e.message);
+        dispatch(setCurrentSmartTransactionsError(errorObj?.type));
+      }
+    }
+    return null;
+  };
+}
+
+export function estimateSwapsSmartTransactionsGas(
   unsignedTransaction,
   approveTxParams,
 ) {
   return async (dispatch, getState) => {
     const {
-      swaps: { isFeatureFlagLoaded },
+      swaps: { isFeatureFlagLoaded, swapsSTXLoading },
     } = getState();
+    if (swapsSTXLoading) {
+      return;
+    }
     try {
-      return await dispatch(
-        fetchSmartTransactionFees(unsignedTransaction, approveTxParams),
+      await dispatch(
+        estimateSmartTransactionsGas(unsignedTransaction, approveTxParams),
       );
     } catch (e) {
       if (e.message.startsWith('Fetch error:') && isFeatureFlagLoaded) {
@@ -1330,7 +1342,6 @@ export function fetchSwapsSmartTransactionFees(
         dispatch(setCurrentSmartTransactionsError(errorObj?.type));
       }
     }
-    return null;
   };
 }
 
diff --git a/ui/helpers/constants/common.js b/ui/helpers/constants/common.js
index 914299d1d9b6..3deae2356041 100644
--- a/ui/helpers/constants/common.js
+++ b/ui/helpers/constants/common.js
@@ -5,6 +5,17 @@ export const WEI = 'WEI';
 export const PRIMARY = 'PRIMARY';
 export const SECONDARY = 'SECONDARY';
 
+export const ERC20 = 'ERC20';
+export const ERC721 = 'ERC721';
+export const ERC1155 = 'ERC1155';
+
+export const TOKEN_STANDARDS = {
+  ERC20,
+  ERC721,
+  ERC1155,
+  NONE: 'NONE',
+};
+
 export const GAS_ESTIMATE_TYPES = {
   SLOW: 'SLOW',
   AVERAGE: 'AVERAGE',
@@ -14,8 +25,6 @@ export const GAS_ESTIMATE_TYPES = {
 
 let _supportLink = 'https://support.metamask.io';
 let _supportRequestLink = 'https://metamask.zendesk.com/hc/en-us/requests/new';
-const _contractAddressLink =
-  'https://metamask.zendesk.com/hc/en-us/articles/360020028092-What-is-the-known-contract-address-warning-';
 
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 _supportLink = 'https://metamask-flask.zendesk.com/hc';
@@ -25,4 +34,3 @@ _supportRequestLink =
 
 export const SUPPORT_LINK = _supportLink;
 export const SUPPORT_REQUEST_LINK = _supportRequestLink;
-export const CONTRACT_ADDRESS_LINK = _contractAddressLink;
diff --git a/ui/helpers/constants/critical-error.js b/ui/helpers/constants/critical-error.js
deleted file mode 100644
index a9c18cf5599f..000000000000
--- a/ui/helpers/constants/critical-error.js
+++ /dev/null
@@ -1 +0,0 @@
-export const TEN_SECONDS_IN_MILLISECONDS = 10_000;
diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js
index 7bfa2817c020..1809ea31c3af 100644
--- a/ui/helpers/constants/design-system.js
+++ b/ui/helpers/constants/design-system.js
@@ -11,7 +11,6 @@ export const COLORS = {
   TEXT_ALTERNATIVE: 'text-alternative',
   TEXT_MUTED: 'text-muted',
   ICON_DEFAULT: 'icon-default',
-  ICON_ALTERNATIVE: 'text-alternative',
   ICON_MUTED: 'icon-muted',
   BORDER_DEFAULT: 'border-default',
   BORDER_MUTED: 'border-muted',
@@ -127,11 +126,9 @@ export const DISPLAY = {
   FLEX: 'flex',
   GRID: 'grid',
   INLINE_BLOCK: 'inline-block',
-  INLINE: 'inline',
   INLINE_FLEX: 'inline-flex',
   INLINE_GRID: 'inline-grid',
   LIST_ITEM: 'list-item',
-  NONE: 'none',
 };
 
 export const FRACTIONS = {
@@ -209,5 +206,3 @@ export const RESIZE = {
   INITIAL: 'initial',
   INHERIT: 'inherit',
 };
-
-export const BREAKPOINTS = ['base', 'sm', 'md', 'lg'];
diff --git a/ui/helpers/constants/notifications.js b/ui/helpers/constants/notifications.js
deleted file mode 100644
index 1acc32dd06a3..000000000000
--- a/ui/helpers/constants/notifications.js
+++ /dev/null
@@ -1,6 +0,0 @@
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-
-// The time after which a notification should be deleted.
-export const NOTIFICATIONS_EXPIRATION_DELAY = 10000;
-
-///: END:ONLY_INCLUDE_IN
diff --git a/ui/helpers/constants/routes.js b/ui/helpers/constants/routes.js
index fa816e412e1b..519e0a0981b6 100644
--- a/ui/helpers/constants/routes.js
+++ b/ui/helpers/constants/routes.js
@@ -12,8 +12,6 @@ const ALERTS_ROUTE = '/settings/alerts';
 const NETWORKS_ROUTE = '/settings/networks';
 const NETWORKS_FORM_ROUTE = '/settings/networks/form';
 const ADD_NETWORK_ROUTE = '/settings/networks/add-network';
-const ADD_POPULAR_CUSTOM_NETWORK =
-  '/settings/networks/add-popular-custom-network';
 const SNAPS_LIST_ROUTE = '/settings/snaps-list';
 const SNAPS_VIEW_ROUTE = '/settings/snaps-view';
 const CONTACT_LIST_ROUTE = '/settings/contact-list';
@@ -35,7 +33,6 @@ const CONNECT_ROUTE = '/connect';
 const CONNECT_CONFIRM_PERMISSIONS_ROUTE = '/confirm-permissions';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 const CONNECT_SNAP_INSTALL_ROUTE = '/snap-install';
-const NOTIFICATIONS_ROUTE = '/notifications';
 ///: END:ONLY_INCLUDE_IN
 const CONNECTED_ROUTE = '/connected';
 const CONNECTED_ACCOUNTS_ROUTE = '/connected/accounts';
@@ -90,7 +87,6 @@ const CONFIRM_SEND_ETHER_PATH = '/send-ether';
 const CONFIRM_SEND_TOKEN_PATH = '/send-token';
 const CONFIRM_DEPLOY_CONTRACT_PATH = '/deploy-contract';
 const CONFIRM_APPROVE_PATH = '/approve';
-const CONFIRM_SET_APPROVAL_FOR_ALL_PATH = '/set-approval-for-all';
 const CONFIRM_TRANSFER_FROM_PATH = '/transfer-from';
 const CONFIRM_SAFE_TRANSFER_FROM_PATH = '/safe-transfer-from';
 const CONFIRM_TOKEN_METHOD_PATH = '/token-method';
@@ -116,8 +112,6 @@ const PATH_NAME_MAP = {
   [NETWORKS_ROUTE]: 'Network Settings Page',
   [NETWORKS_FORM_ROUTE]: 'Network Settings Page Form',
   [ADD_NETWORK_ROUTE]: 'Add Network From Settings Page Form',
-  [ADD_POPULAR_CUSTOM_NETWORK]:
-    'Add Network From A List Of Popular Custom Networks',
   [CONTACT_LIST_ROUTE]: 'Contact List Settings Page',
   [`${CONTACT_EDIT_ROUTE}/:address`]: 'Edit Contact Settings Page',
   [CONTACT_ADD_ROUTE]: 'Add Contact Settings Page',
@@ -146,7 +140,6 @@ const PATH_NAME_MAP = {
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SEND_TOKEN_PATH}`]: 'Confirm Send Token Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_DEPLOY_CONTRACT_PATH}`]: 'Confirm Deploy Contract Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_APPROVE_PATH}`]: 'Confirm Approve Transaction Page',
-  [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`]: 'Confirm Set Approval For All Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_TRANSFER_FROM_PATH}`]: 'Confirm Transfer From Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SAFE_TRANSFER_FROM_PATH}`]: 'Confirm Safe Transfer From Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${SIGNATURE_REQUEST_PATH}`]: 'Signature Request Page',
@@ -208,7 +201,6 @@ export {
   CONFIRM_SEND_TOKEN_PATH,
   CONFIRM_DEPLOY_CONTRACT_PATH,
   CONFIRM_APPROVE_PATH,
-  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
   CONFIRM_TRANSFER_FROM_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
   CONFIRM_TOKEN_METHOD_PATH,
@@ -231,14 +223,12 @@ export {
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
   ADD_NETWORK_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
   INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
   INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
   CONNECT_ROUTE,
   CONNECT_CONFIRM_PERMISSIONS_ROUTE,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   CONNECT_SNAP_INSTALL_ROUTE,
-  NOTIFICATIONS_ROUTE,
   ///: END:ONLY_INCLUDE_IN
   CONNECTED_ROUTE,
   CONNECTED_ACCOUNTS_ROUTE,
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 3148e7543ec4..3f05221e49e0 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -346,11 +346,4 @@ export const SETTINGS_CONSTANTS = [
     icon: 'fa fa-flask',
     featureFlag: 'COLLECTIBLES_V1',
   },
-  {
-    tabMessage: (t) => t('experimental'),
-    sectionMessage: (t) => t('showCustomNetworkList'),
-    descriptionMessage: (t) => t('showCustomNetworkListDescription'),
-    route: `${EXPERIMENTAL_ROUTE}#show-custom-network`,
-    icon: 'fa fa-flask',
-  },
 ];
diff --git a/ui/helpers/constants/transactions.js b/ui/helpers/constants/transactions.js
index 4dc66ab79c43..b7f9320547bc 100644
--- a/ui/helpers/constants/transactions.js
+++ b/ui/helpers/constants/transactions.js
@@ -17,7 +17,6 @@ export const PRIORITY_STATUS_HASH = {
 
 export const TOKEN_CATEGORY_HASH = {
   [TRANSACTION_TYPES.TOKEN_METHOD_APPROVE]: true,
-  [TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL]: true,
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER]: true,
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM]: true,
 };
diff --git a/ui/helpers/utils/error-utils.js b/ui/helpers/utils/error-utils.js
deleted file mode 100644
index 5b98bd60e162..000000000000
--- a/ui/helpers/utils/error-utils.js
+++ /dev/null
@@ -1,55 +0,0 @@
-import getFirstPreferredLangCode from '../../../app/scripts/lib/get-first-preferred-lang-code';
-import { setupLocale } from '../..';
-import switchDirection from './switch-direction';
-
-const getLocaleContext = (currentLocaleMessages, enLocaleMessages) => {
-  return (key) => {
-    let message = currentLocaleMessages[key]?.message;
-    if (!message && enLocaleMessages[key]) {
-      message = enLocaleMessages[key].message;
-    }
-    return message;
-  };
-};
-
-export async function getErrorHtml(supportLink, metamaskState) {
-  let response, preferredLocale;
-  if (metamaskState?.currentLocale) {
-    preferredLocale = metamaskState.currentLocale;
-    response = await setupLocale(metamaskState.currentLocale);
-  } else {
-    preferredLocale = await getFirstPreferredLangCode();
-    response = await setupLocale(preferredLocale);
-  }
-
-  const textDirection = ['ar', 'dv', 'fa', 'he', 'ku'].includes(preferredLocale)
-    ? 'rtl'
-    : 'auto';
-
-  switchDirection(textDirection);
-  const { currentLocaleMessages, enLocaleMessages } = response;
-  const t = getLocaleContext(currentLocaleMessages, enLocaleMessages);
-
-  return `
-    <div class="critical-error">
-      <div class="critical-error__alert">
-        <p class="critical-error__alert__message">
-          ${t('troubleStarting')}        
-        </p>   
-        <button id='critical-error-button' class="critical-error__alert__button">
-          ${t('restartMetamask')}
-        </button>
-      </div>    
-      <p class="critical-error__paragraph">    
-        ${t('stillGettingMessage')}
-        <a           
-          href=${supportLink} 
-          class="critical-error__paragraph__link" 
-          target="_blank" 
-          rel="noopener noreferrer">
-            ${t('sendBugReport')}
-          </a>  
-      </p>
-    </div>
-    `;
-}
diff --git a/ui/helpers/utils/error-utils.test.js b/ui/helpers/utils/error-utils.test.js
deleted file mode 100644
index 84aa05508ff5..000000000000
--- a/ui/helpers/utils/error-utils.test.js
+++ /dev/null
@@ -1,49 +0,0 @@
-import { SUPPORT_LINK } from '../constants/common';
-import { getErrorHtml } from './error-utils';
-import { fetchLocale } from './i18n-helper';
-
-jest.mock('./i18n-helper', () => ({
-  fetchLocale: jest.fn(),
-  loadRelativeTimeFormatLocaleData: jest.fn(),
-}));
-
-describe('Error utils Tests', () => {
-  it('should get error html', async () => {
-    const mockStore = {
-      localeMessages: {
-        current: {
-          troubleStarting: {
-            message:
-              'MetaMask had trouble starting. This error could be intermittent, so try restarting the extension.',
-          },
-          restartMetamask: {
-            message: 'Restart MetaMask',
-          },
-          stillGettingMessage: {
-            message: 'Still getting this message?',
-          },
-          sendBugReport: {
-            message: 'Send us a bug report.',
-          },
-        },
-      },
-      metamask: {
-        currentLocale: 'en',
-      },
-    };
-
-    fetchLocale.mockReturnValue(mockStore.localeMessages.current);
-    const errorHtml = await getErrorHtml(SUPPORT_LINK, mockStore.metamask);
-    const currentLocale = mockStore.localeMessages.current;
-    const troubleStartingMessage = currentLocale.troubleStarting.message;
-    const restartMetamaskMessage = currentLocale.restartMetamask.message;
-    const stillGettingMessageMessage =
-      currentLocale.stillGettingMessage.message;
-    const sendBugReportMessage = currentLocale.sendBugReport.message;
-
-    expect(errorHtml).toContain(troubleStartingMessage);
-    expect(errorHtml).toContain(restartMetamaskMessage);
-    expect(errorHtml).toContain(stillGettingMessageMessage);
-    expect(errorHtml).toContain(sendBugReportMessage);
-  });
-});
diff --git a/ui/helpers/utils/i18n-helper.js b/ui/helpers/utils/i18n-helper.js
index c18e7df83bb3..f5a2aac22134 100644
--- a/ui/helpers/utils/i18n-helper.js
+++ b/ui/helpers/utils/i18n-helper.js
@@ -3,9 +3,10 @@ import React from 'react';
 import log from 'loglevel';
 import * as Sentry from '@sentry/browser';
 
+import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout();
+const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
 
 const warned = {};
 const missingMessageErrors = {};
diff --git a/ui/helpers/utils/icon-factory.js b/ui/helpers/utils/icon-factory.js
index 8e36f6699bc3..5e75f20fce76 100644
--- a/ui/helpers/utils/icon-factory.js
+++ b/ui/helpers/utils/icon-factory.js
@@ -1,4 +1,7 @@
-import { isValidHexAddress } from '../../../shared/modules/hexstring-utils';
+import {
+  isValidHexAddress,
+  toChecksumHexAddress,
+} from '../../../shared/modules/hexstring-utils';
 
 let iconFactory;
 
@@ -14,9 +17,29 @@ function IconFactory(jazzicon) {
   this.cache = {};
 }
 
-IconFactory.prototype.iconForAddress = function (address, diameter, tokenList) {
-  if (iconExistsFor(address.toLowerCase(), tokenList)) {
-    return imageElFor(address.toLowerCase(), tokenList);
+IconFactory.prototype.iconForAddress = function (
+  address,
+  diameter,
+  useTokenDetection,
+  tokenList,
+) {
+  if (process.env.TOKEN_DETECTION_V2) {
+    if (iconExistsFor(address.toLowerCase(), tokenList)) {
+      return imageElFor(address.toLowerCase(), useTokenDetection, tokenList);
+    }
+  } else {
+    /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
+    // When useTokenDetection flag is true the tokenList contains tokens with non-checksum address from the dynamic token service api,
+    // When useTokenDetection flag is false the tokenList contains tokens with checksum addresses from contract-metadata.
+    // So the flag indicates whether the address of tokens currently on the tokenList is checksum or not.
+    // And since the token.address from allTokens is checksumaddress
+    // tokenAddress have to be changed to lowercase when we are using dynamic list
+    const addr = useTokenDetection
+      ? address.toLowerCase()
+      : toChecksumHexAddress(address);
+    if (iconExistsFor(addr, tokenList)) {
+      return imageElFor(addr, useTokenDetection, tokenList);
+    }
   }
 
   return this.generateIdenticonSvg(address, diameter);
@@ -51,10 +74,16 @@ function iconExistsFor(address, tokenList) {
   );
 }
 
-function imageElFor(address, tokenList) {
+function imageElFor(address, useTokenDetection, tokenList) {
   const tokenMetadata = tokenList[address];
+  const fileName = tokenMetadata?.iconUrl;
+  // token from dynamic api list is fetched when useTokenDetection is true
+  // In the static list, the iconUrl will be holding only a filename for the image,
+  // the corresponding images will be available in the `images/contract/` location when the contract-metadata package was added to the extension
+  //  so that it can be accessed using the filename in iconUrl.
+  const path = useTokenDetection ? fileName : `images/contract/${fileName}`;
   const img = document.createElement('img');
-  img.src = tokenMetadata?.iconUrl;
+  img.src = process.env.TOKEN_DETECTION_V2 ? fileName : path;
   img.style.width = '100%';
   return img;
 }
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index c2f9023dfddd..7625880eac67 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -58,11 +58,6 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
     leftIcon: 'fas fa-wifi',
     rightIcon: null,
   },
-  [EndowmentPermissions['endowment:long-running']]: {
-    label: (t) => t('permission_longRunning'),
-    leftIcon: 'fas fa-infinity',
-    rightIcon: null,
-  },
   ///: END:ONLY_INCLUDE_IN
   [UNKNOWN_PERMISSION]: {
     label: (t, permissionName) =>
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index 9f0264e1d761..3ef7825d9f75 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -195,7 +195,7 @@ describe('Settings Search Utils', () => {
 
     it('should get good experimental section number', () => {
       expect(getNumberOfSettingsInSection(t, t('experimental'))).toStrictEqual(
-        4,
+        3,
       );
     });
 
diff --git a/ui/helpers/utils/token-util.js b/ui/helpers/utils/token-util.js
index 5a7507c952df..b934ed176763 100644
--- a/ui/helpers/utils/token-util.js
+++ b/ui/helpers/utils/token-util.js
@@ -5,9 +5,9 @@ import {
   multiplyCurrencies,
 } from '../../../shared/modules/conversion.utils';
 import { getTokenStandardAndDetails } from '../../store/actions';
+import { ERC1155, ERC721 } from '../constants/common';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
-import { ERC20 } from '../../../shared/constants/transaction';
 import * as util from './util';
 import { formatCurrency } from './confirm-tx.util';
 
@@ -43,7 +43,7 @@ async function getDecimalsFromContract(tokenAddress) {
   }
 }
 
-export function getTokenMetadata(tokenAddress, tokenList) {
+function getTokenMetadata(tokenAddress, tokenList) {
   const casedTokenList = Object.keys(tokenList).reduce((acc, base) => {
     return {
       ...acc,
@@ -151,29 +151,9 @@ export function getTokenValueParam(tokenData = {}) {
   return tokenData?.args?._value?.toString();
 }
 
-/**
- * Gets either the '_tokenId' parameter or the 'id' param of the passed token transaction data.,
- * These are the parsed tokenId values returned by `parseStandardTokenTransactionData` as defined
- * in the ERC721 and ERC1155 ABIs from metamask-eth-abis (https://github.com/MetaMask/metamask-eth-abis/tree/main/src/abis)
- *
- * @param {Object} tokenData - ethers Interface token data.
- * @returns {string | undefined} A decimal string value.
- */
-export function getTokenIdParam(tokenData = {}) {
-  return (
-    tokenData?.args?._tokenId?.toString() ?? tokenData?.args?.id?.toString()
-  );
-}
-
-/**
- * Gets the '_approved' parameter of the given token transaction data
- * (i.e function call) per the Human Standard Token ABI, if present.
- *
- * @param {Object} tokenData - ethers Interface token data.
- * @returns {boolean | undefined} A boolean indicating whether the function is being called to approve or revoke access.
- */
-export function getTokenApprovedParam(tokenData = {}) {
-  return tokenData?.args?._approved;
+export function getTokenValue(tokenParams = []) {
+  const valueData = tokenParams.find((param) => param.name === '_value');
+  return valueData && valueData.value;
 }
 
 /**
@@ -248,32 +228,8 @@ export async function getAssetDetails(
     throw new Error('Unable to detect valid token data');
   }
 
-  // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
-  // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
-  // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
-  let tokenId =
-    getTokenIdParam(tokenData)?.toString() ?? getTokenValueParam(tokenData);
-
-  const toAddress = getTokenAddressParam(tokenData);
-
+  const tokenId = getTokenValueParam(tokenData);
   let tokenDetails;
-
-  // if a tokenId is present check if there is a collectible in state matching the address/tokenId
-  // and avoid unnecessary network requests to query token details we already have
-  if (existingCollectibles?.length && tokenId) {
-    const existingCollectible = existingCollectibles.find(
-      ({ address, tokenId: _tokenId }) =>
-        isEqualCaseInsensitive(tokenAddress, address) && _tokenId === tokenId,
-    );
-
-    if (existingCollectible) {
-      return {
-        toAddress,
-        ...existingCollectible,
-      };
-    }
-  }
-
   try {
     tokenDetails = await getTokenStandardAndDetails(
       tokenAddress,
@@ -282,31 +238,26 @@ export async function getAssetDetails(
     );
   } catch (error) {
     log.warn(error);
-    // if we can't determine any token standard or details return the data we can extract purely from the parsed transaction data
-    return { toAddress, tokenId };
+    return {};
   }
 
-  const tokenAmount =
-    tokenData &&
-    tokenDetails?.decimals &&
-    calcTokenAmount(
-      getTokenValueParam(tokenData),
-      tokenDetails?.decimals,
-    ).toString(10);
-
-  const decimals =
-    tokenDetails?.decimals && Number(tokenDetails.decimals?.toString(10));
-
-  if (tokenDetails?.standard === ERC20) {
-    tokenId = undefined;
+  if (tokenDetails?.standard) {
+    const { standard } = tokenDetails;
+    if (standard === ERC721 || standard === ERC1155) {
+      const existingCollectible = existingCollectibles.find(({ address }) =>
+        isEqualCaseInsensitive(tokenAddress, address),
+      );
+
+      if (existingCollectible) {
+        return {
+          ...existingCollectible,
+          standard,
+        };
+      }
+    }
+    // else if not a collectible already in state or standard === ERC20 just return tokenDetails as it contains all required data
+    return tokenDetails;
   }
 
-  // else if not a collectible already in state or standard === ERC20 return tokenDetails and tokenId
-  return {
-    tokenAmount,
-    toAddress,
-    decimals,
-    tokenId,
-    ...tokenDetails,
-  };
+  return {};
 }
diff --git a/ui/helpers/utils/transactions.util.js b/ui/helpers/utils/transactions.util.js
index 07d37341de98..25a38593fc50 100644
--- a/ui/helpers/utils/transactions.util.js
+++ b/ui/helpers/utils/transactions.util.js
@@ -35,23 +35,12 @@ async function getMethodFrom4Byte(fourBytePrefix) {
       mode: 'cors',
     },
   );
-  fourByteResponse.results.sort((a, b) => {
-    return new Date(a.created_at).getTime() < new Date(b.created_at).getTime()
-      ? -1
-      : 1;
-  });
-  return fourByteResponse.results[0].text_signature;
-}
 
-function pickShortest(registrySig, fourByteSig) {
-  if (!registrySig) {
-    return fourByteSig;
-  } else if (!fourByteSig) {
-    return registrySig;
+  if (fourByteResponse.count === 1) {
+    return fourByteResponse.results[0].text_signature;
   }
-  return fourByteSig.length < registrySig.length ? fourByteSig : registrySig;
+  return null;
 }
-
 let registry;
 
 /**
@@ -62,7 +51,7 @@ let registry;
  */
 export async function getMethodDataAsync(fourBytePrefix) {
   try {
-    const fourByteSig = await getMethodFrom4Byte(fourBytePrefix).catch((e) => {
+    const fourByteSig = getMethodFrom4Byte(fourBytePrefix).catch((e) => {
       log.error(e);
       return null;
     });
@@ -71,12 +60,11 @@ export async function getMethodDataAsync(fourBytePrefix) {
       registry = new MethodRegistry({ provider: global.ethereumProvider });
     }
 
-    const registrySig = await registry.lookup(fourBytePrefix).catch((e) => {
-      log.error(e);
-      return null;
-    });
+    let sig = await registry.lookup(fourBytePrefix);
 
-    const sig = pickShortest(registrySig, fourByteSig);
+    if (!sig) {
+      sig = await fourByteSig;
+    }
 
     if (!sig) {
       return {};
@@ -116,7 +104,6 @@ export function isTokenMethodAction(type) {
   return [
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
     TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-    TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
     TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
   ].includes(type);
@@ -218,9 +205,6 @@ export function getTransactionTypeTitle(t, type, nativeCurrency = 'ETH') {
     case TRANSACTION_TYPES.TOKEN_METHOD_APPROVE: {
       return t('approve');
     }
-    case TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL: {
-      return t('setApprovalForAll');
-    }
     case TRANSACTION_TYPES.SIMPLE_SEND: {
       return t('sendingNativeAsset', [nativeCurrency]);
     }
diff --git a/ui/helpers/utils/transactions.util.test.js b/ui/helpers/utils/transactions.util.test.js
index eaf0a963abad..591e46d07f6e 100644
--- a/ui/helpers/utils/transactions.util.test.js
+++ b/ui/helpers/utils/transactions.util.test.js
@@ -1,5 +1,3 @@
-import { HttpProvider } from 'ethjs';
-import nock from 'nock';
 import {
   TRANSACTION_GROUP_STATUSES,
   TRANSACTION_STATUSES,
@@ -57,48 +55,4 @@ describe('Transactions utils', () => {
       ).toStrictEqual(false);
     });
   });
-
-  describe('getMethodDataAsync', () => {
-    global.ethereumProvider = new HttpProvider(
-      'https://mainnet.infura.io/v3/341eacb578dd44a1a049cbc5f6fd4035',
-    );
-    it('returns a valid signature for setApprovalForAll', async () => {
-      nock('https://www.4byte.directory:443', { encodedQueryParams: true })
-        .get('/api/v1/signatures/')
-        .query({ hex_signature: '0xa22cb465' })
-        .reply(200, {
-          count: 2,
-          next: null,
-          previous: null,
-          results: [
-            {
-              id: 841519,
-              created_at: '2022-06-12T00:50:19.305588Z',
-              text_signature: 'niceFunctionHerePlzClick943230089(address,bool)',
-              hex_signature: '0xa22cb465',
-              bytes_signature: '¢,´e',
-            },
-            {
-              id: 29659,
-              created_at: '2018-04-11T21:47:39.980645Z',
-              text_signature: 'setApprovalForAll(address,bool)',
-              hex_signature: '0xa22cb465',
-              bytes_signature: '¢,´e',
-            },
-          ],
-        });
-      nock('https://mainnet.infura.io:443', { encodedQueryParams: true })
-        .post('/v3/341eacb578dd44a1a049cbc5f6fd4035')
-        .reply(200, (_, requestBody) => ({
-          id: requestBody.id,
-          jsonrpc: '2.0',
-          result:
-            '0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002f6e69636546756e6374696f6e48657265506c7a436c69636b39343332333030383928616464726573732c626f6f6c290000000000000000000000000000000000',
-        }));
-      expect(await utils.getMethodDataAsync('0xa22cb465')).toStrictEqual({
-        name: 'Set Approval For All',
-        params: [{ type: 'address' }, { type: 'bool' }],
-      });
-    });
-  });
 });
diff --git a/ui/hooks/useAssetDetails.js b/ui/hooks/useAssetDetails.js
index 8d9de9c6747c..ce9ef30bab4e 100644
--- a/ui/hooks/useAssetDetails.js
+++ b/ui/hooks/useAssetDetails.js
@@ -1,14 +1,24 @@
 import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { getCollectibles } from '../ducks/metamask/metamask';
-import { getAssetDetails } from '../helpers/utils/token-util';
+import { parseStandardTokenTransactionData } from '../../shared/modules/transaction.utils';
+import { getCollectibles, getTokens } from '../ducks/metamask/metamask';
+import { ERC1155, ERC721, ERC20 } from '../helpers/constants/common';
+import {
+  calcTokenAmount,
+  getAssetDetails,
+  getTokenAddressParam,
+  getTokenValueParam,
+} from '../helpers/utils/token-util';
+import { getTokenList } from '../selectors';
 import { hideLoadingIndication, showLoadingIndication } from '../store/actions';
 import { usePrevious } from './usePrevious';
 
 export function useAssetDetails(tokenAddress, userAddress, transactionData) {
   const dispatch = useDispatch();
   // state selectors
+  const tokens = useSelector(getTokens);
   const collectibles = useSelector(getCollectibles);
+  const tokenList = useSelector(getTokenList);
 
   // in-hook state
   const [currentAsset, setCurrentAsset] = useState(null);
@@ -26,6 +36,8 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
         userAddress,
         transactionData,
         collectibles,
+        tokens,
+        tokenList,
       );
       setCurrentAsset(assetDetails);
       dispatch(hideLoadingIndication());
@@ -46,8 +58,22 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
     userAddress,
     transactionData,
     collectibles,
+    tokens,
+    tokenList,
   ]);
 
+  let assetStandard,
+    assetName,
+    assetAddress,
+    tokenSymbol,
+    decimals,
+    tokenImage,
+    userBalance,
+    tokenValue,
+    toAddress,
+    tokenAmount,
+    tokenId;
+
   if (currentAsset) {
     const {
       standard,
@@ -55,25 +81,37 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
       image,
       name,
       balance,
-      tokenId,
-      toAddress,
-      tokenAmount,
-      decimals,
+      decimals: currentAssetDecimals,
     } = currentAsset;
-
-    return {
-      toAddress,
-      tokenId,
-      decimals,
-      tokenAmount,
-      assetAddress: tokenAddress,
-      assetStandard: standard,
-      tokenSymbol: symbol ?? '',
-      tokenImage: image,
-      userBalance: balance,
-      assetName: name,
-    };
+    const tokenData = parseStandardTokenTransactionData(transactionData);
+    assetStandard = standard;
+    assetAddress = tokenAddress;
+    tokenSymbol = symbol;
+    tokenImage = image;
+    toAddress = getTokenAddressParam(tokenData);
+    if (assetStandard === ERC721 || assetStandard === ERC1155) {
+      assetName = name;
+      tokenId = getTokenValueParam(tokenData);
+    }
+    if (assetStandard === ERC20) {
+      userBalance = balance;
+      decimals = Number(currentAssetDecimals?.toString(10));
+      tokenAmount =
+        tokenData &&
+        calcTokenAmount(getTokenValueParam(tokenData), decimals).toString(10);
+    }
   }
-
-  return {};
+  return {
+    assetStandard,
+    assetName,
+    assetAddress,
+    userBalance,
+    tokenSymbol,
+    decimals,
+    tokenImage,
+    tokenValue,
+    toAddress,
+    tokenAmount,
+    tokenId,
+  };
 }
diff --git a/ui/hooks/useAssetDetails.test.js b/ui/hooks/useAssetDetails.test.js
deleted file mode 100644
index d86ba2af7b98..000000000000
--- a/ui/hooks/useAssetDetails.test.js
+++ /dev/null
@@ -1,193 +0,0 @@
-import React from 'react';
-import { Provider } from 'react-redux';
-import { renderHook } from '@testing-library/react-hooks';
-
-import configureStore from '../store/store';
-import * as Actions from '../store/actions';
-import { ERC1155, ERC20, ERC721 } from '../../shared/constants/transaction';
-import { useAssetDetails } from './useAssetDetails';
-
-const renderUseAssetDetails = ({
-  tokenAddress,
-  userAddress,
-  transactionData,
-}) => {
-  const mockState = {
-    metamask: {
-      provider: {
-        type: 'test',
-        chainId: '0x3',
-      },
-      tokenList: {},
-    },
-  };
-
-  const wrapper = ({ children }) => (
-    <Provider store={configureStore(mockState)}>{children}</Provider>
-  );
-
-  return renderHook(
-    () => useAssetDetails(tokenAddress, userAddress, transactionData),
-    { wrapper },
-  );
-};
-
-describe('useAssetDetails', () => {
-  let getTokenStandardAndDetailsStub;
-
-  beforeEach(() => {
-    getTokenStandardAndDetailsStub = jest
-      .spyOn(Actions, 'getTokenStandardAndDetails')
-      .mockImplementation(() => Promise.resolve({}));
-  });
-
-  it('should return object with tokenSymbol set to an empty string, when getAssetDetails returns and empty object', async () => {
-    const toAddress = '000000000000000000000000000000000000dead';
-    const tokenAddress = '0x1';
-
-    const transactionData = `0xa9059cbb000000000000000000000000${toAddress}000000000000000000000000000000000000000000000000016345785d8a0000`;
-
-    const { result, waitForNextUpdate } = renderUseAssetDetails({
-      tokenAddress,
-      userAddress: '0x111',
-      transactionData,
-    });
-
-    await waitForNextUpdate();
-
-    expect(result.current).toStrictEqual(
-      expect.objectContaining({
-        assetAddress: tokenAddress,
-        tokenSymbol: '',
-      }),
-    );
-  });
-
-  it('should return object with correct tokenValues for an ERC20 token', async () => {
-    const userAddress = '0xf04a5cc80b1e94c69b48f5ee68a08cd2f09a7c3e';
-    const tokenAddress = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
-    const toAddress = '000000000000000000000000000000000000dead';
-    const transactionData = `0xa9059cbb000000000000000000000000${toAddress}00000000000000000000000000000000000000000000000000000000000001f4`;
-
-    const standard = ERC20;
-    const symbol = 'WETH';
-    const balance = '1';
-    const decimals = 18;
-
-    getTokenStandardAndDetailsStub.mockImplementation(() =>
-      Promise.resolve({
-        standard,
-        balance,
-        symbol,
-        decimals,
-      }),
-    );
-
-    const { result, waitForNextUpdate } = renderUseAssetDetails({
-      tokenAddress,
-      userAddress,
-      transactionData,
-    });
-
-    await waitForNextUpdate();
-
-    expect(result.current).toStrictEqual({
-      assetAddress: tokenAddress,
-      assetName: undefined,
-      assetStandard: standard,
-      decimals,
-      toAddress: `0x${toAddress}`,
-      tokenAmount: '0.0000000000000005',
-      tokenId: undefined,
-      tokenImage: undefined,
-      tokenSymbol: symbol,
-      userBalance: balance,
-    });
-  });
-
-  it('should return object with correct tokenValues for an ERC721 token', async () => {
-    const tokenAddress = '0xBC4CA0EdA7647A8aB7C2061c2E118A18a936f13D';
-    const toAddress = '000000000000000000000000000000000000dead';
-    const tokenId = '12';
-    const transactionData = `0x23b872dd000000000000000000000000a544eebe103733f22ef62af556023bc918b73d36000000000000000000000000${toAddress}000000000000000000000000000000000000000000000000000000000000000${Number(
-      tokenId,
-    ).toString(16)}`;
-
-    const symbol = 'BAYC';
-    const name = 'BoredApeYachtClub';
-    const image =
-      'https://bafybeihw3gvmthmvrenfmcvagtais5tv7r4nmiezgsv7nyknjubxw4lite.ipfs.dweb.link';
-    const standard = ERC721;
-
-    getTokenStandardAndDetailsStub.mockImplementation(() =>
-      Promise.resolve({
-        standard,
-        symbol,
-        name,
-        image,
-      }),
-    );
-
-    const { result, waitForNextUpdate } = renderUseAssetDetails({
-      tokenAddress,
-      transactionData,
-    });
-
-    await waitForNextUpdate();
-
-    expect(result.current).toStrictEqual({
-      assetAddress: tokenAddress,
-      assetName: name,
-      assetStandard: standard,
-      decimals: undefined,
-      toAddress: `0x${toAddress}`,
-      tokenId,
-      tokenImage: image,
-      tokenSymbol: symbol,
-      userBalance: undefined,
-      tokenAmount: undefined,
-    });
-  });
-
-  it('should return object with correct tokenValues for an ERC1155 token', async () => {
-    const tokenAddress = '0x76BE3b62873462d2142405439777e971754E8E77';
-    const toAddress = '000000000000000000000000000000000000dead';
-    const tokenId = '802';
-    const transactionData = `0xf242432a000000000000000000000000a544eebe103733f22ef62af556023bc918b73d36000000000000000000000000000000000000000000000000000000000000dead0000000000000000000000000000000000000000000000000000000000000${Number(
-      tokenId,
-    ).toString(
-      16,
-    )}000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000`;
-
-    const image =
-      'https://bafybeihw3gvmthmvrenfmcvagtais5tv7r4nmiezgsv7nyknjubxw4lite.ipfs.dweb.link';
-    const standard = ERC1155;
-
-    getTokenStandardAndDetailsStub.mockImplementation(() =>
-      Promise.resolve({
-        standard,
-        image,
-      }),
-    );
-
-    const { result, waitForNextUpdate } = renderUseAssetDetails({
-      tokenAddress,
-      transactionData,
-    });
-
-    await waitForNextUpdate();
-
-    expect(result.current).toStrictEqual({
-      assetAddress: tokenAddress,
-      assetName: undefined,
-      assetStandard: standard,
-      decimals: undefined,
-      toAddress: `0x${toAddress}`,
-      tokenId,
-      tokenImage: image,
-      tokenSymbol: '',
-      userBalance: undefined,
-      tokenAmount: undefined,
-    });
-  });
-});
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index 474bf814f08a..ee47225c8ee7 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -8,7 +8,6 @@ import { camelCaseToCapitalize } from '../helpers/utils/common.util';
 import { PRIMARY, SECONDARY } from '../helpers/constants/common';
 import {
   getTokenAddressParam,
-  getTokenIdParam,
   getTokenValueParam,
 } from '../helpers/utils/token-util';
 import {
@@ -38,41 +37,17 @@ import { useTokenData } from './useTokenData';
 import { useSwappedTokenValue } from './useSwappedTokenValue';
 import { useCurrentAsset } from './useCurrentAsset';
 
-/**
- *  There are seven types of transaction entries that are currently differentiated in the design:
- *  1. Signature request
- *  2. Send (sendEth sendTokens)
- *  3. Deposit
- *  4. Site interaction
- *  5. Approval
- *  6. Swap
- *  7. Swap Approval
- */
-const signatureTypes = [
-  null,
-  undefined,
-  TRANSACTION_TYPES.SIGN,
-  TRANSACTION_TYPES.PERSONAL_SIGN,
-  TRANSACTION_TYPES.SIGN_TYPED_DATA,
-  TRANSACTION_TYPES.ETH_DECRYPT,
-  TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY,
-];
-
-/**
- * @typedef {(import('../../selectors/transactions').TransactionGroup} TransactionGroup
- */
-
 /**
  * @typedef {Object} TransactionDisplayData
- * @property {string} category - the transaction category that will be used for rendering the icon in the activity list
+ * @property {string} title - primary description of the transaction
+ * @property {string} subtitle - supporting text describing the transaction
+ * @property {bool} subtitleContainsOrigin - true if the subtitle includes the origin of the tx
+ * @property {string} category - the transaction category
  * @property {string} primaryCurrency - the currency string to display in the primary position
- * @property {string} recipientAddress - the Ethereum address of the recipient
- * @property {string} senderAddress - the Ethereum address of the sender
- * @property {string} status - the status of the transaction
- * @property {string} subtitle - the supporting text describing the transaction
- * @property {boolean} subtitleContainsOrigin - true if the subtitle includes the origin of the tx
- * @property {string} title - the primary title of the tx that will be displayed in the activity list
  * @property {string} [secondaryCurrency] - the currency string to display in the secondary position
+ * @property {string} status - the status of the transaction
+ * @property {string} senderAddress - the Ethereum address of the sender
+ * @property {string} recipientAddress - the Ethereum address of the recipient
  */
 
 /**
@@ -83,7 +58,7 @@ const signatureTypes = [
  * of data that can power all views related to a transaction. Presently the main
  * case is for shared logic between transaction-list-item and transaction-detail-view
  *
- * @param {TransactionGroup} transactionGroup - group of transactions of the same nonce
+ * @param {Object} transactionGroup - group of transactions
  * @returns {TransactionDisplayData}
  */
 export function useTransactionDisplayData(transactionGroup) {
@@ -94,10 +69,10 @@ export function useTransactionDisplayData(transactionGroup) {
   const knownTokens = useSelector(getTokens);
   const knownCollectibles = useSelector(getCollectibles);
   const t = useI18nContext();
-
   const { initialTransaction, primaryTransaction } = transactionGroup;
   // initialTransaction contains the data we need to derive the primary purpose of this transaction group
   const { type } = initialTransaction;
+
   const { from: senderAddress, to } = initialTransaction.txParams || {};
 
   // for smart contract interactions, methodData can be used to derive the name of the action being taken
@@ -111,9 +86,8 @@ export function useTransactionDisplayData(transactionGroup) {
   const isSubmitted = displayedStatusKey === TRANSACTION_STATUSES.SUBMITTED;
 
   const primaryValue = primaryTransaction.txParams?.value;
-  const date = formatDateWithYearContext(initialTransaction.time);
-
   let prefix = '-';
+  const date = formatDateWithYearContext(initialTransaction.time);
   let subtitle;
   let subtitleContainsOrigin = false;
   let recipientAddress = to;
@@ -139,18 +113,16 @@ export function useTransactionDisplayData(transactionGroup) {
     isTokenCategory,
   );
 
-  // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
-  // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
-  // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
-  const transactionDataTokenId =
-    getTokenIdParam(tokenData) ?? getTokenValueParam(tokenData);
+  // If this is an ERC20 token transaction this value is equal to the amount sent
+  // If it is an ERC721 token transaction it is the tokenId being sent
+  const tokenAmountOrTokenId = getTokenValueParam(tokenData);
 
   const collectible =
     isTokenCategory &&
     knownCollectibles.find(
       ({ address, tokenId }) =>
         isEqualCaseInsensitive(address, recipientAddress) &&
-        tokenId === transactionDataTokenId,
+        tokenId === tokenAmountOrTokenId,
     );
 
   const tokenDisplayValue = useTokenDisplayValue(
@@ -177,8 +149,9 @@ export function useTransactionDisplayData(transactionGroup) {
   // used to display fiat amount of tx. initialized to either tokenFiatAmount or undefined
   // but can later be modified if dealing with a swap
   let secondaryDisplayValue = isTokenCategory ? tokenFiatAmount : undefined;
-
+  // The transaction group category that will be used for rendering the icon in the activity list
   let category;
+  // The primary title of the Tx that will be displayed in the activity list
   let title;
 
   const {
@@ -188,6 +161,25 @@ export function useTransactionDisplayData(transactionGroup) {
     isViewingReceivedTokenFromSwap,
   } = useSwappedTokenValue(transactionGroup, currentAsset);
 
+  // There are seven types of transaction entries that are currently differentiated in the design
+  // 1. Signature request
+  // 2. Send (sendEth sendTokens)
+  // 3. Deposit
+  // 4. Site interaction
+  // 5. Approval
+  // 6. Swap
+  // 7. Swap Approval
+
+  const signatureTypes = [
+    null,
+    undefined,
+    TRANSACTION_TYPES.SIGN,
+    TRANSACTION_TYPES.PERSONAL_SIGN,
+    TRANSACTION_TYPES.SIGN_TYPED_DATA,
+    TRANSACTION_TYPES.ETH_DECRYPT,
+    TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY,
+  ];
+
   if (signatureTypes.includes(type)) {
     category = TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST;
     title = t('signatureRequest');
@@ -225,12 +217,6 @@ export function useTransactionDisplayData(transactionGroup) {
     title = t('approveSpendLimit', [token?.symbol || t('token')]);
     subtitle = origin;
     subtitleContainsOrigin = true;
-  } else if (type === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL) {
-    category = TRANSACTION_GROUP_CATEGORIES.APPROVAL;
-    prefix = '';
-    title = t('setApprovalForAllTitle', [token?.symbol || t('token')]);
-    subtitle = origin;
-    subtitleContainsOrigin = true;
   } else if (type === TRANSACTION_TYPES.CONTRACT_INTERACTION) {
     category = TRANSACTION_GROUP_CATEGORIES.INTERACTION;
     const transactionTypeTitle = getTransactionTypeTitle(t, type);
@@ -252,7 +238,8 @@ export function useTransactionDisplayData(transactionGroup) {
     subtitle = t('fromAddress', [shortenAddress(senderAddress)]);
   } else if (
     type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER
+    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
+    type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
   ) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('sendSpecifiedTokens', [
@@ -260,11 +247,6 @@ export function useTransactionDisplayData(transactionGroup) {
     ]);
     recipientAddress = getTokenAddressParam(tokenData);
     subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
-  } else if (type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM) {
-    category = TRANSACTION_GROUP_CATEGORIES.SEND;
-    title = t('safeTransferFrom');
-    recipientAddress = getTokenAddressParam(tokenData);
-    subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
   } else if (type === TRANSACTION_TYPES.SIMPLE_SEND) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('send');
diff --git a/ui/hooks/useTransactionDisplayData.test.js b/ui/hooks/useTransactionDisplayData.test.js
index b30ea254db18..29e4d43d269d 100644
--- a/ui/hooks/useTransactionDisplayData.test.js
+++ b/ui/hooks/useTransactionDisplayData.test.js
@@ -131,7 +131,7 @@ const expectedResults = [
     displayedStatusKey: TRANSACTION_STATUSES.CONFIRMED,
   },
   {
-    title: 'Safe Transfer From',
+    title: 'Send Token',
     category: TRANSACTION_GROUP_CATEGORIES.SEND,
     subtitle: 'To: 0xe7d...dd98',
     subtitleContainsOrigin: true,
diff --git a/ui/index.js b/ui/index.js
index 842d0f2a9b5a..5c90d00a1fa1 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -1,13 +1,12 @@
 import copyToClipboard from 'copy-to-clipboard';
 import log from 'loglevel';
-import { clone, memoize } from 'lodash';
+import { clone } from 'lodash';
 import React from 'react';
 import { render } from 'react-dom';
 import browser from 'webextension-polyfill';
 
 import { getEnvironmentType } from '../app/scripts/lib/util';
 import { ALERT_TYPES } from '../shared/constants/alerts';
-import { maskObject } from '../shared/modules/object.utils';
 import { SENTRY_STATE } from '../app/scripts/lib/setupSentry';
 import { ENVIRONMENT_TYPE_POPUP } from '../shared/constants/app';
 import * as actions from './store/actions';
@@ -37,7 +36,7 @@ export default function launchMetamaskUi(opts, cb) {
   // check if we are unlocked first
   backgroundConnection.getState(function (err, metamaskState) {
     if (err) {
-      cb(err, metamaskState);
+      cb(err);
       return;
     }
     startApp(metamaskState, backgroundConnection, opts).then((store) => {
@@ -47,31 +46,21 @@ export default function launchMetamaskUi(opts, cb) {
   });
 }
 
-const _setupLocale = async (currentLocale) => {
-  const currentLocaleMessages = currentLocale
-    ? await fetchLocale(currentLocale)
-    : {};
-  const enLocaleMessages = await fetchLocale('en');
-
-  await loadRelativeTimeFormatLocaleData('en');
-  if (currentLocale) {
-    await loadRelativeTimeFormatLocaleData(currentLocale);
-  }
-
-  return { currentLocaleMessages, enLocaleMessages };
-};
-
-export const setupLocale = memoize(_setupLocale);
-
 async function startApp(metamaskState, backgroundConnection, opts) {
   // parse opts
   if (!metamaskState.featureFlags) {
     metamaskState.featureFlags = {};
   }
 
-  const { currentLocaleMessages, enLocaleMessages } = await setupLocale(
-    metamaskState.currentLocale,
-  );
+  const currentLocaleMessages = metamaskState.currentLocale
+    ? await fetchLocale(metamaskState.currentLocale)
+    : {};
+  const enLocaleMessages = await fetchLocale('en');
+
+  await loadRelativeTimeFormatLocaleData('en');
+  if (metamaskState.currentLocale) {
+    await loadRelativeTimeFormatLocaleData(metamaskState.currentLocale);
+  }
 
   if (metamaskState.textDirection === 'rtl') {
     await switchDirection('rtl');
@@ -172,6 +161,29 @@ async function startApp(metamaskState, backgroundConnection, opts) {
   return store;
 }
 
+/**
+ * Return a "masked" copy of the given object.
+ *
+ * The returned object includes only the properties present in the mask. The
+ * mask is an object that mirrors the structure of the given object, except
+ * the only values are `true` or a sub-mask. `true` implies the property
+ * should be included, and a sub-mask implies the property should be further
+ * masked according to that sub-mask.
+ *
+ * @param {Object} object - The object to mask
+ * @param {Object<Object|boolean>} mask - The mask to apply to the object
+ */
+function maskObject(object, mask) {
+  return Object.keys(object).reduce((state, key) => {
+    if (mask[key] === true) {
+      state[key] = object[key];
+    } else if (mask[key]) {
+      state[key] = maskObject(object[key], mask[key]);
+    }
+    return state;
+  }, {});
+}
+
 function setupDebuggingHelpers(store) {
   window.getCleanAppState = async function () {
     const state = clone(store.getState());
diff --git a/ui/index.test.js b/ui/index.test.js
deleted file mode 100644
index 9cb44c025b9b..000000000000
--- a/ui/index.test.js
+++ /dev/null
@@ -1,70 +0,0 @@
-import { setupLocale } from '.';
-
-const enMessages = {
-  troubleStarting: {
-    message:
-      'MetaMask had trouble starting. This error could be intermittent, so try restarting the extension.',
-  },
-  restartMetamask: {
-    message: 'Restart MetaMask',
-  },
-  stillGettingMessage: {
-    message: 'Still getting this message?',
-  },
-  sendBugReport: {
-    message: 'Send us a bug report.',
-  },
-};
-
-const esMessages = {
-  troubleStarting: {
-    message:
-      'MetaMask tuvo problemas para iniciarse. Este error podría ser intermitente, así que intente reiniciar la extensión.',
-  },
-  restartMetamask: {
-    message: 'Reiniciar metamáscara',
-  },
-  sendBugReport: {
-    message: 'Envíenos un informe de errores.',
-  },
-};
-
-jest.mock('./helpers/utils/i18n-helper', () => ({
-  fetchLocale: jest.fn((locale) => (locale === 'en' ? enMessages : esMessages)),
-  loadRelativeTimeFormatLocaleData: jest.fn(),
-}));
-
-describe('Index Tests', () => {
-  it('should get locale messages by calling setupLocale', async () => {
-    let result = await setupLocale('en');
-    const { currentLocaleMessages: clm, enLocaleMessages: elm } = result;
-    expect(clm).toBeDefined();
-    expect(elm).toBeDefined();
-    expect(clm.troubleStarting).toStrictEqual(enMessages.troubleStarting);
-
-    expect(clm.restartMetamask).toStrictEqual(enMessages.restartMetamask);
-
-    expect(clm.stillGettingMessage).toStrictEqual(
-      enMessages.stillGettingMessage,
-    );
-
-    expect(clm.sendBugReport).toStrictEqual(enMessages.sendBugReport);
-
-    result = await setupLocale('es');
-
-    const { currentLocaleMessages: clm2, enLocaleMessages: elm2 } = result;
-    expect(clm2).toBeDefined();
-    expect(elm2).toBeDefined();
-
-    expect(clm2.troubleStarting).toStrictEqual(esMessages.troubleStarting);
-
-    expect(clm2.restartMetamask).toStrictEqual(esMessages.restartMetamask);
-
-    expect(clm2.stillGettingMessage).toBeUndefined();
-    expect(elm2.stillGettingMessage).toStrictEqual(
-      enMessages.stillGettingMessage,
-    );
-
-    expect(clm2.sendBugReport).toStrictEqual(esMessages.sendBugReport);
-  });
-});
diff --git a/ui/pages/add-collectible/add-collectible.js b/ui/pages/add-collectible/add-collectible.js
index fd923d1ee411..7d9112a923ce 100644
--- a/ui/pages/add-collectible/add-collectible.js
+++ b/ui/pages/add-collectible/add-collectible.js
@@ -4,6 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { util } from '@metamask/controllers';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
+
 import {
   DISPLAY,
   FONT_WEIGHT,
@@ -17,7 +18,7 @@ import PageContainer from '../../components/ui/page-container';
 import {
   addCollectibleVerifyOwnership,
   getTokenStandardAndDetails,
-  ignoreTokens,
+  removeToken,
   setNewCollectibleAddedMessage,
 } from '../../store/actions';
 import FormField from '../../components/ui/form-field';
@@ -54,7 +55,9 @@ export default function AddCollectible() {
 
   const handleAddCollectible = async () => {
     try {
-      await dispatch(addCollectibleVerifyOwnership(address, tokenId));
+      await dispatch(
+        addCollectibleVerifyOwnership(address, tokenId.toString()),
+      );
     } catch (error) {
       const { message } = error;
       dispatch(setNewCollectibleAddedMessage(message));
@@ -63,10 +66,7 @@ export default function AddCollectible() {
     }
     if (contractAddressToConvertFromTokenToCollectible) {
       await dispatch(
-        ignoreTokens({
-          tokensToIgnore: contractAddressToConvertFromTokenToCollectible,
-          dontShowLoadingIndicator: true,
-        }),
+        removeToken(contractAddressToConvertFromTokenToCollectible),
       );
     }
     dispatch(setNewCollectibleAddedMessage('success'));
@@ -99,7 +99,7 @@ export default function AddCollectible() {
   };
 
   const validateAndSetTokenId = (val) => {
-    setDisabled(!util.isValidHexAddress(address) || !val || isNaN(Number(val)));
+    setDisabled(!util.isValidHexAddress(address) || !val);
     setTokenId(val);
   };
 
@@ -149,7 +149,7 @@ export default function AddCollectible() {
           )}
           <Box margin={4}>
             <FormField
-              dataTestId="address"
+              id="address"
               titleText={t('address')}
               placeholder="0x..."
               value={address}
@@ -161,7 +161,7 @@ export default function AddCollectible() {
               autoFocus
             />
             <FormField
-              dataTestId="token-id"
+              id="token-id"
               titleText={t('tokenId')}
               placeholder={t('nftTokenIdPlaceholder')}
               value={tokenId}
@@ -170,6 +170,7 @@ export default function AddCollectible() {
                 setCollectibleAddFailed(false);
               }}
               tooltipText={t('importNFTTokenIdToolTip')}
+              numeric
             />
           </Box>
         </Box>
diff --git a/ui/pages/add-collectible/add-collectible.test.js b/ui/pages/add-collectible/add-collectible.test.js
deleted file mode 100644
index be693e444447..000000000000
--- a/ui/pages/add-collectible/add-collectible.test.js
+++ /dev/null
@@ -1,79 +0,0 @@
-import React from 'react';
-import { fireEvent } from '@testing-library/react';
-import configureMockStore from 'redux-mock-store';
-import { renderWithProvider } from '../../../test/jest/rendering';
-import * as Actions from '../../store/actions';
-import AddCollectible from '.';
-
-const VALID_ADDRESS = '0x312BE6a98441F9F6e3F6246B13CA19701e0AC3B9';
-const INVALID_ADDRESS = 'aoinsafasdfa';
-const VALID_TOKENID = '1201';
-const INVALID_TOKENID = 'abcde';
-
-describe('AddCollectible', () => {
-  const store = configureMockStore([])({
-    metamask: { provider: { chainId: '0x1' } },
-  });
-
-  it('should enable the "Add" button when valid entries are input into both Address and TokenId fields', () => {
-    const { getByTestId, getByText } = renderWithProvider(
-      <AddCollectible />,
-      store,
-    );
-    expect(getByText('Add')).not.toBeEnabled();
-    fireEvent.change(getByTestId('address'), {
-      target: { value: VALID_ADDRESS },
-    });
-    fireEvent.change(getByTestId('token-id'), {
-      target: { value: VALID_TOKENID },
-    });
-    expect(getByText('Add')).toBeEnabled();
-  });
-
-  it('should not enable the "Add" button when an invalid entry is input into one or both Address and TokenId fields', () => {
-    const { getByTestId, getByText } = renderWithProvider(
-      <AddCollectible />,
-      store,
-    );
-    expect(getByText('Add')).not.toBeEnabled();
-    fireEvent.change(getByTestId('address'), {
-      target: { value: INVALID_ADDRESS },
-    });
-    fireEvent.change(getByTestId('token-id'), {
-      target: { value: VALID_TOKENID },
-    });
-    expect(getByText('Add')).not.toBeEnabled();
-    fireEvent.change(getByTestId('address'), {
-      target: { value: VALID_ADDRESS },
-    });
-    expect(getByText('Add')).toBeEnabled();
-    fireEvent.change(getByTestId('token-id'), {
-      target: { value: INVALID_TOKENID },
-    });
-    expect(getByText('Add')).not.toBeEnabled();
-  });
-
-  it('should call addCollectibleVerifyOwnership action with correct values (tokenId should not be in scientific notation)', () => {
-    const { getByTestId, getByText } = renderWithProvider(
-      <AddCollectible />,
-      store,
-    );
-    fireEvent.change(getByTestId('address'), {
-      target: { value: VALID_ADDRESS },
-    });
-    const LARGE_TOKEN_ID = Number.MAX_SAFE_INTEGER + 1;
-    fireEvent.change(getByTestId('token-id'), {
-      target: { value: LARGE_TOKEN_ID },
-    });
-    const addCollectibleVerifyOwnershipSpy = jest.spyOn(
-      Actions,
-      'addCollectibleVerifyOwnership',
-    );
-
-    fireEvent.click(getByText('Add'));
-    expect(addCollectibleVerifyOwnershipSpy).toHaveBeenCalledWith(
-      '0x312BE6a98441F9F6e3F6246B13CA19701e0AC3B9',
-      '9007199254740992',
-    );
-  });
-});
diff --git a/ui/pages/asset/asset.scss b/ui/pages/asset/asset.scss
index 0b1b8543eb3b..c717f96503fa 100644
--- a/ui/pages/asset/asset.scss
+++ b/ui/pages/asset/asset.scss
@@ -4,7 +4,7 @@
   }
 
   &__overview {
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 3px 4px rgba(135, 134, 134, 0.16);
   }
 }
 
diff --git a/ui/pages/asset/components/asset-options.js b/ui/pages/asset/components/asset-options.js
index 4d7aef44f56f..160c7788316b 100644
--- a/ui/pages/asset/components/asset-options.js
+++ b/ui/pages/asset/components/asset-options.js
@@ -85,39 +85,14 @@ const AssetOptions = ({
   );
 };
 
-const isNotFunc = (p) => {
-  return typeof p !== 'function';
-};
-
 AssetOptions.propTypes = {
   isEthNetwork: PropTypes.bool,
   isNativeAsset: PropTypes.bool,
+  onRemove: PropTypes.func.isRequired,
   onClickBlockExplorer: PropTypes.func.isRequired,
   onViewAccountDetails: PropTypes.func.isRequired,
-  onRemove: (props) => {
-    if (props.isNativeAsset === false && isNotFunc(props.onRemove)) {
-      throw new Error(
-        'When isNativeAsset is true, onRemove is a required prop',
-      );
-    }
-  },
-  onViewTokenDetails: (props) => {
-    if (props.isNativeAsset === false && isNotFunc(props.onViewTokenDetails)) {
-      throw new Error(
-        'When isNativeAsset is true, onViewTokenDetails is a required prop',
-      );
-    }
-  },
-  tokenSymbol: (props) => {
-    if (
-      props.isNativeAsset === false &&
-      typeof props.tokenSymbol !== 'string'
-    ) {
-      throw new Error(
-        'When isNativeAsset is true, tokenSymbol is a required prop',
-      );
-    }
-  },
+  onViewTokenDetails: PropTypes.func.isRequired,
+  tokenSymbol: PropTypes.string,
 };
 
 export default AssetOptions;
diff --git a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
index 26363fdd9d1b..919f68fd1ce2 100644
--- a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
+++ b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
@@ -13,11 +13,9 @@ import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getSuggestedAssets } from '../../selectors';
 import { rejectWatchAsset, acceptWatchAsset } from '../../store/actions';
+import { TOKEN_STANDARDS } from '../../helpers/constants/common';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-} from '../../../shared/constants/transaction';
+import { ASSET_TYPES } from '../../../shared/constants/transaction';
 
 function getTokenName(name, symbol) {
   return name === undefined ? symbol : `${name} (${symbol})`;
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 6c526c95e0e8..7487e594b9a3 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -28,11 +28,7 @@ import { SECOND } from '../../../../shared/constants/time';
 import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content';
 import GasDetailsItem from '../../../components/app/gas-details-item';
 import LedgerInstructionField from '../../../components/app/ledger-instruction-field';
-import {
-  ERC1155,
-  ERC20,
-  ERC721,
-} from '../../../../shared/constants/transaction';
+import { ERC1155, ERC20, ERC721 } from '../../../helpers/constants/common';
 
 export default class ConfirmApproveContent extends Component {
   static contextTypes = {
@@ -66,7 +62,6 @@ export default class ConfirmApproveContent extends Component {
     txData: PropTypes.object,
     fromAddressIsLedger: PropTypes.bool,
     chainId: PropTypes.string,
-    tokenAddress: PropTypes.string,
     rpcPrefs: PropTypes.object,
     isContract: PropTypes.bool,
     hexTransactionTotal: PropTypes.string,
@@ -75,9 +70,6 @@ export default class ConfirmApproveContent extends Component {
     assetName: PropTypes.string,
     tokenId: PropTypes.string,
     assetStandard: PropTypes.string,
-    isSetApproveForAll: PropTypes.bool,
-    setApproveForAllArg: PropTypes.bool,
-    userAddress: PropTypes.string,
   };
 
   state = {
@@ -107,7 +99,7 @@ export default class ConfirmApproveContent extends Component {
       >
         {showHeader && (
           <div className="confirm-approve-content__card-header">
-            {supportsEIP1559V2 && title === t('transactionFee') ? null : (
+            {!supportsEIP1559V2 && (
               <>
                 <div className="confirm-approve-content__card-header__symbol">
                   {symbol}
@@ -191,9 +183,7 @@ export default class ConfirmApproveContent extends Component {
 
   renderERC721OrERC1155PermissionContent() {
     const { t } = this.context;
-    const { origin, toAddress, isContract, isSetApproveForAll } = this.props;
-
-    const titleTokenDescription = this.getTitleTokenDescription();
+    const { origin, toAddress, isContract, assetName, tokenId } = this.props;
 
     const displayedAddress = isContract
       ? `${t('contract')} (${addressSummary(toAddress)})`
@@ -208,9 +198,7 @@ export default class ConfirmApproveContent extends Component {
             {t('approvedAsset')}:
           </div>
           <div className="confirm-approve-content__medium-text">
-            {isSetApproveForAll
-              ? t('allOfYour', [titleTokenDescription])
-              : titleTokenDescription}
+            {`${assetName} #${tokenId}`}
           </div>
         </div>
         <div className="flex-row">
@@ -308,19 +296,12 @@ export default class ConfirmApproveContent extends Component {
 
   renderDataContent() {
     const { t } = this.context;
-    const { data, isSetApproveForAll, setApproveForAllArg } = this.props;
+    const { data } = this.props;
     return (
       <div className="flex-column">
         <div className="confirm-approve-content__small-text">
-          {isSetApproveForAll
-            ? t('functionSetApprovalForAll')
-            : t('functionApprove')}
+          {t('functionApprove')}
         </div>
-        {isSetApproveForAll && setApproveForAllArg !== undefined ? (
-          <div className="confirm-approve-content__small-text">
-            {`${t('parameters')}: ${setApproveForAllArg}`}
-          </div>
-        ) : null}
         <div className="confirm-approve-content__small-text confirm-approve-content__data__data-block">
           {data}
         </div>
@@ -449,124 +430,6 @@ export default class ConfirmApproveContent extends Component {
     );
   }
 
-  getTitleTokenDescription() {
-    const {
-      tokenId,
-      assetName,
-      tokenAddress,
-      rpcPrefs,
-      chainId,
-      assetStandard,
-      tokenSymbol,
-      isSetApproveForAll,
-      userAddress,
-    } = this.props;
-    const { t } = this.context;
-    let titleTokenDescription = t('token');
-    if (rpcPrefs?.blockExplorerUrl || chainId) {
-      const unknownTokenBlockExplorerLink = getTokenTrackerLink(
-        tokenAddress,
-        chainId,
-        null,
-        userAddress,
-        {
-          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
-        },
-      );
-
-      const unknownTokenLink = (
-        <a
-          href={unknownTokenBlockExplorerLink}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="confirm-approve-content__unknown-asset"
-        >
-          {t('token')}
-        </a>
-      );
-      titleTokenDescription = unknownTokenLink;
-    }
-
-    if (
-      assetStandard === ERC20 ||
-      (tokenSymbol && !tokenId && !isSetApproveForAll)
-    ) {
-      titleTokenDescription = tokenSymbol;
-    } else if (
-      assetStandard === ERC721 ||
-      assetStandard === ERC1155 ||
-      // if we don't have an asset standard but we do have either both an assetname and a tokenID or both a tokenSymbol and tokenId we assume its an NFT
-      (assetName && tokenId) ||
-      (tokenSymbol && tokenId)
-    ) {
-      const tokenIdWrapped = tokenId ? ` (#${tokenId})` : '';
-      if (assetName || tokenSymbol) {
-        titleTokenDescription = `${assetName ?? tokenSymbol}${tokenIdWrapped}`;
-      } else {
-        const unknownNFTBlockExplorerLink = getTokenTrackerLink(
-          tokenAddress,
-          chainId,
-          null,
-          userAddress,
-          {
-            blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
-          },
-        );
-        const unknownNFTLink = (
-          <>
-            <a
-              href={unknownNFTBlockExplorerLink}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="confirm-approve-content__unknown-asset"
-            >
-              {t('nft')}
-            </a>
-            {tokenIdWrapped && <span>{tokenIdWrapped}</span>}
-          </>
-        );
-        titleTokenDescription = unknownNFTLink;
-      }
-    }
-
-    return titleTokenDescription;
-  }
-
-  renderTitle() {
-    const { t } = this.context;
-    const { isSetApproveForAll, setApproveForAllArg } = this.props;
-    const titleTokenDescription = this.getTitleTokenDescription();
-
-    let title;
-
-    if (isSetApproveForAll) {
-      title = t('approveAllTokensTitle', [titleTokenDescription]);
-      if (setApproveForAllArg === false) {
-        title = t('revokeAllTokensTitle', [titleTokenDescription]);
-      }
-    }
-    return title || t('allowSpendToken', [titleTokenDescription]);
-  }
-
-  renderDescription() {
-    const { t } = this.context;
-    const { isContract, isSetApproveForAll, setApproveForAllArg } = this.props;
-    const grantee = isContract
-      ? t('contract').toLowerCase()
-      : t('account').toLowerCase();
-
-    let description = t('trustSiteApprovePermission', [grantee]);
-
-    if (isSetApproveForAll && setApproveForAllArg === false) {
-      description = t('revokeApproveForAllDescription', [
-        grantee,
-        this.getTitleTokenDescription(),
-      ]);
-    }
-
-    return description;
-  }
-
   render() {
     const { t } = this.context;
     const {
@@ -589,7 +452,8 @@ export default class ConfirmApproveContent extends Component {
       rpcPrefs,
       isContract,
       assetStandard,
-      userAddress,
+      tokenId,
+      assetName,
     } = this.props;
     const { showFullTxDetails } = this.state;
 
@@ -632,10 +496,18 @@ export default class ConfirmApproveContent extends Component {
           </Box>
         </Box>
         <div className="confirm-approve-content__title">
-          {this.renderTitle()}
+          {t('allowSpendToken', [
+            assetStandard === ERC20
+              ? tokenSymbol
+              : `${assetName} (#${tokenId})`,
+          ])}
         </div>
         <div className="confirm-approve-content__description">
-          {this.renderDescription()}
+          {t('trustSiteApprovePermission', [
+            isContract
+              ? t('contract').toLowerCase()
+              : t('account').toLowerCase(),
+          ])}
         </div>
         <Box className="confirm-approve-content__address-display-content">
           <Box display={DISPLAY.FLEX}>
@@ -676,15 +548,13 @@ export default class ConfirmApproveContent extends Component {
               className="confirm-approve-content__etherscan-link"
               onClick={() => {
                 const blockExplorerTokenLink = isContract
-                  ? getTokenTrackerLink(toAddress, chainId, null, userAddress, {
+                  ? getTokenTrackerLink(toAddress, chainId, null, null, {
                       blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
                     })
                   : getAccountLink(
                       toAddress,
                       chainId,
-                      {
-                        blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
-                      },
+                      { blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null },
                       null,
                     );
                 global.platform.openTab({
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
index 56824d37745d..dd9cd8dd405c 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/jest/rendering';
-import { ERC20 } from '../../../../shared/constants/transaction';
+import { ERC20 } from '../../../helpers/constants/common';
 import ConfirmApproveContent from '.';
 
 const renderComponent = (props) => {
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
index ca30abe1d6cb..de304a1c90c9 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ERC20 } from '../../../../shared/constants/transaction';
+import { ERC20 } from '../../../helpers/constants/common';
 import ConfirmApproveContent from '.';
 
 export default {
diff --git a/ui/pages/confirm-approve/confirm-approve-content/index.scss b/ui/pages/confirm-approve/confirm-approve-content/index.scss
index 473be2f7b963..0f2593ee46a3 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/index.scss
+++ b/ui/pages/confirm-approve/confirm-approve-content/index.scss
@@ -9,10 +9,6 @@
     padding: 0 24px 16px 24px;
   }
 
-  &__unknown-asset {
-    color: var(--color-primary-default);
-  }
-
   &__icon-display-content {
     display: flex;
     height: 51px;
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index fba2d62f3f48..246baca771da 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -8,10 +8,7 @@ import {
   updateCustomNonce,
   getNextNonce,
 } from '../../store/actions';
-import {
-  calcTokenAmount,
-  getTokenApprovedParam,
-} from '../../helpers/utils/token-util';
+import { calcTokenAmount } from '../../helpers/utils/token-util';
 import { readAddressAsContract } from '../../../shared/modules/contract-utils';
 import { GasFeeContextProvider } from '../../contexts/gasFee';
 import { TransactionModalContextProvider } from '../../contexts/transaction-modal';
@@ -36,8 +33,7 @@ import AdvancedGasFeePopover from '../../components/app/advanced-gas-fee-popover
 import EditGasFeePopover from '../../components/app/edit-gas-fee-popover';
 import EditGasPopover from '../../components/app/edit-gas-popover/edit-gas-popover.component';
 import Loading from '../../components/ui/loading-screen';
-import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
-import { ERC1155, ERC20, ERC721 } from '../../../shared/constants/transaction';
+import { ERC20, ERC1155, ERC721 } from '../../helpers/constants/common';
 import { getCustomTxParamsData } from './confirm-approve.util';
 import ConfirmApproveContent from './confirm-approve-content';
 
@@ -56,12 +52,10 @@ export default function ConfirmApprove({
   tokenId,
   userAddress,
   toAddress,
-  tokenAddress,
   transaction,
   ethTransactionTotal,
   fiatTransactionTotal,
   hexTransactionTotal,
-  isSetApproveForAll,
 }) {
   const dispatch = useDispatch();
   const { txParams: { data: transactionData } = {} } = transaction;
@@ -155,11 +149,6 @@ export default function ConfirmApprove({
       })
     : null;
 
-  const parsedTransactionData = parseStandardTokenTransactionData(
-    transactionData,
-  );
-  const setApproveForAllArg = getTokenApprovedParam(parsedTransactionData);
-
   return tokenSymbol === undefined && assetName === undefined ? (
     <Loading />
   ) : (
@@ -172,9 +161,6 @@ export default function ConfirmApprove({
         contentComponent={
           <TransactionModalContextProvider>
             <ConfirmApproveContent
-              userAddress={userAddress}
-              isSetApproveForAll={isSetApproveForAll}
-              setApproveForAllArg={setApproveForAllArg}
               decimals={decimals}
               siteImage={siteImage}
               setCustomAmount={setCustomPermissionAmount}
@@ -187,7 +173,6 @@ export default function ConfirmApprove({
               tokenId={tokenId}
               assetName={assetName}
               assetStandard={assetStandard}
-              tokenAddress={tokenAddress}
               showCustomizeGasModal={approveTransaction}
               showEditApprovalPermissionModal={({
                 /* eslint-disable no-shadow */
@@ -283,7 +268,6 @@ export default function ConfirmApprove({
 ConfirmApprove.propTypes = {
   assetStandard: PropTypes.string,
   assetName: PropTypes.string,
-  tokenAddress: PropTypes.string,
   userBalance: PropTypes.string,
   tokenSymbol: PropTypes.string,
   decimals: PropTypes.string,
@@ -303,5 +287,4 @@ ConfirmApprove.propTypes = {
   ethTransactionTotal: PropTypes.string,
   fiatTransactionTotal: PropTypes.string,
   hexTransactionTotal: PropTypes.string,
-  isSetApproveForAll: PropTypes.bool,
 };
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
index 01988e2b71c6..a619e5837f11 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
diff --git a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
index b2112a6e262b..f6dd81d8e190 100644
--- a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
+++ b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
@@ -1,22 +1,60 @@
 /* eslint-disable react/prop-types */
-import React from 'react';
+import React, { useEffect } from 'react';
+
+import { select } from '@storybook/addon-knobs';
+import { store } from '../../../.storybook/preview';
+import { updateTransactionParams } from '../../store/actions';
 import ConfirmDeployContract from '.';
 
 export default {
   title: 'Pages/ConfirmDeployContract',
   id: __filename,
-  component: ConfirmDeployContract,
-  argTypes: {
-    txData: {
-      control: {
-        type: 'object',
-      },
-    },
-  },
 };
 
-export const DefaultStory = (args) => {
-  return <ConfirmDeployContract {...args} />;
+// transaction ID
+const id = 3111025347726181;
+
+const PageSet = ({ children }) => {
+  const options = [];
+  const receiverOptions = {
+    'Address 1': '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
+    'Address 2': '0x55e0bfb2d400e9be8cf9b114e38a40969a02f69a',
+  };
+  const state = store.getState();
+  const { identities } = state.metamask;
+  Object.keys(identities).forEach(function (key) {
+    options.push({
+      label: identities[key].name,
+      address: key,
+    });
+  });
+  const sender = select('Sender', options, options[0]);
+  const receiver = select(
+    'Receiver',
+    receiverOptions,
+    '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
+  );
+
+  const confirmTransactionState = state.confirmTransaction.txData.txParams;
+
+  useEffect(() => {
+    confirmTransactionState.from = sender.address;
+    store.dispatch(updateTransactionParams(id, confirmTransactionState));
+  }, [sender, confirmTransactionState]);
+
+  useEffect(() => {
+    confirmTransactionState.to = receiver;
+    store.dispatch(updateTransactionParams(id, confirmTransactionState));
+  }, [receiver, confirmTransactionState]);
+  return children;
+};
+
+export const DefaultStory = () => {
+  return (
+    <PageSet>
+      <ConfirmDeployContract />
+    </PageSet>
+  );
 };
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index 92cbf9dae401..026cea6d8c0b 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -7,7 +7,6 @@ import Identicon from '../../components/ui/identicon';
 
 import { EVENT } from '../../../shared/constants/metametrics';
 import { conversionUtil } from '../../../shared/modules/conversion.utils';
-import SiteOrigin from '../../components/ui/site-origin';
 
 export default class ConfirmEncryptionPublicKey extends Component {
   static contextTypes = {
@@ -119,9 +118,7 @@ export default class ConfirmEncryptionPublicKey extends Component {
     const { t } = this.context;
 
     const targetSubjectMetadata = subjectMetadata[txData.origin];
-    const notice = t('encryptionPublicKeyNotice', [
-      <SiteOrigin siteOrigin={txData.origin} key={txData.origin} />,
-    ]);
+    const notice = t('encryptionPublicKeyNotice', [txData.origin]);
     const name = targetSubjectMetadata?.hostname || txData.origin;
 
     return (
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
index 4e7a2c62b8b6..caed0982a408 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -198,7 +198,6 @@
       flex-direction: column;
       align-items: center;
       flex: 1;
-      width: 100%;
     }
 
     &-identicon {
diff --git a/ui/pages/confirm-import-token/confirm-import-token.js b/ui/pages/confirm-import-token/confirm-import-token.js
index dbf32b63b529..e1a2e4e566cb 100644
--- a/ui/pages/confirm-import-token/confirm-import-token.js
+++ b/ui/pages/confirm-import-token/confirm-import-token.js
@@ -13,11 +13,9 @@ import { MetaMetricsContext } from '../../contexts/metametrics';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import { getPendingTokens } from '../../ducks/metamask/metamask';
 import { addTokens, clearPendingTokens } from '../../store/actions';
+import { TOKEN_STANDARDS } from '../../helpers/constants/common';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
-import {
-  ASSET_TYPES,
-  TOKEN_STANDARDS,
-} from '../../../shared/constants/transaction';
+import { ASSET_TYPES } from '../../../shared/constants/transaction';
 
 const getTokenName = (name, symbol) => {
   return name === undefined ? symbol : `${name} (${symbol})`;
diff --git a/ui/pages/confirm-send-ether/confirm-send-ether.container.js b/ui/pages/confirm-send-ether/confirm-send-ether.container.js
index 80318ea46bbb..eb794b6ce395 100644
--- a/ui/pages/confirm-send-ether/confirm-send-ether.container.js
+++ b/ui/pages/confirm-send-ether/confirm-send-ether.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
-import { editExistingTransaction } from '../../ducks/send';
+import { editTransaction } from '../../ducks/send';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import ConfirmSendEther from './confirm-send-ether.component';
@@ -20,9 +20,7 @@ const mapDispatchToProps = (dispatch) => {
   return {
     editTransaction: async (txData) => {
       const { id } = txData;
-      await dispatch(
-        editExistingTransaction(ASSET_TYPES.NATIVE, id.toString()),
-      );
+      await dispatch(editTransaction(ASSET_TYPES.NATIVE, id.toString()));
       dispatch(clearConfirmTransaction());
     },
   };
diff --git a/ui/pages/confirm-send-ether/confirm-send-ether.stories.js b/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
index b4029f6e3f6f..db92dc53790a 100644
--- a/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
+++ b/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
@@ -1,25 +1,59 @@
-import React from 'react';
+import React, { useEffect } from 'react';
+
+import { select } from '@storybook/addon-knobs';
+import { store } from '../../../.storybook/preview';
+import { updateTransactionParams } from '../../store/actions';
 import ConfirmSendEther from '.';
 
 export default {
   title: 'Pages/ConfirmSendEther',
   id: __filename,
-  component: ConfirmSendEther,
-  argTypes: {
-    editTransaction: {
-      action: 'editTransaction',
-    },
-    history: {
-      control: 'object',
-    },
-    txParams: {
-      control: 'object',
-    },
-  },
 };
 
-export const DefaultStory = (args) => {
-  return <ConfirmSendEther {...args} />;
+// transaction id for redux dispatcher
+const id = 3111025347726181;
+
+const PageSet = ({ children }) => {
+  const options = [];
+  const receiverOptions = {
+    'Address 1': '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
+    'Address 2': '0x55e0bfb2d400e9be8cf9b114e38a40969a02f69a',
+  };
+  const state = store.getState();
+  const { identities } = state.metamask;
+  Object.keys(identities).forEach(function (key) {
+    options.push({
+      label: identities[key].name,
+      address: key,
+    });
+  });
+  const sender = select('Sender', options, options[0]);
+  const receiver = select(
+    'Receiver',
+    receiverOptions,
+    '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
+  );
+
+  const confirmTransactionState = state.confirmTransaction.txData.txParams;
+
+  useEffect(() => {
+    confirmTransactionState.from = sender.address;
+    store.dispatch(updateTransactionParams(id, confirmTransactionState));
+  }, [sender, confirmTransactionState]);
+
+  useEffect(() => {
+    confirmTransactionState.to = receiver;
+    store.dispatch(updateTransactionParams(id, confirmTransactionState));
+  }, [receiver, confirmTransactionState]);
+  return children;
+};
+
+export const DefaultStory = () => {
+  return (
+    <PageSet>
+      <ConfirmSendEther />
+    </PageSet>
+  );
 };
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirm-send-token/confirm-send-token.component.js b/ui/pages/confirm-send-token/confirm-send-token.component.js
index 774fbf670675..6e040fb06118 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.component.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.component.js
@@ -6,15 +6,14 @@ import { SEND_ROUTE } from '../../helpers/constants/routes';
 export default class ConfirmSendToken extends Component {
   static propTypes = {
     history: PropTypes.object,
-    editExistingTransaction: PropTypes.func,
+    editTransaction: PropTypes.func,
     tokenAmount: PropTypes.string,
   };
 
   handleEdit(confirmTransactionData) {
-    const { editExistingTransaction, history } = this.props;
-    editExistingTransaction(confirmTransactionData).then(() => {
-      history.push(SEND_ROUTE);
-    });
+    const { editTransaction, history } = this.props;
+    editTransaction(confirmTransactionData);
+    history.push(SEND_ROUTE);
   }
 
   render() {
diff --git a/ui/pages/confirm-send-token/confirm-send-token.container.js b/ui/pages/confirm-send-token/confirm-send-token.container.js
index 62cee9ac38d7..d8a4984244f1 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.container.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.container.js
@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../store/actions';
-import { editExistingTransaction } from '../../ducks/send';
+import { editTransaction } from '../../ducks/send';
 import { sendTokenTokenAmountAndToAddressSelector } from '../../selectors';
 import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import ConfirmSendToken from './confirm-send-token.component';
@@ -18,11 +18,18 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    editExistingTransaction: async ({ txData }) => {
+    editTransaction: ({ txData, tokenData, tokenProps: assetDetails }) => {
       const { id } = txData;
-      await dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, id.toString()));
-      await dispatch(clearConfirmTransaction());
-      await dispatch(showSendTokenPage());
+      dispatch(
+        editTransaction(
+          ASSET_TYPES.TOKEN,
+          id.toString(),
+          tokenData,
+          assetDetails,
+        ),
+      );
+      dispatch(clearConfirmTransaction());
+      dispatch(showSendTokenPage());
     },
   };
 };
diff --git a/ui/pages/confirm-send-token/confirm-send-token.js b/ui/pages/confirm-send-token/confirm-send-token.js
index 9a8625e34a83..8d40d36c9860 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.js
@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import ConfirmTokenTransactionBase from '../confirm-token-transaction-base/confirm-token-transaction-base';
 import { SEND_ROUTE } from '../../helpers/constants/routes';
-import { editExistingTransaction } from '../../ducks/send';
+import { editTransaction } from '../../ducks/send';
 import {
   contractExchangeRateSelector,
   getCurrentCurrency,
@@ -13,13 +13,10 @@ import {
   getConversionRate,
   getNativeCurrency,
 } from '../../ducks/metamask/metamask';
+import { ERC20, ERC721 } from '../../helpers/constants/common';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../store/actions';
-import {
-  ASSET_TYPES,
-  ERC20,
-  ERC721,
-} from '../../../shared/constants/transaction';
+import { ASSET_TYPES } from '../../../shared/constants/transaction';
 
 export default function ConfirmSendToken({
   assetStandard,
@@ -38,17 +35,27 @@ export default function ConfirmSendToken({
   const dispatch = useDispatch();
   const history = useHistory();
 
-  const handleEditTransaction = async ({ txData }) => {
+  const handleEditTransaction = ({
+    txData,
+    tokenData,
+    tokenProps: assetDetails,
+  }) => {
     const { id } = txData;
-    await dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, id.toString()));
+    dispatch(
+      editTransaction(
+        ASSET_TYPES.TOKEN,
+        id.toString(),
+        tokenData,
+        assetDetails,
+      ),
+    );
     dispatch(clearConfirmTransaction());
     dispatch(showSendTokenPage());
   };
 
   const handleEdit = (confirmTransactionData) => {
-    handleEditTransaction(confirmTransactionData).then(() => {
-      history.push(SEND_ROUTE);
-    });
+    handleEditTransaction(confirmTransactionData);
+    history.push(SEND_ROUTE);
   };
   const conversionRate = useSelector(getConversionRate);
   const nativeCurrency = useSelector(getNativeCurrency);
diff --git a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
index 735ede09471b..edacfaa8aa1d 100644
--- a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
+++ b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
@@ -15,7 +15,13 @@ import {
   getWeiHexFromDecimalValue,
   hexWEIToDecETH,
 } from '../../helpers/utils/conversions.util';
-import { ETH, PRIMARY } from '../../helpers/constants/common';
+import {
+  ERC1155,
+  ERC20,
+  ERC721,
+  ETH,
+  PRIMARY,
+} from '../../helpers/constants/common';
 import {
   contractExchangeRateSelector,
   getCurrentCurrency,
@@ -24,7 +30,6 @@ import {
   getConversionRate,
   getNativeCurrency,
 } from '../../ducks/metamask/metamask';
-import { ERC1155, ERC20, ERC721 } from '../../../shared/constants/transaction';
 
 export default function ConfirmTokenTransactionBase({
   image = '',
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 571bc3524c0f..4d5fccfe510c 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -338,7 +338,6 @@ export default class ConfirmTransactionBase extends Component {
     };
 
     const hasSimulationError = Boolean(txData.simulationFails);
-
     const renderSimulationFailureWarning =
       hasSimulationError && !userAcknowledgedGasMissing;
     const networkName = NETWORK_TO_NAME_MAP[txData.chainId];
@@ -418,7 +417,7 @@ export default class ConfirmTransactionBase extends Component {
           <div className="custom-nonce-input">
             <TextField
               type="number"
-              min={0}
+              min="0"
               placeholder={
                 typeof nextNonce === 'number' ? nextNonce.toString() : null
               }
@@ -547,10 +546,10 @@ export default class ConfirmTransactionBase extends Component {
                   maxPriorityFeePerGas={hexWEIToDecGWEI(
                     maxPriorityFeePerGas ||
                       txData.txParams.maxPriorityFeePerGas,
-                  ).toString()}
+                  )}
                   maxFeePerGas={hexWEIToDecGWEI(
                     maxFeePerGas || txData.txParams.maxFeePerGas,
-                  ).toString()}
+                  )}
                 />
               )}
             </>
@@ -806,10 +805,8 @@ export default class ConfirmTransactionBase extends Component {
       maxFeePerGas,
       maxPriorityFeePerGas,
       baseFeePerGas,
-      methodData,
     } = this.props;
     const { submitting } = this.state;
-    const { name } = methodData;
 
     if (submitting) {
       return;
@@ -819,10 +816,6 @@ export default class ConfirmTransactionBase extends Component {
       txData.estimatedBaseFee = baseFeePerGas;
     }
 
-    if (name) {
-      txData.contractMethodName = name;
-    }
-
     if (maxFeePerGas) {
       txData.txParams = {
         ...txData.txParams,
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 7321d279340c..7752305a2563 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -34,7 +34,6 @@ import {
   getIsMultiLayerFeeNetwork,
   getEIP1559V2Enabled,
   getIsBuyableChain,
-  getEnsResolutionByAddress,
 } from '../../selectors';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import {
@@ -54,7 +53,6 @@ import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import { getGasLoadingAnimationIsShowing } from '../../ducks/app/app';
 import { isLegacyTransaction } from '../../helpers/utils/transactions.util';
 import { CUSTOM_GAS_ESTIMATE } from '../../../shared/constants/gas';
-import { TRANSACTION_TYPES } from '../../../shared/constants/transaction';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getTokenAddressParam } from '../../helpers/utils/token-util';
 import ConfirmTransactionBase from './confirm-transaction-base.component';
@@ -82,6 +80,7 @@ const mapStateToProps = (state, ownProps) => {
   const isBuyableChain = getIsBuyableChain(state);
   const { confirmTransaction, metamask } = state;
   const {
+    ensResolutionsByAddress,
     conversionRate,
     identities,
     addressBook,
@@ -113,10 +112,7 @@ const mapStateToProps = (state, ownProps) => {
 
   const { balance } = accounts[fromAddress];
   const { name: fromName } = identities[fromAddress];
-  let toAddress = txParamsToAddress;
-  if (type !== TRANSACTION_TYPES.SIMPLE_SEND) {
-    toAddress = propsToAddress || tokenToAddress || txParamsToAddress;
-  }
+  const toAddress = propsToAddress || tokenToAddress || txParamsToAddress;
 
   const tokenList = getTokenList(state);
   const useTokenDetection = getUseTokenDetection(state);
@@ -141,7 +137,7 @@ const mapStateToProps = (state, ownProps) => {
     addressBook &&
     addressBook[chainId] &&
     addressBook[chainId][checksummedAddress];
-  const toEns = getEnsResolutionByAddress(state, checksummedAddress);
+  const toEns = ensResolutionsByAddress[checksummedAddress] || '';
   const toNickname = addressBookObject ? addressBookObject.name : '';
   const transactionStatus = transaction ? transaction.status : '';
   const supportsEIP1559 =
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
index 7d7bf1837ddd..c47530242f6d 100644
--- a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
@@ -7,6 +7,7 @@ import { submittedPendingTransactionsSelector } from '../../../selectors/transac
 import { useGasFeeContext } from '../../../contexts/gasFee';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import ActionableMessage from '../../../components/ui/actionable-message/actionable-message';
+import I18nValue from '../../../components/ui/i18n-value';
 import Button from '../../../components/ui/button';
 import Typography from '../../../components/ui/typography';
 import { TYPOGRAPHY } from '../../../helpers/constants/design-system';
@@ -39,7 +40,7 @@ const TransactionAlerts = ({
     <div className="transaction-alerts">
       {hasSimulationError && (
         <ActionableMessage
-          message={t('simulationErrorMessageV2')}
+          message={<I18nValue messageKey="simulationErrorMessageV2" />}
           useIcon
           iconFillColor="var(--color-error-default)"
           type="danger"
@@ -59,28 +60,34 @@ const TransactionAlerts = ({
             <Typography
               align="left"
               className="transaction-alerts__pending-transactions"
-              margin={0}
+              margin={[0, 0]}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
               <strong>
-                {pendingTransactions?.length === 1
-                  ? t('pendingTransactionSingle', [pendingTransactions?.length])
-                  : t('pendingTransactionMultiple', [
-                      pendingTransactions?.length,
-                    ])}
+                <I18nValue
+                  messageKey={
+                    pendingTransactions?.length === 1
+                      ? 'pendingTransactionSingle'
+                      : 'pendingTransactionMultiple'
+                  }
+                  options={[pendingTransactions?.length]}
+                />
               </strong>{' '}
-              {t('pendingTransactionInfo')}
-              {t('learnCancelSpeeedup', [
-                <a
-                  key="cancelSpeedUpInfo"
-                  href="https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-speed-up-or-cancel-a-pending-transaction"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  {t('cancelSpeedUp')}
-                </a>,
-              ])}
+              <I18nValue messageKey="pendingTransactionInfo" />{' '}
+              <I18nValue
+                messageKey="learnCancelSpeeedup"
+                options={[
+                  <a
+                    key="cancelSpeedUpInfo"
+                    href="https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-speed-up-or-cancel-a-pending-transaction"
+                    rel="noopener noreferrer"
+                    target="_blank"
+                  >
+                    <I18nValue messageKey="cancelSpeedUp" />
+                  </a>,
+                ]}
+              />
             </Typography>
           }
           useIcon
@@ -127,11 +134,11 @@ const TransactionAlerts = ({
           message={
             <Typography
               align="left"
-              margin={0}
+              margin={[0, 0]}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
-              {t('lowPriorityMessage')}
+              <I18nValue messageKey="lowPriorityMessage" />
             </Typography>
           }
           useIcon
@@ -144,11 +151,11 @@ const TransactionAlerts = ({
           message={
             <Typography
               align="left"
-              margin={0}
+              margin={[0, 0]}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
-              {t('networkIsBusy')}
+              <I18nValue messageKey="networkIsBusy" />
             </Typography>
           }
           iconFillColor="var(--color-warning-default)"
diff --git a/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js b/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
index 4c6f964fa6a3..db58cc640ae6 100644
--- a/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
+++ b/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
@@ -14,7 +14,6 @@ import {
   DECRYPT_MESSAGE_REQUEST_PATH,
   ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
-  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
 } from '../../helpers/constants/routes';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import { TRANSACTION_TYPES } from '../../../shared/constants/transaction';
@@ -48,10 +47,6 @@ export default class ConfirmTransactionSwitch extends Component {
           const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_APPROVE_PATH}`;
           return <Redirect to={{ pathname }} />;
         }
-        case TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL: {
-          const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`;
-          return <Redirect to={{ pathname }} />;
-        }
         case TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM: {
           const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_TRANSFER_FROM_PATH}`;
           return <Redirect to={{ pathname }} />;
diff --git a/ui/pages/confirm-transaction/confirm-token-transaction-switch.js b/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
index 43b554595019..036f2b149fd7 100644
--- a/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
+++ b/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
@@ -6,7 +6,6 @@ import {
   CONFIRM_APPROVE_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
   CONFIRM_SEND_TOKEN_PATH,
-  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
   CONFIRM_TRANSACTION_ROUTE,
   CONFIRM_TRANSFER_FROM_PATH,
 } from '../../helpers/constants/routes';
@@ -67,30 +66,6 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
           />
         )}
       />
-      <Route
-        exact
-        path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`}
-        render={() => (
-          <ConfirmApprove
-            isSetApproveForAll
-            assetStandard={assetStandard}
-            assetName={assetName}
-            userBalance={userBalance}
-            tokenSymbol={tokenSymbol}
-            decimals={decimals}
-            tokenImage={tokenImage}
-            tokenAmount={tokenAmount}
-            tokenId={tokenId}
-            userAddress={userAddress}
-            tokenAddress={tokenAddress}
-            toAddress={toAddress}
-            transaction={transaction}
-            ethTransactionTotal={ethTransactionTotal}
-            fiatTransactionTotal={fiatTransactionTotal}
-            hexTransactionTotal={hexTransactionTotal}
-          />
-        )}
-      />
       <Route
         exact
         path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${CONFIRM_TRANSFER_FROM_PATH}`}
diff --git a/ui/pages/confirmation/components/confirmation-network-switch/index.scss b/ui/pages/confirmation/components/confirmation-network-switch/index.scss
index b988c30daddf..21c014ea6a8f 100644
--- a/ui/pages/confirmation/components/confirmation-network-switch/index.scss
+++ b/ui/pages/confirmation/components/confirmation-network-switch/index.scss
@@ -18,6 +18,7 @@
     align-items: center;
     justify-content: center;
     position: absolute;
+    filter: drop-shadow(0 1px 5px rgba(0, 0, 0, 0.25));
 
     &::before {
       content: '';
diff --git a/ui/pages/confirmation/confirmation.js b/ui/pages/confirmation/confirmation.js
index 6c6308cceefa..1d09457c547f 100644
--- a/ui/pages/confirmation/confirmation.js
+++ b/ui/pages/confirmation/confirmation.js
@@ -10,7 +10,9 @@ import { useHistory } from 'react-router-dom';
 import { isEqual } from 'lodash';
 import { produce } from 'immer';
 import Box from '../../components/ui/box';
+import Chip from '../../components/ui/chip';
 import MetaMaskTemplateRenderer from '../../components/app/metamask-template-renderer';
+import SiteIcon from '../../components/ui/site-icon';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import {
   COLORS,
@@ -23,8 +25,6 @@ import { useOriginMetadata } from '../../hooks/useOriginMetadata';
 import { getUnapprovedTemplatedConfirmations } from '../../selectors';
 import NetworkDisplay from '../../components/app/network-display/network-display';
 import Callout from '../../components/ui/callout';
-import SiteOrigin from '../../components/ui/site-origin';
-import { addCustomNetwork } from '../../store/actions';
 import ConfirmationFooter from './components/confirmation-footer';
 import { getTemplateValues, getTemplateAlerts } from './templates';
 
@@ -130,7 +130,6 @@ export default function ConfirmationPage() {
   const pendingConfirmation = pendingConfirmations[currentPendingConfirmation];
   const originMetadata = useOriginMetadata(pendingConfirmation?.origin) || {};
   const [alertState, dismissAlert] = useAlertState(pendingConfirmation);
-  const [stayOnPage, setStayOnPage] = useState(false);
 
   // Generating templatedValues is potentially expensive, and if done on every render
   // will result in a new object. Avoiding calling this generation unnecessarily will
@@ -147,11 +146,11 @@ export default function ConfirmationPage() {
     // confirmations reduces to a number that is less than the currently
     // viewed index, reset the index.
     if (pendingConfirmations.length === 0) {
-      !stayOnPage && history.push(DEFAULT_ROUTE);
+      history.push(DEFAULT_ROUTE);
     } else if (pendingConfirmations.length <= currentPendingConfirmation) {
       setCurrentPendingConfirmation(pendingConfirmations.length - 1);
     }
-  }, [pendingConfirmations, history, currentPendingConfirmation, stayOnPage]);
+  }, [pendingConfirmations, history, currentPendingConfirmation]);
   if (!pendingConfirmation) {
     return null;
   }
@@ -191,32 +190,29 @@ export default function ConfirmationPage() {
       )}
       <div className="confirmation-page__content">
         {templatedValues.networkDisplay ? (
-          <Box justifyContent="center" marginTop={2}>
+          <Box justifyContent="center">
             <NetworkDisplay
               indicatorSize={SIZES.XS}
               labelProps={{ color: COLORS.TEXT_DEFAULT }}
             />
           </Box>
         ) : null}
-        {pendingConfirmation.origin === 'metamask' ? null : (
-          <Box
-            alignItems="center"
-            marginTop={1}
-            paddingTop={1}
-            paddingRight={4}
-            paddingLeft={4}
-            paddingBottom={4}
-            flexDirection={FLEX_DIRECTION.COLUMN}
-          >
-            <SiteOrigin
-              chip
-              siteOrigin={stripHttpsScheme(originMetadata.origin)}
-              title={stripHttpsScheme(originMetadata.origin)}
-              iconSrc={originMetadata.iconUrl}
-              iconName={originMetadata.hostname}
-            />
-          </Box>
-        )}
+        <Box
+          alignItems="center"
+          marginTop={1}
+          padding={[1, 4, 4]}
+          flexDirection={FLEX_DIRECTION.COLUMN}
+        >
+          <SiteIcon
+            icon={originMetadata.iconUrl}
+            name={originMetadata.hostname}
+            size={36}
+          />
+          <Chip
+            label={stripHttpsScheme(originMetadata.origin)}
+            borderColor={COLORS.BORDER_DEFAULT}
+          />
+        </Box>
         <MetaMaskTemplateRenderer sections={templatedValues.content} />
       </div>
       <ConfirmationFooter
@@ -237,15 +233,8 @@ export default function ConfirmationPage() {
               </Callout>
             ))
         }
-        onApprove={() => {
-          templatedValues.onApprove.apply();
-          pendingConfirmation.origin === 'metamask' &&
-            dispatch(addCustomNetwork(pendingConfirmation.requestData));
-        }}
-        onCancel={() => {
-          templatedValues.onCancel.apply();
-          pendingConfirmation.origin === 'metamask' && setStayOnPage(true);
-        }}
+        onApprove={templatedValues.onApprove}
+        onCancel={templatedValues.onCancel}
         approveText={templatedValues.approvalText}
         cancelText={templatedValues.cancelText}
       />
diff --git a/ui/pages/confirmation/templates/add-ethereum-chain.js b/ui/pages/confirmation/templates/add-ethereum-chain.js
index f4a56890698e..db7dac420035 100644
--- a/ui/pages/confirmation/templates/add-ethereum-chain.js
+++ b/ui/pages/confirmation/templates/add-ethereum-chain.js
@@ -1,13 +1,7 @@
 import { ethErrors } from 'eth-rpc-errors';
-import React from 'react';
-import { infuraProjectId } from '../../../../shared/constants/network';
 import {
   SEVERITIES,
   TYPOGRAPHY,
-  TEXT_ALIGN,
-  JUSTIFY_CONTENT,
-  DISPLAY,
-  COLORS,
 } from '../../../helpers/constants/design-system';
 import fetchWithCache from '../../../helpers/utils/fetch-with-cache';
 
@@ -20,19 +14,38 @@ const UNRECOGNIZED_CHAIN = {
       element: 'MetaMaskTranslation',
       props: {
         translationKey: 'unrecognizedChain',
+        variables: [
+          {
+            element: 'a',
+            key: 'unrecognizedChainLink',
+            props: {
+              href:
+                'https://metamask.zendesk.com/hc/en-us/articles/360057142392',
+              target: '__blank',
+              tabIndex: 0,
+            },
+            children: {
+              element: 'MetaMaskTranslation',
+              props: {
+                translationKey: 'unrecognizedChainLinkText',
+              },
+            },
+          },
+        ],
       },
     },
   },
 };
 
-const MISMATCHED_CHAIN_RECOMMENDATION = {
-  id: 'MISMATCHED_CHAIN_RECOMMENDATION',
+const INVALID_CHAIN = {
+  id: 'INVALID_CHAIN',
+  severity: SEVERITIES.DANGER,
   content: {
     element: 'span',
     children: {
       element: 'MetaMaskTranslation',
       props: {
-        translationKey: 'mismatchedChainRecommendation',
+        translationKey: 'mismatchedChain',
         variables: [
           {
             element: 'a',
@@ -56,126 +69,48 @@ const MISMATCHED_CHAIN_RECOMMENDATION = {
   },
 };
 
-const MISMATCHED_NETWORK_NAME = {
-  id: 'MISMATCHED_NETWORK_NAME',
-  severity: SEVERITIES.WARNING,
-  content: {
-    element: 'span',
-    children: {
-      element: 'MetaMaskTranslation',
-      props: {
-        translationKey: 'mismatchedNetworkName',
-      },
-    },
-  },
-};
-
-const MISMATCHED_NETWORK_SYMBOL = {
-  id: 'MISMATCHED_NETWORK_SYMBOL',
-  severity: SEVERITIES.DANGER,
-  content: {
-    element: 'span',
-    children: {
-      element: 'MetaMaskTranslation',
-      props: {
-        translationKey: 'mismatchedNetworkSymbol',
-      },
-    },
-  },
-};
-
-const MISMATCHED_NETWORK_RPC = {
-  id: 'MISMATCHED_NETWORK_RPC',
-  severity: SEVERITIES.DANGER,
-  content: {
-    element: 'span',
-    children: {
-      element: 'MetaMaskTranslation',
-      props: {
-        translationKey: 'mismatchedRpcUrl',
-      },
-    },
-  },
-};
-
 async function getAlerts(pendingApproval) {
   const alerts = [];
-  const safeChainsList =
-    (await fetchWithCache('https://chainid.network/chains.json')) || [];
+  const safeChainsList = await fetchWithCache(
+    'https://chainid.network/chains.json',
+  );
   const matchedChain = safeChainsList.find(
     (chain) =>
       chain.chainId === parseInt(pendingApproval.requestData.chainId, 16),
   );
-
-  const originIsMetaMask = pendingApproval.origin === 'metamask';
-  if (originIsMetaMask && Boolean(matchedChain)) {
-    return [];
-  }
+  let validated = Boolean(matchedChain);
 
   if (matchedChain) {
     if (
+      matchedChain.nativeCurrency?.decimals !== 18 ||
       matchedChain.name.toLowerCase() !==
-      pendingApproval.requestData.chainName.toLowerCase()
-    ) {
-      alerts.push(MISMATCHED_NETWORK_NAME);
-    }
-    if (
+        pendingApproval.requestData.chainName.toLowerCase() ||
       matchedChain.nativeCurrency?.symbol !== pendingApproval.requestData.ticker
     ) {
-      alerts.push(MISMATCHED_NETWORK_SYMBOL);
+      validated = false;
     }
 
     const { origin } = new URL(pendingApproval.requestData.rpcUrl);
     if (!matchedChain.rpc.map((rpc) => new URL(rpc).origin).includes(origin)) {
-      alerts.push(MISMATCHED_NETWORK_RPC);
+      validated = false;
     }
   }
 
   if (!matchedChain) {
     alerts.push(UNRECOGNIZED_CHAIN);
+  } else if (!validated) {
+    alerts.push(INVALID_CHAIN);
   }
-
-  if (alerts.length) {
-    alerts.push(MISMATCHED_CHAIN_RECOMMENDATION);
-  }
-
   return alerts;
 }
 
 function getValues(pendingApproval, t, actions) {
-  const originIsMetaMask = pendingApproval.origin === 'metamask';
-
   return {
     content: [
-      {
-        hide: !originIsMetaMask,
-        element: 'Box',
-        key: 'network-box',
-        props: {
-          textAlign: TEXT_ALIGN.CENTER,
-          display: DISPLAY.FLEX,
-          justifyContent: JUSTIFY_CONTENT.CENTER,
-          marginTop: 4,
-          marginBottom: 2,
-        },
-        children: [
-          {
-            element: 'Chip',
-            key: 'network-chip',
-            props: {
-              label: pendingApproval.requestData.chainName,
-              backgroundColor: COLORS.BACKGROUND_ALTERNATIVE,
-              leftIconUrl: pendingApproval.requestData.imageUrl,
-            },
-          },
-        ],
-      },
       {
         element: 'Typography',
         key: 'title',
-        children: originIsMetaMask
-          ? t('wantToAddThisNetwork')
-          : t('addEthereumChainConfirmationTitle'),
+        children: t('addEthereumChainConfirmationTitle'),
         props: {
           variant: TYPOGRAPHY.H3,
           align: 'center',
@@ -193,7 +128,7 @@ function getValues(pendingApproval, t, actions) {
           variant: TYPOGRAPHY.H7,
           align: 'center',
           boxProps: {
-            margin: originIsMetaMask ? [0, 8, 4] : [0, 0, 4],
+            margin: [0, 0, 4],
           },
         },
       },
@@ -204,55 +139,7 @@ function getValues(pendingApproval, t, actions) {
           {
             element: 'b',
             key: 'bolded-text',
-            props: {
-              style: { display: originIsMetaMask && '-webkit-box' },
-            },
-            children: [
-              `${t('addEthereumChainConfirmationRisks')} `,
-              {
-                hide: !originIsMetaMask,
-                element: 'Tooltip',
-                key: 'tooltip-info',
-                props: {
-                  position: 'bottom',
-                  interactive: true,
-                  trigger: 'mouseenter',
-                  html: (
-                    <div
-                      style={{
-                        width: '180px',
-                        margin: '16px',
-                        textAlign: 'left',
-                      }}
-                    >
-                      {t('someNetworksMayPoseSecurity')}{' '}
-                      <a
-                        key="zendesk_page_link"
-                        href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
-                        rel="noreferrer"
-                        target="_blank"
-                        style={{ color: 'var(--color-primary-default)' }}
-                      >
-                        {t('learnMoreUpperCase')}
-                      </a>
-                    </div>
-                  ),
-                },
-                children: [
-                  {
-                    element: 'i',
-                    key: 'info-circle',
-                    props: {
-                      className: 'fas fa-info-circle',
-                      style: {
-                        marginLeft: '4px',
-                        color: 'var(--color-icon-default)',
-                      },
-                    },
-                  },
-                ],
-              },
-            ],
+            children: `${t('addEthereumChainConfirmationRisks')} `,
           },
           {
             element: 'MetaMaskTranslation',
@@ -278,7 +165,7 @@ function getValues(pendingApproval, t, actions) {
           variant: TYPOGRAPHY.H7,
           align: 'center',
           boxProps: {
-            margin: originIsMetaMask ? [0, 8] : 0,
+            margin: 0,
           },
         },
       },
@@ -296,25 +183,13 @@ function getValues(pendingApproval, t, actions) {
           },
           dictionary: {
             [t('networkName')]: pendingApproval.requestData.chainName,
-            [t('networkURL')]: pendingApproval.requestData.rpcUrl?.includes(
-              `/v3/${infuraProjectId}`,
-            )
-              ? pendingApproval.requestData.rpcUrl.replace(
-                  `/v3/${infuraProjectId}`,
-                  '',
-                )
-              : pendingApproval.requestData.rpcUrl,
+            [t('networkURL')]: pendingApproval.requestData.rpcUrl,
             [t('chainId')]: parseInt(pendingApproval.requestData.chainId, 16),
             [t('currencySymbol')]: pendingApproval.requestData.ticker,
             [t('blockExplorerUrl')]: pendingApproval.requestData
               .blockExplorerUrl,
           },
-          prefaceKeys: [
-            t('networkName'),
-            t('networkURL'),
-            t('chainId'),
-            t('currencySymbol'),
-          ],
+          prefaceKeys: [t('networkName'), t('networkURL'), t('chainId')],
         },
       },
     ],
@@ -331,7 +206,7 @@ function getValues(pendingApproval, t, actions) {
         pendingApproval.id,
         ethErrors.provider.userRejectedRequest().serialize(),
       ),
-    networkDisplay: !originIsMetaMask,
+    networkDisplay: true,
   };
 }
 
diff --git a/ui/pages/create-account/connect-hardware/index.scss b/ui/pages/create-account/connect-hardware/index.scss
index 2a380affb017..4521e4a48be0 100644
--- a/ui/pages/create-account/connect-hardware/index.scss
+++ b/ui/pages/create-account/connect-hardware/index.scss
@@ -151,7 +151,7 @@
   }
 
   &__error {
-    color: var(--color-warning-default);
+    color: var(--color-secondary-default);
     margin: 20px 20px 10px;
     display: block;
     text-align: center;
diff --git a/ui/pages/create-account/index.scss b/ui/pages/create-account/index.scss
index a39b96980052..962160c43daa 100644
--- a/ui/pages/create-account/index.scss
+++ b/ui/pages/create-account/index.scss
@@ -4,7 +4,7 @@
 .new-account {
   width: 375px;
   background-color: var(--color-background-default);
-  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+  box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
   z-index: 25;
   height: unset;
   overflow: auto;
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/index.scss b/ui/pages/first-time-flow/metametrics-opt-in/index.scss
index b8ce8929c2fb..de905adaee40 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/index.scss
+++ b/ui/pages/first-time-flow/metametrics-opt-in/index.scss
@@ -33,6 +33,10 @@
 
   &__body-graphic {
     margin-top: 25px;
+
+    .fa-bar-chart {
+      color: var(--color-icon-default);
+    }
   }
 
   &__description {
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index 7fc24e6572fa..673d1c7f3aef 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import PageContainerFooter from '../../../components/ui/page-container/page-container-footer';
 import { EVENT } from '../../../../shared/constants/metametrics';
-import { INITIALIZE_SELECT_ACTION_ROUTE } from '../../../helpers/constants/routes';
 
 export default class MetaMetricsOptIn extends Component {
   static propTypes = {
     history: PropTypes.object,
     setParticipateInMetaMetrics: PropTypes.func,
+    nextRoute: PropTypes.string,
     firstTimeSelectionMetaMetricsName: PropTypes.string,
     participateInMetaMetrics: PropTypes.bool,
   };
@@ -21,6 +21,7 @@ export default class MetaMetricsOptIn extends Component {
   render() {
     const { trackEvent, t } = this.context;
     const {
+      nextRoute,
       history,
       setParticipateInMetaMetrics,
       firstTimeSelectionMetaMetricsName,
@@ -104,7 +105,29 @@ export default class MetaMetricsOptIn extends Component {
               onCancel={async () => {
                 await setParticipateInMetaMetrics(false);
 
-                history.push(INITIALIZE_SELECT_ACTION_ROUTE);
+                try {
+                  if (
+                    participateInMetaMetrics === null ||
+                    participateInMetaMetrics === true
+                  ) {
+                    await trackEvent(
+                      {
+                        category: EVENT.CATEGORIES.ONBOARDING,
+                        event: 'Metrics Opt Out',
+                        properties: {
+                          action: 'Metrics Option',
+                          legacy_event: true,
+                        },
+                      },
+                      {
+                        isOptIn: true,
+                        flushImmediately: true,
+                      },
+                    );
+                  }
+                } finally {
+                  history.push(nextRoute);
+                }
               }}
               cancelText={t('noThanks')}
               hideCancel={false}
@@ -154,7 +177,7 @@ export default class MetaMetricsOptIn extends Component {
                   );
                   await Promise.all(metrics);
                 } finally {
-                  history.push(INITIALIZE_SELECT_ACTION_ROUTE);
+                  history.push(nextRoute);
                 }
               }}
               submitText={t('affirmAgree')}
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
index 9e607ccf757f..e336a9dd2e4d 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
+++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
@@ -1,5 +1,6 @@
 import { connect } from 'react-redux';
 import { setParticipateInMetaMetrics } from '../../../store/actions';
+import { getFirstTimeFlowTypeRoute } from '../../../selectors';
 import MetaMetricsOptIn from './metametrics-opt-in.component';
 
 const firstTimeFlowTypeNameMap = {
@@ -11,6 +12,7 @@ const mapStateToProps = (state) => {
   const { firstTimeFlowType, participateInMetaMetrics } = state.metamask;
 
   return {
+    nextRoute: getFirstTimeFlowTypeRoute(state),
     firstTimeSelectionMetaMetricsName:
       firstTimeFlowTypeNameMap[firstTimeFlowType],
     participateInMetaMetrics,
diff --git a/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss b/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
index 3ff753ce7d69..32922fa11c06 100644
--- a/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
+++ b/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
@@ -85,7 +85,7 @@
       display: inline-flex;
 
       &:hover {
-        box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);
       }
     }
 
diff --git a/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js b/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
index fd95d11f2195..f410ed305142 100644
--- a/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
+++ b/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
@@ -35,11 +35,6 @@ export default function SeedPhraseIntro() {
     ru: 'Russian',
     tl: 'Tagalog',
     vi: 'Vietnamese',
-    de: 'German',
-    el: 'Greek',
-    fr: 'French',
-    tr: 'Turkish',
-    zh: 'Chinese - China',
   };
 
   return (
diff --git a/ui/pages/first-time-flow/select-action/select-action.component.js b/ui/pages/first-time-flow/select-action/select-action.component.js
index 51d2876d7682..7feadb9a3bb2 100644
--- a/ui/pages/first-time-flow/select-action/select-action.component.js
+++ b/ui/pages/first-time-flow/select-action/select-action.component.js
@@ -2,10 +2,7 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Button from '../../../components/ui/button';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
-import {
-  INITIALIZE_CREATE_PASSWORD_ROUTE,
-  INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
-} from '../../../helpers/constants/routes';
+import { INITIALIZE_METAMETRICS_OPT_IN_ROUTE } from '../../../helpers/constants/routes';
 
 export default class SelectAction extends PureComponent {
   static propTypes = {
@@ -29,12 +26,12 @@ export default class SelectAction extends PureComponent {
 
   handleCreate = () => {
     this.props.setFirstTimeFlowType('create');
-    this.props.history.push(INITIALIZE_CREATE_PASSWORD_ROUTE);
+    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
   };
 
   handleImport = () => {
     this.props.setFirstTimeFlowType('import');
-    this.props.history.push(INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE);
+    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
   };
 
   render() {
diff --git a/ui/pages/first-time-flow/welcome/welcome.component.js b/ui/pages/first-time-flow/welcome/welcome.component.js
index 46bf36d226a8..20a929372420 100644
--- a/ui/pages/first-time-flow/welcome/welcome.component.js
+++ b/ui/pages/first-time-flow/welcome/welcome.component.js
@@ -6,7 +6,6 @@ import Button from '../../../components/ui/button';
 import {
   INITIALIZE_CREATE_PASSWORD_ROUTE,
   INITIALIZE_SELECT_ACTION_ROUTE,
-  INITIALIZE_METAMETRICS_OPT_IN_ROUTE,
 } from '../../../helpers/constants/routes';
 import { isBeta } from '../../../helpers/utils/build-types';
 import WelcomeFooter from './welcome-footer.component';
@@ -17,7 +16,6 @@ export default class Welcome extends PureComponent {
     history: PropTypes.object,
     participateInMetaMetrics: PropTypes.bool,
     welcomeScreenSeen: PropTypes.bool,
-    isInitialized: PropTypes.bool,
   };
 
   static contextTypes = {
@@ -31,28 +29,17 @@ export default class Welcome extends PureComponent {
   }
 
   componentDidMount() {
-    const {
-      history,
-      participateInMetaMetrics,
-      welcomeScreenSeen,
-      isInitialized,
-    } = this.props;
+    const { history, participateInMetaMetrics, welcomeScreenSeen } = this.props;
 
-    if (
-      welcomeScreenSeen &&
-      isInitialized &&
-      participateInMetaMetrics !== null
-    ) {
+    if (welcomeScreenSeen && participateInMetaMetrics !== null) {
       history.push(INITIALIZE_CREATE_PASSWORD_ROUTE);
-    } else if (welcomeScreenSeen && participateInMetaMetrics !== null) {
-      history.push(INITIALIZE_SELECT_ACTION_ROUTE);
     } else if (welcomeScreenSeen) {
-      history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
+      history.push(INITIALIZE_SELECT_ACTION_ROUTE);
     }
   }
 
   handleContinue = () => {
-    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
+    this.props.history.push(INITIALIZE_SELECT_ACTION_ROUTE);
   };
 
   render() {
diff --git a/ui/pages/first-time-flow/welcome/welcome.container.js b/ui/pages/first-time-flow/welcome/welcome.container.js
index 27bd2e198efe..77909d25b061 100644
--- a/ui/pages/first-time-flow/welcome/welcome.container.js
+++ b/ui/pages/first-time-flow/welcome/welcome.container.js
@@ -5,16 +5,11 @@ import { closeWelcomeScreen } from '../../../store/actions';
 import Welcome from './welcome.component';
 
 const mapStateToProps = ({ metamask }) => {
-  const {
-    welcomeScreenSeen,
-    participateInMetaMetrics,
-    isInitialized,
-  } = metamask;
+  const { welcomeScreenSeen, participateInMetaMetrics } = metamask;
 
   return {
     welcomeScreenSeen,
     participateInMetaMetrics,
-    isInitialized,
   };
 };
 
diff --git a/ui/pages/first-time-flow/welcome/welcome.test.js b/ui/pages/first-time-flow/welcome/welcome.test.js
index 2c0f79106694..14d1a22ccfea 100644
--- a/ui/pages/first-time-flow/welcome/welcome.test.js
+++ b/ui/pages/first-time-flow/welcome/welcome.test.js
@@ -15,7 +15,7 @@ describe('Welcome', () => {
     sinon.restore();
   });
 
-  it('routes to the metametrics screen when participateInMetaMetrics is not initialized', () => {
+  it('routes to select action when participateInMetaMetrics is not initialized', () => {
     const props = {
       history: {
         push: sinon.spy(),
@@ -32,11 +32,11 @@ describe('Welcome', () => {
     );
     getStartedButton.simulate('click');
     expect(props.history.push.getCall(0).args[0]).toStrictEqual(
-      '/initialize/metametrics-opt-in',
+      '/initialize/select-action',
     );
   });
 
-  it('routes to select action when participateInMetaMetrics is initialized', () => {
+  it('routes to correct password when participateInMetaMetrics is initialized', () => {
     const props = {
       welcomeScreenSeen: true,
       participateInMetaMetrics: false,
@@ -55,7 +55,7 @@ describe('Welcome', () => {
     );
     getStartedButton.simulate('click');
     expect(props.history.push.getCall(0).args[0]).toStrictEqual(
-      '/initialize/select-action',
+      '/initialize/create-password',
     );
   });
 });
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index 0ce2fdd1ee8e..ab4fda2e8af6 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -26,7 +26,9 @@ import {
   TYPOGRAPHY,
   FONT_WEIGHT,
   DISPLAY,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
   COLORS,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/design-system';
 
 import {
@@ -112,7 +114,7 @@ export default class Home extends PureComponent {
     infuraBlocked: PropTypes.bool.isRequired,
     showWhatsNewPopup: PropTypes.bool.isRequired,
     hideWhatsNewPopup: PropTypes.func.isRequired,
-    announcementsToShow: PropTypes.bool.isRequired,
+    notificationsToShow: PropTypes.bool.isRequired,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     errorsToShow: PropTypes.object.isRequired,
     shouldShowErrors: PropTypes.bool.isRequired,
@@ -121,16 +123,7 @@ export default class Home extends PureComponent {
     showRecoveryPhraseReminder: PropTypes.bool.isRequired,
     setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
     setRecoveryPhraseReminderLastShown: PropTypes.func.isRequired,
-    seedPhraseBackedUp: (props) => {
-      if (
-        props.seedPhraseBackedUp !== null &&
-        typeof props.seedPhraseBackedUp !== 'boolean'
-      ) {
-        throw new Error(
-          `seedPhraseBackedUp is required to be null or boolean. Received ${props.seedPhraseBackedUp}`,
-        );
-      }
-    },
+    seedPhraseBackedUp: PropTypes.bool.isRequired,
     newNetworkAdded: PropTypes.string,
     setNewNetworkAdded: PropTypes.func.isRequired,
     // This prop is used in the `shouldCloseNotificationPopup` function
@@ -141,9 +134,6 @@ export default class Home extends PureComponent {
     closeNotificationPopup: PropTypes.func.isRequired,
     newTokensImported: PropTypes.string,
     setNewTokensImported: PropTypes.func.isRequired,
-    newCustomNetworkAdded: PropTypes.object,
-    setNewCustomNetworkAdded: PropTypes.func,
-    setRpcTarget: PropTypes.func,
   };
 
   state = {
@@ -281,9 +271,6 @@ export default class Home extends PureComponent {
       setNewCollectibleAddedMessage,
       newTokensImported,
       setNewTokensImported,
-      newCustomNetworkAdded,
-      setNewCustomNetworkAdded,
-      setRpcTarget,
     } = this.props;
     return (
       <MultipleNotifications>
@@ -483,56 +470,6 @@ export default class Home extends PureComponent {
             key="home-infuraBlockedNotification"
           />
         ) : null}
-        {Object.keys(newCustomNetworkAdded).length !== 0 && (
-          <Popover className="home__new-network-added">
-            <i className="fa fa-check-circle fa-2x home__new-network-added__check-circle" />
-            <Typography
-              variant={TYPOGRAPHY.H4}
-              marginTop={5}
-              marginRight={9}
-              marginLeft={9}
-              marginBottom={0}
-              fontWeight={FONT_WEIGHT.BOLD}
-            >
-              {t('networkAddedSuccessfully')}
-            </Typography>
-            <Box marginTop={8} marginRight={8} marginLeft={8} marginBottom={5}>
-              <Button
-                type="primary"
-                className="home__new-network-added__switch-to-button"
-                onClick={() => {
-                  setRpcTarget(
-                    newCustomNetworkAdded.rpcUrl,
-                    newCustomNetworkAdded.chainId,
-                    newCustomNetworkAdded.ticker,
-                    newCustomNetworkAdded.chainName,
-                  );
-                  setNewCustomNetworkAdded();
-                }}
-              >
-                <Typography
-                  variant={TYPOGRAPHY.H6}
-                  fontWeight={FONT_WEIGHT.NORMAL}
-                  color={COLORS.PRIMARY_INVERSE}
-                >
-                  {t('switchToNetwork', [newCustomNetworkAdded.chainName])}
-                </Typography>
-              </Button>
-              <Button
-                type="secondary"
-                onClick={() => setNewCustomNetworkAdded()}
-              >
-                <Typography
-                  variant={TYPOGRAPHY.H6}
-                  fontWeight={FONT_WEIGHT.NORMAL}
-                  color={COLORS.PRIMARY_DEFAULT}
-                >
-                  {t('dismiss')}
-                </Typography>
-              </Button>
-            </Box>
-          </Popover>
-        )}
       </MultipleNotifications>
     );
   }
@@ -588,7 +525,7 @@ export default class Home extends PureComponent {
       history,
       connectedStatusPopoverHasBeenShown,
       isPopup,
-      announcementsToShow,
+      notificationsToShow,
       showWhatsNewPopup,
       hideWhatsNewPopup,
       seedPhraseBackedUp,
@@ -606,8 +543,9 @@ export default class Home extends PureComponent {
     const showWhatsNew =
       ((completedOnboarding && firstTimeFlowType === 'import') ||
         !completedOnboarding) &&
-      announcementsToShow &&
+      notificationsToShow &&
       showWhatsNewPopup;
+
     return (
       <div className="main-container">
         <Route path={CONNECTED_ROUTE} component={ConnectedSites} exact />
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 1c7f5dfed54d..13229b1996a6 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -37,16 +37,11 @@ import {
   setNewNetworkAdded,
   setNewCollectibleAddedMessage,
   setNewTokensImported,
-  setRpcTarget,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   removeSnapError,
   ///: END:ONLY_INCLUDE_IN
 } from '../../store/actions';
-import {
-  setThreeBoxLastUpdated,
-  hideWhatsNewPopup,
-  setNewCustomNetworkAdded,
-} from '../../ducks/app/app';
+import { setThreeBoxLastUpdated, hideWhatsNewPopup } from '../../ducks/app/app';
 import { getWeb3ShimUsageAlertEnabledness } from '../../ducks/metamask/metamask';
 import { getSwapsFeatureIsLive } from '../../ducks/swaps/swaps';
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
@@ -131,7 +126,7 @@ const mapStateToProps = (state) => {
     shouldShowWeb3ShimUsageNotification,
     pendingConfirmations,
     infuraBlocked: getInfuraBlocked(state),
-    announcementsToShow: getSortedAnnouncementsToShow(state).length > 0,
+    notificationsToShow: getSortedAnnouncementsToShow(state).length > 0,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     errorsToShow: metamask.snapErrors,
     shouldShowErrors: Object.entries(metamask.snapErrors || []).length > 0,
@@ -143,7 +138,6 @@ const mapStateToProps = (state) => {
     isSigningQRHardwareTransaction,
     newCollectibleAddedMessage: getNewCollectibleAddedMessage(state),
     newTokensImported: getNewTokensImported(state),
-    newCustomNetworkAdded: appState.newCustomNetworkAdded,
   };
 };
 
@@ -186,12 +180,6 @@ const mapDispatchToProps = (dispatch) => ({
   setNewTokensImported: (newTokens) => {
     dispatch(setNewTokensImported(newTokens));
   },
-  setNewCustomNetworkAdded: () => {
-    dispatch(setNewCustomNetworkAdded({}));
-  },
-  setRpcTarget: (rpcUrl, chainId, ticker, nickname) => {
-    dispatch(setRpcTarget(rpcUrl, chainId, ticker, nickname));
-  },
 });
 
 export default compose(
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index 388a4f008104..dbecff15393f 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -23,7 +23,7 @@
   // TODO: fix style import order so this isn't required to override specificity of `tab` class
   &__main-view &__tabs {
     border: none;
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 3px 4px rgba(135, 134, 134, 0.16);
   }
 
   &__main-view &__tab {
@@ -116,7 +116,7 @@
     position: absolute;
     top: 73px;
     opacity: 1;
-    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+    box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.2);
     background: none;
   }
 
@@ -207,18 +207,4 @@
       margin-inline-start: 32px;
     }
   }
-
-  &__new-network-added {
-    border-radius: 10px;
-    text-align: center;
-
-    &__check-circle {
-      color: var(--color-success-default);
-      margin-top: 20px;
-    }
-
-    &__switch-to-button {
-      margin-bottom: 16px;
-    }
-  }
 }
diff --git a/ui/pages/import-token/import-token.component.js b/ui/pages/import-token/import-token.component.js
index 30880ca70f35..443988a27962 100644
--- a/ui/pages/import-token/import-token.component.js
+++ b/ui/pages/import-token/import-token.component.js
@@ -23,7 +23,7 @@ import ActionableMessage from '../../components/ui/actionable-message/actionable
 import Typography from '../../components/ui/typography';
 import { TYPOGRAPHY, FONT_WEIGHT } from '../../helpers/constants/design-system';
 import Button from '../../components/ui/button';
-import { TOKEN_STANDARDS } from '../../../shared/constants/transaction';
+import { TOKEN_STANDARDS } from '../../helpers/constants/common';
 import TokenSearch from './token-search';
 import TokenList from './token-list';
 
diff --git a/ui/pages/import-token/token-list/index.scss b/ui/pages/import-token/token-list/index.scss
index b776d093c8ff..f1bfd790da76 100644
--- a/ui/pages/import-token/token-list/index.scss
+++ b/ui/pages/import-token/token-list/index.scss
@@ -46,7 +46,7 @@
     background-position: center;
     border-radius: 50%;
     background-color: var(--color-background-default);
-    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+    box-shadow: 0 2px 4px 0 rgba($black, 0.24);
     margin-right: 12px;
     flex: 0 0 auto;
   }
diff --git a/ui/pages/import-token/token-list/token-list.component.js b/ui/pages/import-token/token-list/token-list.component.js
index 670ea6126422..73ac862bffd1 100644
--- a/ui/pages/import-token/token-list/token-list.component.js
+++ b/ui/pages/import-token/token-list/token-list.component.js
@@ -14,6 +14,7 @@ export default class TokenList extends Component {
     results: PropTypes.array,
     selectedTokens: PropTypes.object,
     onToggleToken: PropTypes.func,
+    useTokenDetection: PropTypes.bool,
   };
 
   render() {
@@ -22,6 +23,7 @@ export default class TokenList extends Component {
       selectedTokens = {},
       onToggleToken,
       tokens = [],
+      useTokenDetection,
     } = this.props;
 
     return results.length === 0 ? (
@@ -36,7 +38,14 @@ export default class TokenList extends Component {
             .fill(undefined)
             .map((_, i) => {
               const { iconUrl, symbol, name, address } = results[i] || {};
-              const iconPath = iconUrl;
+              let iconPath = iconUrl;
+              if (!process.env.TOKEN_DETECTION_V2) {
+                /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
+                // token from dynamic api list is fetched when useTokenDetection is true
+                iconPath = useTokenDetection
+                  ? iconUrl
+                  : `images/contract/${iconUrl}`;
+              }
               const tokenAlreadyAdded = checkExistingAddresses(address, tokens);
               const onClick = () =>
                 !tokenAlreadyAdded && onToggleToken(results[i]);
diff --git a/ui/pages/import-token/token-search/token-search.component.js b/ui/pages/import-token/token-search/token-search.component.js
index b6546cd78be3..d5f88a8263d6 100644
--- a/ui/pages/import-token/token-search/token-search.component.js
+++ b/ui/pages/import-token/token-search/token-search.component.js
@@ -4,7 +4,6 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../components/ui/text-field';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
-import SearchIcon from '../../../components/ui/icon/search-icon';
 
 export default class TokenSearch extends Component {
   static contextTypes = {
@@ -60,7 +59,10 @@ export default class TokenSearch extends Component {
   renderAdornment() {
     return (
       <InputAdornment position="start" style={{ marginRight: '12px' }}>
-        <SearchIcon color="var(--color-icon-muted)" />
+        <i
+          className="fa fa-search"
+          style={{ color: 'var(--color-icon-muted)' }}
+        />
       </InputAdornment>
     );
   }
diff --git a/ui/pages/keychains/restore-vault.js b/ui/pages/keychains/restore-vault.js
index b9c4c3ed8662..eda28ed551fd 100644
--- a/ui/pages/keychains/restore-vault.js
+++ b/ui/pages/keychains/restore-vault.js
@@ -78,11 +78,7 @@ class RestoreVaultPage extends Component {
             <Typography color={COLORS.TEXT_DEFAULT}>
               {t('resetWalletSubHeader')}
             </Typography>
-            <Typography
-              color={COLORS.TEXT_DEFAULT}
-              marginTop={4}
-              marginBottom={4}
-            >
+            <Typography color={COLORS.TEXT_DEFAULT} margin={[4, 0]}>
               {t('resetWalletUsingSRP', [
                 <Button
                   type="link"
@@ -116,7 +112,7 @@ class RestoreVaultPage extends Component {
                 </Button>,
               ])}
             </Typography>
-            <Typography color={COLORS.TEXT_DEFAULT} margin={0} marginBottom={4}>
+            <Typography color={COLORS.TEXT_DEFAULT} margin={[0, 0, 4]}>
               {t('resetWalletWarning')}
             </Typography>
             <CreateNewVault
diff --git a/ui/pages/notifications/index.js b/ui/pages/notifications/index.js
deleted file mode 100644
index d9f22168ea6a..000000000000
--- a/ui/pages/notifications/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './notifications';
diff --git a/ui/pages/notifications/index.scss b/ui/pages/notifications/index.scss
deleted file mode 100644
index a76a4cb870d8..000000000000
--- a/ui/pages/notifications/index.scss
+++ /dev/null
@@ -1,114 +0,0 @@
-.notifications {
-  position: relative;
-  display: flex;
-  flex-direction: column;
-  background-color: var(--color-background-default);
-
-  &__header {
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    width: 100%;
-    padding: 65px 24px 15px 24px;
-    border-bottom: 1px solid var(--color-border-muted);
-
-    @media screen and (max-width: $break-small) {
-      padding: 10px 20px;
-    }
-
-    &__title-container {
-      display: flex;
-      flex-flow: row;
-      align-items: center;
-      flex: 0 0 auto;
-
-      &__title {
-        @include H3;
-
-        margin-left: 26px;
-
-        @media screen and (max-width: $break-small) {
-          @include H6;
-
-          margin-left: 16px;
-          font-weight: bold;
-        }
-      }
-    }
-
-    &_button {
-      width: auto;
-
-      @media screen and (max-width: $break-small) {
-        font-size: 0.75rem;
-        padding: 3.5px 1rem;
-      }
-    }
-  }
-
-  &__container {
-    display: flex;
-    overflow: auto;
-    flex-direction: column;
-    flex: 1 1 auto;
-
-    @media screen and (max-width: $break-small) {
-      height: 100%;
-    }
-
-    &__text {
-      @include H3;
-
-      color: var(--color-text-muted);
-      text-align: center;
-
-      @media screen and (max-width: $break-small) {
-        @include H6;
-      }
-    }
-  }
-
-  .empty {
-    justify-content: center;
-    align-items: center;
-  }
-
-  &__item {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    border-bottom: 1px solid var(--color-border-muted);
-    padding: 16px;
-    cursor: pointer;
-
-    &:hover {
-      background-color: var(--color-background-alternative);
-    }
-
-    &__unread-dot {
-      content: ' ';
-      align-self: flex-start;
-      margin-top: 6px;
-      width: 8px;
-      height: 8px;
-      background-color: transparent;
-      border-radius: 50%;
-    }
-
-    .unread {
-      background-color: var(--color-primary-default);
-    }
-
-    &__details {
-      display: flex;
-      flex-direction: column;
-      margin-left: 12px;
-
-      &__infos {
-        color: var(--color-text-muted);
-        font-size: 12px;
-        margin-top: 6px;
-      }
-    }
-  }
-}
diff --git a/ui/pages/notifications/notification.test.js b/ui/pages/notifications/notification.test.js
deleted file mode 100644
index b66a9113e2c8..000000000000
--- a/ui/pages/notifications/notification.test.js
+++ /dev/null
@@ -1,100 +0,0 @@
-import React from 'react';
-
-import { renderWithProvider } from '../../../test/lib/render-helpers';
-import configureStore from '../../store/store';
-import Notifications, { NotificationItem } from './notifications';
-
-describe('Notifications', () => {
-  const render = (params) => {
-    const store = configureStore({
-      ...params,
-    });
-
-    return renderWithProvider(<Notifications />, store);
-  };
-
-  it('can render a list of notifications', () => {
-    const mockStore = {
-      metamask: {
-        notifications: {
-          test: {
-            id: 'test',
-            origin: 'test',
-            createdDate: 1652967897732,
-            readDate: null,
-            message: 'foo',
-          },
-          test2: {
-            id: 'test2',
-            origin: 'test',
-            createdDate: 1652967897732,
-            readDate: null,
-            message: 'bar',
-          },
-        },
-        snaps: {
-          test: {
-            enabled: true,
-            id: 'test',
-            manifest: {
-              proposedName: 'Notification Example Snap',
-              description: 'A notification example snap.',
-            },
-          },
-        },
-      },
-    };
-
-    const { getByText } = render(mockStore);
-
-    expect(
-      getByText(mockStore.metamask.notifications.test.message),
-    ).toBeDefined();
-
-    expect(
-      getByText(mockStore.metamask.notifications.test2.message),
-    ).toBeDefined();
-  });
-
-  it('can render an empty list of notifications', () => {
-    const mockStore = {
-      metamask: {
-        notifications: {},
-        snaps: {},
-      },
-    };
-
-    const { getByText } = render(mockStore);
-
-    expect(getByText('Nothing to see here.')).toBeDefined();
-  });
-});
-
-describe('NotificationItem', () => {
-  const render = (props) => renderWithProvider(<NotificationItem {...props} />);
-  it('can render notification item', () => {
-    const props = {
-      notification: {
-        id: 'test',
-        origin: 'test',
-        createdDate: 1652967897732,
-        readDate: null,
-        message: 'Hello, http://localhost:8086!',
-      },
-      snaps: [
-        {
-          id: 'test',
-          tabMessage: () => 'test snap name',
-          descriptionMessage: () => 'test description',
-          sectionMessage: () => 'test section Message',
-          route: '/test',
-          icon: 'test',
-        },
-      ],
-      onItemClick: jest.fn(),
-    };
-    const { getByText } = render(props);
-
-    expect(getByText(props.notification.message)).toBeDefined();
-  });
-});
diff --git a/ui/pages/notifications/notifications.js b/ui/pages/notifications/notifications.js
deleted file mode 100644
index 3c485137a99c..000000000000
--- a/ui/pages/notifications/notifications.js
+++ /dev/null
@@ -1,141 +0,0 @@
-import React, { useEffect } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { useDispatch, useSelector } from 'react-redux';
-import { useHistory } from 'react-router-dom';
-import { formatDate } from '../../helpers/utils/util';
-import {
-  getNotifications,
-  getSnapsRouteObjects,
-  getUnreadNotifications,
-} from '../../selectors';
-import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
-import {
-  deleteExpiredNotifications,
-  markNotificationsAsRead,
-} from '../../store/actions';
-import IconCaretLeft from '../../components/ui/icon/icon-caret-left';
-import Button from '../../components/ui/button';
-import { useI18nContext } from '../../hooks/useI18nContext';
-
-export function NotificationItem({ notification, snaps, onItemClick }) {
-  const { message, origin, createdDate, readDate } = notification;
-  const history = useHistory();
-  const t = useI18nContext();
-
-  const snap = snaps.find(({ id: snapId }) => {
-    return snapId === origin;
-  });
-
-  const handleNameClick = (e) => {
-    e.stopPropagation();
-    history.push(snap.route);
-  };
-
-  const handleItemClick = () => onItemClick(notification);
-
-  return (
-    <div className="notifications__item" onClick={handleItemClick}>
-      <div
-        className={classnames(
-          'notifications__item__unread-dot',
-          !readDate && 'unread',
-        )}
-      />
-      <div className="notifications__item__details">
-        <p className="notifications__item__details__message">{message}</p>
-        <p className="notifications__item__details__infos">
-          {t('notificationsInfos', [
-            formatDate(createdDate, "LLLL d',' yyyy 'at' t"),
-            <Button type="inline" onClick={handleNameClick} key="button">
-              {snap.tabMessage()}
-            </Button>,
-          ])}
-        </p>
-      </div>
-    </div>
-  );
-}
-
-export default function Notifications() {
-  const history = useHistory();
-  const dispatch = useDispatch();
-  const t = useI18nContext();
-  const notifications = useSelector(getNotifications);
-  const snapsRouteObject = useSelector(getSnapsRouteObjects);
-  const unreadNotifications = useSelector(getUnreadNotifications);
-
-  const markAllAsRead = () => {
-    const unreadNotificationIds = unreadNotifications.map(({ id }) => id);
-
-    dispatch(markNotificationsAsRead(unreadNotificationIds));
-  };
-
-  const markAsRead = (notificationToMark) => {
-    if (!notificationToMark.readDate) {
-      dispatch(markNotificationsAsRead([notificationToMark.id]));
-    }
-  };
-
-  useEffect(() => {
-    return () => dispatch(deleteExpiredNotifications());
-  }, [dispatch]);
-
-  return (
-    <div className="main-container notifications">
-      <div className="notifications__header">
-        <div className="notifications__header__title-container">
-          <IconCaretLeft
-            className="notifications__header__title-container__back-button"
-            color="var(--color-text-default)"
-            size={23}
-            onClick={() => history.push(DEFAULT_ROUTE)}
-          />
-          <div className="notifications__header__title-container__title">
-            {t('notificationsHeader')}
-          </div>
-        </div>
-        <Button
-          type="secondary"
-          className="notifications__header_button"
-          onClick={markAllAsRead}
-        >
-          {t('notificationsMarkAllAsRead')}
-        </Button>
-      </div>
-      <div
-        className={classnames(
-          'notifications__container',
-          notifications.length === 0 && 'empty',
-        )}
-      >
-        {notifications.length > 0 ? (
-          notifications.map((notification, id) => (
-            <NotificationItem
-              notification={notification}
-              snaps={snapsRouteObject}
-              key={id}
-              onItemClick={markAsRead}
-            />
-          ))
-        ) : (
-          <div className="notifications__container__text">
-            {t('notificationsEmptyText')}
-          </div>
-        )}
-      </div>
-    </div>
-  );
-}
-
-NotificationItem.propTypes = {
-  notification: {
-    id: PropTypes.string.isRequired,
-    message: PropTypes.string.isRequired,
-    origin: PropTypes.string.isRequired,
-    createdDate: PropTypes.number.isRequired,
-    readDate: PropTypes.number.isRequired,
-  },
-  snaps: PropTypes.array.isRequired,
-  onItemClick: PropTypes.func.isRequired,
-};
diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js
index 0bb23a96d565..96d7d838ff51 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.js
@@ -154,23 +154,25 @@ export default function CreatePassword({
     <div className="create-password__wrapper">
       {secretRecoveryPhrase &&
       firstTimeFlowType === FIRST_TIME_FLOW_TYPES.IMPORT ? (
-        <TwoStepProgressBar
-          stage={twoStepStages.PASSWORD_CREATE}
-          marginBottom={4}
-        />
+        <TwoStepProgressBar stage={twoStepStages.PASSWORD_CREATE} />
       ) : (
-        <ThreeStepProgressBar
-          stage={threeStepStages.PASSWORD_CREATE}
-          marginBottom={4}
-        />
+        <ThreeStepProgressBar stage={threeStepStages.PASSWORD_CREATE} />
       )}
       <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
         {t('createPassword')}
       </Typography>
-      <Typography variant={TYPOGRAPHY.H4} align={TEXT_ALIGN.CENTER}>
+      <Typography
+        variant={TYPOGRAPHY.H4}
+        align={TEXT_ALIGN.CENTER}
+        boxProps={{ margin: 5 }}
+      >
         {t('passwordSetupDetails')}
       </Typography>
-      <Box justifyContent={JUSTIFY_CONTENT.CENTER} marginTop={3}>
+      <Box
+        justifyContent={JUSTIFY_CONTENT.CENTER}
+        marginTop={3}
+        padding={[0, 12]}
+      >
         <form className="create-password__form" onSubmit={handleCreate}>
           <FormField
             dataTestId="create-password-new"
@@ -245,7 +247,6 @@ export default function CreatePassword({
                 : 'create-password-wallet'
             }
             type="primary"
-            large
             className="create-password__form--submit-button"
             disabled={!isValid || !termsChecked}
             onClick={handleCreate}
diff --git a/ui/pages/onboarding-flow/create-password/index.scss b/ui/pages/onboarding-flow/create-password/index.scss
index dc87f8cc6e41..c56853aada6d 100644
--- a/ui/pages/onboarding-flow/create-password/index.scss
+++ b/ui/pages/onboarding-flow/create-password/index.scss
@@ -16,6 +16,8 @@
     justify-content: center;
     flex-direction: column;
     align-items: center;
+    max-width: 600px;
+    max-height: 750px;
   }
 
   &__link-text {
@@ -23,15 +25,17 @@
   }
 
   &__form {
-    @media screen and (min-width: $break-large) {
-      max-width: 320px;
-    }
+    padding: 0 24px;
 
     &--password-button {
       background-color: transparent;
       color: var(--color-text-default);
     }
 
+    &--submit-button {
+      padding: 20px;
+    }
+
     &--checkmark {
       i {
         color: var(--color-success-default);
@@ -44,7 +48,6 @@
 
     .form-field__input {
       height: 50px;
-      width: 100%;
     }
   }
 }
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index 969487f4e8bc..d4cefa637ef7 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -8,7 +8,6 @@ import {
   FONT_WEIGHT,
   TEXT_ALIGN,
   TYPOGRAPHY,
-  ALIGN_ITEMS,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
@@ -46,7 +45,7 @@ export default function CreationSuccessful() {
   };
   return (
     <div className="creation-successful">
-      <Box textAlign={TEXT_ALIGN.CENTER}>
+      <Box textAlign={TEXT_ALIGN.CENTER} margin={6}>
         <img src="./images/tada.png" />
         <Typography
           variant={TYPOGRAPHY.H2}
@@ -59,13 +58,7 @@ export default function CreationSuccessful() {
           {t('walletCreationSuccessDetail')}
         </Typography>
       </Box>
-      <Typography
-        variant={TYPOGRAPHY.H4}
-        boxProps={{ align: ALIGN_ITEMS.LEFT }}
-        marginLeft={12}
-      >
-        {t('remember')}
-      </Typography>
+      <Typography variant={TYPOGRAPHY.H4}>{t('remember')}</Typography>
       <ul>
         <li>
           <Typography variant={TYPOGRAPHY.H4}>
diff --git a/ui/pages/onboarding-flow/creation-successful/index.scss b/ui/pages/onboarding-flow/creation-successful/index.scss
index 5aa7567bf5b6..54273b1e0d20 100644
--- a/ui/pages/onboarding-flow/creation-successful/index.scss
+++ b/ui/pages/onboarding-flow/creation-successful/index.scss
@@ -1,15 +1,9 @@
 .creation-successful {
-  @media screen and (min-width: $break-large) {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-  }
-
   img {
     align-self: center;
   }
 
-  max-width: 600px;
+  max-width: 575px;
 
   ul {
     list-style-type: disc;
diff --git a/ui/pages/onboarding-flow/import-srp/import-srp.js b/ui/pages/onboarding-flow/import-srp/import-srp.js
index 536c5823f086..df02244fbf8e 100644
--- a/ui/pages/onboarding-flow/import-srp/import-srp.js
+++ b/ui/pages/onboarding-flow/import-srp/import-srp.js
@@ -25,10 +25,7 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
 
   return (
     <div className="import-srp">
-      <TwoStepProgressBar
-        stage={twoStepStages.RECOVERY_PHRASE_CONFIRM}
-        marginBottom={4}
-      />
+      <TwoStepProgressBar stage={twoStepStages.RECOVERY_PHRASE_CONFIRM} />
       <div className="import-srp__header">
         <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
           {t('accessYourWalletWithSRP')}
@@ -56,10 +53,10 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
             srpText={t('typeYourSRP')}
           />
           <Button
-            className="import-srp__confirm-button"
             type="primary"
             data-testid="import-srp-confirm"
             large
+            className="import-srp__confirm-button"
             onClick={() => {
               submitSecretRecoveryPhrase(secretRecoveryPhrase);
               history.replace(ONBOARDING_CREATE_PASSWORD_ROUTE);
diff --git a/ui/pages/onboarding-flow/import-srp/index.scss b/ui/pages/onboarding-flow/import-srp/index.scss
index 55d53dfe898e..912cd52eb7fd 100644
--- a/ui/pages/onboarding-flow/import-srp/index.scss
+++ b/ui/pages/onboarding-flow/import-srp/index.scss
@@ -1,12 +1,29 @@
 .import-srp {
-  margin-bottom: 24px;
+  width: 840px;
+
+  @media screen and (max-width: 349px) {
+    width: 300px;
+  }
+
+  @media screen and (min-width: 350px) and (max-width: 460px) {
+    width: 357px;
+  }
+
+  @media screen and (min-width: 461px) and (max-width: $break-small) {
+    width: 450px;
+  }
+
+  @media screen and (min-width: $break-small) and (max-width: 840px) {
+    width: 580px;
+  }
 
   &__header {
     display: flex;
     flex-direction: column;
     justify-content: center;
     text-align: center;
-    margin-bottom: 24px;
+    margin: 20px auto;
+    max-width: 500px;
   }
 
   &__description {
@@ -33,11 +50,17 @@
     align-items: center;
     text-align: left;
     margin: auto;
+
+    &--link {
+      @include H6;
+
+      margin-bottom: 12px;
+    }
   }
 
   &__confirm-button {
-    max-width: 327px;
+    width: 327px;
     margin: auto;
-    margin-top: 24px;
+    margin-top: 59px;
   }
 }
diff --git a/ui/pages/onboarding-flow/index.scss b/ui/pages/onboarding-flow/index.scss
index 72d384031163..bddf337de3bc 100644
--- a/ui/pages/onboarding-flow/index.scss
+++ b/ui/pages/onboarding-flow/index.scss
@@ -10,21 +10,17 @@
 @import 'metametrics/index';
 
 .onboarding-flow {
-  background-color: var(--color-background-default);
-  padding: 0 16px;
   width: 100%;
+  background-color: var(--color-background-default);
+  display: flex;
+  flex-direction: column;
+  align-items: center;
 
   &__wrapper {
-    margin: 24px auto;
-    padding: 32px 16px;
-    max-width: 600px;
+    margin-top: 40px;
+    padding: 32px;
     border: 1px solid var(--color-border-muted);
-    border-radius: 24px;
-
-    @media screen and (min-width: $break-large) {
-      margin: 64px auto 40px;
-      padding: 32px;
-    }
+    border-radius: 20px;
   }
 
   &__twitter-button {
diff --git a/ui/pages/onboarding-flow/metametrics/index.scss b/ui/pages/onboarding-flow/metametrics/index.scss
index 568a367a9b2f..2157182572fc 100644
--- a/ui/pages/onboarding-flow/metametrics/index.scss
+++ b/ui/pages/onboarding-flow/metametrics/index.scss
@@ -1,10 +1,5 @@
 .onboarding-metametrics {
-  @media screen and (min-width: $break-large) {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-  }
+  width: 600px;
 
   ul {
     margin: 24px 0 0 0;
@@ -34,21 +29,13 @@
   }
 
   &__buttons {
-    margin-top: 24px;
-    width: 100%;
-
-    @media screen and (min-width: $break-large) {
-      margin-top: 40px;
-      justify-content: space-between;
-      display: flex;
-    }
+    margin: 24px auto 0 auto;
+    justify-content: space-between;
+    display: flex;
 
     button {
       margin-bottom: 24px;
-
-      @media screen and (min-width: $break-large) {
-        width: 200px;
-      }
+      width: 200px;
     }
   }
 }
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index e9928577ca12..78695700d98e 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -43,10 +43,8 @@ export default function OnboardingMetametrics() {
   const onConfirm = async () => {
     const [, metaMetricsId] = await dispatch(setParticipateInMetaMetrics(true));
 
-    const isInitiallyNotParticipating = !participateInMetaMetrics;
-
     try {
-      if (isInitiallyNotParticipating) {
+      if (!participateInMetaMetrics) {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
@@ -85,11 +83,8 @@ export default function OnboardingMetametrics() {
   const onCancel = async () => {
     await dispatch(setParticipateInMetaMetrics(false));
 
-    const isInitiallyParticipatingOrNotSet =
-      participateInMetaMetrics === null || participateInMetaMetrics;
-
     try {
-      if (isInitiallyParticipatingOrNotSet) {
+      if (!participateInMetaMetrics) {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
@@ -119,10 +114,7 @@ export default function OnboardingMetametrics() {
       >
         {t('metametricsTitle')}
       </Typography>
-      <Typography
-        className="onboarding-metametrics__desc"
-        align={TEXT_ALIGN.CENTER}
-      >
+      <Typography align={TEXT_ALIGN.CENTER}>
         {t('metametricsOptInDescription2')}
       </Typography>
       <ul>
diff --git a/ui/pages/onboarding-flow/onboarding-app-header/index.scss b/ui/pages/onboarding-flow/onboarding-app-header/index.scss
index 400ca92314eb..567d8bfe11eb 100644
--- a/ui/pages/onboarding-flow/onboarding-app-header/index.scss
+++ b/ui/pages/onboarding-flow/onboarding-app-header/index.scss
@@ -9,7 +9,7 @@
   flex: 0 0 auto;
 
   @media screen and (max-width: $break-small) {
-    padding: 16px;
+    padding: 1rem;
     z-index: $mobile-header-z-index;
   }
 
diff --git a/ui/pages/onboarding-flow/pin-extension/index.scss b/ui/pages/onboarding-flow/pin-extension/index.scss
index 89830f801a19..0ff5f9c0f7b1 100644
--- a/ui/pages/onboarding-flow/pin-extension/index.scss
+++ b/ui/pages/onboarding-flow/pin-extension/index.scss
@@ -1,4 +1,6 @@
 .onboarding-pin-extension {
+  max-width: 800px;
+
   .control-dots .dot {
     background: var(--color-icon-muted);
     box-shadow: none;
@@ -10,7 +12,7 @@
 
   &__diagram {
     margin: 24px auto;
-    max-width: 799px;
+    width: 799px;
     height: 320px;
   }
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/index.scss b/ui/pages/onboarding-flow/privacy-settings/index.scss
index 0f3c1e874b18..75d23b83dc0f 100644
--- a/ui/pages/onboarding-flow/privacy-settings/index.scss
+++ b/ui/pages/onboarding-flow/privacy-settings/index.scss
@@ -4,14 +4,6 @@
   justify-content: center;
   align-items: center;
 
-  @media screen and (max-width: $break-small) {
-    margin-bottom: 24px;
-  }
-
-  @media screen and (min-width: $break-large) {
-    margin-bottom: 40px;
-  }
-
   &__header {
     display: flex;
     justify-content: center;
@@ -29,11 +21,6 @@
     max-width: 620px;
     margin-bottom: 20px;
 
-    @media screen and (min-width: $break-large) {
-      margin-inline-start: 48px;
-      margin-inline-end: 48px;
-    }
-
     a {
       color: var(--color-primary-default);
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/setting.js b/ui/pages/onboarding-flow/privacy-settings/setting.js
index f2951fc97979..82ba1275ca3d 100644
--- a/ui/pages/onboarding-flow/privacy-settings/setting.js
+++ b/ui/pages/onboarding-flow/privacy-settings/setting.js
@@ -29,5 +29,5 @@ Setting.propTypes = {
   value: PropTypes.bool,
   setValue: PropTypes.func,
   title: PropTypes.string,
-  description: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
+  description: PropTypes.string,
 };
diff --git a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
index 32e6888c8129..b600b7f78c69 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
@@ -54,11 +54,8 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
   };
 
   return (
-    <div className="recovery-phrase__confirm">
-      <ThreeStepProgressBar
-        stage={threeStepStages.RECOVERY_PHRASE_CONFIRM}
-        marginBottom={4}
-      />
+    <div>
+      <ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_CONFIRM} />
       <Box
         justifyContent={JUSTIFY_CONTENT.CENTER}
         textAlign={TEXT_ALIGN.CENTER}
@@ -84,12 +81,11 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
         inputValue={phraseElements}
         indicesToCheck={indicesToCheck}
       />
-      <div className="recovery-phrase__footer__confirm">
+      <div className="recovery-phrase__footer">
         <Button
           data-testid="recovery-phrase-confirm"
           type="primary"
-          large
-          className="recovery-phrase__footer__confirm--button"
+          className="recovery-phrase__footer--button"
           onClick={() => {
             history.push(ONBOARDING_COMPLETION_ROUTE);
           }}
diff --git a/ui/pages/onboarding-flow/recovery-phrase/index.scss b/ui/pages/onboarding-flow/recovery-phrase/index.scss
index 89fa4d1ed98d..d55ec5e82d9e 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/index.scss
+++ b/ui/pages/onboarding-flow/recovery-phrase/index.scss
@@ -1,42 +1,22 @@
 .recovery-phrase {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  &__header {
-    max-width: 420px;
-  }
+  max-width: 600px;
 
   &__tips {
     flex-direction: column;
-    max-width: 420px;
-    margin: 0 auto;
 
     ul {
       list-style: disc;
       margin-left: 20px;
-      margin-bottom: 24px;
     }
   }
 
   &__chips {
     display: grid;
+    grid-template-columns: 190px 190px 190px;
     justify-items: center;
     align-items: center;
     row-gap: 16px;
 
-    @media screen and (max-width: 460px) {
-      grid-template-columns: 198px;
-    }
-
-    @media screen and (min-width: 460px) and (max-width: $break-small) {
-      grid-template-columns: 181px 181px;
-    }
-
-    @media screen and (min-width: $break-large) {
-      grid-template-columns: 166px 166px 166px;
-    }
-
     &--hidden {
       filter: blur(5px);
     }
@@ -44,7 +24,6 @@
 
   &__secret {
     position: relative;
-    width: 100%;
   }
 
   &__secret-blocker {
@@ -83,38 +62,11 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
-    width: 100%;
-
-    @media screen and (max-width: $break-small) {
-      margin-inline-start: 40px;
-      margin-inline-end: 40px;
-      margin-bottom: 40px;
-    }
-
-    &__confirm {
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
-      width: 100%;
-
-      @media screen and (min-width: $break-small) {
-        margin-top: 20px;
-      }
-
-      &--button {
-        align-self: center;
-        width: 100%;
-        max-width: 300px;
-      }
-    }
 
     &--button {
+      width: 50%;
+      padding: 20px;
       align-self: center;
-
-      @media screen and (min-width: $break-large) {
-        max-width: 300px;
-      }
     }
 
     &__copy-and-hide {
@@ -126,10 +78,6 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
-
-        @media screen and (min-width: $break-large) {
-          justify-content: space-around;
-        }
       }
 
       &__button {
@@ -152,11 +100,6 @@
           justify-content: flex-end;
         }
 
-        @media screen and (max-width: $break-small) {
-          justify-content: center;
-          width: 100%;
-        }
-
         svg {
           width: 15px;
         }
@@ -179,18 +122,10 @@
 
     &--with-input {
       width: 120px;
-      box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+      box-shadow: 0 3px 4px -3px rgba(0, 0, 0, 0.15);
       border-width: 2px;
       border-radius: 13px;
       height: 32px;
     }
   }
-
-  &__confirm {
-    @media screen and (min-width: $break-large) {
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-    }
-  }
 }
diff --git a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
index a046b3d75d6d..0482a36693c7 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
@@ -35,11 +35,7 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
         textAlign={TEXT_ALIGN.CENTER}
         marginBottom={4}
       >
-        <Typography
-          variant={TYPOGRAPHY.H2}
-          fontWeight={FONT_WEIGHT.BOLD}
-          className="recovery-phrase__header"
-        >
+        <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
           {t('seedPhraseWriteDownHeader')}
         </Typography>
       </Box>
@@ -53,6 +49,7 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
         </Typography>
       </Box>
       <Box
+        justifyContent={JUSTIFY_CONTENT.SPACE_EVENLY}
         textAlign={TEXT_ALIGN.LEFT}
         marginBottom={4}
         className="recovery-phrase__tips"
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/index.scss b/ui/pages/onboarding-flow/secure-your-wallet/index.scss
index 9fcad972fea0..5fa4f553085e 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/index.scss
+++ b/ui/pages/onboarding-flow/secure-your-wallet/index.scss
@@ -3,29 +3,17 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
+  max-width: 1000px;
+  max-height: 1300px;
 
-  &__video {
-    max-width: 100%;
-    border-radius: 8px;
+  &__details {
+    max-width: 550px;
+    padding-inline-end: 10px;
   }
 
   &__actions {
-    flex-direction: column;
-    justify-content: space-between;
-    width: 100%;
-
-    @media screen and (min-width: $break-large) {
-      flex-direction: row;
-    }
-
     button {
-      margin-bottom: 16px;
-
-      @media screen and (min-width: $break-large) {
-        + button {
-          margin-left: 16px;
-        }
-      }
+      margin: 16px;
     }
   }
 
@@ -33,7 +21,7 @@
     list-style: disc inside;
 
     li {
-      @include H4;
+      font-size: 18px;
     }
   }
 
@@ -41,10 +29,6 @@
     background-color: var(--color-primary-muted);
     padding: 12px;
     border-radius: 10px;
-
-    @media screen and (min-width: $break-large) {
-      margin-inline-end: 43px;
-    }
   }
 }
 
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
index 04eb178128c0..1990b7a4c1fc 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
@@ -47,11 +47,6 @@ export default function SecureYourWallet() {
     ru: 'Russian',
     tl: 'Tagalog',
     vi: 'Vietnamese',
-    de: 'German',
-    el: 'Greek',
-    fr: 'French',
-    tr: 'Turkish',
-    zh: 'Chinese - China',
   };
 
   const defaultLang = subtitles[currentLocale] ? currentLocale : 'en';
@@ -60,14 +55,12 @@ export default function SecureYourWallet() {
       {showSkipSRPBackupPopover && (
         <SkipSRPBackup handleClose={() => setShowSkipSRPBackupPopover(false)} />
       )}
-      <ThreeStepProgressBar
-        stage={threeStepStages.RECOVERY_PHRASE_VIDEO}
-        marginBottom={4}
-      />
+      <ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_VIDEO} />
       <Box
         justifyContent={JUSTIFY_CONTENT.CENTER}
         textAlign={TEXT_ALIGN.CENTER}
         marginBottom={4}
+        marginTop={8}
       >
         <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
           {t('seedPhraseIntroTitle')}
@@ -82,7 +75,7 @@ export default function SecureYourWallet() {
         </Typography>
       </Box>
       <Box>
-        <video className="secure-your-wallet__video" controls>
+        <video controls style={{ borderRadius: '10px' }}>
           <source
             type="video/webm"
             src="./images/videos/recovery-onboarding/video.webm"
@@ -103,6 +96,7 @@ export default function SecureYourWallet() {
       </Box>
       <Box
         margin={8}
+        width="10/12"
         justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
         className="secure-your-wallet__actions"
       >
@@ -125,7 +119,7 @@ export default function SecureYourWallet() {
           {t('seedPhraseIntroRecommendedButtonCopy')}
         </Button>
       </Box>
-      <Box className="secure-your-wallet__desc">
+      <Box>
         <Box marginBottom={4}>
           <Typography
             tag="p"
diff --git a/ui/pages/onboarding-flow/welcome/index.scss b/ui/pages/onboarding-flow/welcome/index.scss
index 3131edfecb35..603b44a1e7fc 100644
--- a/ui/pages/onboarding-flow/welcome/index.scss
+++ b/ui/pages/onboarding-flow/welcome/index.scss
@@ -1,6 +1,8 @@
 @import "./react-gallery/carousel.min.css";
 
 .onboarding-welcome {
+  width: 600px;
+
   .control-dots .dot {
     background: var(--color-icon-muted);
     box-shadow: none;
@@ -14,10 +16,6 @@
   .carousel.carousel-slider .control-arrow {
     opacity: 1;
     color: var(--color-icon-default);
-
-    @media screen and (min-width: $break-large) {
-      padding: 40px;
-    }
   }
 
   .carousel .control-next.control-arrow::before {
@@ -44,7 +42,7 @@
   }
 
   &__buttons {
-    max-width: 300px;
+    max-width: 50%;
     margin: 40px auto 0 auto;
 
     li {
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index f1290cc04b72..3943575c3588 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -42,7 +42,7 @@ export default function OnboardingWelcome() {
           >
             {t('welcomeToMetaMask')}
           </Typography>
-          <Typography align={TEXT_ALIGN.CENTER} marginLeft={6} marginRight={6}>
+          <Typography align={TEXT_ALIGN.CENTER}>
             {t('welcomeToMetaMaskIntro')}
           </Typography>
           <div className="onboarding-welcome__mascot">
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index d6160c24f745..a2a6c56c2bc7 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -24,4 +24,3 @@
 @import 'token-details/index';
 @import 'unlock-page/index';
 @import 'onboarding-flow/index';
-@import 'notifications/index';
diff --git a/ui/pages/permissions-connect/flask/snap-install/index.scss b/ui/pages/permissions-connect/flask/snap-install/index.scss
index 87047ec056b3..53e525acbdf1 100644
--- a/ui/pages/permissions-connect/flask/snap-install/index.scss
+++ b/ui/pages/permissions-connect/flask/snap-install/index.scss
@@ -22,6 +22,10 @@
     }
   }
 
+  .version {
+    font-family: monospace;
+  }
+
   .page-container__footer {
     width: 100%;
     margin-top: 12px;
diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index 466a874fa5a3..497ca45af016 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -37,6 +37,13 @@ export default function SnapInstall({
     approveSnapInstall,
   ]);
 
+  const npmId = useMemo(() => {
+    if (!targetSubjectMetadata.origin.startsWith('npm:')) {
+      return undefined;
+    }
+    return targetSubjectMetadata.origin.substring(4);
+  }, [targetSubjectMetadata]);
+
   const shouldShowWarning = useMemo(
     () =>
       Boolean(
@@ -67,7 +74,7 @@ export default function SnapInstall({
           headerTitle={t('snapInstall')}
           headerText={null} // TODO(ritave): Add header text when snaps support description
           siteOrigin={targetSubjectMetadata.origin}
-          isSnapInstall
+          npmPackageName={npmId}
           snapVersion={targetSubjectMetadata.version}
           boxProps={{ alignItems: ALIGN_ITEMS.CENTER }}
         />
diff --git a/ui/pages/permissions-connect/index.scss b/ui/pages/permissions-connect/index.scss
index fd02a75b23f7..fc07dede8b7a 100644
--- a/ui/pages/permissions-connect/index.scss
+++ b/ui/pages/permissions-connect/index.scss
@@ -27,7 +27,7 @@
   &__back {
     @include H7;
 
-    color: var(--color-icon-default);
+    color: var(--color-text-default);
     font-weight: bold;
     cursor: pointer;
 
@@ -39,7 +39,7 @@
   &__page-count {
     @include H7;
 
-    color: var(--color-text-default);
+    color: var(--color-icon-default);
     grid-column: 2;
     justify-self: end;
     font-weight: bold;
diff --git a/ui/pages/permissions-connect/redirect/index.scss b/ui/pages/permissions-connect/redirect/index.scss
index a1a8c8047c72..9fbb6f1216dc 100644
--- a/ui/pages/permissions-connect/redirect/index.scss
+++ b/ui/pages/permissions-connect/redirect/index.scss
@@ -39,6 +39,7 @@
     align-items: center;
     justify-content: center;
     position: absolute;
+    filter: drop-shadow(0 1px 5px rgba(0, 0, 0, 0.25));
 
     &::before {
       content: '';
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index a4d3d8c5a69a..851111fa7abf 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -34,9 +34,6 @@ import Alerts from '../../components/app/alerts';
 import Asset from '../asset';
 import OnboardingAppHeader from '../onboarding-flow/onboarding-app-header/onboarding-app-header';
 import TokenDetailsPage from '../token-details';
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-import Notifications from '../notifications';
-///: END:ONLY_INCLUDE_IN
 
 import {
   IMPORT_TOKEN_ROUTE,
@@ -62,9 +59,6 @@ import {
   ONBOARDING_ROUTE,
   ADD_COLLECTIBLE_ROUTE,
   TOKEN_DETAILS,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  NOTIFICATIONS_ROUTE,
-  ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/routes';
 
 import {
@@ -181,11 +175,6 @@ export default class Routes extends Component {
           exact
         />
         <Authenticated path={SETTINGS_ROUTE} component={Settings} />
-        {
-          ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          <Authenticated path={NOTIFICATIONS_ROUTE} component={Notifications} />
-          ///: END:ONLY_INCLUDE_IN
-        }
         <Authenticated
           path={`${CONFIRM_TRANSACTION_ROUTE}/:id?`}
           component={ConfirmTransaction}
diff --git a/ui/pages/send/send-content/add-recipient/add-recipient.component.js b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
index efe1070ebf22..a46fa7a8b82c 100644
--- a/ui/pages/send/send-content/add-recipient/add-recipient.component.js
+++ b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
@@ -32,7 +32,6 @@ export default class AddRecipient extends Component {
       error: PropTypes.string,
       warning: PropTypes.string,
     }),
-    updateRecipientUserInput: PropTypes.func,
   };
 
   constructor(props) {
@@ -71,7 +70,6 @@ export default class AddRecipient extends Component {
       `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
     );
     this.props.updateRecipient({ address, nickname });
-    this.props.updateRecipientUserInput(address);
   };
 
   searchForContacts = () => {
@@ -117,7 +115,7 @@ export default class AddRecipient extends Component {
         recipient.nickname,
         'validated user input',
       );
-    } else if (ensResolution && !recipient.error) {
+    } else if (ensResolution) {
       content = this.renderExplicitAddress(
         ensResolution,
         addressBookEntryName || userInput,
@@ -210,13 +208,9 @@ export default class AddRecipient extends Component {
           addressBook={addressBook}
           searchForContacts={this.searchForContacts.bind(this)}
           searchForRecents={this.searchForRecents.bind(this)}
-          selectRecipient={(address, name) => {
-            this.selectRecipient(
-              address,
-              name,
-              `${name ? 'contact' : 'recent'} list`,
-            );
-          }}
+          selectRecipient={(address, name) =>
+            this.selectRecipient(address, name, 'contact list')
+          }
         >
           {ownedAccounts && ownedAccounts.length > 1 && !userInput && (
             <Button
diff --git a/ui/pages/send/send-content/add-recipient/ens-input.component.js b/ui/pages/send/send-content/add-recipient/ens-input.component.js
index d220d753ee16..4cf63a7fab48 100644
--- a/ui/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/pages/send/send-content/add-recipient/ens-input.component.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-import { addHexPrefix } from '../../../../../app/scripts/lib/util';
 import { isValidDomainName } from '../../../../helpers/utils/util';
 import {
   isBurnAddress,
@@ -44,7 +43,7 @@ export default class EnsInput extends Component {
           !isBurnAddress(input) &&
           isValidHexAddress(input, { mixedCaseUseChecksum: true })
         ) {
-          this.props.onPaste(addHexPrefix(input));
+          this.props.onPaste(input);
         }
       });
     }
@@ -75,7 +74,7 @@ export default class EnsInput extends Component {
         !isBurnAddress(input) &&
         isValidHexAddress(input, { mixedCaseUseChecksum: true })
       ) {
-        onValidAddressTyped(addHexPrefix(input));
+        onValidAddressTyped(input);
       }
     }
 
diff --git a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
index 45b85d79904f..a163a13a0973 100644
--- a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
+++ b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
@@ -3,13 +3,9 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import { fireEvent } from '@testing-library/react';
-import { AMOUNT_MODES, SEND_STATUSES } from '../../../../../ducks/send';
+import { initialState, SEND_STATUSES } from '../../../../../ducks/send';
 import { renderWithProvider } from '../../../../../../test/jest';
 import { GAS_ESTIMATE_TYPES } from '../../../../../../shared/constants/gas';
-import {
-  getInitialSendStateWithExistingTxState,
-  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-} from '../../../../../../test/jest/mocks';
 import AmountMaxButton from './amount-max-button';
 
 const middleware = [thunk];
@@ -26,7 +22,7 @@ describe('AmountMaxButton Component', () => {
               EIPS: {},
             },
           },
-          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          send: initialState,
         }),
       );
       expect(getByText('Max')).toBeTruthy();
@@ -40,14 +36,12 @@ describe('AmountMaxButton Component', () => {
             EIPS: {},
           },
         },
-        send: getInitialSendStateWithExistingTxState({
-          status: SEND_STATUSES.VALID,
-        }),
+        send: { ...initialState, status: SEND_STATUSES.VALID },
       });
       const { getByText } = renderWithProvider(<AmountMaxButton />, store);
 
       const expectedActions = [
-        { type: 'send/updateAmountMode', payload: AMOUNT_MODES.MAX },
+        { type: 'send/updateAmountMode', payload: 'MAX' },
       ];
 
       fireEvent.click(getByText('Max'), { bubbles: true });
@@ -64,10 +58,9 @@ describe('AmountMaxButton Component', () => {
           },
         },
         send: {
-          ...getInitialSendStateWithExistingTxState({
-            status: SEND_STATUSES.VALID,
-          }),
-          amountMode: AMOUNT_MODES.MAX,
+          ...initialState,
+          status: SEND_STATUSES.VALID,
+          amount: { ...initialState.amount, mode: 'MAX' },
         },
       });
       const { getByText } = renderWithProvider(<AmountMaxButton />, store);
diff --git a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
index 138ad06edad4..ac075ddf845f 100644
--- a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
+++ b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
@@ -5,14 +5,10 @@ import Identicon from '../../../../components/ui/identicon';
 import TokenBalance from '../../../../components/ui/token-balance';
 import TokenListDisplay from '../../../../components/app/token-list-display';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display';
-import { PRIMARY } from '../../../../helpers/constants/common';
+import { ERC20, ERC721, PRIMARY } from '../../../../helpers/constants/common';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 import { EVENT } from '../../../../../shared/constants/metametrics';
-import {
-  ASSET_TYPES,
-  ERC20,
-  ERC721,
-} from '../../../../../shared/constants/transaction';
+import { ASSET_TYPES } from '../../../../../shared/constants/transaction';
 
 export default class SendAssetRow extends Component {
   static propTypes = {
diff --git a/ui/pages/send/send-content/send-content.component.js b/ui/pages/send/send-content/send-content.component.js
index a856624d12fa..3b54b4a784ac 100644
--- a/ui/pages/send/send-content/send-content.component.js
+++ b/ui/pages/send/send-content/send-content.component.js
@@ -2,7 +2,6 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import PageContainerContent from '../../../components/ui/page-container/page-container-content.component';
 import Dialog from '../../../components/ui/dialog';
-import ActionableMessage from '../../../components/ui/actionable-message';
 import NicknamePopovers from '../../../components/app/modals/nickname-popovers';
 import {
   ETH_GAS_PRICE_FETCH_WARNING_KEY,
@@ -11,7 +10,6 @@ import {
   INSUFFICIENT_FUNDS_FOR_GAS_ERROR_KEY,
 } from '../../../helpers/constants/error-keys';
 import { ASSET_TYPES } from '../../../../shared/constants/transaction';
-import { CONTRACT_ADDRESS_LINK } from '../../../helpers/constants/common';
 import SendAmountRow from './send-amount-row';
 import SendHexDataRow from './send-hex-data-row';
 import SendAssetRow from './send-asset-row';
@@ -40,9 +38,6 @@ export default class SendContent extends Component {
     asset: PropTypes.object,
     to: PropTypes.string,
     assetError: PropTypes.string,
-    recipient: PropTypes.object,
-    acknowledgeRecipientWarning: PropTypes.func,
-    recipientWarningAcknowledged: PropTypes.bool,
   };
 
   render() {
@@ -56,8 +51,6 @@ export default class SendContent extends Component {
       getIsBalanceInsufficient,
       asset,
       assetError,
-      recipient,
-      recipientWarningAcknowledged,
     } = this.props;
 
     let gasError;
@@ -73,10 +66,6 @@ export default class SendContent extends Component {
       asset.type !== ASSET_TYPES.TOKEN &&
       asset.type !== ASSET_TYPES.COLLECTIBLE;
 
-    const showKnownRecipientWarning =
-      recipient.warning === 'knownAddressRecipient';
-    const hideAddContactDialog = recipient.warning === 'loading';
-
     return (
       <PageContainerContent>
         <div className="send-v2__form">
@@ -87,12 +76,7 @@ export default class SendContent extends Component {
             : null}
           {error ? this.renderError(error) : null}
           {warning ? this.renderWarning() : null}
-          {showKnownRecipientWarning && !recipientWarningAcknowledged
-            ? this.renderRecipientWarning()
-            : null}
-          {showKnownRecipientWarning || hideAddContactDialog
-            ? null
-            : this.maybeRenderAddContact()}
+          {this.maybeRenderAddContact()}
           <SendAssetRow />
           <SendAmountRow />
           {networkOrAccountNotSupports1559 ? <SendGasRow /> : null}
@@ -120,7 +104,6 @@ export default class SendContent extends Component {
         >
           {t('newAccountDetectedDialogMessage')}
         </Dialog>
-
         {showNicknamePopovers ? (
           <NicknamePopovers
             onClose={() => this.setState({ showNicknamePopovers: false })}
@@ -141,36 +124,6 @@ export default class SendContent extends Component {
     );
   }
 
-  renderRecipientWarning() {
-    const { acknowledgeRecipientWarning } = this.props;
-    const { t } = this.context;
-    return (
-      <div className="send__warning-container">
-        <ActionableMessage
-          type="danger"
-          useIcon
-          iconFillColor="#d73a49"
-          primaryActionV2={{
-            label: t('tooltipApproveButton'),
-            onClick: acknowledgeRecipientWarning,
-          }}
-          message={t('sendingToTokenContractWarning', [
-            <a
-              key="contractWarningSupport"
-              target="_blank"
-              rel="noopener noreferrer"
-              className="send__warning-container__link"
-              href={CONTRACT_ADDRESS_LINK}
-            >
-              {t('learnMoreUpperCase')}
-            </a>,
-          ])}
-          roundedButtons
-        />
-      </div>
-    );
-  }
-
   renderError(error) {
     const { t } = this.context;
     return (
diff --git a/ui/pages/send/send-content/send-content.component.test.js b/ui/pages/send/send-content/send-content.component.test.js
index ec8ed3ecf66d..7b06b50e313e 100644
--- a/ui/pages/send/send-content/send-content.component.test.js
+++ b/ui/pages/send/send-content/send-content.component.test.js
@@ -16,32 +16,6 @@ describe('SendContent Component', () => {
     gasIsExcessive: false,
     networkAndAccountSupports1559: true,
     asset: { type: 'NATIVE' },
-    recipient: {
-      mode: 'CONTACT_LIST',
-      userInput: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
-      address: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
-      nickname: 'John Doe',
-      error: null,
-      warning: null,
-    },
-    tokenAddressList: {
-      '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
-        name: 'BitBase',
-        symbol: 'BTBS',
-        decimals: 18,
-        address: '0x32E6C34Cd57087aBBD59B5A4AECC4cB495924356',
-        iconUrl: 'BTBS.svg',
-        occurrences: null,
-      },
-      '0x3fa400483487a489ec9b1db29c4129063eec4654': {
-        name: 'Cryptokek.com',
-        symbol: 'KEK',
-        decimals: 18,
-        address: '0x3fa400483487A489EC9b1dB29C4129063EEC4654',
-        iconUrl: 'cryptokek.svg',
-        occurrences: null,
-      },
-    },
   };
 
   beforeEach(() => {
@@ -176,7 +150,7 @@ describe('SendContent Component', () => {
       true,
     );
     expect(
-      PageContainerContentChild.childAt(2).find(
+      PageContainerContentChild.childAt(1).find(
         'send-v2__asset-dropdown__single-asset',
       ),
     ).toHaveLength(0);
diff --git a/ui/pages/send/send-content/send-content.container.js b/ui/pages/send/send-content/send-content.container.js
index 53fca75303be..d3e508e9f4e2 100644
--- a/ui/pages/send/send-content/send-content.container.js
+++ b/ui/pages/send/send-content/send-content.container.js
@@ -11,9 +11,6 @@ import {
   getSendTo,
   getSendAsset,
   getAssetError,
-  getRecipient,
-  acknowledgeRecipientWarning,
-  getRecipientWarningAcknowledgement,
 } from '../../../ducks/send';
 
 import SendContent from './send-content.component';
@@ -21,10 +18,6 @@ import SendContent from './send-content.component';
 function mapStateToProps(state) {
   const ownedAccounts = accountsWithSendEtherInfoSelector(state);
   const to = getSendTo(state);
-  const recipient = getRecipient(state);
-  const recipientWarningAcknowledged = getRecipientWarningAcknowledgement(
-    state,
-  );
   return {
     isOwnedAccount: Boolean(
       ownedAccounts.find(
@@ -41,15 +34,7 @@ function mapStateToProps(state) {
     getIsBalanceInsufficient: getIsBalanceInsufficient(state),
     asset: getSendAsset(state),
     assetError: getAssetError(state),
-    recipient,
-    recipientWarningAcknowledged,
   };
 }
 
-function mapDispatchToProps(dispatch) {
-  return {
-    acknowledgeRecipientWarning: () => dispatch(acknowledgeRecipientWarning()),
-  };
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(SendContent);
+export default connect(mapStateToProps)(SendContent);
diff --git a/ui/pages/send/send-content/send-content.stories.js b/ui/pages/send/send-content/send-content.stories.js
index 16f9ab6b0fe3..66ed9b53bf9f 100644
--- a/ui/pages/send/send-content/send-content.stories.js
+++ b/ui/pages/send/send-content/send-content.stories.js
@@ -1,84 +1,26 @@
 import React from 'react';
+import { boolean, text } from '@storybook/addon-knobs';
 
 import SendContent from './send-content.component';
 
 export default {
   title: 'Pages/Send/SendContent',
   id: __filename,
-  argsTypes: {
-    showHexData: {
-      control: 'boolean',
-    },
-    isOwnedAccount: {
-      control: 'boolean',
-    },
-    contact: {
-      control: 'object',
-    },
-    noGasPrice: {
-      control: 'boolean',
-    },
-    isEthGasPrice: {
-      control: 'boolean',
-    },
-
-    gasIsExcessive: {
-      control: 'boolean',
-    },
-    networkOrAccountNotSupports1559: {
-      control: 'boolean',
-    },
-    getIsBalanceInsufficient: {
-      control: 'boolean',
-    },
-    error: {
-      control: 'text',
-    },
-    warning: {
-      control: 'text',
-    },
-    to: {
-      control: 'text',
-    },
-    assetError: {
-      control: 'text',
-    },
-    asset: {
-      control: 'object',
-    },
-    recipient: {
-      control: 'object',
-    },
-  },
 };
 
-export const DefaultStory = (args) => {
-  return <SendContent {...args} />;
+export const DefaultStory = () => {
+  return (
+    <SendContent
+      showHexData={boolean('Show Hex Data', false)}
+      isOwnedAccount={boolean('Is In Address Book', true)}
+      noGasPrice={boolean('No Gas Price', false)}
+      isEthGasPrice={boolean('Backup Gas Price', false)}
+      gasIsExcessive={boolean('Gas Is Excessive', false)}
+      // Get error and warning message from messages.json
+      error={text('Error', 'connecting')}
+      warning={text('Warning', 'connecting')}
+    />
+  );
 };
 
 DefaultStory.storyName = 'Default';
-DefaultStory.args = {
-  showHexData: false,
-  isOwnedAccount: true,
-  noGasPrice: false,
-  isEthGasPrice: false,
-  gasIsExcessive: false,
-  error: 'connecting',
-  warning: 'connecting',
-  asset: {
-    type: 'NATIVE',
-  },
-  recipient: {
-    mode: 'CONTACT_LIST',
-    userInput: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
-    address: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
-    nickname: 'John Doe',
-    error: null,
-    warning: null,
-  },
-  contact: { name: 'testName' },
-  networkOrAccountNotSupports1559: false,
-  getIsBalanceInsufficient: false,
-  to: 'string to',
-  assetError: 'newAccountDetectedDialogMessage',
-};
diff --git a/ui/pages/send/send-header/send-header.component.js b/ui/pages/send/send-header/send-header.component.js
index d71b6ef99d3d..f4528a6c4a14 100644
--- a/ui/pages/send/send-header/send-header.component.js
+++ b/ui/pages/send/send-header/send-header.component.js
@@ -5,7 +5,6 @@ import PageContainerHeader from '../../../components/ui/page-container/page-cont
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
-  getDraftTransactionExists,
   getSendAsset,
   getSendStage,
   resetSendState,
@@ -20,18 +19,15 @@ export default function SendHeader() {
   const stage = useSelector(getSendStage);
   const asset = useSelector(getSendAsset);
   const t = useI18nContext();
-  const draftTransactionExists = useSelector(getDraftTransactionExists);
+
   const onClose = () => {
     dispatch(resetSendState());
     history.push(mostRecentOverviewPage);
   };
 
-  let title = asset?.type === ASSET_TYPES.NATIVE ? t('send') : t('sendTokens');
+  let title = asset.type === ASSET_TYPES.NATIVE ? t('send') : t('sendTokens');
 
-  if (
-    draftTransactionExists === false ||
-    [SEND_STAGES.ADD_RECIPIENT, SEND_STAGES.INACTIVE].includes(stage)
-  ) {
+  if (stage === SEND_STAGES.ADD_RECIPIENT || stage === SEND_STAGES.INACTIVE) {
     title = t('sendTo');
   } else if (stage === SEND_STAGES.EDIT) {
     title = t('edit');
diff --git a/ui/pages/send/send-header/send-header.component.test.js b/ui/pages/send/send-header/send-header.component.test.js
index a6eaa19d9106..5ec8bdc6914c 100644
--- a/ui/pages/send/send-header/send-header.component.test.js
+++ b/ui/pages/send/send-header/send-header.component.test.js
@@ -3,13 +3,9 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import { fireEvent } from '@testing-library/react';
-import { SEND_STAGES } from '../../../ducks/send';
+import { initialState, SEND_STAGES } from '../../../ducks/send';
 import { renderWithProvider } from '../../../../test/jest';
 import { ASSET_TYPES } from '../../../../shared/constants/transaction';
-import {
-  getInitialSendStateWithExistingTxState,
-  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-} from '../../../../test/jest/mocks';
 import SendHeader from './send-header.component';
 
 const middleware = [thunk];
@@ -30,7 +26,7 @@ describe('SendHeader Component', () => {
       const { getByText, rerender } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          send: initialState,
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -39,10 +35,7 @@ describe('SendHeader Component', () => {
       rerender(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: {
-            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-            stage: SEND_STAGES.ADD_RECIPIENT,
-          },
+          send: { ...initialState, stage: SEND_STAGES.ADD_RECIPIENT },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -55,12 +48,9 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            ...initialState,
             stage: SEND_STAGES.DRAFT,
-            asset: {
-              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT.asset,
-              type: ASSET_TYPES.NATIVE,
-            },
+            asset: { ...initialState.asset, type: ASSET_TYPES.NATIVE },
           },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
@@ -74,12 +64,9 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...getInitialSendStateWithExistingTxState({
-              asset: {
-                type: ASSET_TYPES.TOKEN,
-              },
-            }),
+            ...initialState,
             stage: SEND_STAGES.DRAFT,
+            asset: { ...initialState.asset, type: ASSET_TYPES.TOKEN },
           },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
@@ -93,7 +80,7 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            ...initialState,
             stage: SEND_STAGES.EDIT,
           },
           gas: { basicEstimateStatus: 'LOADING' },
@@ -109,7 +96,7 @@ describe('SendHeader Component', () => {
       const { getByText } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          send: initialState,
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -121,10 +108,7 @@ describe('SendHeader Component', () => {
       const { getByText } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: {
-            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-            stage: SEND_STAGES.EDIT,
-          },
+          send: { ...initialState, stage: SEND_STAGES.EDIT },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -134,7 +118,7 @@ describe('SendHeader Component', () => {
 
     it('resets send state when clicked', () => {
       const store = configureMockStore(middleware)({
-        send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+        send: initialState,
         gas: { basicEstimateStatus: 'LOADING' },
         history: { mostRecentOverviewPage: 'activity' },
       });
diff --git a/ui/pages/send/send.constants.js b/ui/pages/send/send.constants.js
index c1db267225fc..9f48bea0ad74 100644
--- a/ui/pages/send/send.constants.js
+++ b/ui/pages/send/send.constants.js
@@ -3,12 +3,12 @@ import {
   multiplyCurrencies,
 } from '../../../shared/modules/conversion.utils';
 import { addHexPrefix } from '../../../app/scripts/lib/util';
-import { MIN_GAS_LIMIT_HEX } from '../../../shared/constants/gas';
 
 const MIN_GAS_PRICE_DEC = '0';
 const MIN_GAS_PRICE_HEX = parseInt(MIN_GAS_PRICE_DEC, 10).toString(16);
 const MIN_GAS_LIMIT_DEC = '21000';
 const MAX_GAS_LIMIT_DEC = '7920027';
+const MIN_GAS_LIMIT_HEX = parseInt(MIN_GAS_LIMIT_DEC, 10).toString(16);
 
 const HIGH_FEE_WARNING_MULTIPLIER = 1.5;
 const MIN_GAS_PRICE_GWEI = addHexPrefix(
@@ -63,6 +63,7 @@ export {
   ENS_UNKNOWN_ERROR,
   ENS_REGISTRATION_ERROR,
   MIN_GAS_LIMIT_DEC,
+  MIN_GAS_LIMIT_HEX,
   MIN_GAS_PRICE_DEC,
   MIN_GAS_PRICE_GWEI,
   MIN_GAS_PRICE_HEX,
diff --git a/ui/pages/send/send.js b/ui/pages/send/send.js
index ad10615a7728..79980b25c4e6 100644
--- a/ui/pages/send/send.js
+++ b/ui/pages/send/send.js
@@ -1,26 +1,24 @@
-import React, { useEffect, useCallback, useContext, useRef } from 'react';
+import React, { useEffect, useCallback, useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
 import {
   addHistoryEntry,
-  getDraftTransactionExists,
   getIsUsingMyAccountForRecipientSearch,
   getRecipient,
   getRecipientUserInput,
   getSendStage,
+  initializeSendState,
   resetRecipientInput,
   resetSendState,
   SEND_STAGES,
-  startNewDraftTransaction,
   updateRecipient,
   updateRecipientUserInput,
 } from '../../ducks/send';
-import { isCustomPriceExcessive } from '../../selectors';
+import { getCurrentChainId, isCustomPriceExcessive } from '../../selectors';
 import { getSendHexDataFeatureFlagState } from '../../ducks/metamask/metamask';
 import { showQrScanner } from '../../store/actions';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import { EVENT } from '../../../shared/constants/metametrics';
-import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import SendHeader from './send-header';
 import AddRecipient from './send-content/add-recipient';
 import SendContent from './send-content';
@@ -32,7 +30,7 @@ const sendSliceIsCustomPriceExcessive = (state) =>
 
 export default function SendTransactionScreen() {
   const history = useHistory();
-  const startedNewDraftTransaction = useRef(false);
+  const chainId = useSelector(getCurrentChainId);
   const stage = useSelector(getSendStage);
   const gasIsExcessive = useSelector(sendSliceIsCustomPriceExcessive);
   const isUsingMyAccountsForRecipientSearch = useSelector(
@@ -41,7 +39,6 @@ export default function SendTransactionScreen() {
   const recipient = useSelector(getRecipient);
   const showHexData = useSelector(getSendHexDataFeatureFlagState);
   const userInput = useSelector(getRecipientUserInput);
-  const draftTransactionExists = useSelector(getDraftTransactionExists);
   const location = useLocation();
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -51,26 +48,12 @@ export default function SendTransactionScreen() {
     dispatch(resetSendState());
   }, [dispatch]);
 
-  /**
-   * It is possible to route to this page directly, either by typing in the url
-   * or by clicking the browser back button after progressing to the confirm
-   * screen. In the case where a draft transaction does not yet exist, this
-   * hook is responsible for creating it. We will assume that this is a native
-   * asset send.
-   */
   useEffect(() => {
-    if (
-      draftTransactionExists === false &&
-      startedNewDraftTransaction.current === false
-    ) {
-      startedNewDraftTransaction.current = true;
-      dispatch(startNewDraftTransaction({ type: ASSET_TYPES.NATIVE }));
+    if (chainId !== undefined) {
+      dispatch(initializeSendState());
+      window.addEventListener('beforeunload', cleanup);
     }
-  }, [draftTransactionExists, dispatch]);
-
-  useEffect(() => {
-    window.addEventListener('beforeunload', cleanup);
-  }, [cleanup]);
+  }, [chainId, dispatch, cleanup]);
 
   useEffect(() => {
     if (location.search === '?scan=true') {
@@ -92,10 +75,7 @@ export default function SendTransactionScreen() {
 
   let content;
 
-  if (
-    draftTransactionExists &&
-    [SEND_STAGES.EDIT, SEND_STAGES.DRAFT].includes(stage)
-  ) {
+  if ([SEND_STAGES.EDIT, SEND_STAGES.DRAFT].includes(stage)) {
     content = (
       <>
         <SendContent
@@ -116,11 +96,10 @@ export default function SendTransactionScreen() {
         userInput={userInput}
         className="send__to-row"
         onChange={(address) => dispatch(updateRecipientUserInput(address))}
-        onValidAddressTyped={async (address) => {
+        onValidAddressTyped={(address) => {
           dispatch(
             addHistoryEntry(`sendFlow - Valid address typed ${address}`),
           );
-          await dispatch(updateRecipientUserInput(address));
           dispatch(updateRecipient({ address, nickname: '' }));
         }}
         internalSearch={isUsingMyAccountsForRecipientSearch}
@@ -132,6 +111,7 @@ export default function SendTransactionScreen() {
               `sendFlow - User pasted ${text} into address field`,
             ),
           );
+          return dispatch(updateRecipient({ address: text, nickname: '' }));
         }}
         onReset={() => dispatch(resetRecipientInput())}
         scanQrCode={() => {
diff --git a/ui/pages/send/send.scss b/ui/pages/send/send.scss
index 2735ba89a699..71c40afb005f 100644
--- a/ui/pages/send/send.scss
+++ b/ui/pages/send/send.scss
@@ -35,15 +35,6 @@
     margin: 1rem;
   }
 
-  &__warning-container {
-    padding-left: 16px;
-    padding-right: 16px;
-
-    &__link {
-      color: var(--primary-1);
-    }
-  }
-
   &__to-row {
     margin: 0;
     padding: 0.5rem;
@@ -241,7 +232,7 @@
     &__subtitle {
       @include H7;
 
-      color: var(--color-text-default);
+      color: var(--color-icon-default);
       margin-top: 0.25rem;
     }
   }
diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js
index dc8a76628f66..e2d16be9f5ae 100644
--- a/ui/pages/send/send.test.js
+++ b/ui/pages/send/send.test.js
@@ -1,31 +1,17 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
+
 import { useLocation } from 'react-router-dom';
-import { SEND_STAGES, startNewDraftTransaction } from '../../ducks/send';
+import { initialState, SEND_STAGES } from '../../ducks/send';
 import { ensInitialState } from '../../ducks/ens';
 import { renderWithProvider } from '../../../test/jest';
 import { RINKEBY_CHAIN_ID } from '../../../shared/constants/network';
 import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas';
-import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks';
 import Send from './send';
 
 const middleware = [thunk];
 
-jest.mock('../../ducks/send/send', () => {
-  const original = jest.requireActual('../../ducks/send/send');
-  return {
-    ...original,
-    // We don't really need to start a draft transaction, and the mock store
-    // does not update as a result of action calls so instead we just ensure
-    // that the action WOULD be called.
-    startNewDraftTransaction: jest.fn(() => ({
-      type: 'TEST_START_NEW_DRAFT',
-      payload: null,
-    })),
-  };
-});
-
 jest.mock('react-router-dom', () => {
   const original = jest.requireActual('react-router-dom');
   return {
@@ -37,22 +23,18 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-jest.mock('ethers', () => {
-  const originalModule = jest.requireActual('ethers');
-  return {
-    ...originalModule,
-    ethers: {
-      ...originalModule.ethers,
-      providers: {
-        Web3Provider: jest.fn().mockImplementation(() => {
-          return {};
-        }),
-      },
+jest.mock(
+  'ethjs-ens',
+  () =>
+    class MocKENS {
+      async ensLookup() {
+        return '';
+      }
     },
-  };
-});
+);
+
 const baseStore = {
-  send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+  send: initialState,
   ENS: ensInitialState,
   gas: {
     customData: { limit: null, price: null },
@@ -97,25 +79,6 @@ const baseStore = {
       '0x0': { balance: '0x0', address: '0x0' },
     },
     identities: { '0x0': { address: '0x0' } },
-    tokenAddress: '0x32e6c34cd57087abbd59b5a4aecc4cb495924356',
-    tokenList: {
-      '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
-        name: 'BitBase',
-        symbol: 'BTBS',
-        decimals: 18,
-        address: '0x32E6C34Cd57087aBBD59B5A4AECC4cB495924356',
-        iconUrl: 'BTBS.svg',
-        occurrences: null,
-      },
-      '0x3fa400483487a489ec9b1db29c4129063eec4654': {
-        name: 'Cryptokek.com',
-        symbol: 'KEK',
-        decimals: 18,
-        address: '0x3fa400483487A489EC9b1dB29C4129063EEC4654',
-        iconUrl: 'cryptokek.svg',
-        occurrences: null,
-      },
-    },
   },
   appState: {
     sendInputCurrencySwitched: false,
@@ -124,7 +87,7 @@ const baseStore = {
 
 describe('Send Page', () => {
   describe('Send Flow Initialization', () => {
-    it('should initialize the ENS slice on render', () => {
+    it('should initialize the send, ENS, and gas slices on render', () => {
       const store = configureMockStore(middleware)(baseStore);
       renderWithProvider(<Send />, store);
       const actions = store.getActions();
@@ -133,6 +96,9 @@ describe('Send Page', () => {
           expect.objectContaining({
             type: 'ENS/enableEnsLookup',
           }),
+          expect.objectContaining({
+            type: 'send/initializeSendState/pending',
+          }),
         ]),
       );
     });
@@ -147,6 +113,9 @@ describe('Send Page', () => {
           expect.objectContaining({
             type: 'ENS/enableEnsLookup',
           }),
+          expect.objectContaining({
+            type: 'send/initializeSendState/pending',
+          }),
           expect.objectContaining({
             type: 'UI_MODAL_OPEN',
             payload: { name: 'QR_SCANNER' },
@@ -177,25 +146,6 @@ describe('Send Page', () => {
       const { queryByText } = renderWithProvider(<Send />, store);
       expect(queryByText('Next')).toBeNull();
     });
-
-    it('should render correctly even when a draftTransaction does not exist', () => {
-      const modifiedStore = {
-        ...baseStore,
-        send: {
-          ...baseStore.send,
-          currentTransactionUUID: null,
-        },
-      };
-      const store = configureMockStore(middleware)(modifiedStore);
-      const { getByPlaceholderText } = renderWithProvider(<Send />, store);
-      // Ensure that the send flow renders on the add recipient screen when
-      // there is no draft transaction.
-      expect(
-        getByPlaceholderText('Search, public address (0x), or ENS'),
-      ).toBeTruthy();
-      // Ensure we start a new draft transaction when its missing.
-      expect(startNewDraftTransaction).toHaveBeenCalledTimes(1);
-    });
   });
 
   describe('Send and Edit Flow (draft)', () => {
diff --git a/ui/pages/send/send.utils.js b/ui/pages/send/send.utils.js
index 2a917dcd1db4..6935a8b0c2bb 100644
--- a/ui/pages/send/send.utils.js
+++ b/ui/pages/send/send.utils.js
@@ -10,7 +10,7 @@ import {
 
 import { calcTokenAmount } from '../../helpers/utils/token-util';
 import { addHexPrefix } from '../../../app/scripts/lib/util';
-import { ERC20, ERC721 } from '../../../shared/constants/transaction';
+import { ERC20, ERC721 } from '../../helpers/constants/common';
 import {
   TOKEN_TRANSFER_FUNCTION_SIGNATURE,
   COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE,
@@ -142,7 +142,7 @@ function generateERC20TransferData({
       .call(
         abi.rawEncode(
           ['address', 'uint256'],
-          [addHexPrefix(toAddress), addHexPrefix(amount)],
+          [toAddress, addHexPrefix(amount)],
         ),
         (x) => `00${x.toString(16)}`.slice(-2),
       )
@@ -164,7 +164,7 @@ function generateERC721TransferData({
       .call(
         abi.rawEncode(
           ['address', 'address', 'uint256'],
-          [addHexPrefix(fromAddress), addHexPrefix(toAddress), tokenId],
+          [fromAddress, toAddress, tokenId],
         ),
         (x) => `00${x.toString(16)}`.slice(-2),
       )
diff --git a/ui/pages/send/send.utils.test.js b/ui/pages/send/send.utils.test.js
index 39f7c7b8fba9..f6da81d0e71d 100644
--- a/ui/pages/send/send.utils.test.js
+++ b/ui/pages/send/send.utils.test.js
@@ -73,7 +73,7 @@ describe('send utils', () => {
       expect(rawEncode.mock.calls[0].toString()).toStrictEqual(
         [
           ['address', 'uint256'],
-          ['0xmockAddress', '0xab'],
+          ['mockAddress', '0xab'],
         ].toString(),
       );
     });
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 3000033197da..5c639e551f49 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -30,7 +30,6 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
-        userHasALedgerAccount
       />,
       {
         context: {
@@ -60,9 +59,6 @@ describe('AdvancedTab Component', () => {
         setDismissSeedBackUpReminder={() => undefined}
         dismissSeedBackUpReminder={false}
         setShowTestNetworks={toggleTestnet}
-        useTokenDetection
-        setUseTokenDetection={toggleTokenDetection}
-        userHasALedgerAccount
       />,
       {
         context: {
@@ -107,7 +103,6 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
-        userHasALedgerAccount
       />,
       {
         context: {
@@ -144,7 +139,6 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
-        userHasALedgerAccount
       />,
       {
         context: {
diff --git a/ui/pages/settings/alerts-tab/alerts-tab.js b/ui/pages/settings/alerts-tab/alerts-tab.js
index 40ecf4394407..9eecef497e3d 100644
--- a/ui/pages/settings/alerts-tab/alerts-tab.js
+++ b/ui/pages/settings/alerts-tab/alerts-tab.js
@@ -30,7 +30,7 @@ const AlertSettingsEntry = ({ alertId, description, title }) => {
             title={description}
             wrapperClassName="alerts-tab__description"
           >
-            <i className="fa fa-info-circle alerts-tab__description__icon" />
+            <i className="fa fa-info-circle" />
           </Tooltip>
           <ToggleButton
             offLabel={t('off')}
diff --git a/ui/pages/settings/alerts-tab/alerts-tab.scss b/ui/pages/settings/alerts-tab/alerts-tab.scss
index 5027ac49a951..8266b885d3ca 100644
--- a/ui/pages/settings/alerts-tab/alerts-tab.scss
+++ b/ui/pages/settings/alerts-tab/alerts-tab.scss
@@ -20,10 +20,6 @@
   &__description {
     display: flex;
     align-items: center;
-
-    &__icon {
-      color: var(--color-icon-alternative);
-    }
   }
 
   &__item {
diff --git a/ui/pages/settings/contact-list-tab/index.scss b/ui/pages/settings/contact-list-tab/index.scss
index 543635c979ec..12a3e252ad29 100644
--- a/ui/pages/settings/contact-list-tab/index.scss
+++ b/ui/pages/settings/contact-list-tab/index.scss
@@ -53,7 +53,6 @@
   &__icon {
     margin-bottom: 16px;
     display: block;
-    color: var(--color-icon-muted);
   }
 
   &__title {
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index d3f26068faf0..f702c466f9d5 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -26,8 +26,6 @@ export default class ExperimentalTab extends PureComponent {
     setEIP1559V2Enabled: PropTypes.func,
     theme: PropTypes.string,
     setTheme: PropTypes.func,
-    customNetworkListEnabled: PropTypes.bool,
-    setCustomNetworkListEnabled: PropTypes.func,
   };
 
   settingsRefs = Array(
@@ -217,9 +215,9 @@ export default class ExperimentalTab extends PureComponent {
               onToggle={(value) => {
                 this.context.trackEvent({
                   category: EVENT.CATEGORIES.SETTINGS,
-                  event: 'Enable/Disable Advanced Gas UI',
+                  event: 'Enabled/Disable OpenSea',
                   properties: {
-                    action: 'Enable/Disable Advanced Gas UI',
+                    action: 'Enabled/Disable OpenSea',
                     legacy_event: true,
                   },
                 });
@@ -286,45 +284,6 @@ export default class ExperimentalTab extends PureComponent {
     );
   }
 
-  renderCustomNetworkListToggle() {
-    const { t } = this.context;
-    const {
-      customNetworkListEnabled,
-      setCustomNetworkListEnabled,
-    } = this.props;
-
-    return (
-      <div ref={this.settingsRefs[5]} className="settings-page__content-row">
-        <div className="settings-page__content-item">
-          <span>{t('showCustomNetworkList')}</span>
-          <div className="settings-page__content-description">
-            {t('showCustomNetworkListDescription')}
-          </div>
-        </div>
-        <div className="settings-page__content-item">
-          <div className="settings-page__content-item-col">
-            <ToggleButton
-              value={customNetworkListEnabled}
-              onToggle={(value) => {
-                this.context.trackEvent({
-                  category: EVENT.CATEGORIES.SETTINGS,
-                  event: 'Enabled/Disable CustomNetworkList',
-                  properties: {
-                    action: 'Enabled/Disable CustomNetworkList',
-                    legacy_event: true,
-                  },
-                });
-                setCustomNetworkListEnabled(!value);
-              }}
-              offLabel={t('off')}
-              onLabel={t('on')}
-            />
-          </div>
-        </div>
-      </div>
-    );
-  }
-
   render() {
     return (
       <div className="settings-page__body">
@@ -336,7 +295,6 @@ export default class ExperimentalTab extends PureComponent {
         {this.renderCollectibleDetectionToggle()}
         {this.renderEIP1559V2EnabledToggle()}
         {this.renderTheme()}
-        {this.renderCustomNetworkListToggle()}
       </div>
     );
   }
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.js b/ui/pages/settings/experimental-tab/experimental-tab.container.js
index 244de6198096..1fb4124ee957 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.js
@@ -7,7 +7,6 @@ import {
   setOpenSeaEnabled,
   setEIP1559V2Enabled,
   setTheme,
-  setCustomNetworkListEnabled,
 } from '../../../store/actions';
 import {
   getUseTokenDetection,
@@ -15,7 +14,6 @@ import {
   getOpenSeaEnabled,
   getEIP1559V2Enabled,
   getTheme,
-  getIsCustomNetworkListEnabled,
 } from '../../../selectors';
 import ExperimentalTab from './experimental-tab.component';
 
@@ -28,7 +26,6 @@ const mapStateToProps = (state) => {
     openSeaEnabled: getOpenSeaEnabled(state),
     eip1559V2Enabled: getEIP1559V2Enabled(state),
     theme: getTheme(state),
-    customNetworkListEnabled: getIsCustomNetworkListEnabled(state),
   };
 };
 
@@ -43,8 +40,6 @@ const mapDispatchToProps = (dispatch) => {
     setOpenSeaEnabled: (val) => dispatch(setOpenSeaEnabled(val)),
     setEIP1559V2Enabled: (val) => dispatch(setEIP1559V2Enabled(val)),
     setTheme: (val) => dispatch(setTheme(val)),
-    setCustomNetworkListEnabled: (val) =>
-      dispatch(setCustomNetworkListEnabled(val)),
   };
 };
 
diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js
index 0fa9964c16c4..eab873053e86 100644
--- a/ui/pages/settings/flask/view-snap/view-snap.js
+++ b/ui/pages/settings/flask/view-snap/view-snap.js
@@ -47,6 +47,7 @@ function ViewSnap() {
     }
   }, [history, snap]);
 
+  const authorshipPillUrl = `https://npmjs.com/package/${snap?.manifest.source.location.npm.packageName}`;
   const connectedSubjects = useSelector((state) =>
     getSubjectsWithPermission(state, snap?.permissionName),
   );
@@ -86,7 +87,10 @@ function ViewSnap() {
           </Typography>
           <Box className="view-snap__pill-toggle-container">
             <Box className="view-snap__pill-container" paddingLeft={2}>
-              <SnapsAuthorshipPill snapId={snap.id} />
+              <SnapsAuthorshipPill
+                packageName={snap.id}
+                url={authorshipPillUrl}
+              />
             </Box>
             <Box paddingLeft={4} className="view-snap__toggle-container">
               <Tooltip interactive position="bottom" html={t('snapsToggle')}>
diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index caf7e0f7f4d9..7696fce541e5 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -70,7 +70,7 @@
       &__list {
         background: var(--color-background-default);
         box-sizing: border-box;
-        box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+        box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
         border-radius: 6px;
         position: absolute;
         width: 100%;
@@ -320,7 +320,7 @@
 
       margin-top: 8px;
       margin-bottom: 12px;
-      color: var(--color-text-default);
+      color: var(--color-icon-default);
     }
   }
 
@@ -331,7 +331,7 @@
   &__content-description {
     @include H6;
 
-    color: var(--color-text-default);
+    color: var(--color-icon-default);
     padding-top: 5px;
 
     a {
diff --git a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
index 7daffb4ce4fc..b3f7f8a346c7 100644
--- a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
+++ b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
@@ -4,7 +4,7 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../../components/ui/text-field';
 import { I18nContext } from '../../../../contexts/i18n';
-import SearchIcon from '../../../../components/ui/icon/search-icon';
+import SearchIcon from '../../../../components/ui/search-icon';
 
 export default function CustomContentSearch({
   onSearch,
@@ -32,7 +32,7 @@ export default function CustomContentSearch({
     if (searchQuery === '') {
       setSearchIconColor('var(--color-icon-muted)');
     } else {
-      setSearchIconColor('var(--color-icon-alternative)');
+      setSearchIconColor('var(--color-icon-default)');
     }
 
     const fuseSearchResult = networksSearchFuse.search(searchQuery);
diff --git a/ui/pages/settings/networks-tab/index.scss b/ui/pages/settings/networks-tab/index.scss
index f105548390ba..6c57a4b5ddbf 100644
--- a/ui/pages/settings/networks-tab/index.scss
+++ b/ui/pages/settings/networks-tab/index.scss
@@ -7,34 +7,31 @@
   }
 
   &__content {
-    &--with-networks-list-popup-footer {
-      // padding-bottom required to offset content from fixed footer: &__networks-list-popup-footer
-      padding-bottom: 80px;
-      // isolation contains stacking context(z-index) of &__networks-list-popup-footer
-      isolation: isolate;
-    }
+    display: flex;
+    height: 100%;
+    max-width: 779px;
+    justify-content: space-between;
 
-    @media screen and (min-width: $break-large) {
-      display: grid;
-      grid-template-columns: 1fr 1fr;
+    &__custom-image {
+      border: 1px solid var(--color-border-default);
+      margin-inline-start: 8px;
     }
 
-    &__icon-check {
-      max-width: 24px;
-      flex: 0 0 24px;
-    }
+    &__check-icon {
+      margin-inline-end: 10px;
+      color: var(--color-success-default);
 
-    &__custom-image {
-      border: 1px solid var(--color-border-muted);
+      &__transparent {
+        color: transparent;
+        width: 16px;
+        margin-inline-end: 10px;
+      }
     }
 
     &__icon-with-fallback {
-      display: flex;
-      align-items: center;
-      padding: 0;
-      max-width: 24px;
-      flex: 0 0 24px;
-      color: var(--color-text-alternative);
+      padding: 0 1px 2px 2px;
+      color: var(--color-primary-inverse); // TODO: design-tokens needs network colors
+      margin-inline-start: 8px;
 
       @each $variant, $color in design-system.$color-map {
         &--color-#{$variant} {
@@ -43,90 +40,160 @@
         }
       }
     }
+
+    @media screen and (max-width: $break-small) {
+      margin-top: 0;
+      flex-direction: column;
+      overflow-x: hidden;
+      align-items: center;
+    }
   }
 
   &__body {
+    padding-right: 24px;
+    height: 100%;
     display: flex;
     flex-direction: column;
 
-    @media screen and (min-width: $break-large) {
-      margin-inline-end: 16px;
-      margin-bottom: 24px;
+    @media screen and (max-width: $break-small) {
+      padding: 0;
     }
   }
 
   &__subheader {
-    display: none;
+    @include H4;
 
-    @media screen and (min-width: $break-large) {
-      @include H4;
+    padding: 16px 4px;
+    border-bottom: 1px solid var(--color-border-default);
+    height: 72px;
+    align-items: center;
+    display: flex;
+    flex-flow: row nowrap;
+  }
 
-      padding: 16px 4px;
-      border-bottom: 1px solid var(--color-border-default);
-      height: 72px;
-      align-items: center;
-      display: flex;
-      gap: 8px;
-      flex-flow: row nowrap;
-    }
+  &__subheader--break {
+    margin-inline-start: 10px;
   }
 
   &__sub-header-text {
     @include H4;
 
     color: var(--color-text-muted);
+    margin-right: 10px;
   }
 
   &__network-form {
-    padding: 16px 24px;
-
-    @media screen and (min-width: $break-large) {
-      padding: 16px;
-    }
+    display: flex;
+    flex: 1 0;
+    flex-direction: column;
+    justify-content: space-between;
+    max-height: 465px;
+    max-width: 400px;
+    margin-top: 24px;
+    padding-inline-start: 24px;
 
     .page-container__footer {
       border-top: none;
 
+      @media screen and (max-width: $break-small) {
+        width: 93%;
+      }
+
       footer {
         padding: 10px 0;
       }
     }
+
+    @media screen and (max-width: $break-small) {
+      display: flex;
+      flex: auto;
+      max-width: 100%;
+      max-height: 100%;
+      align-items: center;
+      width: 90%;
+      margin-top: 10px;
+      padding: 0;
+    }
   }
 
-  &__networks-list {
+  &__add-network-form {
     display: flex;
     flex-direction: column;
-    gap: 16px;
-    padding: 16px 24px;
+    max-height: 465px;
+  }
+
+  &__network-form-body {
+    display: grid;
+    grid-template-columns: 100%;
+    width: 95%;
 
-    @media screen and (min-width: $break-large) {
-      padding: 16px;
-      min-width: 160px; // Allow network form to take priority in the grid on resize
-      border-right: 1px solid var(--color-border-muted);
+    &__view-only {
+      width: 100%;
     }
+  }
+
+  &__add-network-form-body {
+    display: grid;
+    grid-template-columns: 48% 48%;
+    column-gap: 5%;
+    margin-top: 24px;
+    width: 100%;
+  }
+
+  &__networks-list {
+    flex: 0.5 0 auto;
+    max-width: 350px;
+    border-right: 1px solid var(--color-border-default);
 
     &__custom-search-network {
-      @include H6;
+      margin-top: 24px;
+    }
+
+    .MuiInput-input {
+      font-size: 14px;
+
+      @media screen and (max-width: $break-small) {
+        font-size: 12px;
+      }
+    }
+
+    .MuiTextField-root {
+      padding-inline-end: 16px;
+
+      #search-networks-helper-text {
+        color: var(--color-text-alternative);
+      }
 
-      @media screen and (min-width: $break-large) {
-        @include Paragraph;
+      @media screen and (max-width: $break-small) {
+        padding: 0 24px 0 24px;
       }
     }
+
+    &__label {
+      @media screen and (max-width: $break-small) {
+        margin-inline-start: 58px;
+      }
+    }
+
+    @media screen and (max-width: $break-small) {
+      flex: 1;
+      overflow-y: auto;
+      max-width: 100vw;
+      width: 100vw;
+      margin-top: 0;
+    }
   }
 
   &__networks-list-popup-footer {
+    width: 100%;
     display: flex;
     justify-content: center;
-    padding: 16px 24px;
+    padding-top: 23px;
+    padding-bottom: 23px;
     border-top: 1px solid var(--color-border-default);
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    background: var(--color-background-default);
 
-    @media screen and (min-width: $break-large) {
-      display: none;
+    .button {
+      width: 178px;
     }
   }
 
@@ -151,20 +218,42 @@
 
   &__networks-list-item {
     display: flex;
-    gap: 4px;
-    padding-top: 4px;
-    padding-bottom: 4px;
+    padding: 12px 24px 12px 0;
+    position: relative;
+    align-items: center;
+    width: 311px;
+
+    .color-indicator {
+      &:hover {
+        cursor: pointer;
+      }
+
+      @media screen and (max-width: $break-small) {
+        margin: 0 4px 0 20px;
+      }
+    }
+
+    @media screen and (max-width: $break-small) {
+      padding: 12px 0 12px 24px;
+      max-width: 351px;
+    }
+  }
+
+  &__networks-list-item:last-of-type {
+    @media screen and (max-width: $break-small) {
+      border-bottom: none;
+    }
   }
 
   &__networks-list-name {
     @include Paragraph;
 
-    margin-left: 8px;
+    margin-left: 11px;
     color: var(--color-text-alternative);
+    width: 70%;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
-    flex-grow: 1;
 
     &:hover {
       cursor: pointer;
@@ -201,43 +290,30 @@
   &__network-form-footer {
     display: flex;
     flex-flow: row nowrap;
-    padding: 12px 0;
+    padding: 0.75rem 0;
+    width: 95%;
 
-    .btn--rounded {
-      white-space: nowrap;
+    @media screen and (max-width: $break-small) {
+      width: 93%;
     }
 
     .btn-secondary {
-      margin-left: auto;
+      margin-right: 0.375rem;
     }
 
     .btn-primary {
-      margin-left: 16px;
+      margin-left: 0.375rem;
     }
 
     .btn-danger {
-      margin-right: 16px;
-    }
-  }
-
-  &__add-network-form {
-    padding: 16px 24px;
-    grid-column: span 2; // spread both columns of grid layout
-
-    @media screen and (min-width: $break-large) {
-      max-width: 400px; // but only expand to 400px
-      padding: 16px;
-    }
-
-    &__alert {
-      margin-top: 0;
+      margin-right: 3.75rem;
     }
   }
 
   &__add-network-form-footer {
     display: flex;
     flex-flow: row;
-    padding: 12px 0;
+    padding: 0.75rem 0;
     width: 60%;
 
     .btn-secondary {
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 682af2f1291a..533910d6574d 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -1,10 +1,4 @@
-import React, {
-  useCallback,
-  useContext,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
@@ -34,12 +28,6 @@ import {
 } from '../../../../helpers/constants/routes';
 import fetchWithCache from '../../../../helpers/utils/fetch-with-cache';
 import { usePrevious } from '../../../../hooks/usePrevious';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
-import { EVENT } from '../../../../../shared/constants/metametrics';
-import {
-  infuraProjectId,
-  FEATURED_RPCS,
-} from '../../../../../shared/constants/network';
 
 /**
  * Attempts to convert the given chainId to a decimal string, for display
@@ -85,7 +73,6 @@ const NetworksForm = ({
   selectedNetwork,
 }) => {
   const t = useI18nContext();
-  const trackEvent = useContext(MetaMetricsContext);
   const history = useHistory();
   const dispatch = useDispatch();
   const { label, labelKey, viewOnly, rpcPrefs } = selectedNetwork;
@@ -100,9 +87,6 @@ const NetworksForm = ({
   const [errors, setErrors] = useState({});
   const [warnings, setWarnings] = useState({});
   const [isSubmitting, setIsSubmitting] = useState(false);
-  const chainIdMatchesFeaturedRPC = FEATURED_RPCS.some(
-    (featuredRpc) => Number(featuredRpc.chainId) === Number(chainId),
-  );
 
   const resetForm = useCallback(() => {
     setNetworkName(selectedNetworkName || '');
@@ -344,14 +328,15 @@ const NetworksForm = ({
       }
 
       try {
-        safeChainsList =
-          (await fetchWithCache('https://chainid.network/chains.json')) || [];
+        safeChainsList = await fetchWithCache(
+          'https://chainid.network/chains.json',
+        );
       } catch (err) {
         log.warn('Failed to fetch the chainList from chainid.network', err);
         providerError = err;
       }
 
-      if (providerError) {
+      if (providerError || !Array.isArray(safeChainsList)) {
         warningKey = 'failedToFetchTickerSymbolData';
         warningMessage = t('failedToFetchTickerSymbolData');
       } else {
@@ -451,12 +436,12 @@ const NetworksForm = ({
       const rpcUrlError = validateRPCUrl(rpcUrl);
       setErrors({
         ...errors,
+        chainId: chainIdError,
         blockExplorerUrl: blockExplorerError,
         rpcUrl: rpcUrlError,
       });
       setWarnings({
         ...warnings,
-        chainId: chainIdError,
         ticker: tickerWarning,
       });
     }
@@ -512,30 +497,6 @@ const NetworksForm = ({
       }
 
       if (addNewNetwork) {
-        let rpcUrlOrigin;
-        try {
-          rpcUrlOrigin = new URL(rpcUrl).origin;
-        } catch {
-          // error
-        }
-        trackEvent({
-          event: 'Custom Network Added',
-          category: EVENT.CATEGORIES.NETWORK,
-          referrer: {
-            url: rpcUrlOrigin,
-          },
-          properties: {
-            chain_id: chainId,
-            network_name: networkName,
-            network: rpcUrlOrigin,
-            symbol: ticker,
-            block_explorer_url: blockExplorerUrl,
-            source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
-          },
-          sensitiveProperties: {
-            rpc_url: rpcUrlOrigin,
-          },
-        });
         dispatch(setNewNetworkAdded(networkName));
         history.push(DEFAULT_ROUTE);
       }
@@ -562,19 +523,17 @@ const NetworksForm = ({
         onConfirm: () => {
           resetForm();
           dispatch(setSelectedSettingsRpcUrl(''));
+          history.push(NETWORKS_ROUTE);
         },
       }),
     );
   };
   const deletable = !isCurrentRpcTarget && !viewOnly && !addNewNetwork;
   const stateUnchanged = stateIsUnchanged();
-  const chainIdErrorOnFeaturedRpcDuringEdit =
-    selectedNetwork?.rpcUrl && warnings.chainId && chainIdMatchesFeaturedRPC;
   const isSubmitDisabled =
     hasErrors() ||
     isSubmitting ||
     stateUnchanged ||
-    chainIdErrorOnFeaturedRpcDuringEdit ||
     !rpcUrl ||
     !chainId ||
     !ticker;
@@ -593,7 +552,6 @@ const NetworksForm = ({
           iconFillColor="var(--color-warning-default)"
           useIcon
           withRightButton
-          className="networks-tab__add-network-form__alert"
         />
       ) : null}
       <div
@@ -615,15 +573,11 @@ const NetworksForm = ({
           error={errors.rpcUrl?.msg || ''}
           onChange={setRpcUrl}
           titleText={t('rpcUrl')}
-          value={
-            rpcUrl?.includes(`/v3/${infuraProjectId}`)
-              ? rpcUrl.replace(`/v3/${infuraProjectId}`, '')
-              : rpcUrl
-          }
+          value={rpcUrl}
           disabled={viewOnly}
         />
         <FormField
-          warning={warnings.chainId?.msg || ''}
+          error={errors.chainId?.msg || ''}
           onChange={setChainId}
           titleText={t('chainId')}
           value={chainId}
diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
index b6b13089c13a..5f41df97c35f 100644
--- a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
+++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
@@ -73,17 +73,9 @@ const NetworksListItem = ({
       }}
     >
       {isCurrentRpcTarget ? (
-        <IconCheck
-          className="networks-tab__content__icon-check"
-          color="var(--color-success-default)"
-          aria-label={t('active')}
-        />
+        <IconCheck color="var(--color-success-default)" />
       ) : (
-        <IconCheck
-          className="networks-tab__content__icon-check"
-          color="transparent"
-          aria-hidden="true"
-        />
+        <div className="networks-tab__content__check-icon__transparent">✓</div>
       )}
       {network.chainId in CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP ? (
         <Identicon
diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.js b/ui/pages/settings/networks-tab/networks-list/networks-list.js
index 56c12834be03..58e13e87f2f3 100644
--- a/ui/pages/settings/networks-tab/networks-list/networks-list.js
+++ b/ui/pages/settings/networks-tab/networks-list/networks-list.js
@@ -66,8 +66,8 @@ const NetworksList = ({
       {searchQuery === '' && (
         <Typography
           variant={TYPOGRAPHY.H6}
-          marginTop={4}
-          color={COLORS.TEXT_ALTERNATIVE}
+          margin={[6, 0, 0, 9]}
+          color={COLORS.TEXT_MUTED}
           className="networks-tab__networks-list__label"
         >
           {t('testNetworks')}
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
index 1fad5fdc48ca..1420e3082cd8 100644
--- a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
@@ -1,31 +1,18 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
-import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import {
-  ADD_NETWORK_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
-} from '../../../../helpers/constants/routes';
+import { ADD_NETWORK_ROUTE } from '../../../../helpers/constants/routes';
 import Button from '../../../../components/ui/button';
-import { getIsCustomNetworkListEnabled } from '../../../../selectors';
 
 const NetworksFormSubheader = ({ addNewNetwork }) => {
   const t = useI18nContext();
   const history = useHistory();
-  const addPopularNetworkFeatureToggledOn = useSelector(
-    getIsCustomNetworkListEnabled,
-  );
-
   return addNewNetwork ? (
     <div className="networks-tab__subheader">
       <span className="networks-tab__sub-header-text">{t('networks')}</span>
-      <span className="networks-tab__sub-header-text">{'  >  '}</span>
-      <div className="networks-tab__sub-header-text">{t('addANetwork')}</div>
       <span>{'  >  '}</span>
-      <div className="networks-tab__subheader--break">
-        {t('addANetworkManually')}
-      </div>
+      <div className="networks-tab__subheader--break">{t('addANetwork')}</div>
     </div>
   ) : (
     <div className="settings-page__sub-header">
@@ -35,9 +22,7 @@ const NetworksFormSubheader = ({ addNewNetwork }) => {
           type="primary"
           onClick={(event) => {
             event.preventDefault();
-            addPopularNetworkFeatureToggledOn
-              ? history.push(ADD_POPULAR_CUSTOM_NETWORK)
-              : history.push(ADD_NETWORK_ROUTE);
+            history.push(ADD_NETWORK_ROUTE);
           }}
         >
           {t('addANetwork')}
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
index 44b5b1768bf3..0992610491ea 100644
--- a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
-import { waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../../test/jest/rendering';
 import NetworksTabSubheader from '.';
 
@@ -37,11 +36,11 @@ describe('NetworksTabSubheader Component', () => {
     expect(getByRole('button', { text: 'Add a network' })).toBeDefined();
   });
   it('should render add network form subheader correctly', () => {
-    const { queryByText, getAllByText } = renderComponent({
+    const { queryByText } = renderComponent({
       addNewNetwork: true,
     });
     expect(queryByText('Networks')).toBeInTheDocument();
-    waitFor(() => expect(getAllByText('>')).toBeInTheDocument());
+    expect(queryByText('>')).toBeInTheDocument();
     expect(queryByText('Add a network')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/settings/networks-tab/networks-tab.js b/ui/pages/settings/networks-tab/networks-tab.js
index 35814d419e91..71028c3ccd7f 100644
--- a/ui/pages/settings/networks-tab/networks-tab.js
+++ b/ui/pages/settings/networks-tab/networks-tab.js
@@ -1,12 +1,10 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { useLocation, useHistory } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   ADD_NETWORK_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
   NETWORKS_FORM_ROUTE,
 } from '../../../helpers/constants/routes';
 import { setSelectedSettingsRpcUrl } from '../../../store/actions';
@@ -15,7 +13,6 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
 import {
   getFrequentRpcListDetail,
-  getIsCustomNetworkListEnabled,
   getNetworksTabSelectedRpcUrl,
   getProvider,
 } from '../../../selectors';
@@ -38,7 +35,6 @@ const NetworksTab = ({ addNewNetwork }) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
   const { pathname } = useLocation();
-  const history = useHistory();
 
   const environmentType = getEnvironmentType();
   const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
@@ -48,14 +44,11 @@ const NetworksTab = ({ addNewNetwork }) => {
   const frequentRpcListDetail = useSelector(getFrequentRpcListDetail);
   const provider = useSelector(getProvider);
   const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl);
-  const addPopularNetworkFeatureToggledOn = useSelector(
-    getIsCustomNetworkListEnabled,
-  );
 
   const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
     return {
       label: rpc.nickname,
-      iconColor: 'var(--color-icon-alternative)',
+      iconColor: 'var(--color-icon-default)',
       providerType: NETWORK_TYPE_RPC,
       rpcUrl: rpc.rpcUrl,
       chainId: rpc.chainId,
@@ -99,12 +92,7 @@ const NetworksTab = ({ addNewNetwork }) => {
       {isFullScreen ? (
         <NetworksFormSubheader addNewNetwork={addNewNetwork} />
       ) : null}
-      <div
-        className={classnames('networks-tab__content', {
-          'networks-tab__content--with-networks-list-popup-footer':
-            !isFullScreen && !shouldRenderNetworkForm,
-        })}
-      >
+      <div className="networks-tab__content">
         {addNewNetwork ? (
           <NetworksForm
             networksToRender={networksToRender}
@@ -124,16 +112,9 @@ const NetworksTab = ({ addNewNetwork }) => {
               <div className="networks-tab__networks-list-popup-footer">
                 <Button
                   type="primary"
-                  onClick={() => {
-                    if (addPopularNetworkFeatureToggledOn) {
-                      history.push(ADD_POPULAR_CUSTOM_NETWORK);
-                    } else {
-                      isFullScreen
-                        ? history.push(ADD_NETWORK_ROUTE)
-                        : global.platform.openExtensionInBrowser(
-                            ADD_NETWORK_ROUTE,
-                          );
-                    }
+                  onClick={(event) => {
+                    event.preventDefault();
+                    global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
                   }}
                 >
                   {t('addNetwork')}
diff --git a/ui/pages/settings/settings-search/settings-search.js b/ui/pages/settings/settings-search/settings-search.js
index 6f37e399c931..2126d55471d2 100644
--- a/ui/pages/settings/settings-search/settings-search.js
+++ b/ui/pages/settings/settings-search/settings-search.js
@@ -7,7 +7,7 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../components/ui/text-field';
 import { I18nContext } from '../../../contexts/i18n';
-import SearchIcon from '../../../components/ui/icon/search-icon';
+import SearchIcon from '../../../components/ui/search-icon';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import { getSnapsRouteObjects } from '../../../selectors';
diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js
index fe117ee065ea..982447077f84 100644
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@@ -225,10 +225,7 @@ export default class SettingsTab extends PureComponent {
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H7}
-                marginTop={0}
-                marginRight={12}
-                marginBottom={0}
-                marginLeft={3}
+                margin={[0, 12, 0, 3]}
               >
                 {t('jazzicons')}
               </Typography>
@@ -256,8 +253,7 @@ export default class SettingsTab extends PureComponent {
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H7}
-                margin={0}
-                marginBottom={3}
+                margin={[0, 0, 0, 3]}
               >
                 {t('blockies')}
               </Typography>
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index 64995b15cf12..dc9bb1d31430 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -23,11 +23,9 @@ import {
   CONTACT_VIEW_ROUTE,
   EXPERIMENTAL_ROUTE,
   ADD_NETWORK_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
 } from '../../helpers/constants/routes';
 
 import { getSettingsRoutes } from '../../helpers/utils/settings-search';
-import AddNetwork from '../../components/app/add-network/add-network';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
 import NetworksTab from './networks-tab';
@@ -126,6 +124,7 @@ class SettingsPage extends PureComponent {
             )}
 
             {this.renderTitle()}
+
             <div
               className="settings-page__header__title-container__close-button"
               onClick={() => {
@@ -343,16 +342,7 @@ class SettingsPage extends PureComponent {
           path={ADD_NETWORK_ROUTE}
           render={() => <NetworksTab addNewNetwork />}
         />
-        <Route
-          exact
-          path={NETWORKS_ROUTE}
-          render={() => <NetworksTab addNewNetwork={false} />}
-        />
-        <Route
-          exact
-          path={ADD_POPULAR_CUSTOM_NETWORK}
-          render={() => <AddNetwork />}
-        />
+        <Route path={NETWORKS_ROUTE} component={NetworksTab} />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
         <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
         <Route exact path={CONTACT_LIST_ROUTE} component={ContactListTab} />
diff --git a/ui/pages/settings/settings.container.js b/ui/pages/settings/settings.container.js
index 735e66507576..78a470b94147 100644
--- a/ui/pages/settings/settings.container.js
+++ b/ui/pages/settings/settings.container.js
@@ -27,7 +27,6 @@ import {
   ADD_NETWORK_ROUTE,
   SNAPS_LIST_ROUTE,
   SNAPS_VIEW_ROUTE,
-  ADD_POPULAR_CUSTOM_NETWORK,
 } from '../../helpers/constants/routes';
 import Settings from './settings.component';
 
@@ -47,7 +46,6 @@ const ROUTES_TO_I18N_KEYS = {
   [ADD_NETWORK_ROUTE]: 'networks',
   [SECURITY_ROUTE]: 'securityAndPrivacy',
   [EXPERIMENTAL_ROUTE]: 'experimental',
-  [ADD_POPULAR_CUSTOM_NETWORK]: 'addNetwork',
 };
 
 const mapStateToProps = (state, ownProps) => {
@@ -66,9 +64,6 @@ const mapStateToProps = (state, ownProps) => {
     Boolean(pathname.match(NETWORKS_FORM_ROUTE)) ||
     Boolean(pathname.match(ADD_NETWORK_ROUTE));
   const addNewNetwork = Boolean(pathname.match(ADD_NETWORK_ROUTE));
-  const isAddPopularCustomNetwork = Boolean(
-    pathname.match(ADD_POPULAR_CUSTOM_NETWORK),
-  );
 
   const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
   const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
@@ -82,8 +77,6 @@ const mapStateToProps = (state, ownProps) => {
     backRoute = NETWORKS_ROUTE;
   } else if (isSnapViewPage) {
     backRoute = SNAPS_LIST_ROUTE;
-  } else if (isAddPopularCustomNetwork) {
-    backRoute = NETWORKS_ROUTE;
   }
 
   let initialBreadCrumbRoute;
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 5456c10673dd..dcb3a08b197a 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -17,6 +17,7 @@ import {
   getUSDConversionRate,
   isHardwareWallet,
   getHardwareWalletType,
+  getSwapsDefaultToken,
 } from '../../../selectors';
 
 import {
@@ -33,8 +34,10 @@ import {
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getMaxSlippage,
+  setSwapsFromToken,
 } from '../../../ducks/swaps/swaps';
 import Mascot from '../../../components/ui/mascot';
+import Box from '../../../components/ui/box';
 import {
   QUOTES_EXPIRED_ERROR,
   SWAP_FAILED_ERROR,
@@ -53,11 +56,10 @@ import { stopPollingForQuotes } from '../../../store/actions';
 import { getRenderableNetworkFeesForQuote } from '../swaps.util';
 import SwapsFooter from '../swaps-footer';
 
-import CreateNewSwap from '../create-new-swap';
-import ViewOnBlockExplorer from '../view-on-block-explorer';
 import SwapFailureIcon from './swap-failure-icon';
 import SwapSuccessIcon from './swap-success-icon';
 import QuotesTimeoutIcon from './quotes-timeout-icon';
+import ViewOnEtherScanLink from './view-on-ether-scan-link';
 
 export default function AwaitingSwap({
   swapComplete,
@@ -83,6 +85,8 @@ export default function AwaitingSwap({
   const usdConversionRate = useSelector(getUSDConversionRate);
   const chainId = useSelector(getCurrentChainId);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider, shallowEqual);
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
+
   const [trackedQuotesExpiredEvent, setTrackedQuotesExpiredEvent] = useState(
     false,
   );
@@ -137,6 +141,11 @@ export default function AwaitingSwap({
     { blockExplorerUrl: baseNetworkUrl },
   );
 
+  const isCustomBlockExplorerUrl = Boolean(
+    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ||
+      rpcPrefs.blockExplorerUrl,
+  );
+
   let headerText;
   let statusImage;
   let descriptionText;
@@ -164,9 +173,10 @@ export default function AwaitingSwap({
     submitText = t('tryAgain');
     statusImage = <SwapFailureIcon />;
     content = blockExplorerUrl && (
-      <ViewOnBlockExplorer
+      <ViewOnEtherScanLink
+        txHash={txHash}
         blockExplorerUrl={blockExplorerUrl}
-        sensitiveTrackingProperties={sensitiveProperties}
+        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
       />
     );
   } else if (errorKey === QUOTES_EXPIRED_ERROR) {
@@ -211,9 +221,10 @@ export default function AwaitingSwap({
       </span>,
     ]);
     content = blockExplorerUrl && (
-      <ViewOnBlockExplorer
+      <ViewOnEtherScanLink
+        txHash={txHash}
         blockExplorerUrl={blockExplorerUrl}
-        sensitiveTrackingProperties={sensitiveProperties}
+        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
       />
     );
   } else if (!errorKey && swapComplete) {
@@ -229,13 +240,35 @@ export default function AwaitingSwap({
       </span>,
     ]);
     content = blockExplorerUrl && (
-      <ViewOnBlockExplorer
+      <ViewOnEtherScanLink
+        txHash={txHash}
         blockExplorerUrl={blockExplorerUrl}
-        sensitiveTrackingProperties={sensitiveProperties}
+        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
       />
     );
   }
 
+  const MakeAnotherSwap = () => {
+    return (
+      <Box marginBottom={3}>
+        <a
+          href="#"
+          onClick={async () => {
+            trackEvent({
+              event: 'Make Another Swap',
+              category: EVENT.CATEGORIES.SWAPS,
+              sensitiveProperties,
+            });
+            await dispatch(navigateBackToBuildQuote(history));
+            dispatch(setSwapsFromToken(defaultSwapsToken));
+          }}
+        >
+          {t('makeAnotherSwap')}
+        </a>
+      </Box>
+    );
+  };
+
   useEffect(() => {
     if (errorKey) {
       // If there was an error, stop polling for quotes.
@@ -258,9 +291,7 @@ export default function AwaitingSwap({
         <div className="awaiting-swap__main-description">{descriptionText}</div>
         {content}
       </div>
-      {!errorKey && swapComplete ? (
-        <CreateNewSwap sensitiveTrackingProperties={sensitiveProperties} />
-      ) : null}
+      {!errorKey && swapComplete ? <MakeAnotherSwap /> : null}
       <SwapsFooter
         onSubmit={async () => {
           if (errorKey === OFFLINE_FOR_MAINTENANCE) {
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
index 5bc56817c9e2..30a587df1300 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
@@ -5,7 +5,6 @@ import {
   renderWithProvider,
   createSwapsMockStore,
 } from '../../../../test/jest';
-import { SLIPPAGE } from '../../../../shared/constants/swaps';
 import AwaitingSwap from '.';
 
 const createProps = (customProps = {}) => {
@@ -15,7 +14,7 @@ const createProps = (customProps = {}) => {
     tokensReceived: 'tokens received:',
     submittingSwap: true,
     inputValue: 5,
-    maxSlippage: SLIPPAGE.DEFAULT,
+    maxSlippage: 3,
     ...customProps,
   };
 };
diff --git a/ui/pages/swaps/awaiting-swap/index.scss b/ui/pages/swaps/awaiting-swap/index.scss
index 2dd865fd3419..0750ace6f58c 100644
--- a/ui/pages/swaps/awaiting-swap/index.scss
+++ b/ui/pages/swaps/awaiting-swap/index.scss
@@ -20,6 +20,10 @@
     justify-content: center;
   }
 
+  a {
+    color: var(--color-primary-default);
+  }
+
   &__status-image {
     margin-top: 12px;
     margin-bottom: 16px;
@@ -60,6 +64,7 @@
     font-weight: bold;
   }
 
+  &__view-on-etherscan,
   &__support-link {
     color: var(--color-primary-default);
     margin-top: 24px;
@@ -70,6 +75,20 @@
     @include H6;
   }
 
+  &__view-on-etherscan {
+    @include H7;
+
+    transition: opacity 1s ease-in-out;
+  }
+
+  &__view-on-etherscan--invisible {
+    opacity: 0;
+  }
+
+  &__view-on-etherscan--visible {
+    opacity: 1;
+  }
+
   &__amount-and-symbol {
     color: var(--color-text-default);
     font-weight: bold;
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
new file mode 100644
index 000000000000..89d31d36df2e
--- /dev/null
+++ b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
@@ -0,0 +1,21 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ViewOnEtherScanLink renders the component with a custom block explorer link 1`] = `
+<div>
+  <div
+    class="awaiting-swap__view-on-etherscan awaiting-swap__view-on-etherscan--visible"
+  >
+    View Swap at custom-blockchain.explorer
+  </div>
+</div>
+`;
+
+exports[`ViewOnEtherScanLink renders the component with initial props 1`] = `
+<div>
+  <div
+    class="awaiting-swap__view-on-etherscan awaiting-swap__view-on-etherscan--visible"
+  >
+    View Swap on Etherscan
+  </div>
+</div>
+`;
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
new file mode 100644
index 000000000000..6aa4a3347117
--- /dev/null
+++ b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
@@ -0,0 +1 @@
+export { default } from './view-on-ether-scan-link';
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
new file mode 100644
index 000000000000..baa13ef02d1e
--- /dev/null
+++ b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
@@ -0,0 +1,50 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { I18nContext } from '../../../../contexts/i18n';
+import { getURLHostName } from '../../../../helpers/utils/util';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import { EVENT } from '../../../../../shared/constants/metametrics';
+
+export default function ViewOnEtherScanLink({
+  txHash,
+  blockExplorerUrl,
+  isCustomBlockExplorerUrl,
+}) {
+  const t = useContext(I18nContext);
+  const trackEvent = useContext(MetaMetricsContext);
+
+  return (
+    <div
+      className={classnames('awaiting-swap__view-on-etherscan', {
+        'awaiting-swap__view-on-etherscan--visible': txHash,
+        'awaiting-swap__view-on-etherscan--invisible': !txHash,
+      })}
+      onClick={() => {
+        trackEvent({
+          event: 'Clicked Block Explorer Link',
+          category: EVENT.CATEGORIES.SWAPS,
+          properties: {
+            link_type: 'Transaction Block Explorer',
+            action: 'Swap Transaction',
+            block_explorer_domain: getURLHostName(blockExplorerUrl),
+          },
+        });
+        global.platform.openTab({ url: blockExplorerUrl });
+      }}
+    >
+      {isCustomBlockExplorerUrl
+        ? t('viewOnCustomBlockExplorer', [
+            t('blockExplorerSwapAction'),
+            getURLHostName(blockExplorerUrl),
+          ])
+        : t('viewOnEtherscan', [t('blockExplorerSwapAction')])}
+    </div>
+  );
+}
+
+ViewOnEtherScanLink.propTypes = {
+  txHash: PropTypes.string,
+  blockExplorerUrl: PropTypes.string,
+  isCustomBlockExplorerUrl: PropTypes.bool,
+};
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
new file mode 100644
index 000000000000..0fc96d87d68a
--- /dev/null
+++ b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import { renderWithProvider } from '../../../../../test/jest';
+import ViewOnEtherScanLink from '.';
+
+const createProps = (customProps = {}) => {
+  return {
+    txHash:
+      '0x58e5a0fc7fbc849eddc100d44e86276168a8c7baaa5604e44ba6f5eb8ba1b7eb',
+    blockExplorerUrl: 'https://block.explorer',
+    isCustomBlockExplorerUrl: false,
+    ...customProps,
+  };
+};
+
+describe('ViewOnEtherScanLink', () => {
+  it('renders the component with initial props', () => {
+    const { container, getByText } = renderWithProvider(
+      <ViewOnEtherScanLink {...createProps()} />,
+    );
+    expect(getByText('View Swap on Etherscan')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+
+  it('renders the component with a custom block explorer link', () => {
+    const { container, getByText } = renderWithProvider(
+      <ViewOnEtherScanLink
+        {...createProps({
+          blockExplorerUrl: 'https://custom-blockchain.explorer',
+          isCustomBlockExplorerUrl: true,
+        })}
+      />,
+    );
+    expect(
+      getByText('View Swap at custom-blockchain.explorer'),
+    ).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap b/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
index b0551966d1c6..4314aea3a33e 100644
--- a/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
+++ b/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
@@ -6,16 +6,16 @@ exports[`BuildQuote renders the component with initial props 1`] = `
   role="radiogroup"
 >
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button1"
     role="radio"
   >
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index eac8f2a04bf8..230b5aa4ec73 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -95,7 +95,7 @@ import {
 
 import {
   resetSwapsPostFetchState,
-  ignoreTokens,
+  removeToken,
   setBackgroundSwapRouteState,
   clearSwapsQuotes,
   stopPollingForQuotes,
@@ -359,12 +359,7 @@ export default function BuildQuote({
   const onToSelect = useCallback(
     (token) => {
       if (destinationTokenAddedForSwap && token.address !== toAddress) {
-        dispatch(
-          ignoreTokens({
-            tokensToIgnore: toAddress,
-            dontShowLoadingIndicator: true,
-          }),
-        );
+        dispatch(removeToken(toAddress));
       }
       dispatch(setSwapToToken(token));
       setVerificationClicked(false);
diff --git a/ui/pages/swaps/build-quote/build-quote.stories.js b/ui/pages/swaps/build-quote/build-quote.stories.js
index f3fd3d462ab4..9783c63042fd 100644
--- a/ui/pages/swaps/build-quote/build-quote.stories.js
+++ b/ui/pages/swaps/build-quote/build-quote.stories.js
@@ -1,33 +1,204 @@
-import React from 'react';
-import { shuffle } from 'lodash';
-import testData from '../../../../.storybook/test-data';
-import BuildQuote from './build-quote';
+import React, { useState } from 'react';
+import { action } from '@storybook/addon-actions';
+import { boolean } from '@storybook/addon-knobs';
+import DropdownInputPair from '../dropdown-input-pair';
+import DropdownSearchList from '../dropdown-search-list';
 
-const tokenValuesArr = shuffle(testData.metamask.tokenList);
+const tokens = [
+  {
+    primaryLabel: 'MetaMark (META)',
+    name: 'MetaMark',
+    iconUrl: '.storybook/images/metamark.svg',
+    erc20: true,
+    decimals: 18,
+    symbol: 'META',
+    address: '0x617b3f8050a0BD94b6b1da02B4384eE5B4DF13F4',
+  },
+  {
+    primaryLabel: '0x (ZRX)',
+    name: '0x',
+    iconUrl: '.storybook/images/0x.svg',
+    erc20: true,
+    symbol: 'ZRX',
+    decimals: 18,
+    address: '0xE41d2489571d322189246DaFA5ebDe1F4699F498',
+  },
+  {
+    primaryLabel: 'AirSwap Token (AST)',
+    name: 'AirSwap Token',
+    iconUrl: '.storybook/images/AST.png',
+    erc20: true,
+    symbol: 'AST',
+    decimals: 4,
+    address: '0x27054b13b1B798B345b591a4d22e6562d47eA75a',
+  },
+  {
+    primaryLabel: 'Basic Attention Token (BAT)',
+    name: 'Basic Attention Token',
+    iconUrl: '.storybook/images/BAT_icon.svg',
+    erc20: true,
+    symbol: 'BAT',
+    decimals: 18,
+    address: '0x0D8775F648430679A709E98d2b0Cb6250d2887EF',
+  },
+  {
+    primaryLabel: 'Civil Token (CVL)',
+    name: 'Civil Token',
+    iconUrl: '.storybook/images/CVL_token.svg',
+    erc20: true,
+    symbol: 'CVL',
+    decimals: 18,
+    address: '0x01FA555c97D7958Fa6f771f3BbD5CCD508f81e22',
+  },
+  {
+    primaryLabel: 'Gladius (GLA)',
+    name: 'Gladius',
+    iconUrl: '.storybook/images/gladius.svg',
+    erc20: true,
+    symbol: 'GLA',
+    decimals: 8,
+    address: '0x71D01dB8d6a2fBEa7f8d434599C237980C234e4C',
+  },
+  {
+    primaryLabel: 'Gnosis Token (GNO)',
+    name: 'Gnosis Token',
+    iconUrl: '.storybook/images/gnosis.svg',
+    erc20: true,
+    symbol: 'GNO',
+    decimals: 18,
+    address: '0x6810e776880C02933D47DB1b9fc05908e5386b96',
+  },
+  {
+    primaryLabel: 'OmiseGO (OMG)',
+    name: 'OmiseGO',
+    iconUrl: '.storybook/images/omg.jpg',
+    erc20: true,
+    symbol: 'OMG',
+    decimals: 18,
+    address: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07',
+  },
+  {
+    primaryLabel: 'Sai Stablecoin v1.0 (SAI)',
+    name: 'Sai Stablecoin v1.0',
+    iconUrl: '.storybook/images/sai.svg',
+    erc20: true,
+    symbol: 'SAI',
+    decimals: 18,
+    address: '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359',
+  },
+  {
+    primaryLabel: 'Tether USD (USDT)',
+    name: 'Tether USD',
+    iconUrl: '.storybook/images/tether_usd.png',
+    erc20: true,
+    symbol: 'USDT',
+    decimals: 6,
+    address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+  },
+  {
+    primaryLabel: 'WednesdayCoin (WED)',
+    name: 'WednesdayCoin',
+    iconUrl: '.storybook/images/wed.png',
+    erc20: true,
+    symbol: 'WED',
+    decimals: 18,
+    address: '0x7848ae8F19671Dc05966dafBeFbBbb0308BDfAbD',
+  },
+  {
+    primaryLabel: 'Wrapped BTC (WBTC)',
+    name: 'Wrapped BTC',
+    iconUrl: '.storybook/images/wbtc.png',
+    erc20: true,
+    symbol: 'WBTC',
+    decimals: 8,
+    address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
+  },
+];
+
+const tokensToSearch = tokens.map((token) => ({
+  ...token,
+  primaryLabel: token.symbol,
+  secondaryLabel: token.name,
+  rightPrimaryLabel: `${(Math.random() * 100).toFixed(
+    Math.floor(Math.random() * 6),
+  )} ${token.symbol}`,
+  rightSecondaryLabel: `$${(Math.random() * 1000).toFixed(2)}`,
+}));
 
 export default {
   title: 'Pages/Swaps/BuildQuote',
   id: __filename,
-  argTypes: {
-    ethBalance: {
-      control: { type: 'text' },
-    },
-    selectedAccountAddress: {
-      control: { type: 'text' },
-    },
-    shuffledTokensList: { control: 'object' },
-  },
-  args: {
-    ethBalance: '0x8',
-    selectedAccountAddress: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
-    shuffledTokensList: tokenValuesArr,
-  },
 };
 
-export const DefaultStory = (args) => {
+export const DefaultStory = () => {
+  const [inputValue, onInputChange] = useState(null);
+  const [selectedFromToken, setSelectedFromToken] = useState(null);
+  const formattedSwapFromFiatValue = `$${(Number(inputValue) * 4).toFixed(2)}`;
+  const loading = boolean('loading', false);
+  const selectedFromTokenIsNull = boolean('selectedFromTokenIsNull', false);
   return (
     <>
-      <BuildQuote {...args} />
+      <h1>NOT ACTUAL COMPONENT</h1>
+
+      <div
+        style={{
+          height: '415px',
+          width: '357px',
+          border: '1px solid grey',
+          paddingLeft: '24px',
+          paddingRight: '24px',
+          overflow: 'hidden',
+        }}
+      >
+        <div className="build-quote">
+          <div className="build-quote__dropdown-input-pair-header">
+            <div className="build-quote__input-label">Swap from</div>
+            <div
+              className="build-quote__max-button"
+              onClick={action('clickedMax')}
+            >
+              Max
+            </div>
+          </div>
+          <DropdownInputPair
+            itemsToSearch={tokensToSearch}
+            onInputChange={onInputChange}
+            inputValue={inputValue}
+            leftValue={formattedSwapFromFiatValue}
+            onSelect={setSelectedFromToken}
+            selectedItem={selectedFromTokenIsNull ? null : selectedFromToken}
+            maxListItems={30}
+            loading={loading}
+            hideItemIf={(tokenListItem) => tokenListItem.decimals !== 18}
+            selectPlaceHolderText="Select"
+          />
+          <div className="build-quote__swap-arrows-row">
+            <button className="build-quote__swap-arrows">
+              <i className="fa fa-arrow-up" title="swapSwapSwitch" />
+              <i className="fa fa-arrow-down" title="swapSwapSwitch" />
+            </button>
+          </div>
+          <div className="build-quote__dropdown-swap-to-header">
+            <div className="build-quote__input-label">Swap to</div>
+          </div>
+          <DropdownSearchList
+            itemsToSearch={tokensToSearch}
+            listContainerClassName="build-quote__open-to-dropdown"
+            searchPlaceholderText="Search for a token"
+            fuseSearchKeys={[
+              { name: 'name', weight: 0.499 },
+              { name: 'symbol', weight: 0.499 },
+              { name: 'address', weight: 0.002 },
+            ]}
+            maxListItems={30}
+            onSelect={action('onToSelect')}
+            selectPlaceHolderText="Select a token"
+            loading={loading}
+            hideRightLabels
+            defaultToAll
+          />
+        </div>
+      </div>
     </>
   );
 };
diff --git a/ui/pages/swaps/build-quote/build-quote.test.js b/ui/pages/swaps/build-quote/build-quote.test.js
index 5ea33a674a0c..12f1b27bc452 100644
--- a/ui/pages/swaps/build-quote/build-quote.test.js
+++ b/ui/pages/swaps/build-quote/build-quote.test.js
@@ -22,7 +22,7 @@ const createProps = (customProps = {}) => {
 
 setBackgroundConnection({
   resetPostFetchState: jest.fn(),
-  ignoreTokens: jest.fn(),
+  removeToken: jest.fn(),
   setBackgroundSwapRouteState: jest.fn(),
   clearSwapsQuotes: jest.fn(),
   stopPollingForQuotes: jest.fn(),
diff --git a/ui/pages/swaps/build-quote/index.scss b/ui/pages/swaps/build-quote/index.scss
index bf28abb1aeae..e062d492d599 100644
--- a/ui/pages/swaps/build-quote/index.scss
+++ b/ui/pages/swaps/build-quote/index.scss
@@ -110,7 +110,7 @@
   &__open-dropdown,
   &__open-to-dropdown {
     max-height: 330px;
-    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
     position: absolute;
     width: 100%;
   }
diff --git a/ui/pages/swaps/create-new-swap/create-new-swap.js b/ui/pages/swaps/create-new-swap/create-new-swap.js
deleted file mode 100644
index 2739085497ac..000000000000
--- a/ui/pages/swaps/create-new-swap/create-new-swap.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useContext } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
-import { useHistory } from 'react-router-dom';
-import isEqual from 'lodash/isEqual';
-
-import Box from '../../../components/ui/box';
-import { I18nContext } from '../../../contexts/i18n';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
-import {
-  navigateBackToBuildQuote,
-  setSwapsFromToken,
-} from '../../../ducks/swaps/swaps';
-import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
-import { getSwapsDefaultToken } from '../../../selectors';
-
-export default function CreateNewSwap({ sensitiveTrackingProperties }) {
-  const t = useContext(I18nContext);
-  const trackEvent = useContext(MetaMetricsContext);
-  const dispatch = useDispatch();
-  const history = useHistory();
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
-
-  return (
-    <Box marginBottom={3} className="create-new-swap">
-      <button
-        onClick={async () => {
-          trackEvent({
-            event: 'Make Another Swap',
-            category: EVENT.CATEGORIES.SWAPS,
-            sensitiveProperties: sensitiveTrackingProperties,
-          });
-          history.push(DEFAULT_ROUTE); // It cleans up Swaps state.
-          await dispatch(navigateBackToBuildQuote(history));
-          dispatch(setSwapsFromToken(defaultSwapsToken));
-        }}
-      >
-        {t('makeAnotherSwap')}
-      </button>
-    </Box>
-  );
-}
-
-CreateNewSwap.propTypes = {
-  sensitiveTrackingProperties: PropTypes.object.isRequired,
-};
diff --git a/ui/pages/swaps/create-new-swap/create-new-swap.test.js b/ui/pages/swaps/create-new-swap/create-new-swap.test.js
deleted file mode 100644
index 53835efff221..000000000000
--- a/ui/pages/swaps/create-new-swap/create-new-swap.test.js
+++ /dev/null
@@ -1,27 +0,0 @@
-import React from 'react';
-import configureMockStore from 'redux-mock-store';
-
-import {
-  renderWithProvider,
-  createSwapsMockStore,
-} from '../../../../test/jest';
-import CreateNewSwap from '.';
-
-const createProps = (customProps = {}) => {
-  return {
-    sensitiveProperties: {},
-    ...customProps,
-  };
-};
-
-describe('CreateNewSwap', () => {
-  it('renders the component with initial props', () => {
-    const store = configureMockStore()(createSwapsMockStore());
-    const props = createProps();
-    const { getByText } = renderWithProvider(
-      <CreateNewSwap {...props} />,
-      store,
-    );
-    expect(getByText('Create a new swap')).toBeInTheDocument();
-  });
-});
diff --git a/ui/pages/swaps/create-new-swap/index.js b/ui/pages/swaps/create-new-swap/index.js
deleted file mode 100644
index d9e08ef8ba30..000000000000
--- a/ui/pages/swaps/create-new-swap/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './create-new-swap';
diff --git a/ui/pages/swaps/create-new-swap/index.scss b/ui/pages/swaps/create-new-swap/index.scss
deleted file mode 100644
index fb7beecf5687..000000000000
--- a/ui/pages/swaps/create-new-swap/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.create-new-swap {
-  button {
-    @include H5;
-
-    color: var(--color-primary-default);
-    background-color: transparent;
-  }
-}
diff --git a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
index d65d50117b62..f8c81626477b 100644
--- a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -154,7 +154,9 @@ export default function DropdownSearchList({
     SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
 
-  const blockExplorerHostName = getURLHostName(blockExplorerLink);
+  const blockExplorerLabel = rpcPrefs.blockExplorerUrl
+    ? getURLHostName(blockExplorerLink)
+    : t('etherscan');
 
   const importTokenProps = {
     onImportTokenCloseClick,
@@ -226,14 +228,15 @@ export default function DropdownSearchList({
               ) : (
                 <div className="dropdown-search-list__placeholder">
                   {t('swapBuildQuotePlaceHolderText', [searchQuery])}
-                  {blockExplorerLink && (
-                    <div
-                      tabIndex="0"
-                      className="searchable-item-list__item searchable-item-list__item--add-token"
-                      key="searchable-item-list-item-last"
-                    >
-                      <ActionableMessage
-                        message={t('addCustomTokenByContractAddress', [
+                  <div
+                    tabIndex="0"
+                    className="searchable-item-list__item searchable-item-list__item--add-token"
+                    key="searchable-item-list-item-last"
+                  >
+                    <ActionableMessage
+                      message={
+                        blockExplorerLink &&
+                        t('addCustomTokenByContractAddress', [
                           <a
                             key="dropdown-search-list__etherscan-link"
                             onClick={() => {
@@ -243,7 +246,9 @@ export default function DropdownSearchList({
                                 properties: {
                                   link_type: 'Token Tracker',
                                   action: 'Verify Contract Address',
-                                  block_explorer_domain: blockExplorerHostName,
+                                  block_explorer_domain: getURLHostName(
+                                    blockExplorerLink,
+                                  ),
                                 },
                               });
                               global.platform.openTab({
@@ -253,12 +258,12 @@ export default function DropdownSearchList({
                             target="_blank"
                             rel="noopener noreferrer"
                           >
-                            {blockExplorerHostName}
+                            {blockExplorerLabel}
                           </a>,
-                        ])}
-                      />
-                    </div>
-                  )}
+                        ])
+                      }
+                    />
+                  </div>
                 </div>
               )
             }
diff --git a/ui/pages/swaps/dropdown-search-list/index.scss b/ui/pages/swaps/dropdown-search-list/index.scss
index 18a9134c0c7f..711fd3f3155c 100644
--- a/ui/pages/swaps/dropdown-search-list/index.scss
+++ b/ui/pages/swaps/dropdown-search-list/index.scss
@@ -18,7 +18,7 @@
   }
 
   &--open {
-    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18); /* TODO! */
     border: 1px solid var(--color-border-default);
   }
 
@@ -91,7 +91,7 @@
   }
 
   &__search-list--open {
-    box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
     border: 1px solid var(--color-border-muted);
   }
 
diff --git a/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap b/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
index 019965e73101..c07a79d6c578 100644
--- a/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
+++ b/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
@@ -36,7 +36,7 @@ exports[`ExchangeRateDisplay renders the component with initial props 1`] = `
       >
         <path
           d="M4.15294 4.38514H9.99223L8.50853 5.86884C8.30421 6.07297 8.30421 6.40418 8.50853 6.60869C8.61069 6.71085 8.74443 6.76203 8.87836 6.76203C9.01229 6.76203 9.14603 6.71085 9.24819 6.60869L11.6249 4.23219C11.649 4.20803 11.6707 4.1814 11.6899 4.15305C11.6947 4.14563 11.6981 4.13726 11.7025 4.12965C11.7154 4.10815 11.7282 4.08646 11.7381 4.06325C11.7426 4.05222 11.7447 4.04043 11.7487 4.0292C11.7558 4.00827 11.7636 3.98754 11.7681 3.96547C11.775 3.93161 11.7786 3.89717 11.7786 3.86198C11.7786 3.82678 11.775 3.79235 11.7681 3.75849C11.7638 3.73642 11.756 3.71568 11.7487 3.69476C11.7447 3.68353 11.7428 3.67174 11.7381 3.6607C11.7282 3.63749 11.7156 3.616 11.7025 3.59431C11.6981 3.5867 11.6947 3.57833 11.6899 3.57091C11.6707 3.54256 11.649 3.51593 11.6249 3.49177L9.24876 1.11564C9.04444 0.911322 8.71342 0.911322 8.50891 1.11564C8.30459 1.31977 8.30459 1.65098 8.50891 1.85549L9.99223 3.339H4.15294C2.22978 3.339 0.665039 4.90374 0.665039 6.8269C0.665039 7.11588 0.899227 7.35007 1.1882 7.35007C1.47718 7.35007 1.71137 7.11588 1.71137 6.8269C1.71137 5.48037 2.80659 4.38514 4.15294 4.38514ZM12.2066 6.57445C11.9177 6.57445 11.6835 6.80864 11.6835 7.09762C11.6835 8.44396 10.5883 9.53919 9.24191 9.53919H3.40262L4.88632 8.05549C5.09064 7.85136 5.09064 7.52014 4.88632 7.31563C4.682 7.11112 4.35098 7.11131 4.14647 7.31563L1.76977 9.69233C1.74561 9.71649 1.72393 9.74312 1.70471 9.77147C1.70015 9.7787 1.69691 9.78669 1.69273 9.79392C1.6796 9.81561 1.66647 9.83748 1.65677 9.86126C1.6524 9.87211 1.6503 9.88371 1.64631 9.89475C1.63927 9.91586 1.63128 9.93679 1.62671 9.95905C1.61986 9.99291 1.61625 10.0273 1.61625 10.0625C1.61625 10.0977 1.61986 10.1322 1.62671 10.166C1.63109 10.1883 1.63908 10.2092 1.64631 10.2303C1.6503 10.2414 1.65221 10.253 1.65677 10.2638C1.66666 10.2874 1.6796 10.3093 1.69273 10.3312C1.69691 10.3384 1.70015 10.3464 1.70471 10.3536C1.72393 10.382 1.74561 10.4086 1.76977 10.4328L4.14609 12.8091C4.24825 12.9112 4.38199 12.9624 4.51592 12.9624C4.64985 12.9624 4.78359 12.9112 4.88575 12.8091C5.09007 12.6049 5.09007 12.2737 4.88575 12.0692L3.40243 10.5857H9.24172C11.1649 10.5857 12.7296 9.02097 12.7296 7.09781C12.7298 6.80864 12.4956 6.57445 12.2066 6.57445Z"
-          fill="var(--color-primary-default)"
+          fill="var(--color-icon-default)"
         />
       </svg>
     </div>
diff --git a/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js b/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
index e9eb34c6cece..ffa0d9fab677 100644
--- a/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
+++ b/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
@@ -12,7 +12,7 @@ export default function ExchangeRateDisplay({
   secondaryTokenValue,
   secondaryTokenDecimals = 18,
   secondaryTokenSymbol,
-  arrowColor = 'var(--color-primary-default)',
+  arrowColor = 'var(--color-icon-default)',
   boldSymbols = true,
   className,
 }) {
diff --git a/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap b/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
index dea196ec9932..85bc1b6b42ca 100644
--- a/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
+++ b/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
@@ -1,5 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`FeeCard renders the component with EIP-1559 V2 enabled 1`] = `null`;
+
 exports[`FeeCard renders the component with EIP-1559 enabled 1`] = `null`;
 
 exports[`FeeCard renders the component with initial props 1`] = `null`;
diff --git a/ui/pages/swaps/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js
index dfb6d9d5ab59..f2451f6245c4 100644
--- a/ui/pages/swaps/fee-card/fee-card.js
+++ b/ui/pages/swaps/fee-card/fee-card.js
@@ -18,6 +18,7 @@ import {
   TYPOGRAPHY,
   FONT_WEIGHT,
 } from '../../../helpers/constants/design-system';
+import GasDetailsItemTitle from '../../../components/app/gas-details-item/gas-details-item-title';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { EVENT } from '../../../../shared/constants/metametrics';
 
@@ -34,7 +35,10 @@ export default function FeeCard({
   numberOfQuotes,
   onQuotesClick,
   chainId,
+  smartTransactionsOptInStatus,
+  smartTransactionsEnabled,
   isBestQuote,
+  supportsEIP1559V2 = false,
 }) {
   const t = useContext(I18nContext);
 
@@ -68,49 +72,57 @@ export default function FeeCard({
     <div className="fee-card">
       <div className="fee-card__main">
         <TransactionDetail
-          disableEditGasFeeButton
+          disableEditGasFeeButton={
+            smartTransactionsEnabled && smartTransactionsOptInStatus
+          }
           rows={[
             <TransactionDetailItem
               key="gas-item"
               detailTitle={
-                <>
-                  {t('transactionDetailGasHeading')}
-                  <InfoTooltip
-                    position="top"
-                    contentText={
-                      <>
-                        <p className="fee-card__info-tooltip-paragraph">
-                          {t('swapGasFeesSummary', [
-                            getTranslatedNetworkName(),
-                          ])}
-                        </p>
-                        <p className="fee-card__info-tooltip-paragraph">
-                          {t('swapGasFeesDetails')}
-                        </p>
-                        <p className="fee-card__info-tooltip-paragraph">
-                          <a
-                            className="fee-card__link"
-                            onClick={() => {
-                              trackEvent({
-                                event: 'Clicked "Gas Fees: Learn More" Link',
-                                category: EVENT.CATEGORIES.SWAPS,
-                              });
-                              global.platform.openTab({
-                                url: GAS_FEES_LEARN_MORE_URL,
-                              });
-                            }}
-                            target="_blank"
-                            rel="noopener noreferrer"
-                          >
-                            {t('swapGasFeesLearnMore')}
-                          </a>
-                        </p>
-                      </>
-                    }
-                    containerClassName="fee-card__info-tooltip-content-container"
-                    wrapperClassName="fee-card__row-label fee-card__info-tooltip-container"
-                  />
-                </>
+                supportsEIP1559V2 &&
+                (!smartTransactionsEnabled || !smartTransactionsOptInStatus) ? (
+                  <GasDetailsItemTitle />
+                ) : (
+                  <>
+                    {t('transactionDetailGasHeading')}
+                    <InfoTooltip
+                      position="top"
+                      contentText={
+                        <>
+                          <p className="fee-card__info-tooltip-paragraph">
+                            {t('swapGasFeesSummary', [
+                              getTranslatedNetworkName(),
+                            ])}
+                          </p>
+                          <p className="fee-card__info-tooltip-paragraph">
+                            {t('swapGasFeesDetails')}
+                          </p>
+                          <p className="fee-card__info-tooltip-paragraph">
+                            <a
+                              className="fee-card__link"
+                              onClick={() => {
+                                trackEvent({
+                                  event: 'Clicked "Gas Fees: Learn More" Link',
+                                  category: EVENT.CATEGORIES.SWAPS,
+                                });
+                                global.platform.openTab({
+                                  url: GAS_FEES_LEARN_MORE_URL,
+                                });
+                              }}
+                              target="_blank"
+                              rel="noopener noreferrer"
+                            >
+                              {t('swapGasFeesLearnMore')}
+                            </a>
+                          </p>
+                        </>
+                      }
+                      containerClassName="fee-card__info-tooltip-content-container"
+                      wrapperClassName="fee-card__row-label fee-card__info-tooltip-container"
+                      wide
+                    />
+                  </>
+                )
               }
               detailText={primaryFee.fee}
               detailTotal={secondaryFee.fee}
@@ -197,5 +209,8 @@ FeeCard.propTypes = {
   onQuotesClick: PropTypes.func.isRequired,
   numberOfQuotes: PropTypes.number.isRequired,
   chainId: PropTypes.string.isRequired,
+  smartTransactionsOptInStatus: PropTypes.bool,
+  smartTransactionsEnabled: PropTypes.bool,
   isBestQuote: PropTypes.bool.isRequired,
+  supportsEIP1559V2: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/fee-card/fee-card.test.js b/ui/pages/swaps/fee-card/fee-card.test.js
index 5caea9a71d0e..218fba458f5e 100644
--- a/ui/pages/swaps/fee-card/fee-card.test.js
+++ b/ui/pages/swaps/fee-card/fee-card.test.js
@@ -9,15 +9,23 @@ import {
   setBackgroundConnection,
   MOCKS,
 } from '../../../../test/jest';
+import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
 import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network';
 
-import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
+import {
+  checkNetworkAndAccountSupports1559,
+  getEIP1559V2Enabled,
+  getPreferences,
+  getSelectedAccount,
+} from '../../../selectors';
 import {
   getGasEstimateType,
   getGasFeeEstimates,
   getIsGasEstimatesLoading,
 } from '../../../ducks/metamask/metamask';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../helpers/constants/transactions';
+import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
 
 import FeeCard from '.';
 
@@ -145,4 +153,56 @@ describe('FeeCard', () => {
     expect(getByText(`: ${props.secondaryFee.maxFee}`)).toBeInTheDocument();
     expect(queryByTestId('fee-card__edit-link')).not.toBeInTheDocument();
   });
+
+  it('renders the component with EIP-1559 V2 enabled', () => {
+    useGasFeeEstimates.mockImplementation(() => ({ gasFeeEstimates: {} }));
+    useSelector.mockImplementation((selector) => {
+      if (selector === getPreferences) {
+        return {
+          useNativeCurrencyAsPrimaryCurrency: true,
+        };
+      }
+      if (selector === getEIP1559V2Enabled) {
+        return true;
+      }
+      if (selector === getSelectedAccount) {
+        return {
+          balance: '0x440aa47cc2556',
+        };
+      }
+      if (selector === checkNetworkAndAccountSupports1559) {
+        return true;
+      }
+      return undefined;
+    });
+
+    const store = configureMockStore(middleware)(createSwapsMockStore());
+    const props = createProps({
+      networkAndAccountSupports1559: true,
+      maxPriorityFeePerGasDecGWEI: '3',
+      maxFeePerGasDecGWEI: '4',
+      supportsEIP1559V2: true,
+    });
+    const { getByText } = renderWithProvider(
+      <GasFeeContextProvider
+        transaction={{ txParams: {}, userFeeLevel: 'high' }}
+        editGasMode={EDIT_GAS_MODES.SWAPS}
+      >
+        <FeeCard {...props} />
+      </GasFeeContextProvider>,
+      store,
+    );
+    expect(getByText('Best of 6 quotes.')).toBeInTheDocument();
+    expect(getByText('Gas')).toBeInTheDocument();
+    expect(getByText('(estimated)')).toBeInTheDocument();
+    expect(getByText('Swap suggested')).toBeInTheDocument();
+    expect(getByText('Max fee')).toBeInTheDocument();
+    expect(getByText(props.primaryFee.fee)).toBeInTheDocument();
+    expect(getByText(props.secondaryFee.fee)).toBeInTheDocument();
+    expect(getByText(`: ${props.secondaryFee.maxFee}`)).toBeInTheDocument();
+    expect(getByText('Includes a 0.875% MetaMask fee.')).toBeInTheDocument();
+    expect(
+      document.querySelector('.fee-card__top-bordered-row'),
+    ).toMatchSnapshot();
+  });
 });
diff --git a/ui/pages/swaps/import-token/import-token.js b/ui/pages/swaps/import-token/import-token.js
index baa0ab9e7eae..88a0645a84f5 100644
--- a/ui/pages/swaps/import-token/import-token.js
+++ b/ui/pages/swaps/import-token/import-token.js
@@ -47,9 +47,7 @@ export default function ImportToken({
       footer={ImportTokenModalFooter}
     >
       <Box
-        paddingRight={6}
-        paddingBottom={4}
-        paddingLeft={4}
+        padding={[0, 6, 4, 6]}
         alignItems={ALIGN_ITEMS.CENTER}
         display={DISPLAY.FLEX}
         className="import-token"
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index 861d0292e7df..bae9e6cbde38 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -76,7 +76,7 @@ import {
 import {
   resetBackgroundSwapsState,
   setSwapsTokens,
-  ignoreTokens,
+  removeToken,
   setBackgroundSwapRouteState,
   setSwapsErrorKey,
 } from '../../store/actions';
@@ -157,21 +157,11 @@ export default function Swap() {
   const showSmartTransactionsErrorMessage =
     currentSmartTransactionsError && !smartTransactionsErrorMessageDismissed;
 
-  useEffect(() => {
-    const leaveSwaps = async () => {
-      await dispatch(prepareToLeaveSwaps());
-      // We need to wait until "prepareToLeaveSwaps" is done, because otherwise
-      // a user would be redirected from DEFAULT_ROUTE back to Swaps.
-      history.push(DEFAULT_ROUTE);
-    };
-
-    if (!isSwapsChain) {
-      leaveSwaps();
-    }
-  }, [isSwapsChain, dispatch, history]);
-
-  // This will pre-load gas fees before going to the View Quote page.
-  useGasFeeEstimates();
+  if (networkAndAccountSupports1559) {
+    // This will pre-load gas fees before going to the View Quote page.
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useGasFeeEstimates();
+  }
 
   const {
     balance: ethBalance,
@@ -214,12 +204,7 @@ export default function Swap() {
         destinationTokenAddedForSwap &&
         (!isAwaitingSwapRoute || conversionError)
       ) {
-        dispatch(
-          ignoreTokens({
-            tokensToIgnore: destinationTokenInfo?.address,
-            dontShowLoadingIndicator: true,
-          }),
-        );
+        dispatch(removeToken(destinationTokenInfo?.address));
       }
     };
   }, [
@@ -238,9 +223,6 @@ export default function Swap() {
 
   // eslint-disable-next-line
   useEffect(() => {
-    if (!isSwapsChain) {
-      return undefined;
-    }
     fetchTokens(chainId)
       .then((tokens) => {
         dispatch(setSwapsTokens(tokens));
@@ -258,7 +240,7 @@ export default function Swap() {
     return () => {
       dispatch(prepareToLeaveSwaps());
     };
-  }, [dispatch, chainId, networkAndAccountSupports1559, isSwapsChain]);
+  }, [dispatch, chainId, networkAndAccountSupports1559]);
 
   const hardwareWalletUsed = useSelector(isHardwareWallet);
   const hardwareWalletType = useSelector(getHardwareWalletType);
@@ -371,9 +353,7 @@ export default function Swap() {
   ]);
 
   if (!isSwapsChain) {
-    // A user is being redirected outside of Swaps via the async "leaveSwaps" function above. In the meantime
-    // we have to prevent the code below this condition, which wouldn't work on an unsupported chain.
-    return <></>;
+    return <Redirect to={{ pathname: DEFAULT_ROUTE }} />;
   }
 
   const isStxNotEnoughFundsError =
diff --git a/ui/pages/swaps/index.scss b/ui/pages/swaps/index.scss
index 4d2f8f6c9a5b..faa2e8b9e50c 100644
--- a/ui/pages/swaps/index.scss
+++ b/ui/pages/swaps/index.scss
@@ -15,8 +15,6 @@
 @import 'swaps-footer/index';
 @import 'view-quote/index';
 @import 'import-token/index';
-@import 'create-new-swap/index';
-@import 'view-on-block-explorer/index';
 
 .swaps {
   display: flex;
@@ -50,7 +48,7 @@
       width: 460px;
       background: var(--color-background-default);
       border: 1px solid var(--color-border-muted);
-      box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
+      box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
       border-radius: 8px;
       height: 620px;
     }
diff --git a/ui/pages/swaps/main-quote-summary/README.mdx b/ui/pages/swaps/main-quote-summary/README.mdx
deleted file mode 100644
index 75a8f89baf59..000000000000
--- a/ui/pages/swaps/main-quote-summary/README.mdx
+++ /dev/null
@@ -1,14 +0,0 @@
-import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
-import MainQuoteSummary from '.';
-
-# MainQuoteSummary
-
-MainQuoteSummary displays the quote of a swap.
-
-<Canvas>
-  <Story id="ui-pages-swaps-main-quote-summary-main-quote-summary-stories-js--default-story" />
-</Canvas>
-
-## Component API
-
-<ArgsTable of={MainQuoteSummary} />
\ No newline at end of file
diff --git a/ui/pages/swaps/main-quote-summary/main-quote-summary.js b/ui/pages/swaps/main-quote-summary/main-quote-summary.js
index 33a1f8fdcd82..ceab8ef75ea1 100644
--- a/ui/pages/swaps/main-quote-summary/main-quote-summary.js
+++ b/ui/pages/swaps/main-quote-summary/main-quote-summary.js
@@ -93,6 +93,7 @@ export default function MainQuoteSummary({
               position="bottom"
               html={amountToDisplay}
               disabled={ellipsedAmountToDisplay === amountToDisplay}
+              theme="white"
             >
               <span
                 className="main-quote-summary__quote-large-number"
@@ -128,54 +129,21 @@ export default function MainQuoteSummary({
 }
 
 MainQuoteSummary.propTypes = {
-  /**
-   * The amount that will be sent in the smallest denomination.
-   * For example, wei is the smallest denomination for ether.
-   */
   sourceValue: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.instanceOf(BigNumber),
   ]).isRequired,
-
-  /**
-   * Maximum number of decimal places for the source token.
-   */
   sourceDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
-
-  /**
-   * The ticker symbol for the source token.
-   */
   sourceSymbol: PropTypes.string.isRequired,
-
-  /**
-   * The amount that will be received in the smallest denomination.
-   * For example, wei is the smallest denomination for ether.
-   */
   destinationValue: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.instanceOf(BigNumber),
   ]).isRequired,
-
-  /**
-   * Maximum number of decimal places for the destination token.
-   */
   destinationDecimals: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number,
   ]),
-
-  /**
-   * The ticker symbol for the destination token.
-   */
   destinationSymbol: PropTypes.string.isRequired,
-
-  /**
-   * The location of the source token icon file.
-   */
   sourceIconUrl: PropTypes.string,
-
-  /**
-   * The location of the destination token icon file.
-   */
   destinationIconUrl: PropTypes.string,
 };
diff --git a/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js b/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
index 7648e3e0c847..51dd381826bb 100644
--- a/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
+++ b/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
@@ -1,55 +1,13 @@
 import React from 'react';
-import README from './README.mdx';
+import { text, number } from '@storybook/addon-knobs';
 import MainQuoteSummary from './main-quote-summary';
 
 export default {
   title: 'Pages/Swaps/MainQuoteSummary',
   id: __filename,
-  component: MainQuoteSummary,
-  parameters: {
-    docs: {
-      page: README,
-    },
-  },
-  argTypes: {
-    sourceValue: {
-      control: 'text',
-    },
-    sourceDecimals: {
-      control: 'number',
-    },
-    sourceSymbol: {
-      control: 'text',
-    },
-    destinationValue: {
-      control: 'text',
-    },
-    destinationDecimals: {
-      control: 'number',
-    },
-    destinationSymbol: {
-      control: 'text',
-    },
-    sourceIconUrl: {
-      control: 'text',
-    },
-    destinationIconUrl: {
-      control: 'text',
-    },
-  },
-  args: {
-    sourceValue: '2000000000000000000',
-    sourceDecimals: 18,
-    sourceSymbol: 'ETH',
-    destinationValue: '200000000000000000',
-    destinationDecimals: 18,
-    destinationSymbol: 'ABC',
-    sourceIconUrl: '.storybook/images/metamark.svg',
-    destinationIconUrl: '.storybook/images/sai.svg',
-  },
 };
 
-export const DefaultStory = (args) => {
+export const DefaultStory = () => {
   return (
     <div
       style={{
@@ -59,7 +17,16 @@ export const DefaultStory = (args) => {
         padding: '24px',
       }}
     >
-      <MainQuoteSummary {...args} />
+      <MainQuoteSummary
+        sourceValue={text('sourceValue', '2000000000000000000')}
+        sourceDecimals={number('sourceDecimals', 18)}
+        sourceSymbol={text('sourceSymbol', 'ETH')}
+        destinationValue={text('destinationValue', '200000000000000000')}
+        destinationDecimals={number('destinationDecimals', 18)}
+        destinationSymbol={text('destinationSymbol', 'ABC')}
+        sourceIconUrl=".storybook/images/metamark.svg"
+        destinationIconUrl=".storybook/images/sai.svg"
+      />
     </div>
   );
 };
diff --git a/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap b/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
index 347fcbec7bbe..b0ea92102c4e 100644
--- a/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
+++ b/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
@@ -11,17 +11,9 @@ exports[`SearchableItemList renders the component with initial props 1`] = `
       class="MuiInputAdornment-root MuiInputAdornment-positionStart"
       style="margin-right: 12px;"
     >
-      <svg
-        fill="var(--color-icon-muted)"
-        height="20"
-        viewBox="0 0 512 512"
-        width="20"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="m235 427c-51 0-100-21-136-57-36-36-56-84-56-135 0-26 5-51 14-74 10-23 24-44 42-62 18-18 39-32 62-42 23-9 48-14 74-14 25 0 50 5 73 14 23 10 45 24 62 42 18 18 32 39 42 62 10 23 15 48 15 74 0 43-15 86-42 119l78 79c2 2 4 4 5 7 1 2 1 5 1 8 0 3 0 6-1 8-1 3-3 5-5 7-2 2-4 4-7 5-2 1-5 1-8 1-3 0-6 0-8-1-3-1-5-3-7-5l-79-78c-33 27-76 42-119 42z m0-43c82 0 149-67 149-149 0-83-67-150-149-150-83 0-150 67-150 150 0 82 67 149 150 149z"
-        />
-      </svg>
+      <i
+        class="fa fa-search fa-lg"
+      />
     </div>
     <input
       aria-invalid="false"
diff --git a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
index 34d2ed87f061..01ab42c03ee6 100644
--- a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
+++ b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
@@ -37,7 +37,9 @@ export default function ItemList({
     SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
 
-  const blockExplorerHostName = getURLHostName(blockExplorerLink);
+  const blockExplorerLabel = rpcPrefs.blockExplorerUrl
+    ? getURLHostName(blockExplorerLink)
+    : t('etherscan');
   const trackEvent = useContext(MetaMetricsContext);
 
   // If there is a token for import based on a contract address, it's the only one in the list.
@@ -139,36 +141,41 @@ export default function ItemList({
             </div>
           );
         })}
-        {!hasTokenForImport && blockExplorerLink && (
+        {!hasTokenForImport && (
           <div
             tabIndex="0"
             className="searchable-item-list__item searchable-item-list__item--add-token"
             key="searchable-item-list-item-last"
           >
             <ActionableMessage
-              message={t('addCustomTokenByContractAddress', [
-                <a
-                  key="searchable-item-list__etherscan-link"
-                  onClick={() => {
-                    trackEvent({
-                      event: 'Clicked Block Explorer Link',
-                      category: EVENT.CATEGORIES.SWAPS,
-                      properties: {
-                        link_type: 'Token Tracker',
-                        action: 'Verify Contract Address',
-                        block_explorer_domain: blockExplorerHostName,
-                      },
-                    });
-                    global.platform.openTab({
-                      url: blockExplorerLink,
-                    });
-                  }}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  {blockExplorerHostName}
-                </a>,
-              ])}
+              message={
+                blockExplorerLink &&
+                t('addCustomTokenByContractAddress', [
+                  <a
+                    key="searchable-item-list__etherscan-link"
+                    onClick={() => {
+                      trackEvent({
+                        event: 'Clicked Block Explorer Link',
+                        category: EVENT.CATEGORIES.SWAPS,
+                        properties: {
+                          link_type: 'Token Tracker',
+                          action: 'Verify Contract Address',
+                          block_explorer_domain: getURLHostName(
+                            blockExplorerLink,
+                          ),
+                        },
+                      });
+                      global.platform.openTab({
+                        url: blockExplorerLink,
+                      });
+                    }}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                  >
+                    {blockExplorerLabel}
+                  </a>,
+                ])
+              }
             />
           </div>
         )}
diff --git a/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js b/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
index 6e67e00cdffe..afab74664091 100644
--- a/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
+++ b/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
@@ -9,11 +9,13 @@ import { usePrevious } from '../../../../hooks/usePrevious';
 import { isValidHexAddress } from '../../../../../shared/modules/hexstring-utils';
 import { fetchToken } from '../../swaps.util';
 import { getCurrentChainId } from '../../../../selectors/selectors';
-import SearchIcon from '../../../../components/ui/icon/search-icon';
 
 const renderAdornment = () => (
   <InputAdornment position="start" style={{ marginRight: '12px' }}>
-    <SearchIcon size={20} color="var(--color-icon-muted)" />
+    <i
+      className="fa fa-search fa-lg"
+      style={{ color: 'var(--color-icon-muted)' }}
+    />
   </InputAdornment>
 );
 
diff --git a/ui/pages/swaps/searchable-item-list/searchable-item-list.js b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
index d4cdaaf1189c..318c2094eb27 100644
--- a/ui/pages/swaps/searchable-item-list/searchable-item-list.js
+++ b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
@@ -1,4 +1,4 @@
-import React, { useState, useRef, useMemo, useEffect } from 'react';
+import React, { useState, useRef } from 'react';
 import PropTypes from 'prop-types';
 import ItemList from './item-list';
 import ListItemSearch from './list-item-search';
@@ -22,14 +22,7 @@ export default function SearchableItemList({
 }) {
   const itemListRef = useRef();
 
-  const initialResultsState = useMemo(() => {
-    return defaultToAll ? itemsToSearch : [];
-  }, [defaultToAll, itemsToSearch]);
-  const [results, setResults] = useState(initialResultsState);
-  useEffect(() => {
-    setResults(initialResultsState);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [initialResultsState.length]);
+  const [results, setResults] = useState(defaultToAll ? itemsToSearch : []);
   const [searchQuery, setSearchQuery] = useState('');
 
   return (
diff --git a/ui/pages/swaps/select-quote-popover/index.scss b/ui/pages/swaps/select-quote-popover/index.scss
index e2e5bd829183..987a323b5ebe 100644
--- a/ui/pages/swaps/select-quote-popover/index.scss
+++ b/ui/pages/swaps/select-quote-popover/index.scss
@@ -98,7 +98,7 @@
     &--selected {
       color: var(--color-primary-inverse);
       background: linear-gradient(90deg, var(--color-primary-default) 0%, var(--color-primary-alternative) 101.32%);
-      box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
+      box-shadow: 0 10px 39px rgba(3, 125, 214, 0.15);
       border-radius: 8px;
       height: 64px;
 
@@ -246,7 +246,7 @@
     }
 
     &--orange {
-      background: var(--color-warning-default);
+      background: var(--color-secondary-default);
     }
 
     &--green {
diff --git a/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js b/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
index 705cec1924c2..1eaa997389d8 100644
--- a/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
+++ b/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
@@ -10,7 +10,6 @@ const createProps = (customProps = {}) => {
     swapToSymbol: 'ETH',
     initialAggId: 'initialAggId',
     onQuoteDetailsIsOpened: jest.fn(),
-    hideEstimatedGasFee: false,
     ...customProps,
   };
 };
diff --git a/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js b/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
index 51a53b3bf0e9..1b594ba3cc4c 100644
--- a/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
+++ b/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
@@ -10,7 +10,6 @@ jest.mock(
 
 const createProps = (customProps = {}) => {
   return {
-    hideEstimatedGasFee: false,
     selectedAggId: 'Agg2',
     onSelect: jest.fn(),
     onCaretClick: jest.fn(),
diff --git a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
index 34aebe6c49d4..47517ebf3444 100644
--- a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
+++ b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
@@ -21,16 +21,16 @@ exports[`SlippageButtons renders the component with initial props 2`] = `
   role="radiogroup"
 >
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button1"
     role="radio"
   >
@@ -68,16 +68,16 @@ exports[`SlippageButtons renders the component with the Smart Transaction opt-in
   role="radiogroup"
 >
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button1"
     role="radio"
   >
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
index 78e117dfdec9..b93ca1e527f2 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
@@ -15,7 +15,6 @@ import {
   DISPLAY,
 } from '../../../helpers/constants/design-system';
 import { getTranslatedStxErrorMessage } from '../swaps.util';
-import { SLIPPAGE } from '../../../../shared/constants/swaps';
 
 export default function SlippageButtons({
   onSelect,
@@ -31,7 +30,8 @@ export default function SlippageButtons({
   const [customValue, setCustomValue] = useState(() => {
     if (
       typeof currentSlippage === 'number' &&
-      !Object.values(SLIPPAGE).includes(currentSlippage)
+      currentSlippage !== 2 &&
+      currentSlippage !== 3
     ) {
       return currentSlippage.toString();
     }
@@ -39,17 +39,17 @@ export default function SlippageButtons({
   });
   const [enteringCustomValue, setEnteringCustomValue] = useState(false);
   const [activeButtonIndex, setActiveButtonIndex] = useState(() => {
-    if (currentSlippage === SLIPPAGE.HIGH) {
-      return 1; // 3% slippage.
-    } else if (currentSlippage === SLIPPAGE.DEFAULT) {
-      return 0; // 2% slippage.
+    if (currentSlippage === 3) {
+      return 1;
+    } else if (currentSlippage === 2) {
+      return 0;
     } else if (typeof currentSlippage === 'number') {
-      return 2; // Custom slippage.
+      return 2;
     }
-    return 0;
+    return 1; // Choose activeButtonIndex = 1 for 3% slippage by default.
   });
   const [open, setOpen] = useState(() => {
-    return currentSlippage !== SLIPPAGE.DEFAULT; // Only open Advanced Options by default if it's not default slippage.
+    return currentSlippage !== 3; // Only open Advanced Options by default if it's not default 3% slippage.
   });
   const [inputRef, setInputRef] = useState(null);
 
@@ -133,20 +133,20 @@ export default function SlippageButtons({
                       setCustomValue('');
                       setEnteringCustomValue(false);
                       setActiveButtonIndex(0);
-                      onSelect(SLIPPAGE.DEFAULT);
+                      onSelect(2);
                     }}
                   >
-                    {t('swapSlippagePercent', [SLIPPAGE.DEFAULT])}
+                    2%
                   </Button>
                   <Button
                     onClick={() => {
                       setCustomValue('');
                       setEnteringCustomValue(false);
                       setActiveButtonIndex(1);
-                      onSelect(SLIPPAGE.HIGH);
+                      onSelect(3);
                     }}
                   >
-                    {t('swapSlippagePercent', [SLIPPAGE.HIGH])}
+                    3%
                   </Button>
                   <Button
                     className={classnames(
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
index aaf992930a60..232c00639099 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
@@ -7,7 +7,7 @@ const createProps = (customProps = {}) => {
   return {
     onSelect: jest.fn(),
     maxAllowedSlippage: 15,
-    currentSlippage: 3,
+    currentSlippage: 2,
     smartTransactionsEnabled: false,
     ...customProps,
   };
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 85cc42f25736..84c7a0fe8244 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -1,7 +1,6 @@
 import React, { useContext, useEffect, useState } from 'react';
-import { useDispatch, useSelector, shallowEqual } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
-import { getBlockExplorerLink } from '@metamask/etherscan-link';
 
 import { I18nContext } from '../../../contexts/i18n';
 import {
@@ -19,14 +18,7 @@ import {
 import {
   isHardwareWallet,
   getHardwareWalletType,
-  getCurrentChainId,
-  getUSDConversionRate,
-  conversionRateSelector,
-  getCurrentCurrency,
-  getRpcPrefsForCurrentProvider,
-} from '../../../selectors';
-import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
-import { getNativeCurrency } from '../../../ducks/metamask/metamask';
+} from '../../../selectors/selectors';
 import {
   DEFAULT_ROUTE,
   BUILD_QUOTE_ROUTE,
@@ -52,13 +44,8 @@ import { SMART_TRANSACTION_STATUSES } from '../../../../shared/constants/transac
 
 import SwapsFooter from '../swaps-footer';
 import { calcTokenAmount } from '../../../helpers/utils/token-util';
-import {
-  showRemainingTimeInMinAndSec,
-  getFeeForSmartTransaction,
-} from '../swaps.util';
+import { showRemainingTimeInMinAndSec } from '../swaps.util';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
-import CreateNewSwap from '../create-new-swap';
-import ViewOnBlockExplorer from '../view-on-block-explorer';
 import SuccessIcon from './success-icon';
 import RevertedIcon from './reverted-icon';
 import CanceledIcon from './canceled-icon';
@@ -84,26 +71,14 @@ export default function SmartTransactionStatus() {
   const smartTransactionsOptInStatus = useSelector(
     getSmartTransactionsOptInStatus,
   );
-  const chainId = useSelector(getCurrentChainId);
-  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider, shallowEqual);
   const swapsNetworkConfig = useSelector(getSwapsNetworkConfig);
   const smartTransactionsEnabled = useSelector(getSmartTransactionsEnabled);
   const currentSmartTransactionsEnabled = useSelector(
     getCurrentSmartTransactionsEnabled,
   );
-  const baseNetworkUrl =
-    rpcPrefs.blockExplorerUrl ??
-    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
-    null;
-  const nativeCurrencySymbol = useSelector(getNativeCurrency);
-  const conversionRate = useSelector(conversionRateSelector);
-  const USDConversionRate = useSelector(getUSDConversionRate);
-  const currentCurrency = useSelector(getCurrentCurrency);
-
   let smartTransactionStatus = SMART_TRANSACTION_STATUSES.PENDING;
   let latestSmartTransaction = {};
   let latestSmartTransactionUuid;
-  let cancellationFeeWei;
 
   if (currentSmartTransactions && currentSmartTransactions.length > 0) {
     latestSmartTransaction =
@@ -111,8 +86,6 @@ export default function SmartTransactionStatus() {
     latestSmartTransactionUuid = latestSmartTransaction?.uuid;
     smartTransactionStatus =
       latestSmartTransaction?.status || SMART_TRANSACTION_STATUSES.PENDING;
-    cancellationFeeWei =
-      latestSmartTransaction?.statusMetadata?.cancellationFeeWei;
   }
 
   const [timeLeftForPendingStxInSec, setTimeLeftForPendingStxInSec] = useState(
@@ -149,7 +122,6 @@ export default function SmartTransactionStatus() {
   const showCloseButtonOnly =
     isSmartTransactionPending ||
     smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS;
-  const txHash = latestSmartTransaction?.statusMetadata?.minedHash;
 
   useEffect(() => {
     trackEvent({
@@ -197,16 +169,17 @@ export default function SmartTransactionStatus() {
     }, 1000); // Stop polling for quotes after 1s.
   }, [dispatch]);
 
-  let headerText = t('stxPendingPrivatelySubmittingSwap');
+  let headerText = t('stxPendingOptimizingGas');
   let description;
   let subDescription;
   let icon;
-  let blockExplorerUrl;
   if (isSmartTransactionPending) {
-    if (cancelSwapLinkClicked) {
+    if (timeLeftForPendingStxInSec < 120) {
+      headerText = t('stxPendingFinalizing');
+    } else if (timeLeftForPendingStxInSec < 150) {
+      headerText = t('stxPendingPrivatelySubmitting');
+    } else if (cancelSwapLinkClicked) {
       headerText = t('stxTryingToCancel');
-    } else if (cancellationFeeWei > 0) {
-      headerText = t('stxPendingPubliclySubmittingSwap');
     }
   }
   if (smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS) {
@@ -250,28 +223,11 @@ export default function SmartTransactionStatus() {
     ]);
     icon = <RevertedIcon />;
   }
-  if (txHash && latestSmartTransactionUuid) {
-    blockExplorerUrl = getBlockExplorerLink(
-      { hash: txHash, chainId },
-      { blockExplorerUrl: baseNetworkUrl },
-    );
-  }
 
   const showCancelSwapLink =
     latestSmartTransaction.cancellable && !cancelSwapLinkClicked;
 
   const CancelSwap = () => {
-    let feeInFiat;
-    if (cancellationFeeWei > 0) {
-      ({ feeInFiat } = getFeeForSmartTransaction({
-        chainId,
-        currentCurrency,
-        conversionRate,
-        USDConversionRate,
-        nativeCurrencySymbol,
-        feeInWeiDec: cancellationFeeWei,
-      }));
-    }
     return (
       <Box marginBottom={0}>
         <a
@@ -288,9 +244,7 @@ export default function SmartTransactionStatus() {
             dispatch(cancelSwapsSmartTransaction(latestSmartTransactionUuid));
           }}
         >
-          {feeInFiat
-            ? t('cancelSwapForFee', [feeInFiat])
-            : t('cancelSwapForFree')}
+          {t('cancelSwap')}
         </a>
       </Box>
     );
@@ -378,7 +332,7 @@ export default function SmartTransactionStatus() {
               variant={TYPOGRAPHY.H6}
               boxProps={{ marginLeft: 1 }}
             >
-              {`${t('stxSwapCompleteIn')} `}
+              {`${t('swapCompleteIn')} `}
             </Typography>
             <Typography
               color={COLORS.TEXT_ALTERNATIVE}
@@ -415,18 +369,12 @@ export default function SmartTransactionStatus() {
         {description && (
           <Typography
             variant={TYPOGRAPHY.H6}
-            boxProps={{ ...(blockExplorerUrl && { margin: [1, 0, 0] }) }}
+            boxProps={{ marginTop: 0 }}
             color={COLORS.TEXT_ALTERNATIVE}
           >
             {description}
           </Typography>
         )}
-        {blockExplorerUrl && (
-          <ViewOnBlockExplorer
-            blockExplorerUrl={blockExplorerUrl}
-            sensitiveTrackingProperties={sensitiveProperties}
-          />
-        )}
         <Box
           marginTop={3}
           className="smart-transaction-status__background-animation smart-transaction-status__background-animation--bottom"
@@ -444,9 +392,6 @@ export default function SmartTransactionStatus() {
       {showCancelSwapLink &&
         latestSmartTransactionUuid &&
         isSmartTransactionPending && <CancelSwap />}
-      {smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS ? (
-        <CreateNewSwap sensitiveTrackingProperties={sensitiveProperties} />
-      ) : null}
       <SwapsFooter
         onSubmit={async () => {
           if (showCloseButtonOnly) {
diff --git a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
index 8c9a118c610c..091ded904988 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
@@ -19,7 +19,7 @@ describe('SmartTransactionStatus', () => {
   it('renders the component with initial props', () => {
     const store = configureMockStore(middleware)(createSwapsMockStore());
     const { getByText } = renderWithProvider(<SmartTransactionStatus />, store);
-    expect(getByText('Publicly submitting your Swap...')).toBeInTheDocument();
+    expect(getByText('Optimizing gas...')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/swaps/swaps.util.js b/ui/pages/swaps/swaps.util.js
index ec12cc6f96c7..c0993b63f8e0 100644
--- a/ui/pages/swaps/swaps.util.js
+++ b/ui/pages/swaps/swaps.util.js
@@ -420,12 +420,11 @@ export async function fetchAggregatorMetadata(chainId) {
 
 export async function fetchTopAssets(chainId) {
   const topAssetsUrl = getBaseApi('topAssets', chainId);
-  const response =
-    (await fetchWithCache(
-      topAssetsUrl,
-      { method: 'GET', headers: clientIdHeader },
-      { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
-    )) || [];
+  const response = await fetchWithCache(
+    topAssetsUrl,
+    { method: 'GET', headers: clientIdHeader },
+    { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
+  );
   const topAssetsMap = response.reduce((_topAssetsMap, asset, index) => {
     if (validateData(TOP_ASSET_VALIDATORS, asset, topAssetsUrl)) {
       return { ..._topAssetsMap, [asset.address]: { index: String(index) } };
@@ -758,12 +757,6 @@ export function getSwapsTokensReceivedFromTxMeta(
       return null;
     }
 
-    if (txMeta.swapMetaData && txMeta.preTxBalance === txMeta.postTxBalance) {
-      // If preTxBalance and postTxBalance are equal, postTxBalance hasn't been updated on time
-      // because of the RPC provider delay, so we return an estimated receiving amount instead.
-      return txMeta.swapMetaData.token_to_amount;
-    }
-
     let approvalTxGasCost = '0x0';
     if (approvalTxMeta && approvalTxMeta.txReceipt) {
       approvalTxGasCost = calcGasTotal(
diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js
index 8abff8171fb1..0aaa2345f220 100644
--- a/ui/pages/swaps/swaps.util.test.js
+++ b/ui/pages/swaps/swaps.util.test.js
@@ -8,7 +8,6 @@ import {
   RINKEBY_CHAIN_ID,
   KOVAN_CHAIN_ID,
   AVALANCHE_CHAIN_ID,
-  ETH_SYMBOL,
 } from '../../../shared/constants/network';
 import {
   SWAPS_CHAINID_CONTRACT_ADDRESS_MAP,
@@ -40,7 +39,6 @@ import {
   countDecimals,
   shouldEnableDirectWrapping,
   showRemainingTimeInMinAndSec,
-  getSwapsTokensReceivedFromTxMeta,
 } from './swaps.util';
 
 jest.mock('../../helpers/utils/storage-helpers.js', () => ({
@@ -569,106 +567,4 @@ describe('Swaps Util', () => {
       expect(true).toBe(true);
     });
   });
-
-  describe('getSwapsTokensReceivedFromTxMeta', () => {
-    const createProps = () => {
-      return {
-        tokenSymbol: ETH_SYMBOL,
-        txMeta: {
-          swapMetaData: {
-            token_to_amount: 5,
-          },
-          txReceipt: {
-            status: '0x0',
-          },
-          preTxBalance: '8b11',
-          postTxBalance: '8b11',
-        },
-        tokenAddress: '0x881d40237659c251811cec9c364ef91234567890',
-        accountAddress: '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
-        tokenDecimals: 6,
-        approvalTxMeta: null,
-        chainId: MAINNET_CHAIN_ID,
-      };
-    };
-
-    it('returns an estimated amount if preTxBalance and postTxBalance are the same for ETH', () => {
-      const props = createProps();
-      expect(
-        getSwapsTokensReceivedFromTxMeta(
-          props.tokenSymbol,
-          props.txMeta,
-          props.tokenAddress,
-          props.accountAddress,
-          props.tokenDecimals,
-          props.approvalTxMeta,
-          props.chainId,
-        ),
-      ).toBe(props.txMeta.swapMetaData.token_to_amount);
-    });
-
-    it('returns null if there is no txMeta', () => {
-      const props = createProps();
-      props.txMeta = undefined;
-      expect(
-        getSwapsTokensReceivedFromTxMeta(
-          props.tokenSymbol,
-          props.txMeta,
-          props.tokenAddress,
-          props.accountAddress,
-          props.tokenDecimals,
-          props.approvalTxMeta,
-          props.chainId,
-        ),
-      ).toBeNull();
-    });
-
-    it('returns null if there is no txMeta.txReceipt', () => {
-      const props = createProps();
-      props.txMeta.txReceipt = undefined;
-      expect(
-        getSwapsTokensReceivedFromTxMeta(
-          props.tokenSymbol,
-          props.txMeta,
-          props.tokenAddress,
-          props.accountAddress,
-          props.tokenDecimals,
-          props.approvalTxMeta,
-          props.chainId,
-        ),
-      ).toBeNull();
-    });
-
-    it('returns null if there is no txMeta.postTxBalance', () => {
-      const props = createProps();
-      props.txMeta.postTxBalance = undefined;
-      expect(
-        getSwapsTokensReceivedFromTxMeta(
-          props.tokenSymbol,
-          props.txMeta,
-          props.tokenAddress,
-          props.accountAddress,
-          props.tokenDecimals,
-          props.approvalTxMeta,
-          props.chainId,
-        ),
-      ).toBeNull();
-    });
-
-    it('returns null if there is no txMeta.preTxBalance', () => {
-      const props = createProps();
-      props.txMeta.preTxBalance = undefined;
-      expect(
-        getSwapsTokensReceivedFromTxMeta(
-          props.tokenSymbol,
-          props.txMeta,
-          props.tokenAddress,
-          props.accountAddress,
-          props.tokenDecimals,
-          props.approvalTxMeta,
-          props.chainId,
-        ),
-      ).toBeNull();
-    });
-  });
 });
diff --git a/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap b/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
deleted file mode 100644
index e7b00963ca9a..000000000000
--- a/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
+++ /dev/null
@@ -1,13 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ViewOnBlockExplorer renders the component with initial props 1`] = `
-<div>
-  <div
-    class="box view-on-block-explorer box--margin-top-6 box--flex-direction-row"
-  >
-    <button>
-      View Swap at etherscan.io
-    </button>
-  </div>
-</div>
-`;
diff --git a/ui/pages/swaps/view-on-block-explorer/index.js b/ui/pages/swaps/view-on-block-explorer/index.js
deleted file mode 100644
index 7f7e427fcefe..000000000000
--- a/ui/pages/swaps/view-on-block-explorer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './view-on-block-explorer';
diff --git a/ui/pages/swaps/view-on-block-explorer/index.scss b/ui/pages/swaps/view-on-block-explorer/index.scss
deleted file mode 100644
index ed05e956c36c..000000000000
--- a/ui/pages/swaps/view-on-block-explorer/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-.view-on-block-explorer {
-  button {
-    @include H7;
-
-    color: var(--color-primary-default);
-    background-color: transparent;
-  }
-}
diff --git a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
deleted file mode 100644
index 145ca010f535..000000000000
--- a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-
-import Box from '../../../components/ui/box';
-import { I18nContext } from '../../../contexts/i18n';
-import { getURLHostName } from '../../../helpers/utils/util';
-import { MetaMetricsContext } from '../../../contexts/metametrics';
-import { EVENT } from '../../../../shared/constants/metametrics';
-
-export default function ViewOnBlockExplorer({
-  blockExplorerUrl,
-  sensitiveTrackingProperties,
-}) {
-  const t = useContext(I18nContext);
-  const trackEvent = useContext(MetaMetricsContext);
-  const blockExplorerHostName = getURLHostName(blockExplorerUrl);
-
-  return (
-    <Box marginTop={6} className="view-on-block-explorer">
-      <button
-        onClick={() => {
-          trackEvent({
-            event: 'Clicked Block Explorer Link',
-            category: EVENT.CATEGORIES.SWAPS,
-            sensitiveProperties: sensitiveTrackingProperties,
-            properties: {
-              link_type: 'Transaction Block Explorer',
-              action: 'Swap Transaction',
-              block_explorer_domain: blockExplorerHostName,
-            },
-          });
-          global.platform.openTab({ url: blockExplorerUrl });
-        }}
-      >
-        {t('viewOnCustomBlockExplorer', [
-          t('blockExplorerSwapAction'),
-          blockExplorerHostName,
-        ])}
-      </button>
-    </Box>
-  );
-}
-
-ViewOnBlockExplorer.propTypes = {
-  blockExplorerUrl: PropTypes.string.isRequired,
-  sensitiveTrackingProperties: PropTypes.object.isRequired,
-};
diff --git a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js
deleted file mode 100644
index e2917a68fa21..000000000000
--- a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import React from 'react';
-
-import { renderWithProvider } from '../../../../test/jest';
-import ViewOnBlockExplorer from '.';
-
-const createProps = (customProps = {}) => {
-  return {
-    txHash:
-      '0x58e5a0fc7fbc849eddc100d44e86276168a8c7baaa5604e44ba6f5eb8ba1b7eb',
-    blockExplorerUrl: 'https://etherscan.io',
-    ...customProps,
-  };
-};
-
-describe('ViewOnBlockExplorer', () => {
-  it('renders the component with initial props', () => {
-    const { container, getByText } = renderWithProvider(
-      <ViewOnBlockExplorer {...createProps()} />,
-    );
-    expect(getByText('View Swap at etherscan.io')).toBeInTheDocument();
-    expect(container).toMatchSnapshot();
-  });
-});
diff --git a/ui/pages/swaps/view-quote/view-quote-price-difference.js b/ui/pages/swaps/view-quote/view-quote-price-difference.js
index c8f2cd162dfb..343083ce515b 100644
--- a/ui/pages/swaps/view-quote/view-quote-price-difference.js
+++ b/ui/pages/swaps/view-quote/view-quote-price-difference.js
@@ -73,7 +73,11 @@ export default function ViewQuotePriceDifference(props) {
                 <div className="view-quote__price-difference-warning-contents-title">
                   {priceDifferenceTitle}
                 </div>
-                <Tooltip position="bottom" title={t('swapPriceImpactTooltip')}>
+                <Tooltip
+                  position="bottom"
+                  theme="white"
+                  title={t('swapPriceImpactTooltip')}
+                >
                   <i className="fa fa-info-circle" />
                 </Tooltip>
               </Box>
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 7a576d1be2c2..e1a098b2b089 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -47,8 +47,8 @@ import {
   getCurrentSmartTransactionsError,
   getCurrentSmartTransactionsErrorMessageDismissed,
   getSwapsSTXLoading,
-  fetchSwapsSmartTransactionFees,
-  getSmartTransactionFees,
+  estimateSwapsSmartTransactionsGas,
+  getSmartTransactionEstimatedGas,
 } from '../../../ducks/swaps/swaps';
 import {
   conversionRateSelector,
@@ -60,6 +60,7 @@ import {
   isHardwareWallet,
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
+  getEIP1559V2Enabled,
   getUSDConversionRate,
 } from '../../../selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
@@ -91,6 +92,8 @@ import {
   hexWEIToDecGWEI,
   addHexes,
 } from '../../../helpers/utils/conversions.util';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import { TransactionModalContextProvider } from '../../../contexts/transaction-modal';
 import MainQuoteSummary from '../main-quote-summary';
 import { calcGasTotal } from '../../send/send.utils';
 import { getCustomTxParamsData } from '../../confirm-approve/confirm-approve.util';
@@ -102,7 +105,10 @@ import {
 } from '../swaps.util';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { QUOTES_EXPIRED_ERROR } from '../../../../shared/constants/swaps';
-import { GAS_RECOMMENDATIONS } from '../../../../shared/constants/gas';
+import {
+  EDIT_GAS_MODES,
+  GAS_RECOMMENDATIONS,
+} from '../../../../shared/constants/gas';
 import CountdownTimer from '../countdown-timer';
 import SwapsFooter from '../swaps-footer';
 import PulseLoader from '../../../components/ui/pulse-loader'; // TODO: Replace this with a different loading component.
@@ -119,6 +125,7 @@ export default function ViewQuote() {
   const dispatch = useDispatch();
   const t = useContext(I18nContext);
   const trackEvent = useContext(MetaMetricsContext);
+  const eip1559V2Enabled = useSelector(getEIP1559V2Enabled);
 
   const [dispatchedSafeRefetch, setDispatchedSafeRefetch] = useState(false);
   const [submitClicked, setSubmitClicked] = useState(false);
@@ -195,7 +202,9 @@ export default function ViewQuote() {
       (currentSmartTransactionsError !== 'not_enough_funds' ||
         currentSmartTransactionsErrorMessageDismissed)
     );
-  const smartTransactionFees = useSelector(getSmartTransactionFees);
+  const smartTransactionEstimatedGas = useSelector(
+    getSmartTransactionEstimatedGas,
+  );
   const swapsNetworkConfig = useSelector(getSwapsNetworkConfig);
   const unsignedTransaction = usedQuote.trade;
 
@@ -299,7 +308,7 @@ export default function ViewQuote() {
       chainId,
       smartTransactionsEnabled &&
         smartTransactionsOptInStatus &&
-        smartTransactionFees?.tradeTxFees,
+        smartTransactionEstimatedGas?.txData,
       nativeCurrencySymbol,
     );
   }, [
@@ -312,7 +321,7 @@ export default function ViewQuote() {
     approveGas,
     memoizedTokenConversionRates,
     chainId,
-    smartTransactionFees?.tradeTxFees,
+    smartTransactionEstimatedGas?.txData,
     nativeCurrencySymbol,
     smartTransactionsEnabled,
     smartTransactionsOptInStatus,
@@ -382,11 +391,11 @@ export default function ViewQuote() {
   if (
     currentSmartTransactionsEnabled &&
     smartTransactionsOptInStatus &&
-    smartTransactionFees?.tradeTxFees
+    smartTransactionEstimatedGas?.txData
   ) {
     const stxEstimatedFeeInWeiDec =
-      smartTransactionFees?.tradeTxFees.feeEstimate +
-      (smartTransactionFees?.approvalTxFees?.feeEstimate || 0);
+      smartTransactionEstimatedGas.txData.feeEstimate +
+      (smartTransactionEstimatedGas.approvalTxData?.feeEstimate || 0);
     const stxMaxFeeInWeiDec =
       stxEstimatedFeeInWeiDec * swapsNetworkConfig.stxMaxFeeMultiplier;
     ({ feeInFiat, feeInEth, rawEthFee, feeInUsd } = getFeeForSmartTransaction({
@@ -400,7 +409,7 @@ export default function ViewQuote() {
     additionalTrackingParams.stx_fee_in_usd = Number(feeInUsd);
     additionalTrackingParams.stx_fee_in_eth = Number(rawEthFee);
     additionalTrackingParams.estimated_gas =
-      smartTransactionFees?.tradeTxFees.gasLimit;
+      smartTransactionEstimatedGas.txData.gasLimit;
     ({
       feeInFiat: maxFeeInFiat,
       feeInEth: maxFeeInEth,
@@ -776,11 +785,11 @@ export default function ViewQuote() {
         chainId,
       };
       intervalId = setInterval(() => {
-        if (!swapsSTXLoading) {
-          dispatch(fetchSwapsSmartTransactionFees(unsignedTx, approveTxParams));
-        }
+        dispatch(
+          estimateSwapsSmartTransactionsGas(unsignedTx, approveTxParams),
+        );
       }, swapsNetworkConfig.stxGetTransactionsRefreshTime);
-      dispatch(fetchSwapsSmartTransactionFees(unsignedTx, approveTxParams));
+      dispatch(estimateSwapsSmartTransactionsGas(unsignedTx, approveTxParams));
     } else if (intervalId) {
       clearInterval(intervalId);
     }
@@ -823,150 +832,176 @@ export default function ViewQuote() {
     submitClicked,
   ]);
 
+  const transaction = {
+    userFeeLevel: swapsUserFeeLevel || GAS_RECOMMENDATIONS.HIGH,
+    txParams: {
+      maxFeePerGas,
+      maxPriorityFeePerGas,
+      gas: maxGasLimit,
+    },
+  };
+
+  const supportsEIP1559V2 = eip1559V2Enabled && networkAndAccountSupports1559;
+
   return (
-    <div className="view-quote">
-      <div
-        className={classnames('view-quote__content', {
-          'view-quote__content_modal': disableSubmissionDueToPriceWarning,
-        })}
-      >
-        {selectQuotePopoverShown && (
-          <SelectQuotePopover
-            quoteDataRows={renderablePopoverData}
-            onClose={() => setSelectQuotePopoverShown(false)}
-            onSubmit={(aggId) => dispatch(swapsQuoteSelected(aggId))}
-            swapToSymbol={destinationTokenSymbol}
-            initialAggId={usedQuote.aggregator}
-            onQuoteDetailsIsOpened={trackQuoteDetailsOpened}
-            hideEstimatedGasFee={
-              smartTransactionsEnabled && smartTransactionsOptInStatus
-            }
-          />
-        )}
-
-        <div
-          className={classnames('view-quote__warning-wrapper', {
-            'view-quote__warning-wrapper--thin': !isShowingWarning,
-          })}
-        >
-          {viewQuotePriceDifferenceComponent}
-          {(showInsufficientWarning || tokenBalanceUnavailable) && (
-            <ActionableMessage
-              message={actionableBalanceErrorMessage}
-              onClose={() => setWarningHidden(true)}
-            />
-          )}
-        </div>
-        <div className="view-quote__countdown-timer-container">
-          <CountdownTimer
-            timeStarted={quotesLastFetched}
-            warningTime="0:10"
-            labelKey="swapNewQuoteIn"
-          />
-        </div>
-        <MainQuoteSummary
-          sourceValue={calcTokenValue(sourceTokenValue, sourceTokenDecimals)}
-          sourceDecimals={sourceTokenDecimals}
-          sourceSymbol={sourceTokenSymbol}
-          destinationValue={calcTokenValue(
-            destinationTokenValue,
-            destinationTokenDecimals,
-          )}
-          destinationDecimals={destinationTokenDecimals}
-          destinationSymbol={destinationTokenSymbol}
-          sourceIconUrl={sourceTokenIconUrl}
-          destinationIconUrl={destinationIconUrl}
-        />
-        {currentSmartTransactionsEnabled &&
-          smartTransactionsOptInStatus &&
-          !smartTransactionFees?.tradeTxFees && (
-            <Box marginTop={0} marginBottom={10}>
-              <PulseLoader />
-            </Box>
-          )}
-        {(!currentSmartTransactionsEnabled ||
-          !smartTransactionsOptInStatus ||
-          smartTransactionFees?.tradeTxFees) && (
+    <GasFeeContextProvider
+      editGasMode={EDIT_GAS_MODES.SWAPS}
+      minimumGasLimit={usedGasLimit}
+      transaction={transaction}
+    >
+      <TransactionModalContextProvider>
+        <div className="view-quote">
           <div
-            className={classnames('view-quote__fee-card-container', {
-              'view-quote__fee-card-container--three-rows':
-                approveTxParams && (!balanceError || warningHidden),
+            className={classnames('view-quote__content', {
+              'view-quote__content_modal': disableSubmissionDueToPriceWarning,
             })}
           >
-            <FeeCard
-              primaryFee={{
-                fee: feeInEth,
-                maxFee: maxFeeInEth,
-              }}
-              secondaryFee={{
-                fee: feeInFiat,
-                maxFee: maxFeeInFiat,
-              }}
-              hideTokenApprovalRow={
-                !approveTxParams || (balanceError && !warningHidden)
-              }
-              tokenApprovalSourceTokenSymbol={sourceTokenSymbol}
-              onTokenApprovalClick={onFeeCardTokenApprovalClick}
-              metaMaskFee={String(metaMaskFee)}
-              numberOfQuotes={Object.values(quotes).length}
-              onQuotesClick={() => {
-                trackAllAvailableQuotesOpened();
-                setSelectQuotePopoverShown(true);
-              }}
-              chainId={chainId}
-              isBestQuote={isBestQuote}
-              maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI(
-                maxPriorityFeePerGas,
+            {selectQuotePopoverShown && (
+              <SelectQuotePopover
+                quoteDataRows={renderablePopoverData}
+                onClose={() => setSelectQuotePopoverShown(false)}
+                onSubmit={(aggId) => dispatch(swapsQuoteSelected(aggId))}
+                swapToSymbol={destinationTokenSymbol}
+                initialAggId={usedQuote.aggregator}
+                onQuoteDetailsIsOpened={trackQuoteDetailsOpened}
+                hideEstimatedGasFee={
+                  smartTransactionsEnabled && smartTransactionsOptInStatus
+                }
+              />
+            )}
+
+            <div
+              className={classnames('view-quote__warning-wrapper', {
+                'view-quote__warning-wrapper--thin': !isShowingWarning,
+              })}
+            >
+              {viewQuotePriceDifferenceComponent}
+              {(showInsufficientWarning || tokenBalanceUnavailable) && (
+                <ActionableMessage
+                  message={actionableBalanceErrorMessage}
+                  onClose={() => setWarningHidden(true)}
+                />
+              )}
+            </div>
+            <div className="view-quote__countdown-timer-container">
+              <CountdownTimer
+                timeStarted={quotesLastFetched}
+                warningTime="0:10"
+                labelKey="swapNewQuoteIn"
+              />
+            </div>
+            <MainQuoteSummary
+              sourceValue={calcTokenValue(
+                sourceTokenValue,
+                sourceTokenDecimals,
               )}
-              maxFeePerGasDecGWEI={hexWEIToDecGWEI(maxFeePerGas)}
+              sourceDecimals={sourceTokenDecimals}
+              sourceSymbol={sourceTokenSymbol}
+              destinationValue={calcTokenValue(
+                destinationTokenValue,
+                destinationTokenDecimals,
+              )}
+              destinationDecimals={destinationTokenDecimals}
+              destinationSymbol={destinationTokenSymbol}
+              sourceIconUrl={sourceTokenIconUrl}
+              destinationIconUrl={destinationIconUrl}
             />
+            {currentSmartTransactionsEnabled &&
+              smartTransactionsOptInStatus &&
+              !smartTransactionEstimatedGas?.txData && (
+                <Box marginTop={0} marginBottom={10}>
+                  <PulseLoader />
+                </Box>
+              )}
+            {(!currentSmartTransactionsEnabled ||
+              !smartTransactionsOptInStatus ||
+              smartTransactionEstimatedGas?.txData) && (
+              <div
+                className={classnames('view-quote__fee-card-container', {
+                  'view-quote__fee-card-container--three-rows':
+                    approveTxParams && (!balanceError || warningHidden),
+                })}
+              >
+                <FeeCard
+                  primaryFee={{
+                    fee: feeInEth,
+                    maxFee: maxFeeInEth,
+                  }}
+                  secondaryFee={{
+                    fee: feeInFiat,
+                    maxFee: maxFeeInFiat,
+                  }}
+                  hideTokenApprovalRow={
+                    !approveTxParams || (balanceError && !warningHidden)
+                  }
+                  tokenApprovalSourceTokenSymbol={sourceTokenSymbol}
+                  onTokenApprovalClick={onFeeCardTokenApprovalClick}
+                  metaMaskFee={String(metaMaskFee)}
+                  numberOfQuotes={Object.values(quotes).length}
+                  onQuotesClick={() => {
+                    trackAllAvailableQuotesOpened();
+                    setSelectQuotePopoverShown(true);
+                  }}
+                  chainId={chainId}
+                  isBestQuote={isBestQuote}
+                  supportsEIP1559V2={supportsEIP1559V2}
+                  networkAndAccountSupports1559={networkAndAccountSupports1559}
+                  maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI(
+                    maxPriorityFeePerGas,
+                  )}
+                  maxFeePerGasDecGWEI={hexWEIToDecGWEI(maxFeePerGas)}
+                  smartTransactionsEnabled={currentSmartTransactionsEnabled}
+                  smartTransactionsOptInStatus={smartTransactionsOptInStatus}
+                />
+              </div>
+            )}
           </div>
-        )}
-      </div>
-      <SwapsFooter
-        onSubmit={() => {
-          setSubmitClicked(true);
-          if (!balanceError) {
-            if (
+          <SwapsFooter
+            onSubmit={() => {
+              setSubmitClicked(true);
+              if (!balanceError) {
+                if (
+                  currentSmartTransactionsEnabled &&
+                  smartTransactionsOptInStatus &&
+                  smartTransactionEstimatedGas?.txData
+                ) {
+                  dispatch(
+                    signAndSendSwapsSmartTransaction({
+                      unsignedTransaction,
+                      trackEvent,
+                      history,
+                      additionalTrackingParams,
+                    }),
+                  );
+                } else {
+                  dispatch(
+                    signAndSendTransactions(
+                      history,
+                      trackEvent,
+                      additionalTrackingParams,
+                    ),
+                  );
+                }
+              } else if (destinationToken.symbol === defaultSwapsToken.symbol) {
+                history.push(DEFAULT_ROUTE);
+              } else {
+                history.push(`${ASSET_ROUTE}/${destinationToken.address}`);
+              }
+            }}
+            submitText={
               currentSmartTransactionsEnabled &&
               smartTransactionsOptInStatus &&
-              smartTransactionFees?.tradeTxFees
-            ) {
-              dispatch(
-                signAndSendSwapsSmartTransaction({
-                  unsignedTransaction,
-                  trackEvent,
-                  history,
-                  additionalTrackingParams,
-                }),
-              );
-            } else {
-              dispatch(
-                signAndSendTransactions(
-                  history,
-                  trackEvent,
-                  additionalTrackingParams,
-                ),
-              );
+              swapsSTXLoading
+                ? t('preparingSwap')
+                : t('swap')
             }
-          } else if (destinationToken.symbol === defaultSwapsToken.symbol) {
-            history.push(DEFAULT_ROUTE);
-          } else {
-            history.push(`${ASSET_ROUTE}/${destinationToken.address}`);
-          }
-        }}
-        submitText={
-          currentSmartTransactionsEnabled &&
-          smartTransactionsOptInStatus &&
-          swapsSTXLoading
-            ? t('preparingSwap')
-            : t('swap')
-        }
-        hideCancel
-        disabled={isSwapButtonDisabled}
-        className={isShowingWarning && 'view-quote__thin-swaps-footer'}
-        showTopBorder
-      />
-    </div>
+            hideCancel
+            disabled={isSwapButtonDisabled}
+            className={isShowingWarning && 'view-quote__thin-swaps-footer'}
+            showTopBorder
+          />
+        </div>
+      </TransactionModalContextProvider>
+    </GasFeeContextProvider>
   );
 }
diff --git a/ui/pages/swaps/view-quote/view-quote.test.js b/ui/pages/swaps/view-quote/view-quote.test.js
index 855ff0222789..6ad976117e22 100644
--- a/ui/pages/swaps/view-quote/view-quote.test.js
+++ b/ui/pages/swaps/view-quote/view-quote.test.js
@@ -64,7 +64,6 @@ describe('ViewQuote', () => {
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
-    expect(getByText('0.00008 ETH')).toBeInTheDocument();
     expect(getByText('Max fee')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
@@ -88,7 +87,7 @@ describe('ViewQuote', () => {
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
-    expect(getByText('0.00008 ETH')).toBeInTheDocument();
+    expect(getByText('0.00544 ETH')).toBeInTheDocument();
     expect(getByText('Max fee')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
diff --git a/ui/pages/token-details/token-details-page.js b/ui/pages/token-details/token-details-page.js
index fc7ce15f48a3..5b4d067ad624 100644
--- a/ui/pages/token-details/token-details-page.js
+++ b/ui/pages/token-details/token-details-page.js
@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Redirect, useHistory, useParams } from 'react-router-dom';
 import { getTokens } from '../../ducks/metamask/metamask';
-import { getTokenList } from '../../selectors';
+import { getUseTokenDetection, getTokenList } from '../../selectors';
 import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import Identicon from '../../components/ui/identicon';
 import { I18nContext } from '../../contexts/i18n';
@@ -32,6 +32,7 @@ export default function TokenDetailsPage() {
   const t = useContext(I18nContext);
   const tokens = useSelector(getTokens);
   const tokenList = useSelector(getTokenList);
+  const useTokenDetection = useSelector(getUseTokenDetection);
 
   const { address: tokenAddress } = useParams();
   const tokenMetadata = Object.values(tokenList).find((token) =>
@@ -39,7 +40,10 @@ export default function TokenDetailsPage() {
   );
   const aggregators = tokenMetadata?.aggregators?.join(', ');
   const fileName = tokenMetadata?.iconUrl;
-  const imagePath = fileName;
+  let imagePath = fileName;
+  if (!process.env.TOKEN_DETECTION_V2) {
+    imagePath = useTokenDetection ? fileName : `images/contract/${fileName}`;
+  }
 
   const token = tokens.find(({ address }) =>
     isEqualCaseInsensitive(address, tokenAddress),
@@ -70,8 +74,7 @@ export default function TokenDetailsPage() {
       <Box marginLeft={5} marginRight={6}>
         <Typography
           fontWeight={FONT_WEIGHT.BOLD}
-          margin={0}
-          marginTop={4}
+          margin={[4, 0, 0, 0]}
           variant={TYPOGRAPHY.H6}
           color={COLORS.TEXT_DEFAULT}
           className="token-details__title"
@@ -87,8 +90,7 @@ export default function TokenDetailsPage() {
           <Typography
             align={TEXT_ALIGN.CENTER}
             fontWeight={FONT_WEIGHT.BOLD}
-            margin={0}
-            marginRight={5}
+            margin={[0, 5, 0, 0]}
             variant={TYPOGRAPHY.H4}
             color={COLORS.TEXT_DEFAULT}
             className="token-details__token-value"
@@ -104,16 +106,14 @@ export default function TokenDetailsPage() {
           </Box>
         </Box>
         <Typography
-          margin={0}
-          marginTop={4}
+          margin={[4, 0, 0, 0]}
           variant={TYPOGRAPHY.H7}
           color={COLORS.TEXT_ALTERNATIVE}
         >
           {tokenCurrencyBalance || ''}
         </Typography>
         <Typography
-          margin={0}
-          marginTop={6}
+          margin={[6, 0, 0, 0]}
           variant={TYPOGRAPHY.H9}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
@@ -123,8 +123,7 @@ export default function TokenDetailsPage() {
         <Box display={DISPLAY.FLEX}>
           <Typography
             variant={TYPOGRAPHY.H7}
-            margin={0}
-            marginTop={2}
+            margin={[2, 0, 0, 0]}
             color={COLORS.TEXT_DEFAULT}
             overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
             className="token-details__token-address"
@@ -149,8 +148,7 @@ export default function TokenDetailsPage() {
         </Box>
         <Typography
           variant={TYPOGRAPHY.H9}
-          margin={0}
-          marginTop={4}
+          margin={[4, 0, 0, 0]}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
         >
@@ -158,16 +156,14 @@ export default function TokenDetailsPage() {
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H7}
-          margin={0}
-          marginTop={1}
+          margin={[1, 0, 0, 0]}
           color={COLORS.TEXT_DEFAULT}
         >
           {token.decimals}
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H9}
-          margin={0}
-          marginTop={4}
+          margin={[4, 0, 0, 0]}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
         >
@@ -175,8 +171,7 @@ export default function TokenDetailsPage() {
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H7}
-          margin={1}
-          marginTop={0}
+          margin={[1, 0, 0, 0]}
           color={COLORS.TEXT_DEFAULT}
         >
           {networkType === NETWORK_TYPE_RPC
@@ -187,8 +182,7 @@ export default function TokenDetailsPage() {
           <>
             <Typography
               variant={TYPOGRAPHY.H9}
-              margin={0}
-              marginTop={4}
+              margin={[4, 0, 0, 0]}
               color={COLORS.TEXT_ALTERNATIVE}
               fontWeight={FONT_WEIGHT.BOLD}
             >
@@ -196,8 +190,7 @@ export default function TokenDetailsPage() {
             </Typography>
             <Typography
               variant={TYPOGRAPHY.H7}
-              margin={0}
-              marginTop={1}
+              margin={[1, 0, 0, 0]}
               color={COLORS.TEXT_DEFAULT}
             >
               {`${aggregators}.`}
diff --git a/ui/pages/unlock-page/index.scss b/ui/pages/unlock-page/index.scss
index 745b68350ea7..8e3932715b2d 100644
--- a/ui/pages/unlock-page/index.scss
+++ b/ui/pages/unlock-page/index.scss
@@ -1,5 +1,4 @@
 .unlock-page {
-  color: var(--color-text-default);
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -7,13 +6,14 @@
   width: 357px;
   padding: 30px;
   font-weight: 400;
+  color: var(--color-text-default);
 
   &__container {
+    background: var(--color-background-default);
     display: flex;
     align-self: stretch;
     justify-content: center;
     flex: 1 0 auto;
-    background: var(--color-background-default);
   }
 
   &__mascot-container {
diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
index e502d473c8ea..e3e8f6efb3f8 100644
--- a/ui/selectors/confirm-transaction.js
+++ b/ui/selectors/confirm-transaction.js
@@ -117,29 +117,6 @@ export const unconfirmedTransactionsHashSelector = createSelector(
   },
 );
 
-export const unconfirmedMessagesHashSelector = createSelector(
-  unapprovedMsgsSelector,
-  unapprovedPersonalMsgsSelector,
-  unapprovedDecryptMsgsSelector,
-  unapprovedEncryptionPublicKeyMsgsSelector,
-  unapprovedTypedMessagesSelector,
-  (
-    unapprovedMsgs = {},
-    unapprovedPersonalMsgs = {},
-    unapprovedDecryptMsgs = {},
-    unapprovedEncryptionPublicKeyMsgs = {},
-    unapprovedTypedMessages = {},
-  ) => {
-    return {
-      ...unapprovedMsgs,
-      ...unapprovedPersonalMsgs,
-      ...unapprovedDecryptMsgs,
-      ...unapprovedEncryptionPublicKeyMsgs,
-      ...unapprovedTypedMessages,
-    };
-  },
-);
-
 const unapprovedMsgCountSelector = (state) => state.metamask.unapprovedMsgCount;
 const unapprovedPersonalMsgCountSelector = (state) =>
   state.metamask.unapprovedPersonalMsgCount;
diff --git a/ui/selectors/custom-gas.js b/ui/selectors/custom-gas.js
index 3edc9b20bf63..ea72bf9aedd2 100644
--- a/ui/selectors/custom-gas.js
+++ b/ui/selectors/custom-gas.js
@@ -8,7 +8,7 @@ import { decEthToConvertedCurrency as ethTotalToConvertedCurrency } from '../hel
 import { formatETHFee } from '../helpers/utils/formatters';
 import { calcGasTotal } from '../pages/send/send.utils';
 
-import { getGasLimit, getGasPrice } from '../ducks/send';
+import { getGasPrice } from '../ducks/send';
 import {
   GAS_ESTIMATE_TYPES as GAS_FEE_CONTROLLER_ESTIMATE_TYPES,
   GAS_LIMITS,
@@ -321,9 +321,8 @@ export function getRenderableEstimateDataForSmallButtonsFromGWEI(state) {
     return [];
   }
   const showFiat = getShouldShowFiat(state);
-
   const gasLimit =
-    getGasLimit(state) ?? getCustomGasLimit(state) ?? GAS_LIMITS.SIMPLE;
+    state.send.gas.gasLimit || getCustomGasLimit(state) || GAS_LIMITS.SIMPLE;
   const { conversionRate } = state.metamask;
   const currentCurrency = getCurrentCurrency(state);
   const gasFeeEstimates = getGasFeeEstimates(state);
diff --git a/ui/selectors/custom-gas.test.js b/ui/selectors/custom-gas.test.js
index 04733528203b..d41ec27c37cd 100644
--- a/ui/selectors/custom-gas.test.js
+++ b/ui/selectors/custom-gas.test.js
@@ -1,5 +1,4 @@
 import { GAS_ESTIMATE_TYPES, GAS_LIMITS } from '../../shared/constants/gas';
-import { getInitialSendStateWithExistingTxState } from '../../test/jest/mocks';
 import {
   getCustomGasLimit,
   getCustomGasPrice,
@@ -12,9 +11,7 @@ import {
 describe('custom-gas selectors', () => {
   describe('getCustomGasPrice()', () => {
     it('should return gas.customData.price', () => {
-      const mockState = {
-        gas: { customData: { price: 'mockPrice' } },
-      };
+      const mockState = { gas: { customData: { price: 'mockPrice' } } };
       expect(getCustomGasPrice(mockState)).toStrictEqual('mockPrice');
     });
   });
@@ -203,11 +200,11 @@ describe('custom-gas selectors', () => {
             EIPS: {},
           },
         },
-        send: getInitialSendStateWithExistingTxState({
+        send: {
           gas: {
             gasPrice: '0x28bed0160',
           },
-        }),
+        },
         gas: {
           customData: { price: null },
         },
@@ -225,11 +222,11 @@ describe('custom-gas selectors', () => {
             EIPS: {},
           },
         },
-        send: getInitialSendStateWithExistingTxState({
+        send: {
           gas: {
             gasPrice: '0x30e4f9b400',
           },
-        }),
+        },
         gas: {
           customData: { price: null },
         },
@@ -333,11 +330,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -382,11 +379,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -431,11 +428,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -480,11 +477,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
     ];
@@ -545,11 +542,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -594,11 +591,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -643,11 +640,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -692,11 +689,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
       {
@@ -741,11 +738,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: getInitialSendStateWithExistingTxState({
+          send: {
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          }),
+          },
         },
       },
     ];
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index 1eca5bea3059..a397c125da4c 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -375,10 +375,6 @@ export function getAddressBook(state) {
   return Object.values(state.metamask.addressBook[chainId]);
 }
 
-export function getEnsResolutionByAddress(state, address) {
-  return state.metamask.ensResolutionsByAddress[address] || '';
-}
-
 export function getAddressBookEntry(state, address) {
   const addressBook = getAddressBook(state);
   const entry = addressBook.find((contact) =>
@@ -474,24 +470,6 @@ export function getTotalUnapprovedCount(state) {
   );
 }
 
-export function getTotalUnapprovedMessagesCount(state) {
-  const {
-    unapprovedMsgCount = 0,
-    unapprovedPersonalMsgCount = 0,
-    unapprovedDecryptMsgCount = 0,
-    unapprovedEncryptionPublicKeyMsgCount = 0,
-    unapprovedTypedMessagesCount = 0,
-  } = state.metamask;
-
-  return (
-    unapprovedMsgCount +
-    unapprovedPersonalMsgCount +
-    unapprovedDecryptMsgCount +
-    unapprovedEncryptionPublicKeyMsgCount +
-    unapprovedTypedMessagesCount
-  );
-}
-
 function getUnapprovedTxCount(state) {
   const { unapprovedTxs = {} } = state.metamask;
   return Object.keys(unapprovedTxs).length;
@@ -715,15 +693,6 @@ export function getIsBuyableMoonPayChain(state) {
   return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.moonPay);
 }
 
-export function getIsBuyableWyreChain(state) {
-  const chainId = getCurrentChainId(state);
-  return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.wyre);
-}
-export function getIsBuyableCoinbasePayChain(state) {
-  const chainId = getCurrentChainId(state);
-  return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.coinbasePayCurrencies);
-}
-
 export function getNativeCurrencyImage(state) {
   const nativeCurrency = getNativeCurrency(state).toUpperCase();
   return NATIVE_CURRENCY_TOKEN_IMAGE_MAP[nativeCurrency];
@@ -745,7 +714,6 @@ export function getSnaps(state) {
 export const getSnapsRouteObjects = createSelector(getSnaps, (snaps) => {
   return Object.values(snaps).map((snap) => {
     return {
-      id: snap.id,
       tabMessage: () => snap.manifest.proposedName,
       descriptionMessage: () => snap.manifest.description,
       sectionMessage: () => snap.manifest.description,
@@ -754,50 +722,6 @@ export const getSnapsRouteObjects = createSelector(getSnaps, (snaps) => {
     };
   });
 });
-
-/**
- * @typedef {Object} Notification
- * @property {string} id - A unique identifier for the notification
- * @property {string} origin - A string identifing the snap origin
- * @property {EpochTimeStamp} createdDate - A date in epochTimeStramps, identifying when the notification was first committed
- * @property {EpochTimeStamp} readDate - A date in epochTimeStramps, identifying when the notification was read by the user
- * @property {string} message - A string containing the notification message
- */
-
-/**
- * Notifications are managed by the notification controller and referenced by
- * `state.metamask.notifications`. This function returns a list of notifications
- * the can be shown to the user.
- *
- * The returned notifications are sorted by date.
- *
- * @param {Object} state - the redux state object
- * @returns {Notification[]} An array of notifications that can be shown to the user
- */
-
-export function getNotifications(state) {
-  const notifications = Object.values(state.metamask.notifications);
-
-  const notificationsSortedByDate = notifications.sort(
-    (a, b) => new Date(b.createdDate) - new Date(a.createdDate),
-  );
-  return notificationsSortedByDate;
-}
-
-export function getUnreadNotifications(state) {
-  const notifications = getNotifications(state);
-
-  const unreadNotificationCount = notifications.filter(
-    (notification) => notification.readDate === null,
-  );
-
-  return unreadNotificationCount;
-}
-
-export const getUnreadNotificationsCount = createSelector(
-  getUnreadNotifications,
-  (notifications) => notifications.length,
-);
 ///: END:ONLY_INCLUDE_IN
 
 /**
@@ -822,17 +746,16 @@ function getAllowedAnnouncementIds(state) {
     6: false,
     7: false,
     8: supportsWebHid && currentKeyringIsLedger && currentlyUsingLedgerLive,
-    9: false,
+    9: getIsMainnet(state),
     10: Boolean(process.env.TOKEN_DETECTION_V2) && !process.env.IN_TEST,
     11: Boolean(process.env.TOKEN_DETECTION_V2) && !process.env.IN_TEST,
-    12: false,
-    13: true,
+    12: true,
   };
 }
 
 /**
- * @typedef {Object} Announcement
- * @property {number} id - A unique identifier for the announcement
+ * @typedef {Object} Notification
+ * @property {number} id - A unique identifier for the notification
  * @property {string} date - A date in YYYY-MM-DD format, identifying when the notification was first committed
  */
 
@@ -1063,13 +986,3 @@ export function getDetectedTokensInCurrentNetwork(state) {
 export function getNewTokensImported(state) {
   return state.appState.newTokensImported;
 }
-
-/**
- * To get the `customNetworkListEnabled` value which determines whether we use the custom network list
- *
- * @param {*} state
- * @returns Boolean
- */
-export function getIsCustomNetworkListEnabled(state) {
-  return state.metamask.customNetworkListEnabled;
-}
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 385bd2a56f3e..ca3f9c92f8bf 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -244,27 +244,4 @@ describe('Selectors', () => {
     const appIsLoading = selectors.getAppIsLoading(mockState);
     expect(appIsLoading).toStrictEqual(false);
   });
-  it('#getNotifications', () => {
-    const notifications = selectors.getNotifications(mockState);
-
-    expect(notifications).toStrictEqual([
-      mockState.metamask.notifications.test,
-      mockState.metamask.notifications.test2,
-    ]);
-  });
-  it('#getUnreadNotificationsCount', () => {
-    const unreadNotificationCount = selectors.getUnreadNotificationsCount(
-      mockState,
-    );
-
-    expect(unreadNotificationCount).toStrictEqual(1);
-  });
-
-  it('#getUnreadNotifications', () => {
-    const unreadNotifications = selectors.getUnreadNotifications(mockState);
-
-    expect(unreadNotifications).toStrictEqual([
-      mockState.metamask.notifications.test,
-    ]);
-  });
 });
diff --git a/ui/store/actionConstants.js b/ui/store/actionConstants.js
index c9e673afadf8..2a5528e72501 100644
--- a/ui/store/actionConstants.js
+++ b/ui/store/actionConstants.js
@@ -92,7 +92,6 @@ export const SET_SELECTED_SETTINGS_RPC_URL = 'SET_SELECTED_SETTINGS_RPC_URL';
 export const SET_NEW_NETWORK_ADDED = 'SET_NEW_NETWORK_ADDED';
 export const SET_NEW_COLLECTIBLE_ADDED_MESSAGE =
   'SET_NEW_COLLECTIBLE_ADDED_MESSAGE';
-export const SET_NEW_CUSTOM_NETWORK_ADDED = 'SET_NEW_CUSTOM_NETWORK_ADDED';
 
 export const LOADING_METHOD_DATA_STARTED = 'LOADING_METHOD_DATA_STARTED';
 export const LOADING_METHOD_DATA_FINISHED = 'LOADING_METHOD_DATA_FINISHED';
diff --git a/ui/store/actions.js b/ui/store/actions.js
index 308c4ea0ca0b..db0e1cddbba4 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -13,7 +13,6 @@ import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   ORIGIN_METAMASK,
   POLLING_TOKEN_ENVIRONMENT_TYPES,
-  MESSAGE_TYPE,
 } from '../../shared/constants/app';
 import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util';
 import txHelper from '../helpers/utils/tx-helper';
@@ -23,15 +22,8 @@ import {
   getMetaMaskAccounts,
   getPermittedAccountsForCurrentTab,
   getSelectedAddress,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  getNotifications,
-  ///: END:ONLY_INCLUDE_IN
 } from '../selectors';
-import {
-  computeEstimatedGasLimit,
-  initializeSendState,
-  resetSendState,
-} from '../ducks/send';
+import { computeEstimatedGasLimit, resetSendState } from '../ducks/send';
 import { switchedToUnconnectedAccount } from '../ducks/alerts/unconnected-account';
 import { getUnconnectedAccountAlertEnabledness } from '../ducks/metamask/metamask';
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
@@ -43,10 +35,6 @@ import {
 import { EVENT } from '../../shared/constants/metametrics';
 import { parseSmartTransactionsError } from '../pages/swaps/swaps.util';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
-///: BEGIN:ONLY_INCLUDE_IN(flask)
-import { NOTIFICATIONS_EXPIRATION_DELAY } from '../helpers/constants/notifications';
-///: END:ONLY_INCLUDE_IN
-import { setNewCustomNetworkAdded } from '../ducks/app/app';
 import * as actionConstants from './actionConstants';
 
 let background = null;
@@ -745,7 +733,7 @@ export function updateEditableParams(txId, editableParams) {
       log.error(error.message);
       throw error;
     }
-    await forceUpdateMetamaskState(dispatch);
+
     return updatedTransaction;
   };
 }
@@ -1013,44 +1001,6 @@ export function removeSnap(snapId) {
 export async function removeSnapError(msgData) {
   return promisifiedBackground.removeSnapError(msgData);
 }
-
-export function dismissNotifications(ids) {
-  return async (dispatch) => {
-    await promisifiedBackground.dismissNotifications(ids);
-    await forceUpdateMetamaskState(dispatch);
-  };
-}
-
-export function deleteExpiredNotifications() {
-  return async (dispatch, getState) => {
-    const state = getState();
-    const notifications = getNotifications(state);
-
-    const notificationIdsToDelete = notifications
-      .filter((notification) => {
-        const expirationTime = new Date(
-          Date.now() - NOTIFICATIONS_EXPIRATION_DELAY,
-        );
-
-        return Boolean(
-          notification.readDate &&
-            new Date(notification.readDate) < expirationTime,
-        );
-      })
-      .map(({ id }) => id);
-    if (notificationIdsToDelete.length) {
-      await promisifiedBackground.dismissNotifications(notificationIdsToDelete);
-      await forceUpdateMetamaskState(dispatch);
-    }
-  };
-}
-
-export function markNotificationsAsRead(ids) {
-  return async (dispatch) => {
-    await promisifiedBackground.markNotificationsAsRead(ids);
-    await forceUpdateMetamaskState(dispatch);
-  };
-}
 ///: END:ONLY_INCLUDE_IN
 
 export function cancelMsg(msgData) {
@@ -1071,96 +1021,6 @@ export function cancelMsg(msgData) {
   };
 }
 
-/**
- * Cancels all of the given messages
- *
- * @param {Array<object>} msgDataList - a list of msg data objects
- * @returns {function(*): Promise<void>}
- */
-export function cancelMsgs(msgDataList) {
-  return async (dispatch) => {
-    dispatch(showLoadingIndication());
-
-    try {
-      const msgIds = msgDataList.map((id) => id);
-      const cancellations = msgDataList.map(
-        ({ id, type }) =>
-          new Promise((resolve, reject) => {
-            switch (type) {
-              case MESSAGE_TYPE.ETH_SIGN_TYPED_DATA:
-                background.cancelTypedMessage(id, (err) => {
-                  if (err) {
-                    reject(err);
-                    return;
-                  }
-                  resolve();
-                });
-                return;
-              case MESSAGE_TYPE.PERSONAL_SIGN:
-                background.cancelPersonalMessage(id, (err) => {
-                  if (err) {
-                    reject(err);
-                    return;
-                  }
-                  resolve();
-                });
-                return;
-              case MESSAGE_TYPE.ETH_DECRYPT:
-                background.cancelDecryptMessage(id, (err) => {
-                  if (err) {
-                    reject(err);
-                    return;
-                  }
-                  resolve();
-                });
-                return;
-              case MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY:
-                background.cancelEncryptionPublicKeyMsg(id, (err) => {
-                  if (err) {
-                    reject(err);
-                    return;
-                  }
-                  resolve();
-                });
-                return;
-              case MESSAGE_TYPE.ETH_SIGN:
-                background.cancelMessage(id, (err) => {
-                  if (err) {
-                    reject(err);
-                    return;
-                  }
-                  resolve();
-                });
-                return;
-              default:
-                reject(
-                  new Error(
-                    `MetaMask Message Signature: Unknown message type: ${id}`,
-                  ),
-                );
-            }
-          }),
-      );
-
-      await Promise.all(cancellations);
-      const newState = await updateMetamaskStateFromBackground();
-      dispatch(updateMetamaskState(newState));
-
-      msgIds.forEach((id) => {
-        dispatch(completedTx(id));
-      });
-    } catch (err) {
-      log.error(err);
-    } finally {
-      if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
-        closeNotificationPopup();
-      } else {
-        dispatch(hideLoadingIndication());
-      }
-    }
-  };
-}
-
 export function cancelPersonalMsg(msgData) {
   return async (dispatch) => {
     dispatch(showLoadingIndication());
@@ -1447,11 +1307,6 @@ export function updateMetamaskState(newState) {
         type: actionConstants.CHAIN_CHANGED,
         payload: newProvider.chainId,
       });
-      // We dispatch this action to ensure that the send state stays up to date
-      // after the chain changes. This async thunk will fail gracefully in the
-      // event that we are not yet on the send flow with a draftTransaction in
-      // progress.
-      dispatch(initializeSendState({ chainHasChanged: true }));
     }
     dispatch({
       type: actionConstants.UPDATE_METAMASK_STATE,
@@ -1654,10 +1509,10 @@ export function addDetectedTokens(newDetectedTokens) {
  *
  * @param tokensToImport
  */
-export function addImportedTokens(tokensToImport) {
+export function importTokens(tokensToImport) {
   return async (dispatch) => {
     try {
-      await promisifiedBackground.addImportedTokens(tokensToImport);
+      await promisifiedBackground.importTokens(tokensToImport);
     } catch (error) {
       log.error(error);
     } finally {
@@ -1667,32 +1522,18 @@ export function addImportedTokens(tokensToImport) {
 }
 
 /**
- * To add ignored token addresses to state
+ * To add ignored tokens to state
  *
- * @param options
- * @param options.tokensToIgnore
- * @param options.dontShowLoadingIndicator
+ * @param tokensToIgnore
  */
-export function ignoreTokens({
-  tokensToIgnore,
-  dontShowLoadingIndicator = false,
-}) {
-  const _tokensToIgnore = Array.isArray(tokensToIgnore)
-    ? tokensToIgnore
-    : [tokensToIgnore];
-
+export function ignoreTokens(tokensToIgnore) {
   return async (dispatch) => {
-    if (!dontShowLoadingIndicator) {
-      dispatch(showLoadingIndication());
-    }
     try {
-      await promisifiedBackground.ignoreTokens(_tokensToIgnore);
+      await promisifiedBackground.ignoreTokens(tokensToIgnore);
     } catch (error) {
       log.error(error);
-      dispatch(displayWarning(error.message));
     } finally {
       await forceUpdateMetamaskState(dispatch);
-      dispatch(hideLoadingIndication());
     }
   };
 }
@@ -1853,6 +1694,21 @@ export async function getTokenStandardAndDetails(
   );
 }
 
+export function removeToken(address) {
+  return async (dispatch) => {
+    dispatch(showLoadingIndication());
+    try {
+      await promisifiedBackground.removeToken(address);
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning(error.message));
+    } finally {
+      await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
 export function addTokens(tokens) {
   return (dispatch) => {
     if (Array.isArray(tokens)) {
@@ -3565,16 +3421,36 @@ export async function setSmartTransactionsOptInStatus(
   await promisifiedBackground.setSmartTransactionsOptInStatus(optInState);
 }
 
-export function fetchSmartTransactionFees(
+export function fetchSmartTransactionFees(unsignedTransaction) {
+  return async (dispatch) => {
+    try {
+      return await promisifiedBackground.fetchSmartTransactionFees(
+        unsignedTransaction,
+      );
+    } catch (e) {
+      log.error(e);
+      if (e.message.startsWith('Fetch error:')) {
+        const errorObj = parseSmartTransactionsError(e.message);
+        dispatch({
+          type: actionConstants.SET_SMART_TRANSACTIONS_ERROR,
+          payload: errorObj.type,
+        });
+      }
+      throw e;
+    }
+  };
+}
+
+export function estimateSmartTransactionsGas(
   unsignedTransaction,
   approveTxParams,
 ) {
+  if (approveTxParams) {
+    approveTxParams.value = '0x0';
+  }
   return async (dispatch) => {
-    if (approveTxParams) {
-      approveTxParams.value = '0x0';
-    }
     try {
-      return await promisifiedBackground.fetchSmartTransactionFees(
+      await promisifiedBackground.estimateSmartTransactionsGas(
         unsignedTransaction,
         approveTxParams,
       );
@@ -3737,18 +3613,6 @@ export function setEnableEIP1559V2NoticeDismissed() {
   return promisifiedBackground.setEnableEIP1559V2NoticeDismissed(true);
 }
 
-export function setCustomNetworkListEnabled(customNetworkListEnabled) {
-  return async () => {
-    try {
-      await promisifiedBackground.setCustomNetworkListEnabled(
-        customNetworkListEnabled,
-      );
-    } catch (error) {
-      log.error(error);
-    }
-  };
-}
-
 // QR Hardware Wallets
 export async function submitQRHardwareCryptoHDKey(cbor) {
   await promisifiedBackground.submitQRHardwareCryptoHDKey(cbor);
@@ -3775,29 +3639,3 @@ export function cancelQRHardwareSignRequest() {
     await promisifiedBackground.cancelQRHardwareSignRequest();
   };
 }
-
-export function addCustomNetwork(customRpc) {
-  return async (dispatch) => {
-    try {
-      dispatch(setNewCustomNetworkAdded(customRpc));
-      await promisifiedBackground.addCustomNetwork(customRpc);
-    } catch (error) {
-      log.error(error);
-      dispatch(displayWarning('Had a problem changing networks!'));
-    }
-  };
-}
-
-export function requestUserApproval(customRpc, originIsMetaMask) {
-  return async (dispatch) => {
-    try {
-      await promisifiedBackground.requestUserApproval(
-        customRpc,
-        originIsMetaMask,
-      );
-    } catch (error) {
-      log.error(error);
-      dispatch(displayWarning('Had a problem changing networks!'));
-    }
-  };
-}
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index d79b7d5c2330..727835ecff3f 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -1099,34 +1099,32 @@ describe('Actions', () => {
     });
   });
 
-  describe('#ignoreTokens', () => {
+  describe('#removeToken', () => {
     afterEach(() => {
       sinon.restore();
     });
 
-    it('calls ignoreTokens in background', async () => {
+    it('calls removeToken in background', async () => {
       const store = mockStore();
 
-      const ignoreTokensStub = sinon.stub().callsFake((_, cb) => cb());
+      const removeTokenStub = sinon.stub().callsFake((_, cb) => cb());
 
       background.getApi.returns({
-        ignoreTokens: ignoreTokensStub,
+        removeToken: removeTokenStub,
         getState: sinon.stub().callsFake((cb) => cb(null, baseMockState)),
       });
 
       actions._setBackgroundConnection(background.getApi());
 
-      await store.dispatch(
-        actions.ignoreTokens({ tokensToIgnore: '0x0000001' }),
-      );
-      expect(ignoreTokensStub.callCount).toStrictEqual(1);
+      await store.dispatch(actions.removeToken());
+      expect(removeTokenStub.callCount).toStrictEqual(1);
     });
 
-    it('should display warning when ignoreTokens in background fails', async () => {
+    it('should display warning when removeToken in background fails', async () => {
       const store = mockStore();
 
       background.getApi.returns({
-        ignoreTokens: sinon.stub().callsFake((_, cb) => cb(new Error('error'))),
+        removeToken: sinon.stub().callsFake((_, cb) => cb(new Error('error'))),
         getState: sinon.stub().callsFake((cb) => cb(null, baseMockState)),
       });
 
@@ -1142,9 +1140,7 @@ describe('Actions', () => {
         { type: 'HIDE_LOADING_INDICATION' },
       ];
 
-      await store.dispatch(
-        actions.ignoreTokens({ tokensToIgnore: '0x0000001' }),
-      );
+      await store.dispatch(actions.removeToken());
 
       expect(store.getActions()).toStrictEqual(expectedActions);
     });
@@ -1700,58 +1696,4 @@ describe('Actions', () => {
       expect(expectedAction.value.id).toStrictEqual(txId);
     });
   });
-
-  describe('#cancelMsgs', () => {
-    it('creates COMPLETED_TX with the cancelled messages IDs', async () => {
-      const store = mockStore();
-
-      const cancelTypedMessageStub = sinon.stub().callsFake((_, cb) => cb());
-
-      const cancelPersonalMessageStub = sinon.stub().callsFake((_, cb) => cb());
-
-      background.getApi.returns({
-        cancelTypedMessage: cancelTypedMessageStub,
-        cancelPersonalMessage: cancelPersonalMessageStub,
-        getState: sinon.stub().callsFake((cb) =>
-          cb(null, {
-            currentLocale: 'test',
-            selectedAddress: '0xFirstAddress',
-            provider: {
-              chainId: '0x1',
-            },
-            accounts: {
-              '0xFirstAddress': {
-                balance: '0x0',
-              },
-            },
-            cachedBalances: {
-              '0x1': {
-                '0xFirstAddress': '0x0',
-              },
-            },
-          }),
-        ),
-      });
-
-      const msgsList = [
-        { id: 7648683973086304, status: 'unapproved', type: 'personal_sign' },
-        {
-          id: 7648683973086303,
-          status: 'unapproved',
-          type: 'eth_signTypedData',
-        },
-      ];
-
-      actions._setBackgroundConnection(background.getApi());
-
-      await store.dispatch(actions.cancelMsgs(msgsList));
-      const resultantActions = store.getActions();
-      const expectedActions = resultantActions.filter(
-        (action) => action.type === 'COMPLETED_TX',
-      );
-
-      expect(expectedActions[0].value.id).toStrictEqual(msgsList[0]);
-      expect(expectedActions[1].value.id).toStrictEqual(msgsList[1]);
-    });
-  });
 });
diff --git a/yarn.lock b/yarn.lock
index a3e11adcb8a1..e293734226e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1411,21 +1411,6 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
-"@eslint/eslintrc@^1.2.2":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886"
-  integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==
-  dependencies:
-    ajv "^6.12.4"
-    debug "^4.3.2"
-    espree "^9.3.2"
-    globals "^13.9.0"
-    ignore "^5.2.0"
-    import-fresh "^3.2.1"
-    js-yaml "^4.1.0"
-    minimatch "^3.1.2"
-    strip-json-comments "^3.1.1"
-
 "@eth-optimism/contracts@0.0.0-2021919175625":
   version "0.0.0-2021919175625"
   resolved "https://registry.yarnpkg.com/@eth-optimism/contracts/-/contracts-0.0.0-2021919175625.tgz#551ed5d98ac4405596e97f723c28ee6376e65546"
@@ -1472,109 +1457,109 @@
     "@ethereumjs/common" "^2.4.0"
     ethereumjs-util "^7.1.0"
 
-"@ethersproject/abi@5.6.1", "@ethersproject/abi@^5.6.0":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7"
-  integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w==
-  dependencies:
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/hash" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-
-"@ethersproject/abstract-provider@5.6.0", "@ethersproject/abstract-provider@^5.4.1", "@ethersproject/abstract-provider@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061"
-  integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==
-  dependencies:
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/networks" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
-    "@ethersproject/web" "^5.6.0"
-
-"@ethersproject/abstract-signer@5.6.0", "@ethersproject/abstract-signer@^5.4.1", "@ethersproject/abstract-signer@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7"
-  integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==
+"@ethersproject/abi@5.5.0", "@ethersproject/abi@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.5.0.tgz#fb52820e22e50b854ff15ce1647cc508d6660613"
+  integrity sha512-loW7I4AohP5KycATvc0MgujU6JyCHPqHdeoo9z3Nr9xEiNioxa65ccdm1+fsoJhkuhdRtfcL8cfyGamz2AxZ5w==
+  dependencies:
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
+"@ethersproject/abstract-provider@5.5.1", "@ethersproject/abstract-provider@^5.4.1", "@ethersproject/abstract-provider@^5.5.0":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz#2f1f6e8a3ab7d378d8ad0b5718460f85649710c5"
+  integrity sha512-m+MA/ful6eKbxpr99xUYeRvLkfnlqzrF8SZ46d/xFB1A7ZVknYc/sXJG0RcufF52Qn2jeFj1hhcoQ7IXjNKUqg==
+  dependencies:
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/networks" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/web" "^5.5.0"
+
+"@ethersproject/abstract-signer@5.5.0", "@ethersproject/abstract-signer@^5.4.1", "@ethersproject/abstract-signer@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
+  integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
   dependencies:
-    "@ethersproject/abstract-provider" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
 
-"@ethersproject/address@5.6.0", "@ethersproject/address@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012"
-  integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==
+"@ethersproject/address@5.5.0", "@ethersproject/address@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.5.0.tgz#bcc6f576a553f21f3dd7ba17248f81b473c9c78f"
+  integrity sha512-l4Nj0eWlTUh6ro5IbPTgbpT4wRbdH5l8CQf7icF7sb/SI3Nhd9Y9HzhonTSTi6CefI0necIw7LJqQPopPLZyWw==
   dependencies:
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/rlp" "^5.6.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
 
-"@ethersproject/base64@5.6.0", "@ethersproject/base64@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9"
-  integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==
+"@ethersproject/base64@5.5.0", "@ethersproject/base64@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.5.0.tgz#881e8544e47ed976930836986e5eb8fab259c090"
+  integrity sha512-tdayUKhU1ljrlHzEWbStXazDpsx4eg1dBXUSI6+mHlYklOXoXF6lZvw8tnD6oVaWfnMxAgRSKROg3cVKtCcppA==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
 
-"@ethersproject/basex@5.6.0", "@ethersproject/basex@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69"
-  integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==
+"@ethersproject/basex@5.5.0", "@ethersproject/basex@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.5.0.tgz#e40a53ae6d6b09ab4d977bd037010d4bed21b4d3"
+  integrity sha512-ZIodwhHpVJ0Y3hUCfUucmxKsWQA5TMnavp5j/UOuDdzZWzJlRmuOjcTMIGgHCYuZmHt36BfiSyQPSRskPxbfaQ==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
 
-"@ethersproject/bignumber@5.6.0", "@ethersproject/bignumber@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26"
-  integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==
+"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527"
+  integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
     bn.js "^4.11.9"
 
-"@ethersproject/bytes@5.6.1", "@ethersproject/bytes@^5.6.0":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.1.tgz#24f916e411f82a8a60412344bf4a813b917eefe7"
-  integrity sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g==
+"@ethersproject/bytes@5.5.0", "@ethersproject/bytes@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c"
+  integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog==
   dependencies:
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/constants@5.6.0", "@ethersproject/constants@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088"
-  integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==
+"@ethersproject/constants@5.5.0", "@ethersproject/constants@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.5.0.tgz#d2a2cd7d94bd1d58377d1d66c4f53c9be4d0a45e"
+  integrity sha512-2MsRRVChkvMWR+GyMGY4N1sAX9Mt3J9KykCsgUFd/1mwS0UH1qw+Bv9k1UJb3X3YJYFco9H20pjSlOIfCG5HYQ==
   dependencies:
-    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bignumber" "^5.5.0"
 
-"@ethersproject/contracts@5.6.0", "@ethersproject/contracts@^5.4.1":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067"
-  integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw==
-  dependencies:
-    "@ethersproject/abi" "^5.6.0"
-    "@ethersproject/abstract-provider" "^5.6.0"
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
+"@ethersproject/contracts@5.5.0", "@ethersproject/contracts@^5.4.1":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.5.0.tgz#b735260d4bd61283a670a82d5275e2a38892c197"
+  integrity sha512-2viY7NzyvJkh+Ug17v7g3/IJC8HqZBDcOjYARZLdzRxrfGlRgmYgl6xPRKVbEzy1dWKw/iv7chDcS83pg6cLxg==
+  dependencies:
+    "@ethersproject/abi" "^5.5.0"
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
 
 "@ethersproject/hardware-wallets@^5.4.0":
   version "5.4.0"
@@ -1588,241 +1573,241 @@
   optionalDependencies:
     "@ledgerhq/hw-transport-node-hid" "5.26.0"
 
-"@ethersproject/hash@5.6.0", "@ethersproject/hash@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2"
-  integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-
-"@ethersproject/hdnode@5.6.0", "@ethersproject/hdnode@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998"
-  integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/basex" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/pbkdf2" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/sha2" "^5.6.0"
-    "@ethersproject/signing-key" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
-    "@ethersproject/wordlists" "^5.6.0"
-
-"@ethersproject/json-wallets@5.6.0", "@ethersproject/json-wallets@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5"
-  integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/hdnode" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/pbkdf2" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/random" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
+"@ethersproject/hash@5.5.0", "@ethersproject/hash@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.5.0.tgz#7cee76d08f88d1873574c849e0207dcb32380cc9"
+  integrity sha512-dnGVpK1WtBjmnp3mUT0PlU2MpapnwWI0PibldQEq1408tQBAbZpPidkWoVVuNMOl/lISO3+4hXZWCL3YV7qzfg==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
+"@ethersproject/hdnode@5.5.0", "@ethersproject/hdnode@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.5.0.tgz#4a04e28f41c546f7c978528ea1575206a200ddf6"
+  integrity sha512-mcSOo9zeUg1L0CoJH7zmxwUG5ggQHU1UrRf8jyTYy6HxdZV+r0PBoL1bxr+JHIPXRzS6u/UW4mEn43y0tmyF8Q==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/basex" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/pbkdf2" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/wordlists" "^5.5.0"
+
+"@ethersproject/json-wallets@5.5.0", "@ethersproject/json-wallets@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.5.0.tgz#dd522d4297e15bccc8e1427d247ec8376b60e325"
+  integrity sha512-9lA21XQnCdcS72xlBn1jfQdj2A1VUxZzOzi9UkNdnokNKke/9Ya2xA9aIK1SC3PQyBDLt4C+dfps7ULpkvKikQ==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hdnode" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/pbkdf2" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
     aes-js "3.0.0"
     scrypt-js "3.0.1"
 
-"@ethersproject/keccak256@5.6.0", "@ethersproject/keccak256@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459"
-  integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==
+"@ethersproject/keccak256@5.5.0", "@ethersproject/keccak256@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.5.0.tgz#e4b1f9d7701da87c564ffe336f86dcee82983492"
+  integrity sha512-5VoFCTjo2rYbBe1l2f4mccaRFN/4VQEYFwwn04aJV2h7qf4ZvI2wFxUE1XOX+snbwCLRzIeikOqtAoPwMza9kg==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
     js-sha3 "0.8.0"
 
-"@ethersproject/logger@5.6.0", "@ethersproject/logger@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a"
-  integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==
+"@ethersproject/logger@5.5.0", "@ethersproject/logger@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d"
+  integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==
 
-"@ethersproject/networks@5.6.2", "@ethersproject/networks@^5.6.0":
-  version "5.6.2"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336"
-  integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA==
+"@ethersproject/networks@5.5.2", "@ethersproject/networks@^5.5.0":
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.5.2.tgz#784c8b1283cd2a931114ab428dae1bd00c07630b"
+  integrity sha512-NEqPxbGBfy6O3x4ZTISb90SjEDkWYDUbEeIFhJly0F7sZjoQMnj5KYzMSkMkLKZ+1fGpx00EDpHQCy6PrDupkQ==
   dependencies:
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/pbkdf2@5.6.0", "@ethersproject/pbkdf2@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a"
-  integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ==
+"@ethersproject/pbkdf2@5.5.0", "@ethersproject/pbkdf2@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.5.0.tgz#e25032cdf02f31505d47afbf9c3e000d95c4a050"
+  integrity sha512-SaDvQFvXPnz1QGpzr6/HToLifftSXGoXrbpZ6BvoZhmx4bNLHrxDe8MZisuecyOziP1aVEwzC2Hasj+86TgWVg==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/sha2" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
 
-"@ethersproject/properties@5.6.0", "@ethersproject/properties@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.6.0.tgz#38904651713bc6bdd5bdd1b0a4287ecda920fa04"
-  integrity sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==
-  dependencies:
-    "@ethersproject/logger" "^5.6.0"
-
-"@ethersproject/providers@5.6.5", "@ethersproject/providers@^5.4.5":
-  version "5.6.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27"
-  integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.6.0"
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/basex" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/hash" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/networks" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/random" "^5.6.0"
-    "@ethersproject/rlp" "^5.6.0"
-    "@ethersproject/sha2" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
-    "@ethersproject/web" "^5.6.0"
+"@ethersproject/properties@5.5.0", "@ethersproject/properties@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.5.0.tgz#61f00f2bb83376d2071baab02245f92070c59995"
+  integrity sha512-l3zRQg3JkD8EL3CPjNK5g7kMx4qSwiR60/uk5IVjd3oq1MZR5qUg40CNOoEJoX5wc3DyY5bt9EbMk86C7x0DNA==
+  dependencies:
+    "@ethersproject/logger" "^5.5.0"
+
+"@ethersproject/providers@5.5.3", "@ethersproject/providers@^5.4.5":
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.5.3.tgz#56c2b070542ac44eb5de2ed3cf6784acd60a3130"
+  integrity sha512-ZHXxXXXWHuwCQKrgdpIkbzMNJMvs+9YWemanwp1fA7XZEv7QlilseysPvQe0D7Q7DlkJX/w/bGA1MdgK2TbGvA==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/basex" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/networks" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/web" "^5.5.0"
     bech32 "1.1.4"
     ws "7.4.6"
 
-"@ethersproject/random@5.6.0", "@ethersproject/random@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6"
-  integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==
+"@ethersproject/random@5.5.1", "@ethersproject/random@^5.5.0":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.5.1.tgz#7cdf38ea93dc0b1ed1d8e480ccdaf3535c555415"
+  integrity sha512-YaU2dQ7DuhL5Au7KbcQLHxcRHfgyNgvFV4sQOo0HrtW3Zkrc9ctWNz8wXQ4uCSfSDsqX2vcjhroxU5RQRV0nqA==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/rlp@5.6.0", "@ethersproject/rlp@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717"
-  integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==
+"@ethersproject/rlp@5.5.0", "@ethersproject/rlp@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.5.0.tgz#530f4f608f9ca9d4f89c24ab95db58ab56ab99a0"
+  integrity sha512-hLv8XaQ8PTI9g2RHoQGf/WSxBfTB/NudRacbzdxmst5VHAqd1sMibWG7SENzT5Dj3yZ3kJYx+WiRYEcQTAkcYA==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/sha2@5.6.0", "@ethersproject/sha2@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9"
-  integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==
+"@ethersproject/sha2@5.5.0", "@ethersproject/sha2@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.5.0.tgz#a40a054c61f98fd9eee99af2c3cc6ff57ec24db7"
+  integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
     hash.js "1.1.7"
 
-"@ethersproject/signing-key@5.6.1", "@ethersproject/signing-key@^5.6.0":
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457"
-  integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ==
+"@ethersproject/signing-key@5.5.0", "@ethersproject/signing-key@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.5.0.tgz#2aa37169ce7e01e3e80f2c14325f624c29cedbe0"
+  integrity sha512-5VmseH7qjtNmDdZBswavhotYbWB0bOwKIlOTSlX14rKn5c11QmJwGt4GHeo7NrL/Ycl7uo9AHvEqs5xZgFBTng==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
     bn.js "^4.11.9"
     elliptic "6.5.4"
     hash.js "1.1.7"
 
-"@ethersproject/solidity@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3"
-  integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww==
-  dependencies:
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/sha2" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
-
-"@ethersproject/strings@5.6.0", "@ethersproject/strings@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd"
-  integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==
+"@ethersproject/solidity@5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.5.0.tgz#2662eb3e5da471b85a20531e420054278362f93f"
+  integrity sha512-9NgZs9LhGMj6aCtHXhtmFQ4AN4sth5HuFXVvAQtzmm0jpSCNOTGtrHZJAeYTh7MBjRR8brylWZxBZR9zDStXbw==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/transactions@5.6.0", "@ethersproject/transactions@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e"
-  integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==
-  dependencies:
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/rlp" "^5.6.0"
-    "@ethersproject/signing-key" "^5.6.0"
-
-"@ethersproject/units@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c"
-  integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw==
+"@ethersproject/strings@5.5.0", "@ethersproject/strings@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.5.0.tgz#e6784d00ec6c57710755699003bc747e98c5d549"
+  integrity sha512-9fy3TtF5LrX/wTrBaT8FGE6TDJyVjOvXynXJz5MT5azq+E6D92zuKNx7i29sWW2FjVOaWjAsiZ1ZWznuduTIIQ==
   dependencies:
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/constants" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/wallet@5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a"
-  integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.6.0"
-    "@ethersproject/abstract-signer" "^5.6.0"
-    "@ethersproject/address" "^5.6.0"
-    "@ethersproject/bignumber" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/hash" "^5.6.0"
-    "@ethersproject/hdnode" "^5.6.0"
-    "@ethersproject/json-wallets" "^5.6.0"
-    "@ethersproject/keccak256" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/random" "^5.6.0"
-    "@ethersproject/signing-key" "^5.6.0"
-    "@ethersproject/transactions" "^5.6.0"
-    "@ethersproject/wordlists" "^5.6.0"
-
-"@ethersproject/web@5.6.0", "@ethersproject/web@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8"
-  integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==
+"@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.5.0.tgz#7e9bf72e97bcdf69db34fe0d59e2f4203c7a2908"
+  integrity sha512-9RZYSKX26KfzEd/1eqvv8pLauCKzDTub0Ko4LfIgaERvRuwyaNV78mJs7cpIgZaDl6RJui4o49lHwwCM0526zA==
+  dependencies:
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/rlp" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+
+"@ethersproject/units@5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.5.0.tgz#104d02db5b5dc42cc672cc4587bafb87a95ee45e"
+  integrity sha512-7+DpjiZk4v6wrikj+TCyWWa9dXLNU73tSTa7n0TSJDxkYbV3Yf1eRh9ToMLlZtuctNYu9RDNNy2USq3AdqSbag==
   dependencies:
-    "@ethersproject/base64" "^5.6.0"
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/constants" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/wordlists@5.6.0", "@ethersproject/wordlists@^5.6.0":
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032"
-  integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q==
+"@ethersproject/wallet@5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.5.0.tgz#322a10527a440ece593980dca6182f17d54eae75"
+  integrity sha512-Mlu13hIctSYaZmUOo7r2PhNSd8eaMPVXe1wxrz4w4FCE4tDYBywDH+bAR1Xz2ADyXGwqYMwstzTrtUVIsKDO0Q==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.5.0"
+    "@ethersproject/abstract-signer" "^5.5.0"
+    "@ethersproject/address" "^5.5.0"
+    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/hdnode" "^5.5.0"
+    "@ethersproject/json-wallets" "^5.5.0"
+    "@ethersproject/keccak256" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/random" "^5.5.0"
+    "@ethersproject/signing-key" "^5.5.0"
+    "@ethersproject/transactions" "^5.5.0"
+    "@ethersproject/wordlists" "^5.5.0"
+
+"@ethersproject/web@5.5.1", "@ethersproject/web@^5.5.0":
+  version "5.5.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.5.1.tgz#cfcc4a074a6936c657878ac58917a61341681316"
+  integrity sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg==
+  dependencies:
+    "@ethersproject/base64" "^5.5.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
+
+"@ethersproject/wordlists@5.5.0", "@ethersproject/wordlists@^5.5.0":
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.5.0.tgz#aac74963aa43e643638e5172353d931b347d584f"
+  integrity sha512-bL0UTReWDiaQJJYOC9sh/XcRu/9i2jMrzf8VLRmPKx58ckSlOJiohODkECCO50dtLZHcGU6MLXQ4OOrgBwP77Q==
   dependencies:
-    "@ethersproject/bytes" "^5.6.0"
-    "@ethersproject/hash" "^5.6.0"
-    "@ethersproject/logger" "^5.6.0"
-    "@ethersproject/properties" "^5.6.0"
-    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/hash" "^5.5.0"
+    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/strings" "^5.5.0"
 
 "@formatjs/intl-relativetimeformat@^5.2.6":
   version "5.2.6"
@@ -2212,20 +2197,6 @@
     ws "*"
     xtend "^4.0.0"
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
-  dependencies:
-    "@humanwhocodes/object-schema" "^1.2.1"
-    debug "^4.1.1"
-    minimatch "^3.0.4"
-
-"@humanwhocodes/object-schema@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
-  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
-
 "@inquirer/confirm@^0.0.14-alpha.0":
   version "0.0.14-alpha.0"
   resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-0.0.14-alpha.0.tgz#4a759c6def5ecd73bc239e090ee6197f74f52dbd"
@@ -2733,11 +2704,6 @@
     prop-types "^15.7.2"
     react-is "^16.8.0"
 
-"@mdn/browser-compat-data@4.1.19":
-  version "4.1.19"
-  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.1.19.tgz#33f8c6c63a14a3acc50062df93eaa92f33a10a0a"
-  integrity sha512-zDrdjvX2dwunW4HOGwpibLHvfnDRQOJ89bGnkQ7TXZ7H7JSehbg2Gf0zNbML+R/03QItZ7EI6QHloOJ2znFSdA==
-
 "@mdx-js/loader@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
@@ -2783,44 +2749,70 @@
   integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
 
 "@metamask/auto-changelog@^2.1.0":
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/@metamask/auto-changelog/-/auto-changelog-2.6.0.tgz#3cef14905635b144b0fc86aed8957e0942a91cc4"
-  integrity sha512-YzZ/Uc/3nfvDxZxZT9YMa0CJn8/kpxif/2y8TXi5blzxBiaYop9zUh9a+7PV3C4EQVUNZuTvkE816Ua3AZ0jHA==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/@metamask/auto-changelog/-/auto-changelog-2.5.0.tgz#078f38142a3086fdb5556c758969a015c71dfdc9"
+  integrity sha512-39FeU98Poll3eTqv/bggqo3Yisza0WQJ8l9IiYloMVa2LV8XqTNqVkS4cNEU/5yq62n47JSAv6lZBtWCqeAjZQ==
   dependencies:
     diff "^5.0.0"
     execa "^5.1.1"
     semver "^7.3.5"
     yargs "^17.0.1"
 
-"@metamask/bip39@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/bip39/-/bip39-4.0.0.tgz#1cb867a8454e3d45d065107b4e070d58bdb64aac"
-  integrity sha512-xH2g8mFe9p2WePnKeQJH4U8MB6pWPyvwpsz4stb0YdnMOR7cKA6Jm/KOSFiPKr1i9+AzNDImt/XxhwF5ej4jXQ==
-  dependencies:
-    "@types/node" "11.11.6"
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-
-"@metamask/browser-passworder@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/browser-passworder/-/browser-passworder-3.0.0.tgz#c06744e66a968ffa13f70cc71a7d3b15d86b0ee7"
-  integrity sha512-hD10mgvhcDkZX8wnauw8udp1K2MzcbZfrN7Yon9sQ+OqVK9kiQ4VhZAyZNZTy9KJLtfoVD9Y2F6L4gEese7hDA==
+"@metamask/contract-metadata@^1.31.0", "@metamask/contract-metadata@^1.33.0":
+  version "1.33.0"
+  resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.33.0.tgz#3f0501d5c6d9119ce09c1edb075fc0a8fed7d09c"
+  integrity sha512-sWfzsUe59UH2Y1A7czRjhPmYrWlg4UQDOUPdf+lY7kbXwYrlF/ZUvhQYajdgJVchv2yDzr+cFhWF7DmNb5NyTQ==
 
-"@metamask/contract-metadata@^1.31.0", "@metamask/contract-metadata@^1.35.0":
-  version "1.35.0"
-  resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.35.0.tgz#2bf2b8f2b6fdbd5132f0bcfa594b6c02dc71c42e"
-  integrity sha512-zfZKwLFOVrQS8vTFoeoNCG9JhqmK4oyembGiGVVpUAYD9BHVZnd9WpicGoUC07ROXLEyQuAK9AJZNBtqwwzfEQ==
+"@metamask/controllers@^27.1.1":
+  version "27.1.1"
+  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-27.1.1.tgz#b3288bfd05e381e9e32ed60b68a09b2855db1140"
+  integrity sha512-RzQ4zKsqmieYqAiVsIIazLTo9GYMcm9fDhYPJklP1M+bzm1k49GRFnZEfru3w/dPVY+wWgcDo/0ZWlOILbu3hg==
+  dependencies:
+    "@ethereumjs/common" "^2.3.1"
+    "@ethereumjs/tx" "^3.2.1"
+    "@keystonehq/metamask-airgapped-keyring" "^0.3.0"
+    "@metamask/contract-metadata" "^1.33.0"
+    "@metamask/metamask-eth-abis" "3.0.0"
+    "@metamask/types" "^1.1.0"
+    "@types/uuid" "^8.3.0"
+    abort-controller "^3.0.0"
+    async-mutex "^0.2.6"
+    babel-runtime "^6.26.0"
+    deep-freeze-strict "^1.1.1"
+    eth-ens-namehash "^2.0.8"
+    eth-json-rpc-infura "^5.1.0"
+    eth-keyring-controller "^6.2.1"
+    eth-method-registry "1.1.0"
+    eth-phishing-detect "^1.1.16"
+    eth-query "^2.1.2"
+    eth-rpc-errors "^4.0.0"
+    eth-sig-util "^3.0.0"
+    ethereumjs-util "^7.0.10"
+    ethereumjs-wallet "^1.0.1"
+    ethers "^5.4.1"
+    ethjs-unit "^0.1.6"
+    fast-deep-equal "^3.1.3"
+    immer "^9.0.6"
+    isomorphic-fetch "^3.0.0"
+    json-rpc-engine "^6.1.0"
+    jsonschema "^1.2.4"
+    multiformats "^9.5.2"
+    nanoid "^3.1.31"
+    punycode "^2.1.1"
+    single-call-balance-checker-abi "^1.0.0"
+    uuid "^8.3.2"
+    web3 "^0.20.7"
+    web3-provider-engine "^16.0.3"
 
-"@metamask/controllers@^30.0.0", "@metamask/controllers@^30.0.2":
-  version "30.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-30.0.2.tgz#0a5512598d2997e34d3542889cae7088fe1fa4b8"
-  integrity sha512-nIUQaaGPzy9whcAvzwHCRsMtw3YWdBv6mUiN9EA2CKdYUesnVj4bpXSSMEso1oEhsNRa2/XTZSb6i+Odo/raJw==
+"@metamask/controllers@^28.0.0":
+  version "28.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-28.0.0.tgz#dbde11df635daeb9d73ff989cb274f94f913ff39"
+  integrity sha512-ABIZ5OO6g9DzyKrDB0yr1KzyleqVZ4V2d9S8jaToz5AaDZ0tnVkcKptCtRfhzV8xC23xynKjoO7cU9ZkDXBbjw==
   dependencies:
     "@ethereumjs/common" "^2.3.1"
     "@ethereumjs/tx" "^3.2.1"
     "@keystonehq/metamask-airgapped-keyring" "^0.3.0"
-    "@metamask/contract-metadata" "^1.35.0"
+    "@metamask/contract-metadata" "^1.33.0"
     "@metamask/metamask-eth-abis" "3.0.0"
     "@metamask/types" "^1.1.0"
     "@types/uuid" "^8.3.0"
@@ -2830,9 +2822,9 @@
     deep-freeze-strict "^1.1.1"
     eth-ens-namehash "^2.0.8"
     eth-json-rpc-infura "^5.1.0"
-    eth-keyring-controller "^7.0.2"
+    eth-keyring-controller "^6.2.1"
     eth-method-registry "1.1.0"
-    eth-phishing-detect "^1.2.0"
+    eth-phishing-detect "^1.1.16"
     eth-query "^2.1.2"
     eth-rpc-errors "^4.0.0"
     eth-sig-util "^3.0.0"
@@ -2853,10 +2845,10 @@
     web3 "^0.20.7"
     web3-provider-engine "^16.0.3"
 
-"@metamask/design-tokens@^1.6.0", "@metamask/design-tokens@^1.8.0":
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/@metamask/design-tokens/-/design-tokens-1.8.0.tgz#072f455d23e4650ee81681ef066a99a56a9b573a"
-  integrity sha512-EO0WaMRPcegh2EPWdmAqtFX0aZ7hO0NyJasUQyVrYeN1XNGUC2WzXfqwaI0wSV79NE/WEE3c9g5se+MQMExLew==
+"@metamask/design-tokens@^1.5.1":
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/@metamask/design-tokens/-/design-tokens-1.5.1.tgz#723f10bc5fe03ce14d47b1ad6190a835df62745a"
+  integrity sha512-HLXpuzQGnVPZHOvHpzOVQoe/1mvjNOTNxvAgR1na3BAUiO3NhnUxhYE2RzV0rpbc3UUUGbjVB+dceMZ4FtFfRw==
 
 "@metamask/eslint-config-jest@^9.0.0":
   version "9.0.0"
@@ -2883,21 +2875,10 @@
   resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f"
   integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A==
 
-"@metamask/eth-hd-keyring@^4.0.2":
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/@metamask/eth-hd-keyring/-/eth-hd-keyring-4.0.2.tgz#0a81556a556b361755c8d6fb5aced1ce5be0331c"
-  integrity sha512-v47VOTCCmZUZ6uxM5tQNoasQjLdrZADmgph2fhk4m7zKVUxDvYFU7FJT3Rm55fk8mg+dKSbEObDriqbdWeBbcA==
-  dependencies:
-    "@metamask/bip39" "^4.0.0"
-    "@metamask/eth-sig-util" "^4.0.0"
-    eth-simple-keyring "^4.2.0"
-    ethereumjs-util "^7.0.9"
-    ethereumjs-wallet "^1.0.1"
-
-"@metamask/eth-ledger-bridge-keyring@^0.13.0":
-  version "0.13.0"
-  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.13.0.tgz#586b705d92339d08650f9eef42ab2388c4dd2675"
-  integrity sha512-Xtze0Itc2Z6hLOlCaUjmuRlG97vtx6bPcWHcV1TWWOAKwLgatymUvBB3LTVIjJ/vxo8vysxp3sDf0jlGGlo7OA==
+"@metamask/eth-ledger-bridge-keyring@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.12.0.tgz#d3986e0dbbfeab713f4e0338bf4e5c74a2265bdd"
+  integrity sha512-kceBQc/wKCAdChZeI1P0Fs0FS15WtiD2Q87MqmfuJYpOriWRx/RmjKZoa6EJe2vy20KurlZRcKIiU8nFQ0e/ag==
   dependencies:
     "@ethereumjs/tx" "^3.2.0"
     eth-sig-util "^2.0.0"
@@ -2933,16 +2914,15 @@
   resolved "https://registry.yarnpkg.com/@metamask/etherscan-link/-/etherscan-link-2.1.0.tgz#c0be8e68445b7b83cf85bcc03a56cdf8e256c973"
   integrity sha512-ADuWlTUkFfN2vXlz81Bg/0BA+XRor+CdK1055p6k7H6BLIPoDKn9SBOFld9haQFuR9cKh/JYHcnlSIv5R4fUEw==
 
-"@metamask/execution-environments@^0.18.1":
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.18.1.tgz#46853241fc0dda4e92b358d56fea927745efef42"
-  integrity sha512-PnEPvcIBsNq2rYshrZePAPL3vGaWPrJyztHlSn+dP9vM2XR1M+Qc0/QrgGy6hnOidQIkhn2ZuFfsnm72dJFmUA==
+"@metamask/execution-environments@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.12.0.tgz#b621eb1a5bb854e9b7b43a0888dc5ab9f12f1e5a"
+  integrity sha512-UJXft9jt6OCFFFfEFT/0i3HZ8aGrtp4APDtOVVbf/CHUqVj9FFUruzwydN9KdFbZlBnU7/Von0UmaudlSgVrow==
   dependencies:
     "@metamask/object-multiplex" "^1.2.0"
-    "@metamask/post-message-stream" "^6.0.0"
-    "@metamask/providers" "^9.0.0"
-    "@metamask/snap-types" "^0.18.1"
-    "@metamask/utils" "^2.0.0"
+    "@metamask/post-message-stream" "^4.0.0"
+    "@metamask/providers" "^8.1.1"
+    "@metamask/snap-types" "^0.12.0"
     eth-rpc-errors "^4.0.3"
     pump "^3.0.0"
     ses "^0.15.15"
@@ -2961,16 +2941,14 @@
     color "^0.11.3"
     mersenne-twister "^1.1.0"
 
-"@metamask/key-tree@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/key-tree/-/key-tree-4.0.0.tgz#2de20618793e85ee300b4b3d4ca4de9d7f40e276"
-  integrity sha512-Pj5nN6Ko15rei6dSgQnTH64JEN1I8JuTM6Q06/1V7Xp3Fw3g3Nf1scr/u7cQnL17YxXALMCDYaEPdQveo70kSA==
+"@metamask/key-tree@^3.0.1":
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/@metamask/key-tree/-/key-tree-3.0.1.tgz#e59b6c9c124c74382477f51a389815e849a16de7"
+  integrity sha512-CcpbQua96/CF+KKItrfw9Y6azrlkzFhoVAkyfUl7iq5qldA8xi4CilNjzIqnK8YJcLU44d7nRs5i5/9atY4Beg==
   dependencies:
-    "@noble/ed25519" "^1.6.0"
-    "@noble/hashes" "^1.0.0"
-    "@noble/secp256k1" "^1.5.5"
-    "@scure/base" "^1.0.0"
-    "@scure/bip39" "^1.0.0"
+    bip39 "^3.0.4"
+    keccak "^3.0.2"
+    secp256k1 "^4.0.2"
 
 "@metamask/logo@^3.1.1":
   version "3.1.1"
@@ -3011,45 +2989,17 @@
     "@metamask/safe-event-emitter" "^2.0.0"
     through2 "^2.0.3"
 
-"@metamask/phishing-warning@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@metamask/phishing-warning/-/phishing-warning-1.2.1.tgz#75554f8653a32c8d101c5b315707dd7990daf156"
-  integrity sha512-VfQLwiQmXg9YrJzBmDKN6eknNEkxYEAssTpoObVrDYiS91LjuDU59IjoIc1SN9IzDNxIP6ZI95dOculsm/o4qw==
-  dependencies:
-    "@metamask/design-tokens" "^1.6.0"
-    "@metamask/post-message-stream" "^5.1.0"
-    globalthis "1.0.1"
-    obj-multiplex "^1.0.0"
-    pump "^3.0.0"
-    ses "0.12.4"
-
-"@metamask/post-message-stream@^4.0.0":
+"@metamask/post-message-stream@4.0.0", "@metamask/post-message-stream@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-4.0.0.tgz#72f120e562346ca86ccc9b3684023ad44265f0df"
   integrity sha512-r0JcoWXNuHycProx8ClxiIElJY/GVb/0/WWXTMsZu7qDejLo52VNXlwfydCdVjbMXeoT2nK1Yt3d5gjmHy5BWw==
   dependencies:
     readable-stream "2.3.3"
 
-"@metamask/post-message-stream@^5.1.0":
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-5.1.0.tgz#3e9a2ed11b540b3868a0a28ffa8ec5a6e5fca29d"
-  integrity sha512-BQi/H67iM7wdtmvoPfgW9bazk/WjvRhXRa5lQ1FpgDlASv1bsCDJaQQ83Q3BwYyisnpnjgJRuC/2bRmas0LMxA==
-  dependencies:
-    "@metamask/utils" "^2.0.0"
-    readable-stream "2.3.3"
-
-"@metamask/post-message-stream@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-6.0.0.tgz#e8c26b1ef41452b2f1862004651ae3970b944868"
-  integrity sha512-z0l6UMW3z6W4qIhKSh48/6n2Q9AG1oOh9tus+Ncs9w6dAbkElKke+mXZ7tT6oAyE3T4JZLnDfGKbPWYoq+nrsA==
-  dependencies:
-    "@metamask/utils" "^2.0.0"
-    readable-stream "2.3.3"
-
-"@metamask/providers@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/providers/-/providers-9.0.0.tgz#644684f9eceb952138e80afb9103c7e39d8350fe"
-  integrity sha512-9qUkaFafZUROK0CAUBqjsut+7mqKOXFhBCpAhAPVRBqj5TfUTdPI4t8S7GYzPVaDbC7M6kH/YLNCgcfaFWAS+w==
+"@metamask/providers@^8.1.1":
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/@metamask/providers/-/providers-8.1.1.tgz#7b0dbb54700c949aafba24c9b98e6f4e9d81f325"
+  integrity sha512-CG1sAuD6Mp4MZ5U90anf1FT0moDbStGXT+80TQFYXJbBeTQjhp321WgC/F2IgIJ3mFqOiByC3MQHLuunEVMQOA==
   dependencies:
     "@metamask/object-multiplex" "^1.1.0"
     "@metamask/safe-event-emitter" "^2.0.0"
@@ -3064,16 +3014,15 @@
     pump "^3.0.0"
     webextension-polyfill-ts "^0.25.0"
 
-"@metamask/rpc-methods@^0.18.1":
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.18.1.tgz#7fa7ff15fd70f6e5ae9f06f0caa719683f52f4f3"
-  integrity sha512-ZBGeg1HOF/k+nSzi2oXvKM5nm8jjRtV3bc6m3db0hlsy12KooMkdy0Q8ZiOkkqLWn0g8ivvHdxXU7LNhPZ8eBw==
+"@metamask/rpc-methods@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.12.0.tgz#f86208ddb1e864058815f7eff2f1d6bca9ebf618"
+  integrity sha512-lqsmQRaeqye6KyBmAmA4t1T5unUw/guw3DNAvY3u4HxYKR0uQktTxPus9TuxPj3xK3G+IVnplWLQCojOlPE6vA==
   dependencies:
-    "@metamask/controllers" "^30.0.0"
-    "@metamask/key-tree" "^4.0.0"
-    "@metamask/snap-controllers" "^0.18.1"
+    "@metamask/controllers" "^28.0.0"
+    "@metamask/key-tree" "^3.0.1"
+    "@metamask/snap-controllers" "^0.12.0"
     "@metamask/types" "^1.1.0"
-    "@metamask/utils" "^2.0.0"
     eth-rpc-errors "^4.0.2"
 
 "@metamask/safe-event-emitter@^2.0.0":
@@ -3086,12 +3035,12 @@
   resolved "https://registry.yarnpkg.com/@metamask/slip44/-/slip44-2.1.0.tgz#f76764ca54afc162fbfe563f1994b79ed4711bba"
   integrity sha512-wkFDdY4XtpF+XCqbgwhsrLRgEM/bYfIt47927JTQZQ2QxQYRbSZ6u0QygnVjIR1eqMteRGx2jtUUZ+bxYQTo/w==
 
-"@metamask/smart-transactions-controller@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-2.1.0.tgz#a1bfbdab05c0ecd93bac5587b8bc56336bc28cc5"
-  integrity sha512-nhvR44ELv/8iBVHaMT8D6B1KLwm9PAb7BSSLAiteDfncxHj7syNGD0nOFynzKp7TPQuRlPXdFo6Z8zXt6O/krg==
+"@metamask/smart-transactions-controller@^1.10.0":
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-1.10.0.tgz#230f611eaf9eefc41bac0e7af78101a215c6acba"
+  integrity sha512-Bx2zT7UJJF2f11yANpC3OYCXYt2gpdqXj+RC4hnf18CELeF9Sp52xwQEkO6ig+3isrj6NsyVVmoo5PRcrU++cA==
   dependencies:
-    "@metamask/controllers" "^30.0.0"
+    "@metamask/controllers" "^27.1.1"
     "@types/lodash" "^4.14.176"
     bignumber.js "^9.0.1"
     ethers "^5.5.1"
@@ -3099,19 +3048,17 @@
     isomorphic-fetch "^3.0.0"
     lodash "^4.17.21"
 
-"@metamask/snap-controllers@^0.18.1":
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.18.1.tgz#081da8664436aed5d3a0ff5f682807de7424fcff"
-  integrity sha512-hoozCeKVV+HCMIPmDg2F5KcIyBEsbIFTM5xL4dmkf5i16+yWDkdNN2iCIfePk+gtpcWyUK6bsevOdu2KwVgEHg==
+"@metamask/snap-controllers@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.12.0.tgz#789793f860471bcc856abfdd46b8693afe3041a7"
+  integrity sha512-EG8/VytoYy2RBHdv+CHXbd91j4ibbV1SKKDTRc3b3iUBrp4FMVvQiuaL+pvXtPHCpEKL7doh6KVoAEgib5tHyw==
   dependencies:
-    "@metamask/browser-passworder" "^3.0.0"
-    "@metamask/controllers" "^30.0.0"
-    "@metamask/execution-environments" "^0.18.1"
+    "@metamask/controllers" "^28.0.0"
+    "@metamask/execution-environments" "^0.12.0"
     "@metamask/object-multiplex" "^1.1.0"
     "@metamask/obs-store" "^7.0.0"
-    "@metamask/post-message-stream" "^6.0.0"
+    "@metamask/post-message-stream" "4.0.0"
     "@metamask/safe-event-emitter" "^2.0.0"
-    "@metamask/utils" "^2.0.0"
     "@types/deep-freeze-strict" "^1.1.0"
     "@types/semver" "^7.3.9"
     ajv "^8.8.2"
@@ -3129,30 +3076,23 @@
     semver "^7.3.5"
     tar-stream "^2.2.0"
 
-"@metamask/snap-types@^0.18.1":
-  version "0.18.1"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.18.1.tgz#3e5e07a14d69ae43b246ae1abb24d7d1d40eca0f"
-  integrity sha512-ri9vznetbO2TjZjWUqfONgXyPEXP9j8VBgU8xCxCqqiyCi/sMIwSCemp81wnDN+kt7m7zXlC8TmEV3MkSnqGmw==
+"@metamask/snap-types@^0.12.0":
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.12.0.tgz#240c92029d3cf6d826c023d4460148f278ad593c"
+  integrity sha512-ZK9gOAc8uNWFN+cdHcGk6OSpQjqKY8i4PdQLFRPQxZfFJfAT4qV2fXXOPOZpnFwYZoAVuFuzHWGV4YnrQbfFvA==
   dependencies:
-    "@metamask/controllers" "^30.0.0"
+    "@metamask/controllers" "^28.0.0"
 
-"@metamask/test-dapp@^5.1.1":
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-5.1.1.tgz#aadebf28542809650c57aa8f5a3489c748e1414f"
-  integrity sha512-Vast76cYR9vOvSH9Ut8y8LXZbDledUE2BkiLX+PGP5AOTp8Pn8V6jiYg1D/slBh7M8/Q/1AmdW9D0B+fw7esBQ==
+"@metamask/test-dapp@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-5.0.0.tgz#ecea832b57ff97782bfdd57a4af3408c7c64c02d"
+  integrity sha512-eR9JQ0jPOeP/hdQj9hUkqbvinfjVLYTtdHV+mDCN1tsNxiTdninZbltg9bx6Gqp91v9/9YPhlhXCmMQPq/AMxQ==
 
 "@metamask/types@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/types/-/types-1.1.0.tgz#9bd14b33427932833c50c9187298804a18c2e025"
   integrity sha512-EEV/GjlYkOSfSPnYXfOosxa3TqYtIW3fhg6jdw+cok/OhMgNn4wCfbENFqjytrHMU2f7ZKtBAvtiP5V8H44sSw==
 
-"@metamask/utils@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-2.0.0.tgz#fe7e970416a256751c429f4a5e96aec6c4366ba7"
-  integrity sha512-AZ63AhRxAZXll+/SEiyEXgrxuAL4yOj0ny4V36VgPmTDvt+7GrmVJWrQF3o5PZZWV6ooaHZ9291RZHRcKZm0HA==
-  dependencies:
-    fast-deep-equal "^3.1.3"
-
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3179,21 +3119,6 @@
     jsbi "^3.1.5"
     sha.js "^2.4.11"
 
-"@noble/ed25519@^1.6.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@noble/ed25519/-/ed25519-1.6.0.tgz#b55f7c9e532b478bf1d7c4f609e1f3a37850b583"
-  integrity sha512-UKju89WV37IUALIMfKhKW3psO8AqmrE/GvH6QbPKjzolQ98zM7WmGUeY+xdIgSf5tqPFf75ZCYMgym6E9Jsw3Q==
-
-"@noble/hashes@^1.0.0", "@noble/hashes@~1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.0.0.tgz#d5e38bfbdaba174805a4e649f13be9a9ed3351ae"
-  integrity sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==
-
-"@noble/secp256k1@^1.5.5":
-  version "1.5.5"
-  resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.5.5.tgz#315ab5745509d1a8c8e90d0bdf59823ccf9bcfc3"
-  integrity sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==
-
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -3341,19 +3266,6 @@
     redux-thunk "^2.3.0"
     reselect "^4.0.0"
 
-"@scure/base@^1.0.0", "@scure/base@~1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.0.0.tgz#109fb595021de285f05a7db6806f2f48296fcee7"
-  integrity sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==
-
-"@scure/bip39@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.0.0.tgz#47504e58de9a56a4bbed95159d2d6829fa491bb0"
-  integrity sha512-HrtcikLbd58PWOkl02k9V6nXWQyoa7A0+Ek9VF7z17DDk9XZAFUcIdqfh0jJXLypmizc5/8P6OxoUeKliiWv4w==
-  dependencies:
-    "@noble/hashes" "~1.0.0"
-    "@scure/base" "~1.0.0"
-
 "@segment/loosely-validate-event@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz#87dfc979e5b4e7b82c5f1d8b722dfd5d77644681"
@@ -4961,7 +4873,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yauzl@2.9.2", "@types/yauzl@^2.9.1":
+"@types/yauzl@^2.9.1":
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
   integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
@@ -5404,10 +5316,17 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
-  version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
-  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+acorn-jsx@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
+  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
+  dependencies:
+    acorn "^3.0.4"
+
+acorn-jsx@^5.0.0, acorn-jsx@^5.0.2, acorn-jsx@^5.3.1:
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
+  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
 
 acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1:
   version "1.8.2"
@@ -5433,12 +5352,17 @@ acorn-walk@^8.2.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^5.1.2:
+acorn@^3.0.4:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
+  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
+
+acorn@^5.1.2, acorn@^5.2.1:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.4.1:
+acorn@^6.0.1, acorn@^6.0.7, acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
@@ -5448,64 +5372,53 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.7.0, acorn@^8.7.1:
-  version "8.7.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
-  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
+acorn@^8.2.4, acorn@^8.7.0:
+  version "8.7.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
+  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
 
-addons-linter@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/addons-linter/-/addons-linter-5.2.0.tgz#a1a36cdb72f5df359e246c25e1261d2183b4f6a7"
-  integrity sha512-wMKD9aJYYIVXK/grrHErqbGFX0uvEehEiMlAkUA/4M3a9zJDvNrpW0OwZxLEAlNpFISOtKPaQTlt0MHKwQTGFQ==
-  dependencies:
-    "@mdn/browser-compat-data" "4.1.19"
-    addons-moz-compare "1.2.0"
-    addons-scanner-utils "7.0.0"
-    ajv "8.11.0"
-    ajv-merge-patch "5.0.1"
-    chalk "4.1.2"
-    cheerio "1.0.0-rc.10"
-    columnify "1.6.0"
-    common-tags "1.8.2"
-    deepmerge "4.2.2"
-    eslint "8.14.0"
-    eslint-plugin-no-unsanitized "4.0.1"
-    eslint-visitor-keys "3.3.0"
-    espree "9.3.1"
+addons-linter@1.14.0:
+  version "1.14.0"
+  resolved "https://registry.yarnpkg.com/addons-linter/-/addons-linter-1.14.0.tgz#611f8d9e8c4cc84646ebd0b61c016f758225bf13"
+  integrity sha512-Of7A53J2ltaIZzD8RPH1hVxOR+DmLDuHBtwfhXJw8JTXwzpDIvOKn/i6XDtPgfFlj5wIWxpUGV+tFb/kE/K9gg==
+  dependencies:
+    ajv "6.10.2"
+    ajv-merge-patch "4.1.0"
+    chalk "2.4.2"
+    cheerio "1.0.0-rc.3"
+    columnify "1.5.4"
+    common-tags "1.8.0"
+    deepmerge "4.0.0"
+    dispensary "0.40.0"
+    es6-promisify "6.0.2"
+    eslint "5.16.0"
+    eslint-plugin-no-unsafe-innerhtml "1.0.16"
+    eslint-visitor-keys "1.1.0"
+    espree "6.1.1"
     esprima "4.0.1"
+    first-chunk-stream "3.0.0"
     fluent-syntax "0.13.0"
-    glob "8.0.1"
-    image-size "1.0.1"
+    glob "7.1.4"
     is-mergeable-object "1.1.1"
     jed "1.1.1"
-    os-locale "5.0.0"
-    pino "7.11.0"
-    postcss "8.4.13"
+    mdn-browser-compat-data "0.0.94"
+    os-locale "4.0.0"
+    pino "5.13.3"
+    po2json "0.4.5"
+    postcss "7.0.18"
+    probe-image-size "5.0.0"
+    regenerator-runtime "0.13.3"
     relaxed-json "1.0.3"
-    semver "7.3.7"
-    sha.js "2.4.11"
-    source-map-support "0.5.21"
-    tosource "1.0.0"
-    upath "2.0.1"
-    yargs "17.4.1"
-    yauzl "2.10.0"
-
-addons-moz-compare@1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/addons-moz-compare/-/addons-moz-compare-1.2.0.tgz#d6246cbae224ab629cb7da397b2b9602938ea085"
-  integrity sha512-COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw==
-
-addons-scanner-utils@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/addons-scanner-utils/-/addons-scanner-utils-7.0.0.tgz#8528b184f51e6552f43676221ce2a7e0aa6de15d"
-  integrity sha512-5j/qMzL13uGSiaFKvUNiMwyWMYD2YtEeY477q7Ahan3c90wLCwXIGCdpCfstgT3hpl44r+d6lqTIo2j2FW6uJQ==
-  dependencies:
-    "@types/yauzl" "2.9.2"
-    common-tags "1.8.2"
-    first-chunk-stream "3.0.0"
+    semver "6.3.0"
+    source-map-support "0.5.13"
     strip-bom-stream "4.0.0"
-    upath "2.0.1"
+    tosource "1.0.0"
+    upath "1.2.0"
+    whatwg-url "7.0.0"
+    yargs "14.0.0"
     yauzl "2.10.0"
+  optionalDependencies:
+    fsevents "2.0.7"
 
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
@@ -5606,30 +5519,43 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
+ajv-keywords@^1.0.0:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
+  integrity sha1-MU3QpLM2j609/NxU7eYXG4htrzw=
+
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-merge-patch@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ajv-merge-patch/-/ajv-merge-patch-5.0.1.tgz#0aba921a2ea8632813478aa3d039d8134b58f876"
-  integrity sha512-0UP3aJCzfzBOkmLR+EinJDCfg6DNtprj3bVPo7JJNgUpZMKt097t9xxQOWFGRoB4JvKKIHE2qe0HkVaS/HyrjQ==
+ajv-merge-patch@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-merge-patch/-/ajv-merge-patch-4.1.0.tgz#cd580e5860ac53431d6aa901fa3d5e2eb2b74a6c"
+  integrity sha512-0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw==
   dependencies:
     fast-json-patch "^2.0.6"
-    json-merge-patch "^1.0.2"
+    json-merge-patch "^0.2.3"
 
-ajv@8.11.0, ajv@^8.0.1, ajv@^8.8.2:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
-  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
+ajv@6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
   dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^4.7.0:
+  version "4.11.8"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
+  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
+  dependencies:
+    co "^4.6.0"
+    json-stable-stringify "^1.0.1"
+
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -5639,6 +5565,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
+ajv@^8.0.1, ajv@^8.8.2:
+  version "8.8.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
+  integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -5694,6 +5630,16 @@ ansi-colors@^4.1.0, ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
+ansi-escapes@^1.1.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
+  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
+
+ansi-escapes@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
+  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
+
 ansi-escapes@^4.2.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
@@ -5728,11 +5674,16 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0, ansi-regex@^5.0.1:
+ansi-regex@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -5748,6 +5699,11 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
+ansi-styles@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
+  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
+
 ansi-to-html@^0.6.11:
   version "0.6.13"
   resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.13.tgz#c72eae8b63e5ca0643aab11bfc6e6f2217425833"
@@ -5838,11 +5794,6 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
-argparse@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
-  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
-
 args@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/args/-/args-5.0.1.tgz#4bf298df90a4799a09521362c579278cc2fdd761"
@@ -6035,7 +5986,7 @@ arraybuffer.slice@~0.0.7:
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-arrify@^1.0.1:
+arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
@@ -6249,6 +6200,11 @@ async@^2.0.1, async@^2.1.2, async@^2.1.4, async@^2.4.0, async@^2.5.0, async@^2.6
   dependencies:
     lodash "^4.17.14"
 
+async@~3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
+  integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
+
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -6264,11 +6220,6 @@ atob@^2.0.0, atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-atomic-sleep@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
-  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
-
 autoprefixer@^8.0.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.1.0.tgz#374cf35be1c0e8fce97408d876f95f66f5cb4641"
@@ -6333,13 +6284,21 @@ axios@^0.19.2, axios@^0.21.2:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^0.24.0:
+  version "0.24.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
+  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
   dependencies:
-    follow-redirects "^1.14.9"
-    form-data "^4.0.0"
+    follow-redirects "^1.14.4"
+
+babel-code-frame@^6.16.0:
+  version "6.26.0"
+  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
+  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
+  dependencies:
+    chalk "^1.1.3"
+    esutils "^2.0.2"
+    js-tokens "^3.0.2"
 
 babel-jest@^26.6.3:
   version "26.6.3"
@@ -6781,6 +6740,27 @@ bip32@^2.0.4:
     typeforce "^1.11.5"
     wif "^2.0.6"
 
+bip39@^2.2.0, bip39@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235"
+  integrity sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==
+  dependencies:
+    create-hash "^1.1.0"
+    pbkdf2 "^3.0.9"
+    randombytes "^2.0.1"
+    safe-buffer "^5.0.1"
+    unorm "^1.3.3"
+
+bip39@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
+  integrity sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==
+  dependencies:
+    "@types/node" "11.11.6"
+    create-hash "^1.1.0"
+    pbkdf2 "^3.0.9"
+    randombytes "^2.0.1"
+
 bip66@^1.1.0, bip66@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -6863,7 +6843,7 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bluebird@3.7.2, bluebird@^3.3.5, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@3.7.2, bluebird@^3.3.5, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -6940,7 +6920,7 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -7024,13 +7004,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
-  dependencies:
-    balanced-match "^1.0.0"
-
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -7653,6 +7626,18 @@ callbackify@^1.1.0:
   resolved "https://registry.yarnpkg.com/callbackify/-/callbackify-1.1.0.tgz#d2a36986d28aa69714526c111209beeb9979d31e"
   integrity sha1-0qNphtKKppcUUmwREgm+65l50x4=
 
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
+  dependencies:
+    callsites "^0.2.0"
+
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -7811,7 +7796,7 @@ chain-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
   integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -7820,13 +7805,16 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
 
 chalk@^3.0.0:
   version "3.0.0"
@@ -7836,6 +7824,23 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chalk@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
+  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
+  dependencies:
+    ansi-styles "~1.0.0"
+    has-color "~0.1.0"
+    strip-ansi "~0.1.0"
+
 change-case@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.2.tgz#fd48746cce02f03f0a672577d1d3a8dc2eceb037"
@@ -7885,6 +7890,11 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc"
   integrity sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=
 
+chardet@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
+
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -7902,29 +7912,17 @@ checkpoint-store@^1.1.0:
   dependencies:
     functional-red-black-tree "^1.0.1"
 
-cheerio-select@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696"
-  integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==
-  dependencies:
-    css-select "^4.3.0"
-    css-what "^6.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-
-cheerio@1.0.0-rc.10, cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
-  integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
-  dependencies:
-    cheerio-select "^1.5.0"
-    dom-serializer "^1.3.2"
-    domhandler "^4.2.0"
-    htmlparser2 "^6.1.0"
-    parse5 "^6.0.1"
-    parse5-htmlparser2-tree-adapter "^6.0.1"
-    tslib "^2.2.0"
+cheerio@1.0.0-rc.3, cheerio@^1.0.0-rc.2:
+  version "1.0.0-rc.3"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
+  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
+  dependencies:
+    css-select "~1.2.0"
+    dom-serializer "~0.1.1"
+    entities "~1.1.1"
+    htmlparser2 "^3.9.1"
+    lodash "^4.15.0"
+    parse5 "^3.0.1"
 
 chokidar@3.3.0:
   version "3.3.0"
@@ -7992,13 +7990,13 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^103.0.0:
-  version "103.0.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-103.0.0.tgz#2ef086d62076e3ff6df6cfb84895d11d2c18d9cf"
-  integrity sha512-7BHf6HWt0PeOHCzWO8qlnD13sARzr5AKTtG8Csn+czsuAsajwPxdLNtry5GPh8HYFyl+i0M+yg3bT43AGfgU9w==
+chromedriver@^101.0.0:
+  version "101.0.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-101.0.0.tgz#ad19003008dd5df1770a1ad96059a9c5fe78e365"
+  integrity sha512-LkkWxy6KM/0YdJS8qBeg5vfkTZTRamhBfOttb4oic4echDgWvCU1E8QcBbUBOHqZpSrYMyi7WMKmKMhXFUaZ+w==
   dependencies:
     "@testim/chrome-version" "^1.1.2"
-    axios "^0.27.2"
+    axios "^0.24.0"
     del "^6.0.0"
     extract-zip "^2.0.1"
     https-proxy-agent "^5.0.0"
@@ -8064,6 +8062,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
+
 cjs-module-lexer@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
@@ -8111,6 +8114,20 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
+cli-cursor@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
+  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
+  dependencies:
+    restore-cursor "^1.0.1"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
+  dependencies:
+    restore-cursor "^2.0.0"
+
 cli-spinners@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
@@ -8126,6 +8143,11 @@ cli-table3@0.6.0:
   optionalDependencies:
     colors "^1.1.2"
 
+cli-width@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
+  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
+
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -8345,6 +8367,11 @@ color@^0.11.3:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
+colorette@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
+
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
@@ -8355,12 +8382,12 @@ colors@^1.1.2, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
-  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
+columnify@1.5.4:
+  version "1.5.4"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
+  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
   dependencies:
-    strip-ansi "^6.0.1"
+    strip-ansi "^3.0.0"
     wcwidth "^1.0.0"
 
 combine-source-map@^0.8.0, combine-source-map@~0.8.0:
@@ -8410,7 +8437,12 @@ comment-parser@1.2.4:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760"
   integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==
 
-common-tags@1.8.2, common-tags@^1.8.0:
+common-tags@1.8.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
+  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
+
+common-tags@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
@@ -8482,7 +8514,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@^1.6.2, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@^1.6.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -8979,7 +9011,7 @@ css-loader@^3.6.0:
     schema-utils "^2.7.0"
     semver "^6.3.0"
 
-css-select@^1.1.0:
+css-select@^1.1.0, css-select@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
@@ -8989,17 +9021,6 @@ css-select@^1.1.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
-css-select@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
-  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^6.0.1"
-    domhandler "^4.3.1"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
 css-to-xpath@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/css-to-xpath/-/css-to-xpath-0.1.0.tgz#ac0d1c26cef023f7bd8cf2e1fc1f77134bc70c47"
@@ -9021,11 +9042,6 @@ css-what@2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
-css-what@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
-  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -9237,7 +9253,7 @@ debug-fabulous@^1.0.0:
     memoizee "0.4.X"
     object-assign "4.X"
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -9391,7 +9407,12 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@4.2.2, deepmerge@^4.2.2:
+deepmerge@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09"
+  integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==
+
+deepmerge@^4.0.0, deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -9494,6 +9515,19 @@ degenerator@^3.0.1:
     esprima "^4.0.0"
     vm2 "^3.9.3"
 
+del@^2.0.2:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
+  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  dependencies:
+    globby "^5.0.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+    rimraf "^2.2.8"
+
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -9855,6 +9889,19 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
+dispensary@0.40.0:
+  version "0.40.0"
+  resolved "https://registry.yarnpkg.com/dispensary/-/dispensary-0.40.0.tgz#dedc4a4e4aebae7afcb6ae91f03e292ba107fe67"
+  integrity sha512-ttKDQvGBf+ygQ4rXuLBLErp3kMJIS+Gfmy+nJ6N/EfV8/RQdjd9SORpc729YK5SYAI+IuBo88S2xGUjKjU2jYw==
+  dependencies:
+    async "~3.1.0"
+    natural-compare-lite "~1.4.0"
+    pino "~5.13.0"
+    request "~2.88.0"
+    sha.js "~2.4.4"
+    source-map-support "~0.5.4"
+    yargs "~14.0.0"
+
 disposables@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
@@ -9910,7 +9957,7 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.1.0:
+doctrine@^2.0.0, doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
@@ -9951,7 +9998,7 @@ dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
-dom-serializer@0:
+dom-serializer@0, dom-serializer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
   integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -9959,15 +10006,6 @@ dom-serializer@0:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
-dom-serializer@^1.0.1, dom-serializer@^1.3.2:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
-  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
 dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
@@ -9983,11 +10021,6 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
-  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
-
 domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.0.tgz#81fe5df81b3f057052cde3a9fa9bf536a85b9ab0"
@@ -10007,13 +10040,6 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
-domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
-  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
-  dependencies:
-    domelementtype "^2.2.0"
-
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -10030,15 +10056,6 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.5.2, domutils@^2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
-  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
-  dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.2.0"
-    domhandler "^4.2.0"
-
 dot-case@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
@@ -10137,10 +10154,10 @@ duplexify@^3.1.2, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.5.1:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-duplexify@^4.1.1, duplexify@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
-  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
+duplexify@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.1.tgz#7027dc374f157b122a8ae08c2d3ea4d2d953aa61"
+  integrity sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==
   dependencies:
     end-of-stream "^1.4.1"
     inherits "^2.0.3"
@@ -10274,6 +10291,13 @@ encoding-down@~5.0.0:
     level-errors "^2.0.0"
     xtend "^4.0.1"
 
+encoding@^0.1.11:
+  version "0.1.12"
+  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
+  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
+  dependencies:
+    iconv-lite "~0.4.13"
+
 end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -10362,16 +10386,11 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^1.1.1, entities@^1.1.2:
+entities@^1.1.1, entities@^1.1.2, entities@~1.1.1:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-entities@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
-  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
-
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -10544,7 +10563,7 @@ es6-iterator@2.0.3, es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-map@^0.1.5:
+es6-map@^0.1.3, es6-map@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
@@ -10566,6 +10585,11 @@ es6-promise@^4.2.8:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
+es6-promisify@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.0.2.tgz#525c23725b8510f5f1f2feb5a1fbad93a93e29b4"
+  integrity sha512-eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==
+
 es6-set@^0.1.5, es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -10649,6 +10673,16 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
+escope@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
+  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
+  dependencies:
+    es6-map "^0.1.3"
+    es6-weak-map "^2.0.1"
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
 eslint-config-prettier@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
@@ -10738,10 +10772,12 @@ eslint-plugin-mocha@^8.1.0:
     eslint-utils "^2.1.0"
     ramda "^0.27.1"
 
-eslint-plugin-no-unsanitized@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.1.tgz#e2343265467ba2270ade478cbe07bbafeaea412d"
-  integrity sha512-y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg==
+eslint-plugin-no-unsafe-innerhtml@1.0.16:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz#7d02878c8e9bf7916b88836d5ac122b42f151932"
+  integrity sha1-fQKHjI6b95FriINtWsEitC8VGTI=
+  dependencies:
+    eslint "^3.7.1"
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -10806,13 +10842,12 @@ eslint-scope@^5.1.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
-  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
+eslint-utils@^1.3.1:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
-    esrecurse "^4.3.0"
-    estraverse "^5.2.0"
+    eslint-visitor-keys "^1.1.0"
 
 eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   version "2.1.0"
@@ -10828,12 +10863,12 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@3.3.0, eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -10843,46 +10878,88 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@8.14.0:
-  version "8.14.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.14.0.tgz#62741f159d9eb4a79695b28ec4989fcdec623239"
-  integrity sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==
+eslint@5.16.0:
+  version "5.16.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
+  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
   dependencies:
-    "@eslint/eslintrc" "^1.2.2"
-    "@humanwhocodes/config-array" "^0.9.2"
-    ajv "^6.10.0"
-    chalk "^4.0.0"
-    cross-spawn "^7.0.2"
-    debug "^4.3.2"
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.9.1"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
     doctrine "^3.0.0"
-    escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^4.0.3"
+    eslint-utils "^1.3.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^5.0.1"
+    esquery "^1.0.1"
     esutils "^2.0.2"
-    fast-deep-equal "^3.1.3"
-    file-entry-cache "^6.0.1"
+    file-entry-cache "^5.0.1"
     functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
-    ignore "^5.2.0"
+    glob "^7.1.2"
+    globals "^11.7.0"
+    ignore "^4.0.6"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    is-glob "^4.0.0"
-    js-yaml "^4.1.0"
+    inquirer "^6.2.2"
+    js-yaml "^3.13.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.4.1"
-    lodash.merge "^4.6.2"
+    levn "^0.3.0"
+    lodash "^4.17.11"
     minimatch "^3.0.4"
+    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.9.1"
-    regexpp "^3.2.0"
-    strip-ansi "^6.0.1"
-    strip-json-comments "^3.1.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^5.5.1"
+    strip-ansi "^4.0.0"
+    strip-json-comments "^2.0.1"
+    table "^5.2.3"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
+
+eslint@^3.7.1:
+  version "3.19.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
+  integrity sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=
+  dependencies:
+    babel-code-frame "^6.16.0"
+    chalk "^1.1.3"
+    concat-stream "^1.5.2"
+    debug "^2.1.1"
+    doctrine "^2.0.0"
+    escope "^3.6.0"
+    espree "^3.4.0"
+    esquery "^1.0.0"
+    estraverse "^4.2.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    glob "^7.0.3"
+    globals "^9.14.0"
+    ignore "^3.2.0"
+    imurmurhash "^0.1.4"
+    inquirer "^0.12.0"
+    is-my-json-valid "^2.10.0"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.5.1"
+    json-stable-stringify "^1.0.0"
+    levn "^0.3.0"
+    lodash "^4.0.0"
+    mkdirp "^0.5.0"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.1"
+    pluralize "^1.2.1"
+    progress "^1.1.8"
+    require-uncached "^1.0.2"
+    shelljs "^0.7.5"
+    strip-bom "^3.0.0"
+    strip-json-comments "~2.0.1"
+    table "^3.7.8"
+    text-table "~0.2.0"
+    user-home "^2.0.0"
 
 eslint@^7.23.0:
   version "7.23.0"
@@ -10932,14 +11009,31 @@ esm@^3.2.25:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+espree@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de"
+  integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^3.3.0"
+    acorn "^7.0.0"
+    acorn-jsx "^5.0.2"
+    eslint-visitor-keys "^1.1.0"
+
+espree@^3.4.0:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
+  integrity sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==
+  dependencies:
+    acorn "^5.2.1"
+    acorn-jsx "^3.0.0"
+
+espree@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
+  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+  dependencies:
+    acorn "^6.0.7"
+    acorn-jsx "^5.0.0"
+    eslint-visitor-keys "^1.0.0"
 
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
@@ -10950,21 +11044,12 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
-espree@^9.3.1, espree@^9.3.2:
-  version "9.3.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
-  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
-  dependencies:
-    acorn "^8.7.1"
-    acorn-jsx "^5.3.2"
-    eslint-visitor-keys "^3.3.0"
-
 esprima@4.0.1, esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
+esquery@^1.0.0, esquery@^1.0.1, esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
   integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
@@ -11038,6 +11123,14 @@ eth-eip712-util-browser@^0.0.3:
     buffer "^6.0.3"
     js-sha3 "^0.8.0"
 
+eth-ens-namehash@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-1.0.2.tgz#05ecdd6bac2d7fd7bc5ca84a993c6bad9da4edb9"
+  integrity sha1-Bezda6wtf9e8XKhKmTxrrZ2k7bk=
+  dependencies:
+    idna-uts46 "^1.0.1"
+    js-sha3 "^0.5.7"
+
 eth-ens-namehash@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf"
@@ -11046,6 +11139,17 @@ eth-ens-namehash@^2.0.8:
     idna-uts46-hx "^2.3.1"
     js-sha3 "^0.5.7"
 
+eth-hd-keyring@^3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-3.6.0.tgz#6835d30aa411b8d3ef098e82f6427b5325082abb"
+  integrity sha512-n2CwE9VNXsxLrXQa6suv0Umt4NT6+HtoahKgWx3YviXx4rQFwVT5nDwZfjhwrT31ESuoXYNIeJgz5hKLD96QeQ==
+  dependencies:
+    bip39 "^2.2.0"
+    eth-sig-util "^3.0.1"
+    eth-simple-keyring "^4.2.0"
+    ethereumjs-util "^7.0.9"
+    ethereumjs-wallet "^1.0.1"
+
 eth-json-rpc-filters@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.1.tgz#82204a13c99927dbf42cbb3962846650c6281f33"
@@ -11100,16 +11204,19 @@ eth-json-rpc-middleware@^8.0.0:
     node-fetch "^2.6.7"
     pify "^3.0.0"
 
-eth-keyring-controller@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-7.0.2.tgz#c4d7f9be179f08b3bb18410066bc4c8e91f50552"
-  integrity sha512-U4bqbXkTn7js/47rnFtVyBYQcvOKtmraD/YReBwuy4R56bFSJN8kinP0JJRl3WTtVfVS1l5A/jjsF3qk5TaTeg==
+eth-keyring-controller@^6.2.0, eth-keyring-controller@^6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-6.2.1.tgz#61901071fc74059ed37cb5ae93870fdcae6e3781"
+  integrity sha512-x2gTM1iHp2Kbvdtd9Eslysw0qzVZiqOzpVB3AU/ni2Xiit+rlcv2H80zYKjrEwlfWFDj4YILD3bOqlnEMmRJOA==
   dependencies:
-    "@metamask/bip39" "^4.0.0"
-    "@metamask/eth-hd-keyring" "^4.0.2"
+    bip39 "^2.4.0"
+    bluebird "^3.5.0"
     browser-passworder "^2.0.3"
+    eth-hd-keyring "^3.6.0"
     eth-sig-util "^3.0.1"
     eth-simple-keyring "^4.2.0"
+    ethereumjs-util "^7.0.9"
+    loglevel "^1.5.0"
     obs-store "^4.0.3"
 
 eth-lattice-keyring@^0.7.3:
@@ -11148,10 +11255,10 @@ eth-method-registry@^2.0.0:
   dependencies:
     ethjs "^0.4.0"
 
-eth-phishing-detect@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.2.0.tgz#11b357776b2d1b98a9ac594a1343e5184fc26bf0"
-  integrity sha512-+M7D4dhu5tkSA9b5eiBwDeJCjwy+7Lv49nuTEw8fNZIZUAVZC3d2XHatBq1MOW7J8kxNGbBdgBuIf65opI7Tkg==
+eth-phishing-detect@^1.1.16:
+  version "1.1.16"
+  resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.1.16.tgz#637158d5774819e1a861f6d169e6d77d076a47fd"
+  integrity sha512-/o9arK5qFOKVdfZK9hJVAQP0eKXjAvImIKNBMfF9Nj1HGicD3wfsVuXDu1OHrxuEi6+4kYtD9wyAn/3G7g7VrA==
   dependencies:
     fast-levenshtein "^2.0.6"
 
@@ -11264,7 +11371,7 @@ ethereum-cryptography@^0.1.3:
     secp256k1 "^4.0.1"
     setimmediate "^1.0.5"
 
-ethereum-ens-network-map@^1.0.2:
+ethereum-ens-network-map@^1.0.0, ethereum-ens-network-map@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ethereum-ens-network-map/-/ethereum-ens-network-map-1.0.2.tgz#4e27bad18dae7bd95d84edbcac2c9e739fc959b9"
   integrity sha512-5qwJ5n3YhjSpE6O/WEBXCAb2nagUgyagJ6C0lGUBWC4LjKp/rRzD+pwtDJ6KCiITFEAoX4eIrWOjRy0Sylq5Hg==
@@ -11435,41 +11542,41 @@ ethers@^4.0.20, ethers@^4.0.28:
     uuid "2.0.1"
     xmlhttprequest "1.8.0"
 
-ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1, ethers@^5.6.4:
-  version "5.6.5"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63"
-  integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA==
-  dependencies:
-    "@ethersproject/abi" "5.6.1"
-    "@ethersproject/abstract-provider" "5.6.0"
-    "@ethersproject/abstract-signer" "5.6.0"
-    "@ethersproject/address" "5.6.0"
-    "@ethersproject/base64" "5.6.0"
-    "@ethersproject/basex" "5.6.0"
-    "@ethersproject/bignumber" "5.6.0"
-    "@ethersproject/bytes" "5.6.1"
-    "@ethersproject/constants" "5.6.0"
-    "@ethersproject/contracts" "5.6.0"
-    "@ethersproject/hash" "5.6.0"
-    "@ethersproject/hdnode" "5.6.0"
-    "@ethersproject/json-wallets" "5.6.0"
-    "@ethersproject/keccak256" "5.6.0"
-    "@ethersproject/logger" "5.6.0"
-    "@ethersproject/networks" "5.6.2"
-    "@ethersproject/pbkdf2" "5.6.0"
-    "@ethersproject/properties" "5.6.0"
-    "@ethersproject/providers" "5.6.5"
-    "@ethersproject/random" "5.6.0"
-    "@ethersproject/rlp" "5.6.0"
-    "@ethersproject/sha2" "5.6.0"
-    "@ethersproject/signing-key" "5.6.1"
-    "@ethersproject/solidity" "5.6.0"
-    "@ethersproject/strings" "5.6.0"
-    "@ethersproject/transactions" "5.6.0"
-    "@ethersproject/units" "5.6.0"
-    "@ethersproject/wallet" "5.6.0"
-    "@ethersproject/web" "5.6.0"
-    "@ethersproject/wordlists" "5.6.0"
+ethers@^5.0.8, ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1:
+  version "5.5.4"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.4.tgz#e1155b73376a2f5da448e4a33351b57a885f4352"
+  integrity sha512-N9IAXsF8iKhgHIC6pquzRgPBJEzc9auw3JoRkaKe+y4Wl/LFBtDDunNe7YmdomontECAcC5APaAgWZBiu1kirw==
+  dependencies:
+    "@ethersproject/abi" "5.5.0"
+    "@ethersproject/abstract-provider" "5.5.1"
+    "@ethersproject/abstract-signer" "5.5.0"
+    "@ethersproject/address" "5.5.0"
+    "@ethersproject/base64" "5.5.0"
+    "@ethersproject/basex" "5.5.0"
+    "@ethersproject/bignumber" "5.5.0"
+    "@ethersproject/bytes" "5.5.0"
+    "@ethersproject/constants" "5.5.0"
+    "@ethersproject/contracts" "5.5.0"
+    "@ethersproject/hash" "5.5.0"
+    "@ethersproject/hdnode" "5.5.0"
+    "@ethersproject/json-wallets" "5.5.0"
+    "@ethersproject/keccak256" "5.5.0"
+    "@ethersproject/logger" "5.5.0"
+    "@ethersproject/networks" "5.5.2"
+    "@ethersproject/pbkdf2" "5.5.0"
+    "@ethersproject/properties" "5.5.0"
+    "@ethersproject/providers" "5.5.3"
+    "@ethersproject/random" "5.5.1"
+    "@ethersproject/rlp" "5.5.0"
+    "@ethersproject/sha2" "5.5.0"
+    "@ethersproject/signing-key" "5.5.0"
+    "@ethersproject/solidity" "5.5.0"
+    "@ethersproject/strings" "5.5.0"
+    "@ethersproject/transactions" "5.5.0"
+    "@ethersproject/units" "5.5.0"
+    "@ethersproject/wallet" "5.5.0"
+    "@ethersproject/web" "5.5.1"
+    "@ethersproject/wordlists" "5.5.0"
 
 ethjs-abi@0.2.0:
   version "0.2.0"
@@ -11510,11 +11617,48 @@ ethjs-contract@0.2.3, ethjs-contract@^0.2.1, ethjs-contract@^0.2.3:
     ethjs-util "0.1.3"
     js-sha3 "0.5.5"
 
+ethjs-contract@^0.1.7:
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/ethjs-contract/-/ethjs-contract-0.1.9.tgz#1c2766896a56d47ec1d6d661829c49cc38a5520a"
+  integrity sha1-HCdmiWpW1H7B1tZhgpxJzDilUgo=
+  dependencies:
+    ethjs-abi "0.2.0"
+    ethjs-filter "0.1.5"
+    ethjs-util "0.1.3"
+    js-sha3 "0.5.5"
+
+ethjs-ens@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/ethjs-ens/-/ethjs-ens-2.0.1.tgz#eda0a21aacbdac2f60c4a01034df21c48a5a325b"
+  integrity sha1-7aCiGqy9rC9gxKAQNN8hxIpaMls=
+  dependencies:
+    eth-ens-namehash "^1.0.2"
+    ethereum-ens-network-map "^1.0.0"
+    ethjs-contract "^0.1.7"
+    ethjs-query "^0.2.4"
+
+ethjs-filter@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/ethjs-filter/-/ethjs-filter-0.1.5.tgz#0112af6017c24677e32b8fdeb20e6196019b7598"
+  integrity sha1-ARKvYBfCRnfjK4/esg5hlgGbdZg=
+
 ethjs-filter@0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/ethjs-filter/-/ethjs-filter-0.1.8.tgz#2b02726b820ed4dd3860614d185c0c0f7ed1747f"
   integrity sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA==
 
+ethjs-format@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.2.tgz#d73b3a605c2e1257079f7077fd5448e998ce0fcd"
+  integrity sha1-1zs6YFwuElcHn3B3/VRI6ZjOD80=
+  dependencies:
+    bn.js "4.11.6"
+    ethjs-schema "0.1.5"
+    ethjs-util "0.1.3"
+    is-hex-prefixed "1.0.0"
+    number-to-bn "1.7.0"
+    strip-hex-prefix "1.0.0"
+
 ethjs-format@0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.7.tgz#20c92f31c259a381588d069830d838b489774b86"
@@ -11553,6 +11697,19 @@ ethjs-query@0.3.8, ethjs-query@^0.3.4, ethjs-query@^0.3.7, ethjs-query@^0.3.8:
     ethjs-rpc "0.2.0"
     promise-to-callback "^1.0.0"
 
+ethjs-query@^0.2.4:
+  version "0.2.9"
+  resolved "https://registry.yarnpkg.com/ethjs-query/-/ethjs-query-0.2.9.tgz#a26e6b4f38699e92f34b2184e75c7894329c42f1"
+  integrity sha1-om5rTzhpnpLzSyGE51x4lDKcQvE=
+  dependencies:
+    ethjs-format "0.2.2"
+    ethjs-rpc "0.1.5"
+
+ethjs-rpc@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.1.5.tgz#099e22f27dc4c18b6978a485fc36b1b0f7969080"
+  integrity sha1-CZ4i8n3EwYtpeKSF/DaxsPeWkIA=
+
 ethjs-rpc@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz#3d0011e32cfff156ed6147818c6fb8f801701b4c"
@@ -11560,6 +11717,11 @@ ethjs-rpc@0.2.0:
   dependencies:
     promise-to-callback "^1.0.0"
 
+ethjs-schema@0.1.5:
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.1.5.tgz#59740e3b3977bcdbb9b11bc3068201e8aceabb0d"
+  integrity sha1-WXQOOzl3vNu5sRvDBoIB6Kzquw0=
+
 ethjs-schema@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.2.1.tgz#47e138920421453617069034684642e26bb310f4"
@@ -11743,6 +11905,11 @@ execall@^2.0.0:
   dependencies:
     clone-regexp "^2.1.0"
 
+exit-hook@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
+  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
+
 exit-on-epipe@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
@@ -11870,7 +12037,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0, extend@~3.0.2:
+extend@3.0.2, extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -11882,6 +12049,15 @@ extension-port-stream@^2.0.0, extension-port-stream@^2.0.1:
   dependencies:
     webextension-polyfill-ts "^0.22.0"
 
+external-editor@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
+  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -12048,11 +12224,6 @@ fast-redact@^1.4.4:
   resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-1.5.0.tgz#302892f566750c4f5eec7b830bfc9bc473484034"
   integrity sha512-Afo61CgUjkzdvOKDHn08qnZ0kwck38AOGcMlvSGzvJbIab6soAP5rdoQayecGCDsD69AiF9vJBXyq31eoEO2tQ==
 
-fast-redact@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.1.tgz#790fcff8f808c2e12fabbfb2be5cb2deda448fa0"
-  integrity sha512-odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A==
-
 fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.7:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
@@ -12117,6 +12288,29 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
+figures@^1.3.5:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
+  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+    object-assign "^4.1.0"
+
+figures@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
+  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -12388,6 +12582,16 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
   integrity sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=
 
+flat-cache@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
+  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
+  dependencies:
+    circular-json "^0.3.1"
+    del "^2.0.2"
+    graceful-fs "^4.1.2"
+    write "^0.2.1"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -12455,10 +12659,10 @@ fnv1a@^1.0.1:
   resolved "https://registry.yarnpkg.com/fnv1a/-/fnv1a-1.0.1.tgz#915e2d6d023c43d5224ad9f6d2a3c4156f5712f5"
   integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU=
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.9:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
-  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
+follow-redirects@^1.14.0, follow-redirects@^1.14.4:
+  version "1.14.8"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
+  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -12559,15 +12763,6 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
-form-data@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
-  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
-  dependencies:
-    asynckit "^0.4.0"
-    combined-stream "^1.0.8"
-    mime-types "^2.1.12"
-
 format@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
@@ -12699,6 +12894,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+fsevents@2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
+  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
+
 fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
@@ -12821,6 +13021,20 @@ geckodriver@^1.21.0:
     https-proxy-agent "5.0.0"
     tar "6.0.2"
 
+generate-function@^2.0.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
+  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
+  dependencies:
+    is-property "^1.0.2"
+
+generate-object-property@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
+  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
+  dependencies:
+    is-property "^1.0.0"
+
 generic-names@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872"
@@ -12951,6 +13165,13 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
+gettext-parser@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-1.1.0.tgz#2c5a6638d893934b9b55037d0ad82cb7004b2679"
+  integrity sha1-LFpmONiTk0ubVQN9CtgstwBLJnk=
+  dependencies:
+    encoding "^0.1.11"
+
 git-up@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
@@ -13016,13 +13237,6 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0,
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
-  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
-  dependencies:
-    is-glob "^4.0.3"
-
 glob-promise@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20"
@@ -13075,15 +13289,15 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@8.0.1:
-  version "8.0.1"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
-  integrity sha512-cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow==
+glob@7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^5.0.1"
+    minimatch "^3.0.4"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -13181,7 +13395,7 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.1.0:
+globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
@@ -13193,14 +13407,19 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.15.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
-  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
+globals@^13.6.0:
+  version "13.7.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
+  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
   dependencies:
     type-fest "^0.20.2"
 
-globalthis@1.0.1, globalthis@^1.0.0, globalthis@^1.0.1:
+globals@^9.14.0:
+  version "9.18.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
+  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
+
+globalthis@^1.0.0, globalthis@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
   integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
@@ -13231,6 +13450,18 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
+globby@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
+  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  dependencies:
+    array-union "^1.0.1"
+    arrify "^1.0.0"
+    glob "^7.0.3"
+    object-assign "^4.0.1"
+    pify "^2.0.0"
+    pinkie-promise "^2.0.0"
+
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -13615,6 +13846,13 @@ hard-rejection@^2.1.0:
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  dependencies:
+    ansi-regex "^2.0.0"
+
 has-bigints@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -13627,6 +13865,11 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
+has-color@~0.1.0:
+  version "0.1.7"
+  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
+  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
+
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -13995,7 +14238,7 @@ htmlescape@^1.1.0, htmlescape@^1.1.1:
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
   integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
-htmlparser2@^3.10.0, htmlparser2@^3.3.0:
+htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -14007,16 +14250,6 @@ htmlparser2@^3.10.0, htmlparser2@^3.3.0:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-htmlparser2@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
-  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.0.0"
-    domutils "^2.5.2"
-    entities "^2.0.0"
-
 http-assert@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878"
@@ -14181,7 +14414,7 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
   integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -14219,6 +14452,13 @@ idna-uts46-hx@^2.3.1:
   dependencies:
     punycode "2.1.0"
 
+idna-uts46@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/idna-uts46/-/idna-uts46-1.1.0.tgz#be098b2b7c1cabfbef87a8b80f626fac37366aea"
+  integrity sha1-vgmLK3wcq/vvh6i4D2JvrDc2auo=
+  dependencies:
+    punycode "^2.1.0"
+
 ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -14236,22 +14476,20 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
+ignore@^3.2.0:
+  version "3.3.7"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
+  integrity sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==
+
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-image-size@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5"
-  integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==
-  dependencies:
-    queue "6.0.2"
+ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
+  version "5.1.8"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
+  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
 
 immediate@^3.2.3, immediate@~3.2.3:
   version "3.2.3"
@@ -14369,6 +14607,44 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
+inquirer@^0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
+  integrity sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=
+  dependencies:
+    ansi-escapes "^1.1.0"
+    ansi-regex "^2.0.0"
+    chalk "^1.0.0"
+    cli-cursor "^1.0.1"
+    cli-width "^2.0.0"
+    figures "^1.3.5"
+    lodash "^4.3.0"
+    readline2 "^1.0.1"
+    run-async "^0.1.0"
+    rx-lite "^3.1.2"
+    string-width "^1.0.1"
+    strip-ansi "^3.0.0"
+    through "^2.3.6"
+
+inquirer@^6.2.2:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
+  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
+  dependencies:
+    ansi-escapes "^3.2.0"
+    chalk "^2.4.2"
+    cli-cursor "^2.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^2.0.0"
+    lodash "^4.17.11"
+    mute-stream "0.0.7"
+    run-async "^2.2.0"
+    rxjs "^6.4.0"
+    string-width "^2.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
 insert-module-globals@^7.0.0, insert-module-globals@^7.2.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz#d5e33185181a4e1f33b15f7bf100ee91890d5cb3"
@@ -15273,10 +15549,10 @@ is-glob@^3.0.0, is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
-  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -15349,6 +15625,22 @@ is-mergeable-object@1.1.1:
   resolved "https://registry.yarnpkg.com/is-mergeable-object/-/is-mergeable-object-1.1.1.tgz#faaa3ed1cfce87d6f7d2f5885e92cc30af3e2ebf"
   integrity sha512-CPduJfuGg8h8vW74WOxHtHmtQutyQBzR+3MjQ6iDHIYdbOnm1YC7jv43SqCoU8OPGTJD4nibmiryA4kmogbGrA==
 
+is-my-ip-valid@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
+  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
+
+is-my-json-valid@^2.10.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a"
+  integrity sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==
+  dependencies:
+    generate-function "^2.0.0"
+    generate-object-property "^1.1.0"
+    is-my-ip-valid "^1.0.0"
+    jsonpointer "^4.0.0"
+    xtend "^4.0.0"
+
 is-nan@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
@@ -15509,6 +15801,11 @@ is-promise@~1, is-promise@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5"
   integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU=
 
+is-property@^1.0.0, is-property@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
+  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
+
 is-pull-stream@0.0.0, is-pull-stream@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/is-pull-stream/-/is-pull-stream-0.0.0.tgz#a3bc3d1c6d3055151c46bde6f399efed21440ca9"
@@ -15549,6 +15846,11 @@ is-relative@^1.0.0:
   dependencies:
     is-unc-path "^1.0.0"
 
+is-resolvable@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
+  integrity sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==
+
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
@@ -16284,6 +16586,11 @@ js-string-escape@^1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
+js-tokens@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
+
 js-yaml@3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -16292,7 +16599,7 @@ js-yaml@3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.1, js-yaml@^3.14.0:
+js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.5.1:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -16300,13 +16607,6 @@ js-yaml@^3.13.1, js-yaml@^3.14.0:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsan@^3.1.13:
   version "3.1.13"
   resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.13.tgz#4de8c7bf8d1cfcd020c313d438f930cec4b91d86"
@@ -16410,12 +16710,12 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-merge-patch@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-merge-patch/-/json-merge-patch-1.0.2.tgz#c4626811943b2f362f8607ae8f03d528875465b0"
-  integrity sha512-M6Vp2GN9L7cfuMXiWOmHj9bEFbeC250iVtcKQbqVgEsDVYnIsrNsbU+h/Y/PkbBQCtEa4Bez+Ebv0zfbC8ObLg==
+json-merge-patch@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/json-merge-patch/-/json-merge-patch-0.2.3.tgz#fa2c6b5af87da77bae2966a589d52e23ed81fe40"
+  integrity sha1-+ixrWvh9p3uuKWalidUuI+2B/kA=
   dependencies:
-    fast-deep-equal "^3.1.3"
+    deep-equal "^1.0.0"
 
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
@@ -16569,6 +16869,11 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
+jsonpointer@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
+  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
+
 jsonschema@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
@@ -16667,15 +16972,15 @@ jss@^10.0.3, jss@^10.3.0:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
-jszip@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061"
-  integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==
+jszip@^3.6.0:
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
+  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    setimmediate "^1.0.5"
+    set-immediate-shim "~1.0.1"
 
 junk@^3.1.0:
   version "3.1.0"
@@ -16732,7 +17037,7 @@ keccak@3.0.1:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-keccak@^3.0.0:
+keccak@^3.0.0, keccak@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0"
   integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==
@@ -16957,9 +17262,9 @@ lavamoat-tofu@^5.1.3:
     "@babel/traverse" "^7.10.1"
 
 lavamoat-tofu@^6.0.1:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.2.tgz#eed3031e31fac37b36eb42a7bad9ec7ef824ea34"
-  integrity sha512-za9lWVdB5hk1Clt77Sfb81x425sOi9nnZvJcsCfhQaojNJSn8B/3MQR9D7HmmNw4jJE+4B0ILqZoz/MNaABEYg==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.1.tgz#df3a1d09021790d5a4ccc1039751e9b3c2df85f6"
+  integrity sha512-QotLOiEcGBlWBJPYSZKDRRFchpwN9s3Ra8DDTuxJ57dGTBKOvvvfA+BpAjH/w1JcEhFkl5Wkc57Hl1oVzE8D2A==
   dependencies:
     "@babel/parser" "^7.10.1"
     "@babel/traverse" "^7.10.1"
@@ -17273,6 +17578,14 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
+levn@^0.3.0, levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -17281,14 +17594,6 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 libp2p-bootstrap@~0.9.3:
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/libp2p-bootstrap/-/libp2p-bootstrap-0.9.7.tgz#eabedab24775a6175f07ce035b716e8114d84a76"
@@ -17963,11 +18268,6 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash.merge@^4.6.2:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
 lodash.partition@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.partition/-/lodash.partition-4.6.0.tgz#a38e46b73469e0420b0da1212e66d414be364ba4"
@@ -18003,7 +18303,7 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@=3.10.1, lodash@^4.13.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.7.0, lodash@~4.17.2:
+lodash@=3.10.1, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.2:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -18029,7 +18329,7 @@ log-symbols@^4.0.0:
   dependencies:
     chalk "^4.0.0"
 
-loglevel@^1.4.1:
+loglevel@^1.4.1, loglevel@^1.5.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
   integrity sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=
@@ -18360,6 +18660,13 @@ mdast-util-to-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
+mdn-browser-compat-data@0.0.94:
+  version "0.0.94"
+  resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.94.tgz#eaa1653761ce95881ea1858a8c0ce6066d85f94b"
+  integrity sha512-O3zJqbmehz0Hn3wpk62taA0+jNF7yn6BDWqQ9Wh2bEoO9Rx1BYiTmNX565eNVbW0ixfQkY6Sp9FvY/rr79Qmyg==
+  dependencies:
+    extend "3.0.2"
+
 mdurl@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -18656,6 +18963,11 @@ mime@^2.4.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+  integrity sha1-5md4PZLonb00KBi1IwudYqZyrRg=
+
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -18702,27 +19014,13 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4:
+minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
-  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
-  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist-options@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -18732,10 +19030,10 @@ minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
+  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -19249,6 +19547,16 @@ mute-stdout@^1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
+mute-stream@0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
+  integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=
+
+mute-stream@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
+  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
+
 mute-stream@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -19264,10 +19572,10 @@ nanoid@^2.0.0, nanoid@^2.1.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
   integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
 
-nanoid@^3.1.31, nanoid@^3.3.3:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
+nanoid@^3.1.23, nanoid@^3.1.31:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
+  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
 
 nanomatch@^1.2.9:
   version "1.2.9"
@@ -19314,6 +19622,11 @@ native-url@^0.2.6:
   dependencies:
     querystring "^0.2.0"
 
+natural-compare-lite@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
+  integrity sha1-F7CVgZiJef3a/gIB6TG6kzyWy7Q=
+
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -19661,6 +19974,14 @@ nofilter@^1.0.4:
   resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e"
   integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==
 
+nomnom@1.8.1:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
+  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
+  dependencies:
+    chalk "~0.4.0"
+    underscore "~1.6.0"
+
 nomnom@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
@@ -19797,13 +20118,6 @@ npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
-nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
-  dependencies:
-    boolbase "^1.0.0"
-
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -20057,11 +20371,6 @@ observable-webworkers@^1.0.0:
   resolved "https://registry.yarnpkg.com/observable-webworkers/-/observable-webworkers-1.0.0.tgz#dcbd484a9644d512accc351962c6e710313fbb68"
   integrity sha512-+cECwCR8IEh8UY5nefQVLO9Cydqpk1izO+o7BABmKjXfJZyEOzBWY3ss5jbOPM6KmEa9aQExvAtTW6tVTOsNAQ==
 
-on-exit-leak-free@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209"
-  integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==
-
 on-finished@^2.3.0, on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -20081,6 +20390,18 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+onetime@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
+  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
+  dependencies:
+    mimic-fn "^1.0.0"
+
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -20118,7 +20439,7 @@ optional@^0.1.3:
   resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
   integrity sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==
 
-optionator@^0.8.1:
+optionator@^0.8.1, optionator@^0.8.2:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
@@ -20296,12 +20617,12 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0"
-  integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==
+os-locale@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-4.0.0.tgz#06e4fb102f38f33e9e904f41af3c34a5aa3b2b7b"
+  integrity sha512-HsSR1+2l6as4Wp2SGZxqLnuFHxVvh1Ir9pvZxyujsC13egZVe7P0YeBLN0ijQzM/twrO5To3ia3jzBXAvpMTEA==
   dependencies:
-    execa "^4.0.0"
+    execa "^1.0.0"
     lcid "^3.0.0"
     mem "^5.0.0"
 
@@ -20744,19 +21065,12 @@ parse-url@^5.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-parse5-htmlparser2-tree-adapter@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
-  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
-  dependencies:
-    parse5 "^6.0.1"
-
-parse5@6.0.1, parse5@^6.0.0, parse5@^6.0.1:
+parse5@6.0.1, parse5@^6.0.0:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^3.0.2:
+parse5@^3.0.1, parse5@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
   integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
@@ -20862,7 +21176,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@1.0.2, path-is-inside@^1.0.1:
+path-is-inside@1.0.2, path-is-inside@^1.0.1, path-is-inside@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -21111,14 +21425,6 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pino-abstract-transport@v0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0"
-  integrity sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==
-  dependencies:
-    duplexify "^4.1.2"
-    split2 "^4.0.0"
-
 pino-pretty@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-2.6.1.tgz#b5a8e28137deb1629428931d98c708b51f0e9555"
@@ -21139,29 +21445,7 @@ pino-std-serializers@^2.3.0:
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz#cb5e3e58c358b26f88969d7e619ae54bdfcc1ae1"
   integrity sha512-WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ==
 
-pino-std-serializers@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2"
-  integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==
-
-pino@7.11.0:
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6"
-  integrity sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==
-  dependencies:
-    atomic-sleep "^1.0.0"
-    fast-redact "^3.0.0"
-    on-exit-leak-free "^0.2.0"
-    pino-abstract-transport v0.5.0
-    pino-std-serializers "^4.0.0"
-    process-warning "^1.0.0"
-    quick-format-unescaped "^4.0.3"
-    real-require "^0.1.0"
-    safe-stable-stringify "^2.1.0"
-    sonic-boom "^2.2.1"
-    thread-stream "^0.15.1"
-
-pino@^5.12.3:
+pino@5.13.3, pino@^5.12.3, pino@~5.13.0:
   version "5.13.3"
   resolved "https://registry.yarnpkg.com/pino/-/pino-5.13.3.tgz#26cd6f69b4bd03d6408af28eddcd9313687f143d"
   integrity sha512-FL12DKlPwBlbhztlUz6kseR03PRR8nD+wvLdN/Sji9UiBYYfSjX+k8ocU7/NwW55JdFRONTn3iACoelXnMFVVQ==
@@ -21232,6 +21516,11 @@ plugin-error@1.0.1, plugin-error@^1.0.1:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
+pluralize@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
+  integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=
+
 pn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -21244,6 +21533,14 @@ pnp-webpack-plugin@1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
+po2json@0.4.5:
+  version "0.4.5"
+  resolved "https://registry.yarnpkg.com/po2json/-/po2json-0.4.5.tgz#47bb2952da32d58a1be2f256a598eebc0b745118"
+  integrity sha1-R7spUtoy1Yob4vJWpZjuvAt0URg=
+  dependencies:
+    gettext-parser "1.1.0"
+    nomnom "1.8.1"
+
 polished@^4.0.5:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.3.tgz#7a3abf2972364e7d97770b827eec9a9e64002cfc"
@@ -21480,6 +21777,15 @@ postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss@7.0.18:
+  version "7.0.18"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
+  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 postcss@7.0.21:
   version "7.0.21"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
@@ -21489,15 +21795,6 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@8.4.13, postcss@^8.1.10, postcss@^8.1.7:
-  version "8.4.13"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
-  integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
-  dependencies:
-    nanoid "^3.3.3"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
 postcss@^6.0.1, postcss@^6.0.19, postcss@^6.0.23:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
@@ -21515,6 +21812,15 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
+postcss@^8.1.10, postcss@^8.1.7:
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
+  integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
+  dependencies:
+    colorette "^1.2.2"
+    nanoid "^3.1.23"
+    source-map-js "^0.6.2"
+
 postmsg-rpc@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/postmsg-rpc/-/postmsg-rpc-2.4.0.tgz#4e2daf6851852364696debd5d6bf6936d1424cdf"
@@ -21687,6 +21993,17 @@ prismjs@^1.21.0, prismjs@~1.22.0:
   optionalDependencies:
     clipboard "^2.0.0"
 
+probe-image-size@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-5.0.0.tgz#1b87d20340ab8fcdb4324ec77fbc8a5f53419878"
+  integrity sha512-V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg==
+  dependencies:
+    deepmerge "^4.0.0"
+    inherits "^2.0.3"
+    next-tick "^1.0.0"
+    request "^2.83.0"
+    stream-parser "~0.3.1"
+
 process-nextick-args@^1.0.6, process-nextick-args@^1.0.7, process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -21704,11 +22021,6 @@ process-on-spawn@^1.0.0:
   dependencies:
     fromentries "^1.2.0"
 
-process-warning@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
-  integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
-
 process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -21719,6 +22031,11 @@ process@~0.5.1:
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
   integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
 
+progress@^1.1.8:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
+  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
+
 progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -21856,9 +22173,9 @@ proto-list@~1.2.1:
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
 protobufjs@^6.11.2:
-  version "6.11.3"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
-  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
+  version "6.11.2"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
+  integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -22286,23 +22603,11 @@ queue-microtask@^1.2.3:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-queue@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
-  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
-  dependencies:
-    inherits "~2.0.3"
-
 quick-format-unescaped@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-3.0.2.tgz#0137e94d8fb37ffeb70040535111c378e75396fb"
   integrity sha512-FXTaCkwvpIlkdKeGDNgcq07SXWS383noQUuZjvdE1QcTt+eLuqof6/BDiEPqB59FWLie/l91+HtlJSw7iCViSA==
 
-quick-format-unescaped@^4.0.3:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
-  integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
-
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -23033,10 +23338,14 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
-real-require@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381"
-  integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==
+readline2@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
+  integrity sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=
+  dependencies:
+    code-point-at "^1.0.0"
+    is-fullwidth-code-point "^1.0.0"
+    mute-stream "0.0.5"
 
 receptacle@^1.3.2:
   version "1.3.2"
@@ -23131,7 +23440,7 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.11.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@0.13.3, regenerator-runtime@^0.11.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
@@ -23171,10 +23480,15 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^3.0.0, regexpp@^3.1.0, regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0, regexpp@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
+  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
 
 regexpu-core@^4.7.1:
   version "4.7.1"
@@ -23459,7 +23773,7 @@ request-promise-native@^1.0.3:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@^2.83.0, request@^2.85.0, request@^2.88.2:
+request@^2.83.0, request@^2.85.0, request@^2.88.2, request@~2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -23510,6 +23824,14 @@ require-package-name@^2.0.1:
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
   integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
 
+require-uncached@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
 requirejs-config-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz#4244da5dd1f59874038cc1091d078d620abb6ebc"
@@ -23558,6 +23880,11 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
+
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -23629,6 +23956,22 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
+restore-cursor@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
+  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
+  dependencies:
+    exit-hook "^1.0.0"
+    onetime "^1.0.0"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
+  dependencies:
+    onetime "^2.0.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -23815,7 +24158,14 @@ rtlcss@^2.4.0:
     postcss "^6.0.23"
     strip-json-comments "^2.0.0"
 
-run-async@^2.3.0:
+run-async@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
+  integrity sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=
+  dependencies:
+    once "^1.3.0"
+
+run-async@^2.2.0, run-async@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -23842,7 +24192,12 @@ rustbn.js@~0.2.0:
   resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca"
   integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==
 
-rxjs@6, rxjs@^6.5.2:
+rx-lite@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
+  integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
+
+rxjs@6, rxjs@^6.4.0, rxjs@^6.5.2:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -23883,11 +24238,6 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
-safe-stable-stringify@^2.1.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73"
-  integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==
-
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -24081,7 +24431,7 @@ secp256k1@^3.0.1, secp256k1@^3.6.1, secp256k1@^3.6.2:
     nan "^2.14.0"
     safe-buffer "^5.1.2"
 
-secp256k1@^4.0.0, secp256k1@^4.0.1:
+secp256k1@^4.0.0, secp256k1@^4.0.1, secp256k1@^4.0.2:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
   integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
@@ -24095,14 +24445,14 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-selenium-webdriver@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.3.1.tgz#5e9c6c4adee65e57776b5bd4c07c59b65b8f056d"
-  integrity sha512-TjH/ls1WKRQoFEHcqtn6UtwcLnA3yvx08v9cSSFYvyhp8hJWRtbe9ae2I8uXPisEZ2EaGKKoxBZ4EHv0BJM15g==
+selenium-webdriver@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.0.tgz#d11e5d43674e2718265a30684bcbf6ec734fd3bd"
+  integrity sha512-kUDH4N8WruYprTzvug4Pl73Th+WKb5YiLz8z/anOpHyUNUdM3UzrdTOxmSNaf9AczzBeY+qXihzku8D1lMaKOg==
   dependencies:
-    jszip "^3.10.0"
+    jszip "^3.6.0"
     tmp "^0.2.1"
-    ws ">=8.7.0"
+    ws ">=7.4.6"
 
 semaphore@>=1.0.1, semaphore@^1.0.3:
   version "1.1.0"
@@ -24133,23 +24483,23 @@ semver-greatest-satisfied-range@^1.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
+semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.7, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.7"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
-  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
   dependencies:
     lru-cache "^6.0.0"
 
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 semver@~5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
@@ -24238,7 +24588,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-ses@0.12.4, ses@^0.12.4:
+ses@^0.12.4:
   version "0.12.4"
   resolved "https://registry.yarnpkg.com/ses/-/ses-0.12.4.tgz#f466f7199292b5c4454949c7d497f5569ade5805"
   integrity sha512-qbtkhuuAXNXb390yiaNUdNvDg/QmX7W2cO+srIUJllINMYADc/8m0vt7DNBmq+rqOBRrjVRPPeyQq8ZTLK3Rmw==
@@ -24257,7 +24607,7 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1:
+set-immediate-shim@^1.0.1, set-immediate-shim@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
   integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
@@ -24292,7 +24642,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@2.4.11, sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8, sha.js@~2.4.4:
+sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8, sha.js@~2.4.4:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -24373,6 +24723,15 @@ shell-quote@1.7.2, shell-quote@^1.4.2, shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
+shelljs@^0.7.5:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 shelljs@^0.8.1:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
@@ -24478,6 +24837,11 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
+slice-ansi@0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
+  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
+
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -24645,13 +25009,6 @@ sonic-boom@^0.7.5:
   dependencies:
     flatstr "^1.0.12"
 
-sonic-boom@^2.2.1:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611"
-  integrity sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==
-  dependencies:
-    atomic-sleep "^1.0.0"
-
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -24682,10 +25039,10 @@ source-map-explorer@^2.4.2:
     temp "^0.9.1"
     yargs "^15.3.1"
 
-source-map-js@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
-  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+source-map-js@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
+  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
 
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.1:
   version "0.5.1"
@@ -24706,10 +25063,18 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@0.5.21, source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
-  version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
-  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+source-map-support@0.5.13:
+  version "0.5.13"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
+  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20, source-map-support@~0.5.4:
+  version "0.5.20"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
+  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -24832,11 +25197,6 @@ split2@^3.0.0, split2@^3.1.0:
   dependencies:
     readable-stream "^3.0.0"
 
-split2@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
-  integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
-
 split@0.3, split@~0.3.0:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -25054,6 +25414,13 @@ stream-http@^3.0.0:
     readable-stream "^3.6.0"
     xtend "^4.0.2"
 
+stream-parser@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=
+  dependencies:
+    debug "2"
+
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -25124,7 +25491,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -25141,14 +25508,14 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
-  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.1"
+    strip-ansi "^6.0.0"
 
 "string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.4:
   version "4.0.4"
@@ -25252,7 +25619,7 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@6.0.0:
+strip-ansi@6.0.0, strip-ansi@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
   integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
@@ -25280,12 +25647,10 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@^6.0.0, strip-ansi@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
-  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
-  dependencies:
-    ansi-regex "^5.0.1"
+strip-ansi@~0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
+  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
 
 strip-bom-buf@^2.0.0:
   version "2.0.0"
@@ -25356,7 +25721,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@2.0.1, strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -25528,6 +25893,11 @@ supports-color@6.0.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+
 supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -25612,7 +25982,19 @@ syntax-error@^1.1.1:
   dependencies:
     acorn-node "^1.2.0"
 
-table@^5.4.6:
+table@^3.7.8:
+  version "3.8.3"
+  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
+  integrity sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=
+  dependencies:
+    ajv "^4.7.0"
+    ajv-keywords "^1.0.0"
+    chalk "^1.1.1"
+    lodash "^4.0.0"
+    slice-ansi "0.0.4"
+    string-width "^2.0.0"
+
+table@^5.2.3, table@^5.4.6:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
   integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
@@ -25823,7 +26205,7 @@ text-encoding@^0.6.4:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
   integrity sha1-45mpgiV6J22uQou5KEXLcb3CbRk=
 
-text-table@0.2.0, text-table@^0.2.0:
+text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -25833,13 +26215,6 @@ textarea-caret@^3.0.1:
   resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf"
   integrity sha1-82DEhpmqGr9xhoCkOjGoUGZcLK8=
 
-thread-stream@^0.15.1:
-  version "0.15.2"
-  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-0.15.2.tgz#fb95ad87d2f1e28f07116eb23d85aba3bc0425f4"
-  integrity sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==
-  dependencies:
-    real-require "^0.1.0"
-
 throat@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
@@ -26130,7 +26505,7 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^1.0.0:
+tr46@^1.0.0, tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
@@ -26242,10 +26617,10 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
 
 tslib@~2.0.1:
   version "2.0.3"
@@ -26468,6 +26843,11 @@ underscore@~1.4.4:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
   integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
 
+underscore@~1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
+  integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
+
 undertaker-registry@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
@@ -26665,6 +27045,11 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
+unorm@^1.3.3:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
+  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
+
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -26693,12 +27078,7 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
-  integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
-
-upath@^1.1.1:
+upath@1.2.0, upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
@@ -26854,6 +27234,13 @@ use@^3.1.0:
   dependencies:
     kind-of "^6.0.2"
 
+user-home@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
+  integrity sha1-nHC/2Babwdy/SGBODwS4tJzenp8=
+  dependencies:
+    os-homedir "^1.0.0"
+
 utf-8-validate@5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922"
@@ -27485,6 +27872,15 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
+whatwg-url@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
+  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
+  dependencies:
+    lodash.sortby "^4.7.0"
+    tr46 "^1.0.1"
+    webidl-conversions "^4.0.2"
+
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -27687,7 +28083,14 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-ws@*, ws@7.1.0, ws@7.4.6, ws@>=8.7.0, ws@^1.1.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.3.1, ws@^7.4.0, ws@^7.4.6, ws@~7.4.2:
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
+  dependencies:
+    mkdirp "^0.5.1"
+
+ws@*, ws@7.1.0, ws@7.4.6, ws@>=7.4.6, ws@^1.1.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.3.1, ws@^7.4.0, ws@^7.4.6, ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -27831,7 +28234,7 @@ yaml@^1.10.0, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@13.1.2, yargs-parser@^13.1.2:
+yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -27860,11 +28263,6 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
-yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
-
 yargs-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/yargs-promise/-/yargs-promise-1.1.0.tgz#97ebb5198df734bb3b11745133ae5b501b16ab1f"
@@ -27895,18 +28293,22 @@ yargs@13.3.2, yargs@^13.2.2, yargs@^13.2.4, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@17.4.1, yargs@^17.0.1:
-  version "17.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.1.tgz#ebe23284207bb75cee7c408c33e722bfb27b5284"
-  integrity sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==
+yargs@14.0.0, yargs@~14.0.0:
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066"
+  integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==
   dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
+    cliui "^5.0.0"
+    decamelize "^1.2.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
     require-directory "^2.1.1"
-    string-width "^4.2.3"
-    y18n "^5.0.5"
-    yargs-parser "^21.0.0"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.1"
 
 yargs@^15.0.0, yargs@^15.0.2, yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
@@ -27938,6 +28340,19 @@ yargs@^16.0.0, yargs@^16.1.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.0.1:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
+  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
 yargs@^7.1.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"

From d640f7e861a0f5946250b46d7269572eb4095c20 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 27 Jul 2022 23:08:43 +0100
Subject: [PATCH 08/10] All metrics

---
 .../connect-hardware/select-hardware.js       | 106 +++++++++++++++---
 1 file changed, 92 insertions(+), 14 deletions(-)

diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 0ddd457c2faf..69f5106f9caf 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -217,7 +217,13 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://shop.ledger.com/?r=17c4991a03fa", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked Ledger Buy Now',
+              })
+              window.open("https://shop.ledger.com/?r=17c4991a03fa", "_blank")
+            }
             }
           >
            {this.context.t('buyNow')}
@@ -225,7 +231,13 @@ export default class SelectHardware extends Component {
           <Button
             className="hw-connect__external-btn"
             type="secondary"
-            onClick={() => window.open("https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked Ledger Tutorial',
+              })
+              window.open("https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true", "_blank")
+            }
             }
           >
            {this.context.t('tutorial')}
@@ -273,7 +285,13 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://gridplus.io/?afmc=7p", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked GridPlus Buy Now',
+              })
+              window.open("https://gridplus.io/?afmc=7p", "_blank")
+            }
             }
           >
           {this.context.t('buyNow')}
@@ -281,7 +299,13 @@ export default class SelectHardware extends Component {
           <Button
             className="hw-connect__external-btn"
             type="secondary"
-            onClick={() => window.open("https://docs.gridplus.io/setup/metamask", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked GidPlus Tutorial',
+              })
+              window.open("https://docs.gridplus.io/setup/metamask", "_blank")
+            }
             }
           >
            {this.context.t('tutorial')}
@@ -329,7 +353,13 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked Trezor Buy Now',
+              })
+              window.open("https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009", "_blank")
+            }
             }
           >
            {this.context.t('buyNow')}
@@ -337,7 +367,13 @@ export default class SelectHardware extends Component {
           <Button
             className="hw-connect__external-btn"
             type="secondary"
-            onClick={() => window.open("https://wiki.trezor.io/Apps:MetaMask", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked Trezor Tutorial',
+              })
+              window.open("https://wiki.trezor.io/Apps:MetaMask", "_blank")
+            }
             }
           >
            {this.context.t('tutorial')}
@@ -371,14 +407,26 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked Keystone Buy Now',
+              })
+              window.open("https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9", "_blank")
+            }
             }>
               {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
-              onClick={() => window.open("https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone", "_blank")
+              onClick={() => {
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Keystone Buy Now',
+                })
+                window.open("https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone", "_blank")
+              }
               }>
               {this.context.t('tutorial')}
             </Button>
@@ -392,14 +440,26 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://airgap.it/", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked AirGap Vault Buy Now',
+              })
+              window.open("https://airgap.it/", "_blank")
+            }
             }>
               {this.context.t('downloadNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
-              onClick={() => window.open("https://support.airgap.it/guides/metamask/", "_blank")
+              onClick={() => {
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked AirGap Vault Tutorial',
+                })
+                window.open("https://support.airgap.it/guides/metamask/", "_blank")
+              }
               }>
               {this.context.t('tutorial')}
             </Button>
@@ -416,7 +476,7 @@ export default class SelectHardware extends Component {
               onClick={() => {
                 trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
-                  event: 'Clicked Buy CoolWallet',
+                  event: 'Clicked CoolWallet Buy Now',
                 })
                 window.open("https://www.coolwallet.io/", "_blank")
               }
@@ -426,7 +486,13 @@ export default class SelectHardware extends Component {
             <Button
               className="hw-connect__external-btn"
               type="secondary"
-              onClick={() => window.open("https://www.coolwallet.io/metamask-step-by-step-guides/", "_blank")
+              onClick={() => {
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked CoolWallet Tutorial',
+                })
+                window.open("https://www.coolwallet.io/metamask-step-by-step-guides/", "_blank")
+              }
               }>
               {this.context.t('tutorial')}
             </Button>
@@ -440,14 +506,26 @@ export default class SelectHardware extends Component {
             <Button
             className="hw-connect__external-btn-first"
             type="secondary"
-            onClick={() => window.open("https://dcentwallet.com/", "_blank")
+            onClick={() => {
+              trackEvent({
+                category: EVENT.CATEGORIES.NAVIGATION,
+                event: 'Clicked DCent Buy Now',
+              })
+              window.open("https://dcentwallet.com/", "_blank")
+            }
             }>
               {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
-              onClick={() => window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
+              onClick={() => {
+                trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked DCent Tutorial',
+                })
+                window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
+              }
               }>
                 {this.context.t('tutorial')}
             </Button>

From 61e365b57f77a99842e6c21777afebbb15a00945 Mon Sep 17 00:00:00 2001
From: Alex Jupiter <alex@alexjupiter.com>
Date: Wed, 27 Jul 2022 23:10:53 +0100
Subject: [PATCH 09/10] Revert "Revert "Merge branch
 'hardware-wallets-referral-and-tutorial-links' of
 https://github.com/MetaMask/metamask-extension into
 hardware-wallets-referral-and-tutorial-links""

This reverts commit 597a9088f9f4d44c58c12242a3ea2258e7562b59.
---
 .circleci/config.yml                          |   78 +-
 .circleci/scripts/bundle-stats-commit.sh      |   70 +
 .circleci/scripts/chrome-install.sh           |    4 +-
 .circleci/scripts/firefox-install.sh          |    2 +-
 .depcheckrc.yml                               |    1 +
 .eslintrc.js                                  |    1 +
 .github/PULL_REQUEST_TEMPLATE.md              |    7 +-
 .iyarc                                        |    3 +-
 .metamaskrc.dist                              |    3 +
 .nvmrc                                        |    2 +-
 .storybook/1.INTRODUCTION.stories.mdx         |    2 +-
 .storybook/3.COLORS.stories.mdx               |   39 +-
 .storybook/4.BREAKPOINTS.stories.mdx          |  125 +
 .storybook/initial-states/transactions.js     | 1921 ++++++
 .storybook/preview.js                         |    2 +-
 .storybook/test-data.js                       |  394 +-
 CHANGELOG.md                                  |  192 +-
 README.md                                     |    8 +-
 app/_locales/am/messages.json                 |    4 +-
 app/_locales/ar/messages.json                 |    2 +-
 app/_locales/bg/messages.json                 |    4 +-
 app/_locales/bn/messages.json                 |    4 +-
 app/_locales/ca/messages.json                 |    4 +-
 app/_locales/da/messages.json                 |    4 +-
 app/_locales/de/messages.json                 |  142 +-
 app/_locales/el/messages.json                 |  140 +-
 app/_locales/en/messages.json                 |  186 +-
 app/_locales/es/messages.json                 |  142 +-
 app/_locales/es_419/messages.json             |   12 +-
 app/_locales/et/messages.json                 |    4 +-
 app/_locales/fa/messages.json                 |    4 +-
 app/_locales/fi/messages.json                 |    4 +-
 app/_locales/fil/messages.json                |    4 +-
 app/_locales/fr/messages.json                 |  146 +-
 app/_locales/he/messages.json                 |    2 +-
 app/_locales/hi/messages.json                 |  138 +-
 app/_locales/hr/messages.json                 |    4 +-
 app/_locales/hu/messages.json                 |    2 +-
 app/_locales/id/messages.json                 |  138 +-
 app/_locales/it/messages.json                 |    4 +-
 app/_locales/ja/messages.json                 |  140 +-
 app/_locales/kn/messages.json                 |    4 +-
 app/_locales/ko/messages.json                 |  138 +-
 app/_locales/lt/messages.json                 |    4 +-
 app/_locales/lv/messages.json                 |    4 +-
 app/_locales/ms/messages.json                 |    4 +-
 app/_locales/no/messages.json                 |    4 +-
 app/_locales/ph/messages.json                 |   12 +-
 app/_locales/pl/messages.json                 |    4 +-
 app/_locales/pt/messages.json                 |  140 +-
 app/_locales/pt_BR/messages.json              |   12 +-
 app/_locales/ro/messages.json                 |    4 +-
 app/_locales/ru/messages.json                 |  140 +-
 app/_locales/sk/messages.json                 |    4 +-
 app/_locales/sl/messages.json                 |    4 +-
 app/_locales/sr/messages.json                 |    4 +-
 app/_locales/sv/messages.json                 |    4 +-
 app/_locales/sw/messages.json                 |    4 +-
 app/_locales/tl/messages.json                 |  142 +-
 app/_locales/tr/messages.json                 |  140 +-
 app/_locales/uk/messages.json                 |    4 +-
 app/_locales/vi/messages.json                 |  140 +-
 app/_locales/zh/messages.json                 |  146 +-
 app/_locales/zh_CN/messages.json              |   14 +-
 app/_locales/zh_TW/messages.json              |    4 +-
 app/home.html                                 |    5 +-
 app/images/fantom-opera.svg                   |    1 +
 app/images/harmony-one.svg                    |    1 +
 app/images/info-fox.svg                       |    1 +
 .../recovery-onboarding/subtitles/de.vtt      |   68 +-
 .../recovery-onboarding/subtitles/el.vtt      |   98 +
 .../recovery-onboarding/subtitles/es.vtt      |    3 +-
 .../recovery-onboarding/subtitles/fr.vtt      |   98 +
 .../recovery-onboarding/subtitles/hi.vtt      |   69 +-
 .../recovery-onboarding/subtitles/id.vtt      |   63 +-
 .../recovery-onboarding/subtitles/ja.vtt      |   67 +-
 .../recovery-onboarding/subtitles/ko.vtt      |   69 +-
 .../recovery-onboarding/subtitles/pt.vtt      |   79 +-
 .../recovery-onboarding/subtitles/ru.vtt      |   63 +-
 .../recovery-onboarding/subtitles/tl.vtt      |    3 +-
 .../recovery-onboarding/subtitles/tr.vtt      |  116 +
 .../recovery-onboarding/subtitles/vi.vtt      |   84 +-
 .../recovery-onboarding/subtitles/zh.vtt      |   98 +
 app/manifest/{ => v2}/_base.json              |    4 +-
 app/manifest/{ => v2}/brave.json              |    0
 app/manifest/{ => v2}/chrome.json             |    0
 app/manifest/{ => v2}/firefox.json            |    0
 app/manifest/{ => v2}/opera.json              |    0
 app/manifest/v3/_base.json                    |   76 +
 app/manifest/v3/brave.json                    |    1 +
 app/manifest/v3/chrome.json                   |    7 +
 app/manifest/v3/firefox.json                  |   26 +
 app/manifest/v3/opera.json                    |    9 +
 app/phishing.html                             |  150 -
 app/popup.html                                |    5 +-
 app/scripts/app-init.js                       |  124 +
 app/scripts/background.js                     |  168 +-
 app/scripts/constants/contracts.js            |   14 +
 app/scripts/constants/on-ramp.js              |    1 +
 app/scripts/contentscript.js                  |   82 +-
 app/scripts/controllers/detect-tokens.js      |    6 +-
 app/scripts/controllers/detect-tokens.test.js |   28 +-
 app/scripts/controllers/ens/ens.js            |   17 +-
 app/scripts/controllers/ens/index.test.js     |    2 +-
 .../controllers/incoming-transactions.js      |    3 +-
 app/scripts/controllers/metametrics.js        |   17 +-
 app/scripts/controllers/metametrics.test.js   |   10 +-
 app/scripts/controllers/network/network.js    |    8 +-
 .../permissions/flask/snap-permissions.js     |    2 +-
 app/scripts/controllers/preferences.js        |   12 +
 app/scripts/controllers/transactions/index.js |  131 +-
 .../controllers/transactions/index.test.js    |  145 +-
 .../transactions/pending-tx-tracker.js        |    3 +-
 .../transactions/tx-state-manager.js          |   23 +-
 .../transactions/tx-state-manager.test.js     |  109 +-
 app/scripts/init-globals.js                   |   18 +
 .../lib/ComposableObservableStore.test.js     |    4 +-
 app/scripts/lib/account-tracker.js            |   74 +-
 app/scripts/lib/buy-url.js                    |   49 +-
 .../lib/createRPCMethodTrackingMiddleware.js  |  228 +-
 .../createRPCMethodTrackingMiddleware.test.js |  217 +
 app/scripts/lib/ens-ipfs/setup.js             |    3 +-
 app/scripts/lib/metaRPCClientFactory.js       |   29 +-
 app/scripts/lib/metaRPCClientFactory.test.js  |   17 +
 app/scripts/lib/network-store.js              |    3 +-
 .../handlers/add-ethereum-chain.js            |   74 +-
 app/scripts/lib/setupSentry.js                |   12 +-
 app/scripts/lib/util.js                       |    2 +-
 app/scripts/lib/util.test.js                  |    7 -
 app/scripts/metamask-controller.js            |  457 +-
 app/scripts/metamask-controller.test.js       |   55 +
 app/scripts/migrations/072.js                 |   30 +
 app/scripts/migrations/072.test.js            |  427 ++
 app/scripts/migrations/index.js               |    2 +
 app/scripts/phishing-detect.js                |   40 -
 app/scripts/ui.js                             |   43 +-
 development/README.md                         |   21 +
 development/build/README.md                   |   36 +-
 development/build/constants.js                |   48 +
 development/build/etc.js                      |   12 +-
 development/build/index.js                    |  157 +-
 development/build/manifest.js                 |   18 +-
 development/build/scripts.js                  |  228 +-
 development/build/static.js                   |   13 +-
 development/build/styles.js                   |    7 +-
 development/build/transforms/utils.test.js    |    2 +-
 .../charts/flamegraph/chart/index.html        |  170 +
 .../flamegraph/lib/d3-flamegraph-tooltip.js   | 3117 +++++++++
 .../charts/flamegraph/lib/d3-flamegraph.css   |   46 +
 .../charts/flamegraph/lib/d3-flamegraph.js    | 5719 +++++++++++++++++
 development/charts/table/index.html           |   67 +
 development/charts/table/jquery.min.js        |   18 +
 development/metamaskbot-build-announce.js     |   12 +
 development/sourcemap-validator.js            |    1 -
 docs/trezor-emulator.md                       |    2 +-
 jest.config.js                                |   12 +-
 lavamoat/browserify/beta/policy.json          |  500 +-
 lavamoat/browserify/flask/policy.json         |  500 +-
 lavamoat/browserify/main/policy.json          |  500 +-
 lavamoat/browserify/policy-override.json      |    7 +
 lavamoat/build-system/policy-override.json    |   30 +
 lavamoat/build-system/policy.json             |  305 +-
 package.json                                  |   42 +-
 patches/@lavamoat+lavapack+3.1.0.patch        |   15 +
 patches/abort-controller+3.0.0.patch          |    5 +-
 patches/bip39+2.5.0.patch                     |   99 -
 patches/eth-hd-keyring+3.6.0.patch            |   43 -
 patches/eth-keyring-controller+6.2.1.patch    |   37 -
 patches/yargs+17.4.1.patch                    |   11 +
 shared/constants/app.js                       |    5 +
 shared/constants/gas.js                       |   17 +-
 shared/constants/metametrics.js               |   21 +
 shared/constants/network.js                   |  135 +-
 shared/constants/permissions.js               |    1 +
 shared/constants/permissions.test.js          |    2 +-
 shared/constants/phishing.js                  |    4 +
 shared/constants/swaps.js                     |    5 +
 shared/constants/tokens.js                    |   13 +
 shared/constants/transaction.js               |   95 +-
 shared/modules/fetch-with-timeout.js          |    3 +-
 shared/modules/fetch-with-timeout.test.js     |    8 +-
 shared/modules/mv3.utils.js                   |    4 +
 shared/modules/object.utils.js                |   22 +
 shared/modules/rpc.utils.js                   |    3 +-
 shared/modules/transaction.utils.js           |   48 +-
 shared/modules/transaction.utils.test.js      |   89 +-
 shared/notifications/index.js                 |   15 +-
 test/data/mock-state.json                     |   16 +
 test/e2e/benchmark.js                         |   35 +-
 test/e2e/fixtures/address-entry/state.json    |    3 +
 test/e2e/fixtures/connected-state/state.json  |    3 +
 test/e2e/fixtures/custom-rpc/state.json       |    3 +
 test/e2e/fixtures/custom-token/state.json     |    3 +
 test/e2e/fixtures/eip-1559-v2-dapp/state.json |    3 +
 test/e2e/fixtures/eip-1559-v2/state.json      |    3 +
 test/e2e/fixtures/import-ui/state.json        |    3 +
 test/e2e/fixtures/imported-account/state.json |    3 +
 test/e2e/fixtures/localization/state.json     |    3 +
 test/e2e/fixtures/metrics-enabled/state.json  |    3 +
 .../fixtures/navigate-transactions/state.json |    3 +
 test/e2e/fixtures/onboarding/state.json       |    3 +
 test/e2e/fixtures/send-edit-v2/state.json     |    3 +
 test/e2e/fixtures/send-edit/state.json        |    3 +
 test/e2e/fixtures/special-settings/state.json |  149 +
 test/e2e/fixtures/threebox-enabled/state.json |    3 +
 test/e2e/helpers.js                           |   34 +-
 test/e2e/lavamoat-stats.js                    |  140 +
 test/e2e/metamask-ui.spec.js                  |    8 +-
 test/e2e/mock-e2e.js                          |   51 +
 .../index.html                                |   20 +
 test/e2e/mock-page-with-iframe/index.html     |   11 +
 test/e2e/mv3-perf-stats/bundle-size.js        |  119 +
 test/e2e/mv3-perf-stats/index.js              |    2 +
 test/e2e/mv3-perf-stats/init-load-stats.js    |  111 +
 test/e2e/mv3-stats.js                         |  111 +
 test/e2e/phishing-warning-page-server.js      |   58 +
 test/e2e/run-e2e-test.js                      |    3 +
 .../ganache-contract-address-registry.js      |   28 +
 test/e2e/seeder/ganache-seeder.js             |   88 +
 test/e2e/seeder/smart-contracts.js            |   43 +
 test/e2e/snaps/enums.js                       |    3 +
 test/e2e/snaps/test-snap-bip-44.spec.js       |   28 +-
 test/e2e/snaps/test-snap-confirm.spec.js      |   20 +-
 test/e2e/snaps/test-snap-error.spec.js        |   16 +-
 test/e2e/snaps/test-snap-managestate.spec.js  |   72 +-
 test/e2e/snaps/test-snap-notification.spec.js |  109 +
 test/e2e/tests/add-hide-token.spec.js         |    8 +-
 test/e2e/tests/address-book.spec.js           |    1 -
 test/e2e/tests/chain-interactions.spec.js     |   56 +-
 test/e2e/tests/contract-interactions.spec.js  |    2 +-
 test/e2e/tests/custom-rpc-history.spec.js     |   12 +-
 .../tests/custom-token-add-approve.spec.js    |  358 ++
 test/e2e/tests/dapp-interactions.spec.js      |    8 +-
 test/e2e/tests/from-import-ui.spec.js         |    5 +-
 test/e2e/tests/incremental-security.spec.js   |    6 +-
 test/e2e/tests/metamask-responsive-ui.spec.js |    8 +-
 test/e2e/tests/navigate-transactions.spec.js  |    4 -
 test/e2e/tests/phishing-detection.spec.js     |  123 +-
 test/e2e/tests/provider-api.spec.js           |    4 +-
 test/e2e/tests/send-eth.spec.js               |   48 +
 test/e2e/tests/send-hex-address.spec.js       |  329 +
 test/e2e/tests/send-to-contract.spec.js       |   83 +
 test/e2e/tests/settings-search.spec.js        |    9 -
 test/e2e/tests/state-logs.spec.js             |   65 +
 test/e2e/tests/swap-eth.spec.js               |    4 +-
 test/e2e/webdriver/chrome.js                  |   12 +-
 test/e2e/webdriver/driver.js                  |   26 +-
 test/e2e/webdriver/firefox.js                 |   19 +-
 test/e2e/webdriver/index.js                   |    6 +-
 test/helpers/file.js                          |   37 +
 test/jest/mock-store.js                       |  146 +-
 test/jest/mocks.js                            |   44 +
 .../account-menu/account-menu.component.js    |   66 +-
 .../account-menu/account-menu.container.js    |   10 +-
 ui/components/app/account-menu/index.scss     |   44 +-
 ui/components/app/add-network/add-network.js  |  385 +-
 .../app/add-network/add-network.test.js       |   60 +
 ui/components/app/add-network/index.scss      |   54 +-
 .../advanced-gas-controls.component.js        |    6 +-
 .../app/advanced-gas-controls/index.scss      |    2 +-
 .../advanced-gas-fee-defaults.js              |    4 +-
 .../advanced-gas-fee-gas-limit.js             |   11 +-
 .../advanced-gas-fee-input-subtext.js         |    2 +-
 .../base-fee-input/base-fee-input.js          |    2 +-
 .../priority-fee-input/priority-fee-input.js  |    7 +-
 .../advanced-gas-fee-save.js                  |    5 +-
 ui/components/app/app-components.scss         |    1 +
 .../app/app-header/app-header.component.js    |   19 +-
 .../app/app-header/app-header.container.js    |   10 +
 ui/components/app/app-header/index.scss       |   21 +
 .../app/asset-list-item/asset-list-item.js    |    4 +-
 ui/components/app/asset-list/asset-list.js    |   10 +-
 .../cancel-speedup-popover.js                 |   17 +-
 .../collectible-default-image.js              |   41 +
 .../collectible-default-image.stories.js      |   42 +
 .../app/collectible-default-image/index.js    |    1 +
 .../app/collectible-default-image/index.scss  |   22 +
 .../collectible-details.js                    |   17 +-
 .../collectible-details.stories.js            |   36 +-
 .../collectibles-detection-notice.js          |    5 +-
 .../collectibles-items/collectibles-items.js  |   77 +-
 .../app/collectibles-items/index.scss         |   30 +-
 .../collectibles-tab/collectibles-tab.test.js |    6 +-
 .../confirm-detail-row.stories.js             |   47 +
 .../confirm-detail-row/index.scss             |    4 +-
 ...onfirm-page-container-summary.component.js |    9 +-
 .../enableEIP1559V2-notice.js                 |    4 +-
 .../connected-accounts-list.stories.js        |   38 +
 .../connected-sites-list.component.js         |    8 +-
 .../app/connected-sites-list/index.scss       |    4 -
 .../app/currency-input/currency-input.js      |   40 +-
 .../app/currency-input/currency-input.test.js |   21 +-
 .../detected-token-address.js                 |    3 +-
 .../detected-token-ignored-popover.js         |    5 +-
 .../app/detected-token/detected-token.js      |   20 +-
 .../app/detected-token/detected-token.test.js |    6 +-
 ui/components/app/dropdowns/dropdown.js       |    2 +-
 .../app/dropdowns/network-dropdown.js         |   13 +-
 .../app/dropdowns/network-dropdown.test.js    |    5 +-
 .../edit-gas-display.component.js             |    6 +-
 .../edit-gas-display.stories.js               |   14 +-
 ui/components/app/edit-gas-display/index.scss |    4 +-
 .../edit-gas-fee-button.js                    |   23 +-
 .../app/edit-gas-fee-button/index.scss        |    7 +
 .../edit-gas-fee-popover.js                   |   32 +-
 .../edit-gas-item/edit-gas-item.js            |    3 +-
 .../edit-gas-item/index.scss                  |    2 +-
 .../edit-gas-tooltip/index.scss               |    2 +-
 .../network-statistics/network-statistics.js  |    3 +-
 .../status-slider/index.scss                  |    2 +-
 .../status-slider/status-slider.js            |    5 +-
 .../network-statistics/tooltips.js            |    2 +-
 .../flask/snaps-authorship-pill/index.scss    |   23 +-
 .../snaps-authorship-pill.js                  |   50 +-
 .../snaps-authorship-pill.stories.js          |    8 +-
 .../advanced-gas-inputs/index.scss            |    4 +-
 .../gas-price-button-group.stories.js         |   47 +
 .../gas-price-button-group/index.scss         |    2 +-
 .../gas-slider/gas-slider.stories.js          |   34 +
 .../gas-customization/gas-slider/index.scss   |    1 -
 .../gas-details-item-title.js                 |    7 +-
 .../app/gas-details-item/gas-details-item.js  |    9 +-
 ui/components/app/gas-details-item/index.scss |    2 +-
 ui/components/app/gas-timing/index.scss       |    2 +-
 .../hold-to-reveal-button.js                  |    2 +-
 .../app/home-notification/index.scss          |    2 +-
 .../metamask-template-renderer.js             |    3 +
 .../safe-component-list.js                    |    5 +
 .../account-details-modal.test.js             |   14 +-
 .../convert-token-to-nft-modal.js             |    9 +-
 .../deposit-ether-modal.component.js          |   35 +-
 .../deposit-ether-modal.container.js          |   11 +-
 .../hide-token-confirmation-modal.js          |    6 +-
 .../hide-token-confirmation.stories.js        |   11 +
 .../hide-token-confirmation-modal/index.scss  |    2 +-
 ui/components/app/modals/modal.js             |   14 +-
 .../app/modals/new-account-modal/index.scss   |    2 +-
 .../new-account-modal.stories.js              |   11 +
 .../nickname-popovers.component.js            |    2 +-
 .../modals/qr-scanner/qr-scanner.component.js |    2 +-
 .../app/network-display/network-display.js    |    4 +-
 .../app/permissions-connect-header/index.scss |    2 +-
 .../permissions-connect-header.component.js   |   62 +-
 .../index.scss                                |    2 +-
 .../qr-hardware-popover/enhanced-reader.js    |    2 +-
 .../qr-hardware-sign-request/player.js        |    7 +-
 .../recovery-phrase-reminder.js               |    9 +-
 .../selected-account.component.js             |    2 +-
 .../app/signature-request-original/README.mdx |   15 +
 .../app/signature-request-original/index.scss |    8 +-
 .../signature-request-original.component.js   |   44 +-
 .../signature-request-original.container.js   |   28 +-
 .../signature-request-original.stories.js     |  132 +
 .../app/signature-request/index.scss          |   10 +-
 .../signature-request-footer.component.js     |    4 +-
 .../signature-request-message/index.scss      |    2 +-
 .../signature-request-message.component.js    |    2 +-
 .../signature-request.component.js            |    6 +-
 .../signature-request.component.test.js       |    4 +-
 .../signature-request.container.test.js       |    1 +
 .../signature-request.stories.js              |   32 +-
 ui/components/app/srp-input/srp-input.js      |   15 +-
 ui/components/app/srp-input/srp-input.scss    |   25 +-
 .../app/step-progress-bar/index.scss          |   32 +-
 .../step-progress-bar/step-progress-bar.js    |   10 +-
 ui/components/app/tab-bar/index.scss          |    2 +-
 ui/components/app/token-cell/token-cell.js    |    2 +-
 .../transaction-activity-log-icon.stories.js  |    3 +
 .../transaction-decoding.component.js         |    6 +-
 .../app/transaction-detail-item/index.scss    |    2 +-
 .../transaction-detail-item.component.js      |    4 +-
 .../app/transaction-icon/transaction-icon.js  |   18 +-
 ...transaction-list-item-details.component.js |    5 +-
 ...action-list-item-details.component.test.js |    5 +
 ...transaction-list-item-details.container.js |    5 +-
 .../app/transaction-list-item/index.scss      |    6 -
 .../smart-transaction-list-item.component.js  |    9 +-
 .../transaction-list-item.component.js        |   18 +-
 .../transaction-list-item.stories.js          |  210 +
 .../app/transaction-status/index.scss         |    2 +-
 ...erenced-currency-display.component.test.js |    2 +-
 .../app/wallet-overview/eth-overview.js       |   44 +-
 ui/components/app/wallet-overview/index.scss  |    2 +-
 .../app/wallet-overview/token-overview.js     |    4 +-
 .../app/wallet-overview/wallet-overview.js    |    5 +-
 .../app/whats-new-popup/whats-new-popup.js    |    8 +-
 ui/components/ui/alert/README.mdx             |   15 +
 ui/components/ui/alert/alert.stories.js       |   32 +
 ui/components/ui/alert/index.js               |   71 +-
 ui/components/ui/alert/index.test.js          |   24 -
 ui/components/ui/box/README.mdx               |  207 +-
 ui/components/ui/box/box.js                   |  358 +-
 ui/components/ui/box/box.scss                 |  253 +-
 ui/components/ui/box/box.stories.js           |  139 +-
 ui/components/ui/box/box.test.js              |  732 +++
 ui/components/ui/box/index.js                 |    7 +-
 ui/components/ui/breadcrumbs/README.mdx       |   16 +
 .../ui/breadcrumbs/breadcrumbs.stories.js     |   33 +
 ui/components/ui/button-group/index.scss      |    2 +-
 ui/components/ui/button/buttons.scss          |   28 +-
 ui/components/ui/callout/callout.scss         |    2 +-
 ui/components/ui/callout/callout.stories.js   |    6 +-
 ui/components/ui/chip/chip.js                 |   19 +-
 ui/components/ui/chip/chip.scss               |    8 +
 .../ui/color-indicator/color-indicator.js     |    2 +-
 ui/components/ui/confusable/README.mdx        |   25 +
 .../ui/confusable/confusable.stories.js       |   37 +
 .../ui/definition-list/definition-list.js     |    2 +
 .../definition-list.stories.js                |  100 +-
 ui/components/ui/dialog/README.mdx            |   15 +
 ui/components/ui/dialog/dialog.stories.js     |   30 +
 ui/components/ui/dropdown/dropdown.scss       |    1 +
 .../error-message/error-message.component.js  |    8 +
 .../ui/export-text-container/README.mdx       |   15 +
 .../export-text.stories.js                    |   29 +
 .../ui/form-field/form-field.stories.js       |    2 +-
 ui/components/ui/form-field/index.scss        |    4 +-
 ui/components/ui/hex-to-decimal/README.mdx    |   15 +
 .../hex-to-decimal/hex-to-decimal.stories.js  |   32 +
 .../ui/i18n-value/i18n-value.component.js     |   15 -
 ui/components/ui/i18n-value/index.js          |    1 -
 .../icon-with-fallback.scss                   |    2 +-
 ui/components/ui/icon/icon.stories.js         |    5 +-
 ui/components/ui/icon/search-icon.js          |   42 +
 ui/components/ui/info-tooltip/index.scss      |   54 +-
 ui/components/ui/info-tooltip/info-tooltip.js |    9 +-
 .../ui/info-tooltip/info-tooltip.stories.js   |    1 -
 .../ui/jazzicon/jazzicon.component.js         |   10 +-
 ui/components/ui/loading-screen/index.scss    |    4 +-
 .../loading-screen.component.js               |    2 +-
 ui/components/ui/logo/logo-coinbasepay.js     |   58 +
 ui/components/ui/logo/logo-coinbasepay.scss   |    3 +
 ui/components/ui/logo/logo-wyre.js            |   48 +-
 ui/components/ui/logo/logo.stories.js         |    2 +
 ui/components/ui/menu/menu.scss               |    4 +-
 .../ui/metafox-logo/horizontal-logo.js        |    2 +-
 .../nickname-popover.stories.js               |   45 +-
 ui/components/ui/page-container/index.scss    |    2 +-
 .../page-container.component.js               |    4 +-
 .../page-container/page-container.stories.js  |   66 +
 ui/components/ui/popover/index.scss           |    4 +-
 ui/components/ui/search-icon/index.js         |    1 -
 .../ui/search-icon/search-icon.component.js   |   20 -
 .../ui/sender-to-recipient/index.scss         |    4 +-
 ui/components/ui/site-icon/site-icon.test.js  |    3 +-
 ui/components/ui/site-origin/index.scss       |    8 +-
 ui/components/ui/site-origin/site-origin.js   |   52 +-
 .../ui/site-origin/site-origin.stories.js     |    8 +
 ui/components/ui/slider/slider.component.js   |    6 +-
 ui/components/ui/spinner/spinner.stories.js   |   26 +
 ui/components/ui/tabs/index.scss              |    2 +-
 ui/components/ui/tabs/tabs.stories.js         |   47 +-
 ui/components/ui/text-field/index.scss        |    6 +
 ui/components/ui/textarea/textarea.js         |    2 +-
 .../ui/token-input/token-input.component.js   |    9 +-
 .../token-input/token-input.component.test.js |   90 +
 .../ui/token-input/token-input.container.js   |    3 +-
 ui/components/ui/tooltip/index.scss           |   62 +-
 ui/components/ui/tooltip/tooltip.js           |    2 +-
 ui/components/ui/tooltip/tooltip.stories.js   |   92 +
 ui/components/ui/typography/typography.js     |   28 +-
 ui/components/ui/ui-components.scss           |    1 +
 .../ui/update-nickname-popover/index.scss     |    2 +-
 .../update-nickname-popover.js                |   10 +-
 ui/components/ui/url-icon/index.scss          |    2 +-
 ui/css/base-styles.scss                       |    1 -
 ui/css/design-system/attributes.scss          |    4 +-
 ui/css/design-system/breakpoints.scss         |   69 +-
 ui/css/errors.scss                            |   44 +
 ui/css/index.scss                             |    2 +
 ui/css/itcss/components/newui-sections.scss   |    6 +-
 ui/css/itcss/components/send.scss             |   32 +-
 ui/css/loading.scss                           |   13 +
 ui/css/utilities/colors.scss                  |    4 +-
 ui/ducks/app/app.js                           |   10 +
 ui/ducks/ens.js                               |   23 +-
 ui/ducks/send/helpers.js                      |  294 +
 ui/ducks/send/helpers.test.js                 |  163 +
 ui/ducks/send/send.js                         | 3072 +++++----
 ui/ducks/send/send.test.js                    | 2060 +++---
 ui/ducks/swaps/swaps.js                       |   71 +-
 ui/helpers/constants/common.js                |   14 +-
 ui/helpers/constants/critical-error.js        |    1 +
 ui/helpers/constants/design-system.js         |    5 +
 ui/helpers/constants/notifications.js         |    6 +
 ui/helpers/constants/routes.js                |   10 +
 ui/helpers/constants/settings.js              |    7 +
 ui/helpers/constants/transactions.js          |    1 +
 ui/helpers/utils/error-utils.js               |   55 +
 ui/helpers/utils/error-utils.test.js          |   49 +
 ui/helpers/utils/i18n-helper.js               |    3 +-
 ui/helpers/utils/icon-factory.js              |   41 +-
 ui/helpers/utils/permission.js                |    5 +
 ui/helpers/utils/settings-search.test.js      |    2 +-
 ui/helpers/utils/token-util.js                |   97 +-
 ui/helpers/utils/transactions.util.js         |   32 +-
 ui/helpers/utils/transactions.util.test.js    |   46 +
 ui/hooks/useAssetDetails.js                   |   80 +-
 ui/hooks/useAssetDetails.test.js              |  193 +
 ui/hooks/useTransactionDisplayData.js         |   92 +-
 ui/hooks/useTransactionDisplayData.test.js    |    2 +-
 ui/index.js                                   |   56 +-
 ui/index.test.js                              |   70 +
 ui/pages/add-collectible/add-collectible.js   |   19 +-
 .../add-collectible/add-collectible.test.js   |   79 +
 ui/pages/asset/asset.scss                     |    2 +-
 ui/pages/asset/components/asset-options.js    |   31 +-
 .../confirm-add-suggested-token.js            |    6 +-
 .../confirm-approve-content.component.js      |  170 +-
 .../confirm-approve-content.component.test.js |    2 +-
 .../confirm-approve-content.stories.js        |    2 +-
 .../confirm-approve-content/index.scss        |    4 +
 ui/pages/confirm-approve/confirm-approve.js   |   21 +-
 .../confirm-decrypt-message.scss              |    2 +-
 .../confirm-deploy-contract.stories.js        |   60 +-
 ...confirm-encryption-public-key.component.js |    5 +-
 .../confirm-encryption-public-key.scss        |    3 +-
 .../confirm-import-token.js                   |    6 +-
 .../confirm-send-ether.container.js           |    6 +-
 .../confirm-send-ether.stories.js             |   64 +-
 .../confirm-send-token.component.js           |    9 +-
 .../confirm-send-token.container.js           |   17 +-
 .../confirm-send-token/confirm-send-token.js  |   29 +-
 .../confirm-token-transaction-base.js         |    9 +-
 .../confirm-transaction-base.component.js     |   13 +-
 .../confirm-transaction-base.container.js     |   10 +-
 .../transaction-alerts/transaction-alerts.js  |   51 +-
 .../confirm-transaction-switch.component.js   |    5 +
 .../confirm-token-transaction-switch.js       |   25 +
 .../confirmation-network-switch/index.scss    |    1 -
 ui/pages/confirmation/confirmation.js         |   57 +-
 .../templates/add-ethereum-chain.js           |  203 +-
 .../connect-hardware/index.scss               |    2 +-
 ui/pages/create-account/index.scss            |    2 +-
 .../metametrics-opt-in/index.scss             |    4 -
 .../metametrics-opt-in.component.js           |   29 +-
 .../metametrics-opt-in.container.js           |    2 -
 .../confirm-seed-phrase/index.scss            |    2 +-
 .../seed-phrase-intro.component.js            |    5 +
 .../select-action/select-action.component.js  |    9 +-
 .../welcome/welcome.component.js              |   21 +-
 .../welcome/welcome.container.js              |    7 +-
 .../first-time-flow/welcome/welcome.test.js   |    8 +-
 ui/pages/home/home.component.js               |   76 +-
 ui/pages/home/home.container.js               |   16 +-
 ui/pages/home/index.scss                      |   18 +-
 .../import-token/import-token.component.js    |    2 +-
 ui/pages/import-token/token-list/index.scss   |    2 +-
 .../token-list/token-list.component.js        |   11 +-
 .../token-search/token-search.component.js    |    6 +-
 ui/pages/keychains/restore-vault.js           |    8 +-
 ui/pages/notifications/index.js               |    1 +
 ui/pages/notifications/index.scss             |  114 +
 ui/pages/notifications/notification.test.js   |  100 +
 ui/pages/notifications/notifications.js       |  141 +
 .../create-password/create-password.js        |   23 +-
 .../create-password/index.scss                |   11 +-
 .../creation-successful.js                    |   11 +-
 .../creation-successful/index.scss            |    8 +-
 .../onboarding-flow/import-srp/import-srp.js  |    7 +-
 .../onboarding-flow/import-srp/index.scss     |   31 +-
 ui/pages/onboarding-flow/index.scss           |   18 +-
 .../onboarding-flow/metametrics/index.scss    |   23 +-
 .../metametrics/metametrics.js                |   14 +-
 .../onboarding-app-header/index.scss          |    2 +-
 .../onboarding-flow/pin-extension/index.scss  |    4 +-
 .../privacy-settings/index.scss               |   13 +
 .../privacy-settings/setting.js               |    2 +-
 .../confirm-recovery-phrase.js                |   12 +-
 .../recovery-phrase/index.scss                |   75 +-
 .../recovery-phrase/review-recovery-phrase.js |    7 +-
 .../secure-your-wallet/index.scss             |   30 +-
 .../secure-your-wallet/secure-your-wallet.js  |   16 +-
 ui/pages/onboarding-flow/welcome/index.scss   |    8 +-
 ui/pages/onboarding-flow/welcome/welcome.js   |    2 +-
 ui/pages/pages.scss                           |    1 +
 .../flask/snap-install/index.scss             |    4 -
 .../flask/snap-install/snap-install.js        |    9 +-
 ui/pages/permissions-connect/index.scss       |    4 +-
 .../permissions-connect/redirect/index.scss   |    1 -
 ui/pages/routes/routes.component.js           |   11 +
 .../add-recipient/add-recipient.component.js  |   14 +-
 .../add-recipient/ens-input.component.js      |    5 +-
 .../amount-max-button.test.js                 |   21 +-
 .../send-asset-row.component.js               |    8 +-
 .../send-content/send-content.component.js    |   49 +-
 .../send-content.component.test.js            |   28 +-
 .../send-content/send-content.container.js    |   17 +-
 .../send/send-content/send-content.stories.js |   86 +-
 .../send/send-header/send-header.component.js |   10 +-
 .../send-header/send-header.component.test.js |   38 +-
 ui/pages/send/send.constants.js               |    3 +-
 ui/pages/send/send.js                         |   42 +-
 ui/pages/send/send.scss                       |   11 +-
 ui/pages/send/send.test.js                    |   88 +-
 ui/pages/send/send.utils.js                   |    6 +-
 ui/pages/send/send.utils.test.js              |    2 +-
 .../advanced-tab.component.test.js            |    6 +
 ui/pages/settings/alerts-tab/alerts-tab.js    |    2 +-
 ui/pages/settings/alerts-tab/alerts-tab.scss  |    4 +
 ui/pages/settings/contact-list-tab/index.scss |    1 +
 .../experimental-tab.component.js             |   46 +-
 .../experimental-tab.container.js             |    5 +
 .../settings/flask/view-snap/view-snap.js     |    6 +-
 ui/pages/settings/index.scss                  |    6 +-
 .../custom-content-search.js                  |    4 +-
 ui/pages/settings/networks-tab/index.scss     |  244 +-
 .../networks-form/networks-form.js            |   64 +-
 .../networks-list-item/networks-list-item.js  |   12 +-
 .../networks-list/networks-list.js            |    4 +-
 .../networks-tab-subheader.js                 |   21 +-
 .../networks-tab-subheader.test.js            |    5 +-
 .../settings/networks-tab/networks-tab.js     |   31 +-
 .../settings-search/settings-search.js        |    2 +-
 .../settings-tab/settings-tab.component.js    |    8 +-
 ui/pages/settings/settings.component.js       |   14 +-
 ui/pages/settings/settings.container.js       |    7 +
 ui/pages/swaps/awaiting-swap/awaiting-swap.js |   53 +-
 .../swaps/awaiting-swap/awaiting-swap.test.js |    3 +-
 ui/pages/swaps/awaiting-swap/index.scss       |   19 -
 .../view-on-ether-scan-link.test.js.snap      |   21 -
 .../view-on-ether-scan-link/index.js          |    1 -
 .../view-on-ether-scan-link.js                |   50 -
 .../view-on-ether-scan-link.test.js           |   39 -
 .../__snapshots__/build-quote.test.js.snap    |    8 +-
 ui/pages/swaps/build-quote/build-quote.js     |    9 +-
 .../swaps/build-quote/build-quote.stories.js  |  213 +-
 .../swaps/build-quote/build-quote.test.js     |    2 +-
 ui/pages/swaps/build-quote/index.scss         |    2 +-
 .../swaps/create-new-swap/create-new-swap.js  |   47 +
 .../create-new-swap/create-new-swap.test.js   |   27 +
 ui/pages/swaps/create-new-swap/index.js       |    1 +
 ui/pages/swaps/create-new-swap/index.scss     |    8 +
 .../dropdown-search-list.js                   |   35 +-
 .../swaps/dropdown-search-list/index.scss     |    4 +-
 .../exchange-rate-display.test.js.snap        |    2 +-
 .../exchange-rate-display.js                  |    2 +-
 .../__snapshots__/fee-card.test.js.snap       |    2 -
 ui/pages/swaps/fee-card/fee-card.js           |   93 +-
 ui/pages/swaps/fee-card/fee-card.test.js      |   62 +-
 ui/pages/swaps/import-token/import-token.js   |    4 +-
 ui/pages/swaps/index.js                       |   38 +-
 ui/pages/swaps/index.scss                     |    4 +-
 ui/pages/swaps/main-quote-summary/README.mdx  |   14 +
 .../main-quote-summary/main-quote-summary.js  |   34 +-
 .../main-quote-summary.stories.js             |   57 +-
 .../searchable-item-list.test.js.snap         |   14 +-
 .../item-list/item-list.component.js          |   57 +-
 .../list-item-search.component.js             |    6 +-
 .../searchable-item-list.js                   |   11 +-
 .../swaps/select-quote-popover/index.scss     |    4 +-
 .../select-quote-popover.test.js              |    1 +
 .../sort-list/sort-list.test.js               |    1 +
 .../slippage-buttons.test.js.snap             |   16 +-
 .../slippage-buttons/slippage-buttons.js      |   26 +-
 .../slippage-buttons/slippage-buttons.test.js |    2 +-
 .../smart-transaction-status.js               |   79 +-
 .../smart-transaction-status.test.js          |    2 +-
 ui/pages/swaps/swaps.util.js                  |   17 +-
 ui/pages/swaps/swaps.util.test.js             |  104 +
 .../view-on-block-explorer.test.js.snap       |   13 +
 .../swaps/view-on-block-explorer/index.js     |    1 +
 .../swaps/view-on-block-explorer/index.scss   |    8 +
 .../view-on-block-explorer.js                 |   47 +
 .../view-on-block-explorer.test.js            |   23 +
 .../view-quote/view-quote-price-difference.js |    6 +-
 ui/pages/swaps/view-quote/view-quote.js       |  333 +-
 ui/pages/swaps/view-quote/view-quote.test.js  |    3 +-
 ui/pages/token-details/token-details-page.js  |   41 +-
 ui/pages/unlock-page/index.scss               |    4 +-
 ui/selectors/confirm-transaction.js           |   23 +
 ui/selectors/custom-gas.js                    |    5 +-
 ui/selectors/custom-gas.test.js               |   49 +-
 ui/selectors/selectors.js                     |   95 +-
 ui/selectors/selectors.test.js                |   23 +
 ui/store/actionConstants.js                   |    1 +
 ui/store/actions.js                           |  258 +-
 ui/store/actions.test.js                      |   76 +-
 yarn.lock                                     | 2645 ++++----
 679 files changed, 34043 insertions(+), 10096 deletions(-)
 create mode 100755 .circleci/scripts/bundle-stats-commit.sh
 create mode 100644 .storybook/4.BREAKPOINTS.stories.mdx
 create mode 100644 .storybook/initial-states/transactions.js
 create mode 100644 app/images/fantom-opera.svg
 create mode 100644 app/images/harmony-one.svg
 create mode 100644 app/images/info-fox.svg
 create mode 100644 app/images/videos/recovery-onboarding/subtitles/el.vtt
 create mode 100644 app/images/videos/recovery-onboarding/subtitles/fr.vtt
 create mode 100644 app/images/videos/recovery-onboarding/subtitles/tr.vtt
 create mode 100644 app/images/videos/recovery-onboarding/subtitles/zh.vtt
 rename app/manifest/{ => v2}/_base.json (95%)
 rename app/manifest/{ => v2}/brave.json (100%)
 rename app/manifest/{ => v2}/chrome.json (100%)
 rename app/manifest/{ => v2}/firefox.json (100%)
 rename app/manifest/{ => v2}/opera.json (100%)
 create mode 100644 app/manifest/v3/_base.json
 create mode 100644 app/manifest/v3/brave.json
 create mode 100644 app/manifest/v3/chrome.json
 create mode 100644 app/manifest/v3/firefox.json
 create mode 100644 app/manifest/v3/opera.json
 delete mode 100644 app/phishing.html
 create mode 100644 app/scripts/app-init.js
 create mode 100644 app/scripts/init-globals.js
 create mode 100644 app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
 create mode 100644 app/scripts/migrations/072.js
 create mode 100644 app/scripts/migrations/072.test.js
 delete mode 100644 app/scripts/phishing-detect.js
 create mode 100644 development/build/constants.js
 create mode 100644 development/charts/flamegraph/chart/index.html
 create mode 100644 development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
 create mode 100644 development/charts/flamegraph/lib/d3-flamegraph.css
 create mode 100644 development/charts/flamegraph/lib/d3-flamegraph.js
 create mode 100644 development/charts/table/index.html
 create mode 100644 development/charts/table/jquery.min.js
 create mode 100644 patches/@lavamoat+lavapack+3.1.0.patch
 delete mode 100644 patches/bip39+2.5.0.patch
 delete mode 100644 patches/eth-hd-keyring+3.6.0.patch
 delete mode 100644 patches/eth-keyring-controller+6.2.1.patch
 create mode 100644 patches/yargs+17.4.1.patch
 create mode 100644 shared/constants/phishing.js
 create mode 100644 shared/modules/mv3.utils.js
 create mode 100644 shared/modules/object.utils.js
 create mode 100644 test/e2e/fixtures/special-settings/state.json
 create mode 100644 test/e2e/lavamoat-stats.js
 create mode 100644 test/e2e/mock-page-with-disallowed-iframe/index.html
 create mode 100644 test/e2e/mock-page-with-iframe/index.html
 create mode 100644 test/e2e/mv3-perf-stats/bundle-size.js
 create mode 100644 test/e2e/mv3-perf-stats/index.js
 create mode 100644 test/e2e/mv3-perf-stats/init-load-stats.js
 create mode 100644 test/e2e/mv3-stats.js
 create mode 100644 test/e2e/phishing-warning-page-server.js
 create mode 100644 test/e2e/seeder/ganache-contract-address-registry.js
 create mode 100644 test/e2e/seeder/ganache-seeder.js
 create mode 100644 test/e2e/seeder/smart-contracts.js
 create mode 100644 test/e2e/snaps/enums.js
 create mode 100644 test/e2e/snaps/test-snap-notification.spec.js
 create mode 100644 test/e2e/tests/custom-token-add-approve.spec.js
 create mode 100644 test/e2e/tests/send-hex-address.spec.js
 create mode 100644 test/e2e/tests/send-to-contract.spec.js
 create mode 100644 test/e2e/tests/state-logs.spec.js
 create mode 100644 test/helpers/file.js
 create mode 100644 ui/components/app/add-network/add-network.test.js
 create mode 100644 ui/components/app/collectible-default-image/collectible-default-image.js
 create mode 100644 ui/components/app/collectible-default-image/collectible-default-image.stories.js
 create mode 100644 ui/components/app/collectible-default-image/index.js
 create mode 100644 ui/components/app/collectible-default-image/index.scss
 create mode 100644 ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
 create mode 100644 ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
 create mode 100644 ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
 create mode 100644 ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
 create mode 100644 ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
 create mode 100644 ui/components/app/modals/new-account-modal/new-account-modal.stories.js
 create mode 100644 ui/components/app/signature-request-original/README.mdx
 create mode 100644 ui/components/app/signature-request-original/signature-request-original.stories.js
 create mode 100644 ui/components/app/transaction-list-item/transaction-list-item.stories.js
 create mode 100644 ui/components/ui/alert/README.mdx
 create mode 100644 ui/components/ui/alert/alert.stories.js
 create mode 100644 ui/components/ui/box/box.test.js
 create mode 100644 ui/components/ui/breadcrumbs/README.mdx
 create mode 100644 ui/components/ui/breadcrumbs/breadcrumbs.stories.js
 create mode 100644 ui/components/ui/confusable/README.mdx
 create mode 100644 ui/components/ui/confusable/confusable.stories.js
 create mode 100644 ui/components/ui/dialog/README.mdx
 create mode 100644 ui/components/ui/dialog/dialog.stories.js
 create mode 100644 ui/components/ui/export-text-container/README.mdx
 create mode 100644 ui/components/ui/export-text-container/export-text.stories.js
 create mode 100644 ui/components/ui/hex-to-decimal/README.mdx
 create mode 100644 ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
 delete mode 100644 ui/components/ui/i18n-value/i18n-value.component.js
 delete mode 100644 ui/components/ui/i18n-value/index.js
 create mode 100644 ui/components/ui/icon/search-icon.js
 create mode 100644 ui/components/ui/logo/logo-coinbasepay.js
 create mode 100644 ui/components/ui/logo/logo-coinbasepay.scss
 create mode 100644 ui/components/ui/page-container/page-container.stories.js
 delete mode 100644 ui/components/ui/search-icon/index.js
 delete mode 100644 ui/components/ui/search-icon/search-icon.component.js
 create mode 100644 ui/components/ui/spinner/spinner.stories.js
 create mode 100644 ui/components/ui/tooltip/tooltip.stories.js
 create mode 100644 ui/css/errors.scss
 create mode 100644 ui/css/loading.scss
 create mode 100644 ui/ducks/send/helpers.js
 create mode 100644 ui/ducks/send/helpers.test.js
 create mode 100644 ui/helpers/constants/critical-error.js
 create mode 100644 ui/helpers/constants/notifications.js
 create mode 100644 ui/helpers/utils/error-utils.js
 create mode 100644 ui/helpers/utils/error-utils.test.js
 create mode 100644 ui/hooks/useAssetDetails.test.js
 create mode 100644 ui/index.test.js
 create mode 100644 ui/pages/add-collectible/add-collectible.test.js
 create mode 100644 ui/pages/notifications/index.js
 create mode 100644 ui/pages/notifications/index.scss
 create mode 100644 ui/pages/notifications/notification.test.js
 create mode 100644 ui/pages/notifications/notifications.js
 delete mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
 delete mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
 delete mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
 delete mode 100644 ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
 create mode 100644 ui/pages/swaps/create-new-swap/create-new-swap.js
 create mode 100644 ui/pages/swaps/create-new-swap/create-new-swap.test.js
 create mode 100644 ui/pages/swaps/create-new-swap/index.js
 create mode 100644 ui/pages/swaps/create-new-swap/index.scss
 create mode 100644 ui/pages/swaps/main-quote-summary/README.mdx
 create mode 100644 ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
 create mode 100644 ui/pages/swaps/view-on-block-explorer/index.js
 create mode 100644 ui/pages/swaps/view-on-block-explorer/index.scss
 create mode 100644 ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
 create mode 100644 ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 749402c7fe6d..8bc591a91df9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,10 +3,10 @@ version: 2.1
 executors:
   node-browsers:
     docker:
-      - image: circleci/node:14-browsers
+      - image: circleci/node:16-browsers
   node-browsers-medium-plus:
     docker:
-      - image: circleci/node:14-browsers
+      - image: circleci/node:16-browsers
     resource_class: medium+
     environment:
       NODE_OPTIONS: --max_old_space_size=2048
@@ -53,6 +53,9 @@ workflows:
       - prep-build-test:
           requires:
             - prep-deps
+      - prep-build-test-mv3:
+          requires:
+            - prep-deps
       - prep-build-test-flask:
           requires:
             - prep-deps
@@ -133,6 +136,9 @@ workflows:
       - benchmark:
           requires:
             - prep-build-test
+      - stats-module-load-init:
+          requires:
+            - prep-build-test-mv3
       - job-publish-prerelease:
           requires:
             - prep-deps
@@ -140,7 +146,9 @@ workflows:
             - prep-build-beta
             - prep-build-flask
             - prep-build-storybook
+            - prep-build-test-mv3
             - benchmark
+            - stats-module-load-init
             - all-tests-pass
       - job-publish-release:
           filters:
@@ -200,8 +208,8 @@ jobs:
       - persist_to_workspace:
           root: .
           paths:
-          - node_modules
-          - build-artifacts
+            - node_modules
+            - build-artifacts
 
   validate-lavamoat-config:
     executor: node-browsers-medium-plus
@@ -305,6 +313,26 @@ jobs:
             - dist-test-flask
             - builds-test-flask
 
+  prep-build-test-mv3:
+    executor: node-browsers-medium-plus
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build extension in mv3 for testing
+          command: yarn build:test:mv3
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test-mv3
+      - run:
+          name: Move test zips to 'builds-test' to avoid conflict with production build
+          command: mv ./builds ./builds-test-mv3
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-test-mv3
+            - builds-test-mv3
 
   prep-build-test:
     executor: node-browsers-medium-plus
@@ -419,7 +447,6 @@ jobs:
                 name: Validate release candidate changelog
                 command: yarn lint:changelog:rc
 
-
   test-deps-audit:
     executor: node-browsers
     steps:
@@ -574,6 +601,43 @@ jobs:
           paths:
             - test-artifacts
 
+  stats-module-load-init:
+    executor: node-browsers-medium-plus
+    steps:
+      - checkout
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mv3 ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mv3 ./builds
+      - run:
+          name: Run page load benchmark
+          command: |
+            mkdir -p test-artifacts/chrome/mv3
+            cp -R development/charts/flamegraph test-artifacts/chrome/mv3/initialisation
+            cp -R development/charts/flamegraph/chart test-artifacts/chrome/mv3/initialisation/background
+            cp -R development/charts/flamegraph/chart test-artifacts/chrome/mv3/initialisation/ui
+            cp -R development/charts/table test-artifacts/chrome/mv3/load_time
+      - run:
+          name: Run page load benchmark
+          command: yarn mv3:stats:chrome --out test-artifacts/chrome/mv3
+      - run:
+          name: Record bundle size at commit
+          command: ./.circleci/scripts/bundle-stats-commit.sh
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - persist_to_workspace:
+          root: .
+          paths:
+            - test-artifacts
+
   job-publish-prerelease:
     executor: node-browsers
     steps:
@@ -648,7 +712,7 @@ jobs:
     steps:
       - add_ssh_keys:
           fingerprints:
-            - "3d:49:29:f4:b2:e8:ea:af:d1:32:eb:2a:fc:15:85:d8"
+            - '3d:49:29:f4:b2:e8:ea:af:d1:32:eb:2a:fc:15:85:d8'
       - checkout
       - attach_workspace:
           at: .
@@ -670,7 +734,7 @@ jobs:
       - run:
           name: test:coverage:jest
           command: yarn test:coverage:jest
-      - run: 
+      - run:
           name: Validate coverage thresholds
           command: |
             if ! git diff --exit-code jest.config.js development/jest.config.js; then
diff --git a/.circleci/scripts/bundle-stats-commit.sh b/.circleci/scripts/bundle-stats-commit.sh
new file mode 100755
index 000000000000..7c0894430386
--- /dev/null
+++ b/.circleci/scripts/bundle-stats-commit.sh
@@ -0,0 +1,70 @@
+#!/usr/bin/env bash
+
+set -e
+set -u
+set -o pipefail
+
+if [[ "${CI:-}" != 'true' ]]
+then
+    printf '%s\n' 'CI environment variable must be set to true'
+    exit 1
+fi
+
+if [[ "${CIRCLECI:-}" != 'true' ]]
+then
+    printf '%s\n' 'CIRCLECI environment variable must be set to true'
+    exit 1
+fi
+
+if [[ -z "${GITHUB_TOKEN:-}" ]]
+then
+    printf '%s\n' 'GITHUB_TOKEN environment variable must be set'
+    exit 1
+elif [[ -z "${GITHUB_TOKEN_USER:-}" ]]
+then
+    printf '%s\n' 'GITHUB_TOKEN_USER environment variable must be set'
+    exit 1
+fi
+
+printf '%s\n' 'Commit the manifest version and changelog if the manifest has changed'
+
+if [[ "${CIRCLE_BRANCH}" != "develop" ]]
+then
+    printf 'This is not develop branch'
+    exit 0
+fi
+
+mkdir temp
+
+git config --global user.email "metamaskbot@users.noreply.github.com"
+
+git config --global user.name "MetaMask Bot"
+
+git clone git@github.com:MetaMask/extension_bundlesize_stats.git temp
+
+if [[ -f "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json" ]]
+then
+    printf 'Bundle size of the commit is already recorded'
+    cd ..
+    rm -rf temp
+    exit 0
+fi
+
+cp -R test-artifacts/chrome/mv3/bundle_size.json temp/stats
+
+echo " bundle_size_stats-${CIRCLE_SHA1}.json" >> temp/stats/fileList.txt
+
+mv temp/stats/bundle_size.json "temp/stats/bundle_size_stats-${CIRCLE_SHA1}.json"
+
+cd temp
+
+git add .
+
+git commit --message "Bundle size at commit: ${CIRCLE_SHA1}"
+
+repo_slug="$CIRCLE_PROJECT_USERNAME/extension_bundlesize_stats"
+git push "https://$GITHUB_TOKEN_USER:$GITHUB_TOKEN@github.com/$repo_slug" main
+
+cd ..
+
+rm -rf temp
diff --git a/.circleci/scripts/chrome-install.sh b/.circleci/scripts/chrome-install.sh
index 441e61124f92..dcd122fb8399 100755
--- a/.circleci/scripts/chrome-install.sh
+++ b/.circleci/scripts/chrome-install.sh
@@ -5,12 +5,12 @@ set -u
 set -o pipefail
 
 # To get the latest version, see <https://www.ubuntuupdates.org/ppa/google_chrome?dist=stable>
-CHROME_VERSION='101.0.4951.54-1'
+CHROME_VERSION='103.0.5060.53-1'
 CHROME_BINARY="google-chrome-stable_${CHROME_VERSION}_amd64.deb"
 CHROME_BINARY_URL="https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/${CHROME_BINARY}"
 
 # To retrieve this checksum, run the `wget` and `shasum` commands below
-CHROME_BINARY_SHA512SUM='46ebc53c806f179a5f9ab570c1097c2d35fc437dd4f5bd3fb34e758dc4f306771ceb05f8df7d450584355abf35bae34c0e70903e4f0312e2d3caa34491c8f622'
+CHROME_BINARY_SHA512SUM='36f4e79f46cb71c1431dccf1489f5f8e89d35204a717a4618c7f6f638123ddc2b37bd5cbd00498be8f84c7713149f2faa447cb6da3518be1cb9703e99d110e1a'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 
diff --git a/.circleci/scripts/firefox-install.sh b/.circleci/scripts/firefox-install.sh
index 0c3512114796..f2f9f284d1d0 100755
--- a/.circleci/scripts/firefox-install.sh
+++ b/.circleci/scripts/firefox-install.sh
@@ -4,7 +4,7 @@ set -e
 set -u
 set -o pipefail
 
-FIREFOX_VERSION='83.0'
+FIREFOX_VERSION='102.0'
 FIREFOX_BINARY="firefox-${FIREFOX_VERSION}.tar.bz2"
 FIREFOX_BINARY_URL="https://ftp.mozilla.org/pub/firefox/releases/${FIREFOX_VERSION}/linux-x86_64/en-US/${FIREFOX_BINARY}"
 FIREFOX_PATH='/opt/firefox'
diff --git a/.depcheckrc.yml b/.depcheckrc.yml
index 50c309973fe3..2652ffb2b097 100644
--- a/.depcheckrc.yml
+++ b/.depcheckrc.yml
@@ -17,6 +17,7 @@ ignores:
   # used in testing + ci
   - '@metamask/auto-changelog' # invoked as `auto-changelog`
   - '@metamask/forwarder'
+  - '@metamask/phishing-warning' # statically hosted as part of some e2e tests
   - '@metamask/test-dapp'
   - '@metamask/design-tokens' # Only imported in index.css
   - '@tsconfig/node14' # required dynamically by TS, used in tsconfig.json
diff --git a/.eslintrc.js b/.eslintrc.js
index 2001994f4915..16c28cf7dc2b 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -8,6 +8,7 @@ module.exports = {
     'app/vendor/**',
     'builds/**/*',
     'development/chromereload.js',
+    'development/charts/**',
     'dist/**/*',
     'node_modules/**/*',
   ],
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index f15418ea6d08..6df4c6e65ac4 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -49,8 +49,11 @@ How should reviewers and QA manually test your changes? For instance:
 ## Pre-Merge Checklist
 
 - [ ] PR template is filled out
-- [ ] Manual testing complete & passed
 - [ ] **IF** this PR fixes a bug, a test that _would have_ caught the bug has been added
 - [ ] PR is linked to the appropriate GitHub issue
-- [ ] **IF** QA attention is required, "QA Board" label has been applied
 - [ ] PR has been added to the appropriate release Milestone
+
+### + If there are functional changes:
+
+- [ ] Manual testing complete & passed
+- [ ] "Extension QA Board" label has been applied
diff --git a/.iyarc b/.iyarc
index 583324582de8..bbd5d06c106d 100644
--- a/.iyarc
+++ b/.iyarc
@@ -1,4 +1,5 @@
 # improved-yarn-audit advisory exclusions
 GHSA-93q8-gq69-wqmw
 GHSA-257v-vj4p-3w2h
-GHSA-fwr7-v2mv-hh25
+GHSA-wm7h-9275-46v2
+GHSA-pfrx-2q88-qq97
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
index 29dbcb2f791f..d3bff3b467b9 100644
--- a/.metamaskrc.dist
+++ b/.metamaskrc.dist
@@ -6,3 +6,6 @@ ONBOARDING_V2=
 SWAPS_USE_DEV_APIS=
 COLLECTIBLES_V1=
 TOKEN_DETECTION_V2=
+
+; Set this to test changes to the phishing warning page.
+PHISHING_WARNING_PAGE_URL=
diff --git a/.nvmrc b/.nvmrc
index 958b5a36e1fa..6f7f377bf514 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v14
+v16
diff --git a/.storybook/1.INTRODUCTION.stories.mdx b/.storybook/1.INTRODUCTION.stories.mdx
index 23ba7e8f7fb7..2633d11aedb3 100644
--- a/.storybook/1.INTRODUCTION.stories.mdx
+++ b/.storybook/1.INTRODUCTION.stories.mdx
@@ -8,7 +8,7 @@ Welcome to the MetaMask Browser Extension Storybook.
 
 ## Building locally and Contributing
 
-This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of Metamask up and running or contribute to the extension codebase please read the Metamask [README.md](https://github.com/MetaMask/metamask-extension)
+This document is currently only specific to storybook best practices and component documentation guidelines. This may change in future but for now if you are looking to get a local build of MetaMask up and running or contribute to the extension codebase please read the MetaMask [README.md](https://github.com/MetaMask/metamask-extension)
 
 ## Documentation Guidelines
 
diff --git a/.storybook/3.COLORS.stories.mdx b/.storybook/3.COLORS.stories.mdx
index b694a721ad84..fce6ef662839 100644
--- a/.storybook/3.COLORS.stories.mdx
+++ b/.storybook/3.COLORS.stories.mdx
@@ -1,20 +1,12 @@
 import { Meta } from '@storybook/addon-docs';
-import ActionaleMessage from '../ui/components/ui/actionable-message';
 import designTokenDiagramImage from './images/design.token.graphic.svg';
 
-<Meta title="Design Tokens / Color" />
+<Meta title="Foundations / Color" />
 
 # Color
 
 Color is used to express style and communicate meaning.
 
-<ActionaleMessage
-  type="warning"
-  message="We are in the process of consolidating all of our colors, making them accessible and enabling theming. Many of the colors used throughout the codebase are deprecated please follow the guide below to ensure you are using the correct colors when building MetaMask UI"
-/>
-
-<br />
-
 ## Design tokens
 
 We are importing design tokens as CSS variables from [@metamask/design-tokens](https://github.com/MetaMask/design-tokens) repo to help consolidate colors and enable theming across all MetaMask products.
@@ -67,6 +59,7 @@ var(--color-text-muted)
 
 /** Icons */
 var(--color-icon-default)
+var(--color-icon-alternative)
 var(--color-icon-muted)
 
 /** Borders */
@@ -75,20 +68,20 @@ var(--color-border-muted)
 
 /** Overlays */
 var(--color-overlay-default)
-var(--color-overlay-inverse)
+var(--color-overlay-inverse) [DEPRECATED]
 
 /** User Actions */
 var(--color-primary-default)
 var(--color-primary-alternative)
 var(--color-primary-muted)
 var(--color-primary-inverse)
-var(--color-primary-disabled)
+var(--color-primary-disabled) [DEPRECATED]
 
-var(--color-secondary-default)
-var(--color-secondary-alternative)
-var(--color-secondary-muted)
-var(--color-secondary-inverse)
-var(--color-secondary-disabled)
+var(--color-secondary-default) [DEPRECATED]
+var(--color-secondary-alternative) [DEPRECATED]
+var(--color-secondary-muted) [DEPRECATED]
+var(--color-secondary-inverse) [DEPRECATED]
+var(--color-secondary-disabled) [DEPRECATED]
 
 /** States */
 /** Error */
@@ -96,28 +89,28 @@ var(--color-error-default)
 var(--color-error-alternative)
 var(--color-error-muted)
 var(--color-error-inverse)
-var(--color-error-disabled)
+var(--color-error-disabled) [DEPRECATED]
 
 /** Warning */
 var(--color-warning-default)
-var(--color-warning-alternative)
+var(--color-warning-alternative) [DEPRECATED]
 var(--color-warning-muted)
 var(--color-warning-inverse)
-var(--color-warning-disabled)
+var(--color-warning-disabled) [DEPRECATED]
 
 /** Success */
 var(--color-success-default)
-var(--color-success-alternative)
+var(--color-success-alternative) [DEPRECATED]
 var(--color-success-muted)
 var(--color-success-inverse)
-var(--color-success-disabled)
+var(--color-success-disabled) [DEPRECATED]
 
 /** Info */
 var(--color-info-default)
-var(--color-info-alternative)
+var(--color-info-alternative) [DEPRECATED]
 var(--color-info-muted)
 var(--color-info-inverse)
-var(--color-info-disabled)
+var(--color-info-disabled) [DEPRECATED]
 ```
 
 ### **Component colors** (tier 3)
diff --git a/.storybook/4.BREAKPOINTS.stories.mdx b/.storybook/4.BREAKPOINTS.stories.mdx
new file mode 100644
index 000000000000..1ddd2c42087d
--- /dev/null
+++ b/.storybook/4.BREAKPOINTS.stories.mdx
@@ -0,0 +1,125 @@
+import { Meta } from '@storybook/addon-docs';
+
+<Meta title="Foundations / Breakpoints" />
+
+# Breakpoints
+
+Breakpoints are used for responsive layout
+
+## Screen Sizes
+
+There are 4 screen sizes that make up the breakpoints for the MetaMask extension
+
+- base: `0px`
+- sm: `576px`
+- md: `768px`
+- lg: `1280px`
+
+### SCSS
+
+There are Sass variables and mixins available for use for both min and max screens sizes
+
+### Variables
+
+```css
+$screen-sm-max /* 575px */
+$screen-md-max /* 767px */
+$screen-lg-max /* 1279px */
+
+$screen-sm-min /* 576px */
+$screen-md-min /* 768px */
+$screen-lg-min /* 1280px */
+```
+
+### Mixins
+
+```css
+/* Max screen size */
+@include screen-sm-max {
+  /* equivalent css @media screen and (max-width: 575px) */
+}
+@include screen-md-max {
+  /* equivalent css @media screen and (max-width: 767px) */
+}
+@include screen-lg-max {
+  /* equivalent css @media screen and (max-width: 1279px) */
+}
+
+/* Min screen size */
+@include screen-sm-min {
+  /* equivalent css @media screen and (min-width: 576px) */
+}
+@include screen-md-min {
+  /* equivalent css @media screen and (min-width: 768px) */
+}
+@include screen-lg-min {
+  /* equivalent css @media screen and (min-width: 1280px) */
+}
+```
+
+Migrating from the old sass variables to the new mixins looks like this
+
+```css
+/* Max width */
+/* Instead of the media query and sass variable */
+@media screen and (max-width: $break-small) {
+  right: 16px;
+}
+
+/* Use the sass mixin */
+@include screen-sm-max {
+  right: 16px;
+}
+
+/* Min width */
+/* Instead of the media query and sass variable */
+@media screen and (min-width: $break-large) {
+  left: 16px;
+}
+
+/* Use the sass mixin */
+@include screen-sm-min {
+  left: 16px;
+}
+```
+
+## Takeaways
+
+- Try to avoid using static media queries in your code.
+- Try to use the provided SCSS mixins
+
+### ❌ Don't do this
+
+Don't use static media queries in your code.
+
+```css
+/**
+* Don't do this
+* Static media queries create inconsistency and could break the UI if we want to update them in future
+**/
+.account-menu {
+  @media screen and (min-width: 769px) {
+    right: calc((100vw - 80vw) / 2);
+  }
+
+  @media screen and (min-width: 1281px) {
+    right: calc((100vw - 65vw) / 2);
+  }
+}
+```
+
+### ✅ Do this
+
+Do use the provided Sass mixins
+
+```css
+.account-menu {
+  @include screen-md-min {
+    right: calc((100vw - 80vw) / 2);
+  }
+
+  @include screen-lg-min {
+    right: calc((100vw - 65vw) / 2);
+  }
+}
+```
diff --git a/.storybook/initial-states/transactions.js b/.storybook/initial-states/transactions.js
new file mode 100644
index 000000000000..34b848712231
--- /dev/null
+++ b/.storybook/initial-states/transactions.js
@@ -0,0 +1,1921 @@
+const MOCK_TX_TYPE = {
+  CANCEL: 'cancel',
+  CONTRACT_INTERACTION: 'contractInteraction',
+  DEPLOY_CONTRACT: 'contractDeployment',
+  ETH_DECRYPT: 'eth_decrypt',
+  ETH_GET_ENCRYPTION_PUBLIC_KEY: 'eth_getEncryptionPublicKey',
+  INCOMING: 'incoming',
+  PERSONAL_SIGN: 'personal_sign',
+  RETRY: 'retry',
+  SIGN: 'eth_sign',
+  SIGN_TYPED_DATA: 'eth_signTypedData',
+  SIMPLE_SEND: 'simpleSend',
+  SMART: 'smart',
+  SWAP: 'swap',
+  SWAP_APPROVAL: 'swapApproval',
+  TOKEN_METHOD_APPROVE: 'approve',
+  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
+  TOKEN_METHOD_TRANSFER: 'transfer',
+  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
+};
+
+export const MOCK_TRANSACTION_BY_TYPE = {
+  [MOCK_TX_TYPE.CANCEL]: {
+    id: 643368596521636,
+    time: 1653527035634,
+    status: 'submitted',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '5208',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: null,
+    sendFlowHistory: [],
+    txParams: {
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      to: '0xefge7847fd3661a9b7c86aaf1daea08d9da5750e',
+      nonce: '0x51',
+      value: '0x0',
+      gas: '0x5208',
+      gasPrice: '0x59682f0e',
+      estimateSuggested: 'medium',
+      estimateUsed: 'custom',
+    },
+    previousGasParams: {
+      gasPrice: '0x3b9aca00',
+    },
+    type: 'cancel',
+    history: [
+      {
+        id: 643368596521636,
+        time: 1653527035634,
+        status: 'approved',
+        metamaskNetworkId: '4',
+        originalGasEstimate: '5208',
+        userEditedGasLimit: false,
+        chainId: '0x4',
+        loadingDefaults: false,
+        dappSuggestedGasFees: null,
+        sendFlowHistory: [],
+        txParams: {
+          from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+          to: '0xefge7847fd3661a9b7c86aaf1daea08d9da5750e',
+          nonce: '0x51',
+          value: '0x0',
+          gas: '0x5208',
+          gasPrice: '0x59682f0e',
+          estimateSuggested: 'medium',
+          estimateUsed: 'custom',
+        },
+        previousGasParams: {
+          gasPrice: '0x3b9aca00',
+        },
+        type: 'cancel',
+      },
+      [
+        {
+          op: 'add',
+          path: '/nonceDetails',
+          value: {
+            params: {
+              highestLocallyConfirmed: 81,
+              highestSuggested: 81,
+              nextNetworkNonce: 81,
+            },
+            local: {
+              name: 'local',
+              nonce: 83,
+              details: {
+                startPoint: 81,
+                highest: 83,
+              },
+            },
+            network: {
+              name: 'network',
+              nonce: 81,
+              details: {
+                blockNumber: '0xa3e3ac',
+                baseCount: 81,
+              },
+            },
+          },
+          note: 'transactions#approveTransaction',
+          timestamp: 1653527035723,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/r',
+          value:
+            '0xb66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347',
+          note: 'transactions#signTransaction: add r, s, v values',
+          timestamp: 1653527035817,
+        },
+        {
+          op: 'add',
+          path: '/s',
+          value:
+            '0x3a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
+        },
+        {
+          op: 'add',
+          path: '/v',
+          value: '0x2b',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'signed',
+          note: 'txStateManager: setting status to signed',
+          timestamp: 1653527035818,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/rawTx',
+          value:
+            '0xf863518459682f0e82520894e56e7847fd3661a9b7c86aaf1daea08d9da5750e80802ba0b66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347a03a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
+          note: 'transactions#publishTransaction',
+          timestamp: 1653527035819,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/hash',
+          value:
+            '0xb7628b82716108edcfe84dfd6ed49b219bc019e3fc6e96cf95548c32a67c1cbc',
+          note: 'transactions#setTxHash',
+          timestamp: 1653527035923,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/submittedTime',
+          value: 1653527035924,
+          note: 'txStateManager - add submitted time stamp',
+          timestamp: 1653527035924,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'submitted',
+          note: 'txStateManager: setting status to submitted',
+          timestamp: 1653527035925,
+        },
+      ],
+    ],
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 81,
+        highestSuggested: 81,
+        nextNetworkNonce: 81,
+      },
+      local: {
+        name: 'local',
+        nonce: 83,
+        details: {
+          startPoint: 81,
+          highest: 83,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 81,
+        details: {
+          blockNumber: '0xa3e3ac',
+          baseCount: 81,
+        },
+      },
+    },
+    r: '0xb66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347',
+    s: '0x3a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
+    v: '0x2b',
+    rawTx:
+      '0xf863518459682f0e82520894e56e7847fd3661a9b7c86aaf1daea08d9da5750e80802ba0b66eff07d9061c42e47ccf5f6a52b6626ef4d5b10e50d8aa6b8f20ae645fe347a03a2da8d56beff82a2d59e807f7d578f0c3b4b99cd6d3735c72c133d06fe02a9d',
+    hash: '0xb7628b82716108edcfe84dfd6ed49b219bc019e3fc6e96cf95548c32a67c1cbc',
+    submittedTime: 1653527035924,
+  },
+  [MOCK_TX_TYPE.CONTRACT_INTERACTION]: {
+    chainId: '0x4',
+    dappSuggestedGasFees: {
+      gas: '0x118f4',
+      maxFeePerGas: '0x9502f91a',
+      maxPriorityFeePerGas: '0x9502F900',
+    },
+    id: 7694052085150913,
+    loadingDefaults: true,
+    metamaskNetworkId: '4',
+    origin: 'https://remix.ethereum.org',
+    originalGasEstimate: '0x118f4',
+    sendFlowHistory: [],
+    status: 'unapproved',
+    time: 1653417884003,
+    txParams: {
+      data:
+        '0xa1448194000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e0000000000000000000000000000000000000000000000000000000000000004',
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      gas: '0x118f4',
+      maxFeePerGas: '0x9502f91a',
+      maxPriorityFeePerGas: '0x9502F900',
+      to: '0xefg6c980a3fcd3100503d8f80537eefcee516d67',
+      type: '0x2',
+      value: '0x0',
+    },
+    type: 'contractInteraction',
+    userEditedGasLimit: false,
+  },
+  [MOCK_TX_TYPE.DEPLOY_CONTRACT]: {
+    blockNumber: '6195527',
+    id: 4243712234858468,
+    metamaskNetworkId: '4',
+    status: 'confirmed',
+    time: 1585088013000,
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
+    type: 'contractDeployment',
+    origin: 'https://metamask.github.io',
+  },
+  [MOCK_TX_TYPE.ETH_DECRYPT]: {
+    id: 5177046356058652,
+    msgParams: {
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      data:
+        '0x7b2276657273696f6e223a227832353531392d7873616c736132302d706f6c7931333035222c226e6f6e6365223a22415a7a535971376139725531396e3835753174494f5765367a486e32775a6166222c22657068656d5075626c69634b6579223a2251336d346650474a6b6a32396d44766f7133536a77616733686b3651366571744236397671795258517a673d222c2263697068657274657874223a223943556d614c327a69635a5838584c4d5a75646b58392f6531544770384d61513135776276774c6d442b4235772b4f706655694c586c586d55355536645339675638584c61445557446e656735546b3d227d',
+      origin: 'https://metamask.github.io',
+    },
+    time: 1653450860396,
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    status: 'unapproved',
+    type: 'eth_decrypt',
+  },
+  [MOCK_TX_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]: {
+    id: 5177046356058645,
+    msgParams: '0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e',
+    time: 1653450802102,
+    status: 'unapproved',
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    type: 'eth_getEncryptionPublicKey',
+    origin: 'https://metamask.github.io',
+  },
+  [MOCK_TX_TYPE.INCOMING]: {
+    blockNumber: '6477257',
+    id: 4243712234858505,
+    metamaskNetworkId: '4',
+    status: 'confirmed',
+    time: 1589314295000,
+    txParams: {
+      from: '0xabc98d14007bdee637298086988a0bbd31184523',
+      gas: '0x5208',
+      gasPrice: '0x3b9aca00',
+      nonce: '0x56540',
+      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
+      value: '0x1043561a882930000',
+    },
+    hash: '0x5ca26d1cdcabef1ac2ad5b2b38604c9ced65d143efc7525f848c46f28e0e4116',
+    type: 'incoming',
+  },
+  [MOCK_TX_TYPE.PERSONAL_SIGN]: {
+    id: 5177046356058671,
+    msgParams: {
+      0: 'E',
+      1: 'x',
+      2: 'a',
+      3: 'm',
+      4: 'p',
+      5: 'l',
+      6: 'e',
+      7: ' ',
+      8: 'p',
+      9: 'a',
+      10: 's',
+      11: 's',
+      12: 'w',
+      13: 'o',
+      14: 'r',
+      15: 'd',
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      data: '0x4578616d706c652060706572736f6e616c5f7369676e60206d657373616765',
+      origin: 'https://metamask.github.io',
+    },
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    time: 1653451036121,
+    status: 'unapproved',
+    type: 'personal_sign',
+  },
+  [MOCK_TX_TYPE.RETRY]: {
+    id: 3938342322880462,
+    time: 1653459456297,
+    status: 'failed',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '14609',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: null,
+    sendFlowHistory: [],
+    txParams: {
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      nonce: '0x7',
+      value: '0x0',
+      data:
+        '0x6080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032',
+      gas: '0x14609',
+      maxFeePerGas: '0x3b9aca0d',
+      maxPriorityFeePerGas: '0x3b9aca00',
+      estimateSuggested: 'medium',
+      estimateUsed: 'low',
+    },
+    previousGasParams: {
+      maxFeePerGas: '0x3b9aca0b',
+      maxPriorityFeePerGas: '0xbebc200',
+    },
+    type: 'retry',
+    estimatedBaseFee: 'd',
+    history: [
+      {
+        id: 3938342322880462,
+        time: 1653459456297,
+        status: 'approved',
+        metamaskNetworkId: '4',
+        originalGasEstimate: '14609',
+        userEditedGasLimit: false,
+        chainId: '0x4',
+        loadingDefaults: false,
+        dappSuggestedGasFees: null,
+        sendFlowHistory: [],
+        txParams: {
+          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+          nonce: '0x7',
+          value: '0x0',
+          data:
+            '0x6080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032',
+          gas: '0x14609',
+          maxFeePerGas: '0x3b9aca0d',
+          maxPriorityFeePerGas: '0x3b9aca00',
+          estimateSuggested: 'medium',
+          estimateUsed: 'low',
+        },
+        previousGasParams: {
+          maxFeePerGas: '0x3b9aca0b',
+          maxPriorityFeePerGas: '0xbebc200',
+        },
+        type: 'retry',
+        estimatedBaseFee: 'd',
+      },
+      [
+        {
+          op: 'add',
+          path: '/nonceDetails',
+          value: {
+            params: {
+              highestLocallyConfirmed: 7,
+              highestSuggested: 7,
+              nextNetworkNonce: 7,
+            },
+            local: {
+              name: 'local',
+              nonce: 10,
+              details: {
+                startPoint: 7,
+                highest: 10,
+              },
+            },
+            network: {
+              name: 'network',
+              nonce: 7,
+              details: {
+                blockNumber: '0xa3d235',
+                baseCount: 7,
+              },
+            },
+          },
+          note: 'transactions#approveTransaction',
+          timestamp: 1653459456415,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/r',
+          value:
+            '0xde2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26',
+          note: 'transactions#signTransaction: add r, s, v values',
+          timestamp: 1653459456512,
+        },
+        {
+          op: 'add',
+          path: '/s',
+          value:
+            '0x64ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
+        },
+        {
+          op: 'add',
+          path: '/v',
+          value: '0x00',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'signed',
+          note: 'txStateManager: setting status to signed',
+          timestamp: 1653459456512,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/rawTx',
+          value:
+            '0x02f901010407843b9aca00843b9aca0d830146098080b8a96080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032c080a0de2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26a064ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
+          note: 'transactions#publishTransaction',
+          timestamp: 1653459456514,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/err',
+          value: {
+            message:
+              '[ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'',
+            stack:
+              'Error: [ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'\n  at chrome-extension://hbljfohiafgaaaabejngpgolnboohpaf/common-5.js:14346:29',
+          },
+          note: 'transactions:tx-state-manager#fail - add error',
+          timestamp: 1653459456632,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'failed',
+          note: 'txStateManager: setting status to failed',
+          timestamp: 1653459456633,
+        },
+      ],
+    ],
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 7,
+        highestSuggested: 7,
+        nextNetworkNonce: 7,
+      },
+      local: {
+        name: 'local',
+        nonce: 10,
+        details: {
+          startPoint: 7,
+          highest: 10,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 7,
+        details: {
+          blockNumber: '0xa3d235',
+          baseCount: 7,
+        },
+      },
+    },
+    r: '0xde2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26',
+    s: '0x64ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
+    v: '0x00',
+    rawTx:
+      '0x02f901010407843b9aca00843b9aca0d830146098080b8a96080604052348015600f57600080fd5b50608b8061001e6000396000f3fe6080604052610fff3411600e57fe5b3373ffffffffffffffffffffffffffffffffffffffff166108fc349081150290604051600060405180830381858888f193505050501580156053573d6000803e3d6000fd5b5000fea265627a7a72315820631b0dbb6b871cdbfdec2773af15ebfb8e52c794cf836fe27ec21f1aed17180f64736f6c634300050c0032c080a0de2e3131fb55b1edd182de128453521c86eed588f92058b61b3ce56cdfb33a26a064ee1eef8d0fa1b35e122658554d16645366e8977253fc1c47d030f28736409b',
+    err: {
+      message:
+        '[ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'',
+      stack:
+        'Error: [ethjs-query] while formatting outputs from RPC \'{"value":{"code":-32000,"message":"replacement transaction underpriced"}}\'\n  at chrome-extension://hbljfohiafgaaaabejngpgolnboohpaf/common-5.js:14346:29',
+    },
+  },
+  [MOCK_TX_TYPE.SIGN]: {
+    id: 5177046356058675,
+    msgParams: {
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      data:
+        '0x879a053d4800c6354e76c7985a865d2922c82fb5b3f4577b2fe08b998954f2e0',
+      origin: 'https://metamask.github.io',
+    },
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    time: 1653451051909,
+    status: 'unapproved',
+    type: 'eth_sign',
+  },
+  [MOCK_TX_TYPE.SIGN_TYPED_DATA]: {
+    id: 5177046356058598,
+    msgParams: {
+      from: '0xabce7847fd3661a9b7c86aaf1daea08d9da5750e',
+      data: [
+        {
+          type: 'string',
+          name: 'Message',
+          value: 'Hi, Alice!',
+        },
+        {
+          type: 'uint32',
+          name: 'A number',
+          value: '1337',
+        },
+      ],
+      version: 'V1',
+      origin: 'https://metamask.github.io',
+    },
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    time: 1653450005954,
+    status: 'unapproved',
+    type: 'eth_signTypedData',
+  },
+  [MOCK_TX_TYPE.SIMPLE_SEND]: {
+    id: 4243712234858512,
+    time: 1589314601567,
+    status: 'confirmed',
+    metamaskNetworkId: '4',
+    loadingDefaults: false,
+    txParams: {
+      from: '0xabca64466f257793eaa52fcfff5066894b76a149',
+      to: '0xefg5bc4e8f1f969934d773fa67da095d2e491a97',
+      nonce: '0xc',
+      value: '0xde0b6b3a7640000',
+      gas: '0x5208',
+      gasPrice: '0x2540be400',
+    },
+    origin: 'metamask',
+    type: 'simpleSend',
+  },
+  [MOCK_TX_TYPE.SMART]: {
+    blockNumber: '6195527',
+    id: 4243712234858468,
+    metamaskNetworkId: '4',
+    status: 'confirmed',
+    time: 1585088013000,
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      value: '0x00',
+      data:
+        '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+    },
+    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
+    transactionType: 'smart',
+    type: 'contractDeployment',
+    origin: 'https://metamask.github.io',
+  },
+  [MOCK_TX_TYPE.SWAP]: {
+    blockNumber: '6195527',
+    id: 4243712234858467,
+    metamaskNetworkId: '4',
+    status: 'confirmed',
+    time: 1585088013000,
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
+      value: '0xde0b6b3a7640000',
+    },
+    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
+    destinationTokenSymbol: 'ABC',
+    sourceTokenSymbol: 'ETH',
+    type: 'swap',
+  },
+  [MOCK_TX_TYPE.SWAP_APPROVAL]: {
+    blockNumber: '6195527',
+    id: 4243712234858467,
+    metamaskNetworkId: '4',
+    status: 'confirmed',
+    time: 1585088013000,
+    txParams: {
+      from: '0xabc14609ef9e09776ac5fe00bdbfef57bcdefebb',
+      gas: '0x5208',
+      gasPrice: '0x77359400',
+      nonce: '0x3',
+      to: '0xefga64466f257793eaa52fcfff5066894b76a149',
+      value: '0xde0b6b3a7640000',
+    },
+    hash: '0xbcb195f393f4468945b4045cd41bcdbc2f19ad75ae92a32cf153a3004e42009a',
+    destinationTokenSymbol: 'ABC',
+    type: 'swapApproval',
+    sourceTokenSymbol: 'XBN',
+  },
+  [MOCK_TX_TYPE.TOKEN_METHOD_APPROVE]: {
+    id: 5177046356058729,
+    time: 1653457101080,
+    status: 'submitted',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '0xb427',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: {
+      gasPrice: '0x4a817c800',
+      gas: '0xb427',
+    },
+    sendFlowHistory: [],
+    txParams: {
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+      nonce: '0x5',
+      value: '0x0',
+      data:
+        '0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170',
+      gas: '0xb427',
+      maxFeePerGas: '0x4a817c800',
+      maxPriorityFeePerGas: '0x4a817c800',
+    },
+    origin: 'https://metamask.github.io',
+    type: 'approve',
+    history: [
+      {
+        id: 5177046356058729,
+        time: 1653457101080,
+        status: 'unapproved',
+        metamaskNetworkId: '4',
+        originalGasEstimate: '0xb427',
+        userEditedGasLimit: false,
+        chainId: '0x4',
+        loadingDefaults: true,
+        dappSuggestedGasFees: {
+          gasPrice: '0x4a817c800',
+          gas: '0xb427',
+        },
+        sendFlowHistory: [],
+        txParams: {
+          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+          to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+          value: '0x0',
+          data:
+            '0x095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170',
+          gas: '0xb427',
+          gasPrice: '0x4a817c800',
+        },
+        origin: 'https://metamask.github.io',
+        type: 'approve',
+      },
+      [
+        {
+          op: 'remove',
+          path: '/txParams/gasPrice',
+          note: 'Added new unapproved transaction.',
+          timestamp: 1653457101715,
+        },
+        {
+          op: 'add',
+          path: '/txParams/maxFeePerGas',
+          value: '0x4a817c800',
+        },
+        {
+          op: 'add',
+          path: '/txParams/maxPriorityFeePerGas',
+          value: '0x4a817c800',
+        },
+        {
+          op: 'replace',
+          path: '/loadingDefaults',
+          value: false,
+        },
+        {
+          op: 'add',
+          path: '/userFeeLevel',
+          value: 'custom',
+        },
+        {
+          op: 'add',
+          path: '/defaultGasEstimates',
+          value: {
+            estimateType: 'custom',
+            gas: '0xb427',
+            maxFeePerGas: '0x4a817c800',
+            maxPriorityFeePerGas: '0x4a817c800',
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/estimatedBaseFee',
+          value: '14',
+          note: 'confTx: user approved transaction',
+          timestamp: 1653457117006,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'approved',
+          note: 'txStateManager: setting status to approved',
+          timestamp: 1653457117008,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/txParams/nonce',
+          value: '0x5',
+          note: 'transactions#approveTransaction',
+          timestamp: 1653457117294,
+        },
+        {
+          op: 'add',
+          path: '/nonceDetails',
+          value: {
+            params: {
+              highestLocallyConfirmed: 5,
+              highestSuggested: 5,
+              nextNetworkNonce: 5,
+            },
+            local: {
+              name: 'local',
+              nonce: 5,
+              details: {
+                startPoint: 5,
+                highest: 5,
+              },
+            },
+            network: {
+              name: 'network',
+              nonce: 5,
+              details: {
+                blockNumber: '0xa3d19b',
+                baseCount: 5,
+              },
+            },
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/r',
+          value:
+            '0xfdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0',
+          note: 'transactions#signTransaction: add r, s, v values',
+          timestamp: 1653457117407,
+        },
+        {
+          op: 'add',
+          path: '/s',
+          value:
+            '0x54c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
+        },
+        {
+          op: 'add',
+          path: '/v',
+          value: '0x00',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'signed',
+          note: 'txStateManager: setting status to signed',
+          timestamp: 1653457117408,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/rawTx',
+          value:
+            '0x02f8b104058504a817c8008504a817c80082b427949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170c080a0fdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0a054c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
+          note: 'transactions#publishTransaction',
+          timestamp: 1653457117410,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/hash',
+          value:
+            '0x75b35f5b9a95c8e4b1a242be5b163c7a1b18822191b0b1de6985a8b9d3abfe26',
+          note: 'transactions#setTxHash',
+          timestamp: 1653457118158,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/submittedTime',
+          value: 1653457118159,
+          note: 'txStateManager - add submitted time stamp',
+          timestamp: 1653457118160,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'submitted',
+          note: 'txStateManager: setting status to submitted',
+          timestamp: 1653457118161,
+        },
+      ],
+    ],
+    userFeeLevel: 'custom',
+    defaultGasEstimates: {
+      estimateType: 'custom',
+      gas: '0xb427',
+      maxFeePerGas: '0x4a817c800',
+      maxPriorityFeePerGas: '0x4a817c800',
+    },
+    estimatedBaseFee: '14',
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 5,
+        highestSuggested: 5,
+        nextNetworkNonce: 5,
+      },
+      local: {
+        name: 'local',
+        nonce: 5,
+        details: {
+          startPoint: 5,
+          highest: 5,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 5,
+        details: {
+          blockNumber: '0xa3d19b',
+          baseCount: 5,
+        },
+      },
+    },
+    r: '0xfdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0',
+    s: '0x54c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
+    v: '0x00',
+    rawTx:
+      '0x02f8b104058504a817c8008504a817c80082b427949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844095ea7b30000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000011170c080a0fdd2cb46203b5e7bba99cc56a37da3e5e3f36163a5bd9c51cddfd8d7028f5dd0a054c35cfa10b3350a3fd3a0e7b4aeb0b603d528c07a8cfdf4a78505d9864edef4',
+    hash: '0x75b35f5b9a95c8e4b1a242be5b163c7a1b18822191b0b1de6985a8b9d3abfe26',
+    submittedTime: 1653457118159,
+  },
+  [MOCK_TX_TYPE.TOKEN_METHOD_SAFE_TRANSFER_FROM]: {
+    id: 1441203963845330,
+    time: 1652206763566,
+    status: 'confirmed',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '0x118e0',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: {
+      maxPriorityFeePerGas: '0x3B9ACA00',
+      maxFeePerGas: '0x7be830aec',
+    },
+    sendFlowHistory: [],
+    txParams: {
+      from: '0xabc627172af48bd5b0765d3449a7def80d6576ff',
+      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+      nonce: '0x57',
+      value: '0x0',
+      data:
+        '0x42842e0e000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98000000000000000000000000000000000000000000000000000000000009a7cc',
+      gas: '0x118e0',
+      maxFeePerGas: '0x7be830aec',
+      maxPriorityFeePerGas: '0x3B9ACA00',
+    },
+    origin: 'https://rinkeby.etherscan.io',
+    type: 'safetransferfrom',
+    userFeeLevel: 'dappSuggested',
+    defaultGasEstimates: {
+      estimateType: 'dappSuggested',
+      gas: '0x118e0',
+      maxFeePerGas: '0x7be830aec',
+      maxPriorityFeePerGas: '0x3B9ACA00',
+    },
+    estimatedBaseFee: '3ba182755',
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 87,
+        highestSuggested: 87,
+        nextNetworkNonce: 87,
+      },
+      local: {
+        name: 'local',
+        nonce: 87,
+        details: {
+          startPoint: 87,
+          highest: 87,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 87,
+        details: {
+          blockNumber: '0xa28e38',
+          baseCount: 87,
+        },
+      },
+    },
+    r: '0xd13310569a8d5876e37788183034bfe4bc3b49c0663c5fd9b2bf13adf9b4791c',
+    s: '0x7a83d8840e7edcdf4fdedfd2bc1ce19775e54fd17f29ede5165591a1cf3febea',
+    v: '0x00',
+    rawTx:
+      '0x02f8d10457843b9aca008507be830aec830118e094f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86442842e0e000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98000000000000000000000000000000000000000000000000000000000009a7ccc080a0d13310569a8d5876e37788183034bfe4bc3b49c0663c5fd9b2bf13adf9b4791ca07a83d8840e7edcdf4fdedfd2bc1ce19775e54fd17f29ede5165591a1cf3febea',
+    hash: '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
+    submittedTime: 1652206777046,
+    txReceipt: {
+      blockHash:
+        '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
+      blockNumber: 'a28e39',
+      contractAddress: null,
+      cumulativeGasUsed: 'fd5dee',
+      effectiveGasPrice: '0x4028dcaf1',
+      from: '0xabc627172af48bd5b0765d3449a7def80d6576ff',
+      gasUsed: 'bb40',
+      logs: [
+        {
+          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+          blockHash:
+            '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
+          blockNumber: 'a28e39',
+          data: '0x',
+          logIndex: '45',
+          removed: false,
+          topics: [
+            '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+            '0x000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000000000000000000000000000000000000009a7cc',
+          ],
+          transactionHash:
+            '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
+          transactionIndex: '23',
+        },
+        {
+          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+          blockHash:
+            '0x75eb415f79d24f62821b979e3a5f0d4904b2381e973da5fadbddc046c701e3d1',
+          blockNumber: 'a28e39',
+          data: '0x',
+          logIndex: '46',
+          removed: false,
+          topics: [
+            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            '0x000000000000000000000000806627172af48bd5b0765d3449a7def80d6576ff',
+            '0x000000000000000000000000e7d522230eff653bb0a9b4385f0be0815420dd98',
+            '0x000000000000000000000000000000000000000000000000000000000009a7cc',
+          ],
+          transactionHash:
+            '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
+          transactionIndex: '23',
+        },
+      ],
+      logsBloom:
+        '0x00000000000000001000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020800000000000000000800000000000000000000000010000000000000000000000000000080000010000000000000000000000000000000000000020000000000000000000001000000000000000000000000000000000000000000000202000000000000000000000800000000000000000000000000000020000010000000000002008000000000000000000000000000000000000000000000',
+      status: '0x1',
+      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+      transactionHash:
+        '0xe8717d7b075f8bb555cd4bb9846659a7dfba70dc017a84782a2d23d21f948ee3',
+      transactionIndex: '23',
+      type: '0x2',
+    },
+    baseFeePerGas: '0x3c6f300f1',
+    blockTimestamp: '627aacc2',
+  },
+  [MOCK_TX_TYPE.TOKEN_METHOD_TRANSFER]: {
+    id: 5177046356058725,
+    time: 1653457077370,
+    status: 'confirmed',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '0xea60',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: {
+      gasPrice: '0x4a817c800',
+      gas: '0xea60',
+    },
+    sendFlowHistory: [],
+    txParams: {
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+      nonce: '0x4',
+      value: '0x0',
+      data:
+        '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98',
+      gas: '0xea60',
+      maxFeePerGas: '0x4a817c800',
+      maxPriorityFeePerGas: '0x4a817c800',
+    },
+    origin: 'https://metamask.github.io',
+    type: 'transfer',
+    history: [
+      {
+        id: 5177046356058725,
+        time: 1653457077370,
+        status: 'unapproved',
+        metamaskNetworkId: '4',
+        originalGasEstimate: '0xea60',
+        userEditedGasLimit: false,
+        chainId: '0x4',
+        loadingDefaults: true,
+        dappSuggestedGasFees: {
+          gasPrice: '0x4a817c800',
+          gas: '0xea60',
+        },
+        sendFlowHistory: [],
+        txParams: {
+          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+          to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+          value: '0x0',
+          data:
+            '0xa9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98',
+          gas: '0xea60',
+          gasPrice: '0x4a817c800',
+        },
+        origin: 'https://metamask.github.io',
+        type: 'transfer',
+      },
+      [
+        {
+          op: 'remove',
+          path: '/txParams/gasPrice',
+          note: 'Added new unapproved transaction.',
+          timestamp: 1653457077808,
+        },
+        {
+          op: 'add',
+          path: '/txParams/maxFeePerGas',
+          value: '0x4a817c800',
+        },
+        {
+          op: 'add',
+          path: '/txParams/maxPriorityFeePerGas',
+          value: '0x4a817c800',
+        },
+        {
+          op: 'replace',
+          path: '/loadingDefaults',
+          value: false,
+        },
+        {
+          op: 'add',
+          path: '/userFeeLevel',
+          value: 'custom',
+        },
+        {
+          op: 'add',
+          path: '/defaultGasEstimates',
+          value: {
+            estimateType: 'custom',
+            gas: '0xea60',
+            maxFeePerGas: '0x4a817c800',
+            maxPriorityFeePerGas: '0x4a817c800',
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/estimatedBaseFee',
+          value: '16',
+          note: 'confTx: user approved transaction',
+          timestamp: 1653457091914,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'approved',
+          note: 'txStateManager: setting status to approved',
+          timestamp: 1653457091915,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/txParams/nonce',
+          value: '0x4',
+          note: 'transactions#approveTransaction',
+          timestamp: 1653457091939,
+        },
+        {
+          op: 'add',
+          path: '/nonceDetails',
+          value: {
+            params: {
+              highestLocallyConfirmed: 4,
+              highestSuggested: 4,
+              nextNetworkNonce: 4,
+            },
+            local: {
+              name: 'local',
+              nonce: 4,
+              details: {
+                startPoint: 4,
+                highest: 4,
+              },
+            },
+            network: {
+              name: 'network',
+              nonce: 4,
+              details: {
+                blockNumber: '0xa3d198',
+                baseCount: 4,
+              },
+            },
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/r',
+          value:
+            '0xb0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bce',
+          note: 'transactions#signTransaction: add r, s, v values',
+          timestamp: 1653457092053,
+        },
+        {
+          op: 'add',
+          path: '/s',
+          value:
+            '0x08e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
+        },
+        {
+          op: 'add',
+          path: '/v',
+          value: '0x01',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'signed',
+          note: 'txStateManager: setting status to signed',
+          timestamp: 1653457092054,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/rawTx',
+          value:
+            '0x02f8b104048504a817c8008504a817c80082ea60949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844a9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98c001a0b0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bcea008e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
+          note: 'transactions#publishTransaction',
+          timestamp: 1653457092056,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/hash',
+          value:
+            '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+          note: 'transactions#setTxHash',
+          timestamp: 1653457092526,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/submittedTime',
+          value: 1653457092527,
+          note: 'txStateManager - add submitted time stamp',
+          timestamp: 1653457092527,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'submitted',
+          note: 'txStateManager: setting status to submitted',
+          timestamp: 1653457092529,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/firstRetryBlockNumber',
+          value: '0xa3d199',
+          note: 'transactions/pending-tx-tracker#event: tx:block-update',
+          timestamp: 1653457094748,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'confirmed',
+          note: 'txStateManager: setting status to confirmed',
+          timestamp: 1653457115712,
+        },
+        {
+          op: 'add',
+          path: '/txReceipt',
+          value: {
+            blockHash:
+              '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
+            blockNumber: 'a3d19a',
+            contractAddress: null,
+            cumulativeGasUsed: 'ca21',
+            effectiveGasPrice: '0x4a817c800',
+            from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+            gasUsed: 'ca21',
+            logs: [
+              {
+                address: '0x9ba60bbf4ba1de43f3b4983a539feebfbd5fd976',
+                blockHash:
+                  '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
+                blockNumber: 'a3d19a',
+                data:
+                  '0x0000000000000000000000000000000000000000000000000000000000003a98',
+                logIndex: '0',
+                removed: false,
+                topics: [
+                  '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+                  '0x0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c970',
+                ],
+                transactionHash:
+                  '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+                transactionIndex: '0',
+              },
+            ],
+            logsBloom:
+              '0x00000000000000000000000000000000000000000000001000000100000100000000000000000000000000000000000000000000000000000000000000000000000000000020000000000008000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000100000000000000000000000000000000000000000000000000000000000000000000000800000004000000000000001000000000000000',
+            status: '0x1',
+            to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+            transactionHash:
+              '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+            transactionIndex: '0',
+            type: '0x2',
+          },
+        },
+        {
+          op: 'add',
+          path: '/baseFeePerGas',
+          value: '0x14',
+        },
+        {
+          op: 'add',
+          path: '/blockTimestamp',
+          value: '628dc0c8',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/blockTimestamp',
+          value: '628dc0c8',
+          note: 'transactions#confirmTransaction - add txReceipt',
+          timestamp: 1653457115870,
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/transactionIndex',
+          value: '0',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/transactionIndex',
+          value: '0',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/logIndex',
+          value: '0',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/blockNumber',
+          value: 'a3d19a',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/cumulativeGasUsed',
+          value: 'ca21',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/blockNumber',
+          value: 'a3d19a',
+        },
+      ],
+    ],
+    userFeeLevel: 'custom',
+    defaultGasEstimates: {
+      estimateType: 'custom',
+      gas: '0xea60',
+      maxFeePerGas: '0x4a817c800',
+      maxPriorityFeePerGas: '0x4a817c800',
+    },
+    estimatedBaseFee: '16',
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 4,
+        highestSuggested: 4,
+        nextNetworkNonce: 4,
+      },
+      local: {
+        name: 'local',
+        nonce: 4,
+        details: {
+          startPoint: 4,
+          highest: 4,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 4,
+        details: {
+          blockNumber: '0xa3d198',
+          baseCount: 4,
+        },
+      },
+    },
+    r: '0xb0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bce',
+    s: '0x08e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
+    v: '0x01',
+    rawTx:
+      '0x02f8b104048504a817c8008504a817c80082ea60949ba60bbf4ba1de43f3b4983a539feebfbd5fd97680b844a9059cbb0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c9700000000000000000000000000000000000000000000000000000000000003a98c001a0b0f36e4392f9d302351789aef355a2e95b979bcdd99d19026c533152563d3bcea008e59de373e65c9c54e6a8052585461e81409d33178464f9b72f4cc36ac75d40',
+    hash: '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+    submittedTime: 1653457092527,
+    firstRetryBlockNumber: '0xa3d199',
+    txReceipt: {
+      blockHash:
+        '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
+      blockNumber: 'a3d19a',
+      contractAddress: null,
+      cumulativeGasUsed: 'ca21',
+      effectiveGasPrice: '0x4a817c800',
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      gasUsed: 'ca21',
+      logs: [
+        {
+          address: '0x9ba60bbf4ba1de43f3b4983a539feebfbd5fd976',
+          blockHash:
+            '0x243a362e5fda0d6ec8fce3d7f727679148c1df8ec6d7470ff65b38c8a96823b4',
+          blockNumber: 'a3d19a',
+          data:
+            '0x0000000000000000000000000000000000000000000000000000000000003a98',
+          logIndex: '0',
+          removed: false,
+          topics: [
+            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+            '0x0000000000000000000000002f318c334780961fb129d2a6c30d0763d9a5c970',
+          ],
+          transactionHash:
+            '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+          transactionIndex: '0',
+        },
+      ],
+      logsBloom:
+        '0x00000000000000000000000000000000000000000000001000000100000100000000000000000000000000000000000000000000000000000000000000000000000000000020000000000008000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000100000000000000000000000000000000000000000000000000000000000000000000000800000004000000000000001000000000000000',
+      status: '0x1',
+      to: '0xefg60bbf4ba1de43f3b4983a539feebfbd5fd976',
+      transactionHash:
+        '0x3a8ed11c3d0ac26e4fe07812a29efdb642f15b8d83d2716ddf80d11b2542916f',
+      transactionIndex: '0',
+      type: '0x2',
+    },
+    baseFeePerGas: '0x14',
+    blockTimestamp: '628dc0c8',
+  },
+  [MOCK_TX_TYPE.TOKEN_METHOD_TRANSFER_FROM]: {
+    id: 5177046356058754,
+    time: 1653457323504,
+    status: 'confirmed',
+    metamaskNetworkId: '4',
+    originalGasEstimate: '0x10896',
+    userEditedGasLimit: false,
+    chainId: '0x4',
+    loadingDefaults: false,
+    dappSuggestedGasFees: null,
+    sendFlowHistory: [
+      {
+        entry: 'sendFlow - user set asset type to COLLECTIBLE',
+        timestamp: 1653457317999,
+      },
+      {
+        entry: 'sendFlow - user set asset symbol to undefined',
+        timestamp: 1653457318000,
+      },
+      {
+        entry:
+          'sendFlow - user set asset address to 0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
+        timestamp: 1653457318000,
+      },
+      {
+        entry:
+          'sendFlow - user selected transfer to my accounts on recipient screen',
+        timestamp: 1653457319474,
+      },
+      {
+        entry:
+          'sendFlow - User clicked recipient from my accounts. address: 0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e, nickname Account 1',
+        timestamp: 1653457320321,
+      },
+    ],
+    txParams: {
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+      nonce: '0x6',
+      value: '0x0',
+      data:
+        '0x23b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8',
+      gas: '0x10896',
+      maxFeePerGas: '0x59682f12',
+      maxPriorityFeePerGas: '0x59682f00',
+      type: '0x2',
+    },
+    origin: 'metamask',
+    type: 'transferfrom',
+    history: [
+      {
+        id: 5177046356058754,
+        time: 1653457323504,
+        status: 'unapproved',
+        metamaskNetworkId: '4',
+        originalGasEstimate: '0x10896',
+        userEditedGasLimit: false,
+        chainId: '0x4',
+        loadingDefaults: true,
+        dappSuggestedGasFees: null,
+        sendFlowHistory: [
+          {
+            entry: 'sendFlow - user set asset type to COLLECTIBLE',
+            timestamp: 1653457317999,
+          },
+          {
+            entry: 'sendFlow - user set asset symbol to undefined',
+            timestamp: 1653457318000,
+          },
+          {
+            entry:
+              'sendFlow - user set asset address to 0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
+            timestamp: 1653457318000,
+          },
+          {
+            entry:
+              'sendFlow - user selected transfer to my accounts on recipient screen',
+            timestamp: 1653457319474,
+          },
+          {
+            entry:
+              'sendFlow - User clicked recipient from my accounts. address: 0xe56e7847fd3661a9b7c86aaf1daea08d9da5750e, nickname Account 1',
+            timestamp: 1653457320321,
+          },
+        ],
+        txParams: {
+          from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+          to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+          value: '0x0',
+          data:
+            '0x23b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8',
+          gas: '0x10896',
+          maxFeePerGas: '0x59682f12',
+          maxPriorityFeePerGas: '0x59682f00',
+          type: '0x2',
+        },
+        origin: 'metamask',
+        type: 'transferfrom',
+      },
+      [
+        {
+          op: 'replace',
+          path: '/loadingDefaults',
+          value: false,
+          note: 'Added new unapproved transaction.',
+          timestamp: 1653457323593,
+        },
+        {
+          op: 'add',
+          path: '/userFeeLevel',
+          value: 'medium',
+        },
+        {
+          op: 'add',
+          path: '/defaultGasEstimates',
+          value: {
+            estimateType: 'medium',
+            gas: '0x10896',
+            maxFeePerGas: '0x59682f12',
+            maxPriorityFeePerGas: '0x59682f00',
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/estimatedBaseFee',
+          value: 'd',
+          note: 'confTx: user approved transaction',
+          timestamp: 1653457330346,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'approved',
+          note: 'txStateManager: setting status to approved',
+          timestamp: 1653457330347,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/txParams/nonce',
+          value: '0x6',
+          note: 'transactions#approveTransaction',
+          timestamp: 1653457330354,
+        },
+        {
+          op: 'add',
+          path: '/nonceDetails',
+          value: {
+            params: {
+              highestLocallyConfirmed: 6,
+              highestSuggested: 6,
+              nextNetworkNonce: 6,
+            },
+            local: {
+              name: 'local',
+              nonce: 6,
+              details: {
+                startPoint: 6,
+                highest: 6,
+              },
+            },
+            network: {
+              name: 'network',
+              nonce: 6,
+              details: {
+                blockNumber: '0xa3d1a8',
+                baseCount: 6,
+              },
+            },
+          },
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/r',
+          value:
+            '0x58294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdc',
+          note: 'transactions#signTransaction: add r, s, v values',
+          timestamp: 1653457330496,
+        },
+        {
+          op: 'add',
+          path: '/s',
+          value:
+            '0x3993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
+        },
+        {
+          op: 'add',
+          path: '/v',
+          value: '0x01',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'signed',
+          note: 'txStateManager: setting status to signed',
+          timestamp: 1653457330497,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/rawTx',
+          value:
+            '0x02f8d004068459682f008459682f128301089694f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86423b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8c001a058294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdca03993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
+          note: 'transactions#publishTransaction',
+          timestamp: 1653457330498,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/hash',
+          value:
+            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+          note: 'transactions#setTxHash',
+          timestamp: 1653457330596,
+        },
+      ],
+      [
+        {
+          op: 'add',
+          path: '/submittedTime',
+          value: 1653457330597,
+          note: 'txStateManager - add submitted time stamp',
+          timestamp: 1653457330597,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'submitted',
+          note: 'txStateManager: setting status to submitted',
+          timestamp: 1653457330598,
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/status',
+          value: 'confirmed',
+          note: 'txStateManager: setting status to confirmed',
+          timestamp: 1653457338358,
+        },
+        {
+          op: 'add',
+          path: '/txReceipt',
+          value: {
+            blockHash:
+              '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+            blockNumber: 'a3d1aa',
+            contractAddress: null,
+            cumulativeGasUsed: '3c0267',
+            effectiveGasPrice: '0x59682f0d',
+            from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+            gasUsed: '9da4',
+            logs: [
+              {
+                address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+                blockHash:
+                  '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+                blockNumber: 'a3d1aa',
+                data: '0x',
+                logIndex: '21',
+                removed: false,
+                topics: [
+                  '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+                  '0x0000000000000000000000000000000000000000000000000000000000000000',
+                  '0x000000000000000000000000000000000000000000000000000000000009a7b8',
+                ],
+                transactionHash:
+                  '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+                transactionIndex: '11',
+              },
+              {
+                address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+                blockHash:
+                  '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+                blockNumber: 'a3d1aa',
+                data: '0x',
+                logIndex: '22',
+                removed: false,
+                topics: [
+                  '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+                  '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+                  '0x000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e',
+                  '0x000000000000000000000000000000000000000000000000000000000009a7b8',
+                ],
+                transactionHash:
+                  '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+                transactionIndex: '11',
+              },
+            ],
+            logsBloom:
+              '0x00000000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020000000000000000000800000000000000000000000010000000000000000000000000000000000010000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000002504000000100000000000020000000000000000000000000000020000010000000000000000000000400000000000000000000001000000000000000',
+            status: '0x1',
+            to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+            transactionHash:
+              '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+            transactionIndex: '11',
+            type: '0x2',
+          },
+        },
+        {
+          op: 'add',
+          path: '/baseFeePerGas',
+          value: '0xd',
+        },
+        {
+          op: 'add',
+          path: '/blockTimestamp',
+          value: '628dc1b8',
+        },
+      ],
+      [
+        {
+          op: 'replace',
+          path: '/blockTimestamp',
+          value: '628dc1b8',
+          note: 'transactions#confirmTransaction - add txReceipt',
+          timestamp: 1653457338377,
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/transactionIndex',
+          value: '11',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/1/transactionIndex',
+          value: '11',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/1/logIndex',
+          value: '22',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/1/blockNumber',
+          value: 'a3d1aa',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/transactionIndex',
+          value: '11',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/logIndex',
+          value: '21',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/logs/0/blockNumber',
+          value: 'a3d1aa',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/cumulativeGasUsed',
+          value: '3c0267',
+        },
+        {
+          op: 'replace',
+          path: '/txReceipt/blockNumber',
+          value: 'a3d1aa',
+        },
+      ],
+    ],
+    userFeeLevel: 'medium',
+    defaultGasEstimates: {
+      estimateType: 'medium',
+      gas: '0x10896',
+      maxFeePerGas: '0x59682f12',
+      maxPriorityFeePerGas: '0x59682f00',
+    },
+    estimatedBaseFee: 'd',
+    nonceDetails: {
+      params: {
+        highestLocallyConfirmed: 6,
+        highestSuggested: 6,
+        nextNetworkNonce: 6,
+      },
+      local: {
+        name: 'local',
+        nonce: 6,
+        details: {
+          startPoint: 6,
+          highest: 6,
+        },
+      },
+      network: {
+        name: 'network',
+        nonce: 6,
+        details: {
+          blockNumber: '0xa3d1a8',
+          baseCount: 6,
+        },
+      },
+    },
+    r: '0x58294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdc',
+    s: '0x3993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
+    v: '0x01',
+    rawTx:
+      '0x02f8d004068459682f008459682f128301089694f5de760f2e916647fd766b4ad9e85ff943ce3a2b80b86423b872dd000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e000000000000000000000000000000000000000000000000000000000009a7b8c001a058294750acbe46cb0dd15ef615a244be49af61f0d799cce68bbbd3d4e7c75cdca03993c38f6e168065d9b20a0b4254697d47db114f57243f56c22f228c7a173f9c',
+    hash: '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+    submittedTime: 1653457330597,
+    txReceipt: {
+      blockHash:
+        '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+      blockNumber: 'a3d1aa',
+      contractAddress: null,
+      cumulativeGasUsed: '3c0267',
+      effectiveGasPrice: '0x59682f0d',
+      from: '0xabc539a7d5c43940af498008a7c8f3abb35c3725',
+      gasUsed: '9da4',
+      logs: [
+        {
+          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+          blockHash:
+            '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+          blockNumber: 'a3d1aa',
+          data: '0x',
+          logIndex: '21',
+          removed: false,
+          topics: [
+            '0x8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925',
+            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+            '0x0000000000000000000000000000000000000000000000000000000000000000',
+            '0x000000000000000000000000000000000000000000000000000000000009a7b8',
+          ],
+          transactionHash:
+            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+          transactionIndex: '11',
+        },
+        {
+          address: '0xf5de760f2e916647fd766b4ad9e85ff943ce3a2b',
+          blockHash:
+            '0x9e97839be24b9dacd2b91a0504317bc9c6eaea6904472dce450e583c398cb60a',
+          blockNumber: 'a3d1aa',
+          data: '0x',
+          logIndex: '22',
+          removed: false,
+          topics: [
+            '0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef',
+            '0x000000000000000000000000ac9539a7d5c43940af498008a7c8f3abb35c3725',
+            '0x000000000000000000000000e56e7847fd3661a9b7c86aaf1daea08d9da5750e',
+            '0x000000000000000000000000000000000000000000000000000000000009a7b8',
+          ],
+          transactionHash:
+            '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+          transactionIndex: '11',
+        },
+      ],
+      logsBloom:
+        '0x00000000000000000000000000000000000000008000000000000000000100000000000000000000000000000000000000000000000000000000008000200000000000000000000000000008000000000000000000008000000000000000000000000000020000000000000000000800000000000000000000000010000000000000000000000000000000000010000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000002504000000100000000000020000000000000000000000000000020000010000000000000000000000400000000000000000000001000000000000000',
+      status: '0x1',
+      to: '0xefge760f2e916647fd766b4ad9e85ff943ce3a2b',
+      transactionHash:
+        '0xc523e40d676563619138c310391000f91a93005028eedb72bf05133f2d6c8e4d',
+      transactionIndex: '11',
+      type: '0x2',
+    },
+    baseFeePerGas: '0xd',
+    blockTimestamp: '628dc1b8',
+  },
+};
diff --git a/.storybook/preview.js b/.storybook/preview.js
index 517e7820ad40..2e7bc26bc9da 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -30,7 +30,7 @@ addParameters({
     storySort: {
       order: [
         'Getting Started',
-        'Design Tokens',
+        'Foundations',
         'Components',
         ['UI', 'App'],
         'Pages',
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
index 44038239df48..44aca95a649d 100644
--- a/.storybook/test-data.js
+++ b/.storybook/test-data.js
@@ -1,3 +1,4 @@
+import { draftTransactionInitialState } from '../ui/ducks/send';
 const state = {
   invalidCustomNetwork: {
     state: 'CLOSED',
@@ -15,99 +16,99 @@ const state = {
   },
   networkList: [
     {
-      blockExplorerUrl: "https://etherscan.io",
-      chainId: "0x1",
+      blockExplorerUrl: 'https://etherscan.io',
+      chainId: '0x1',
       iconColor: 'var(--mainnet)',
       isATestNetwork: false,
-      labelKey: "mainnet",
-      providerType: "mainnet",
-      rpcUrl: "https://mainnet.infura.io/v3/",
-      ticker: "ETH",
+      labelKey: 'mainnet',
+      providerType: 'mainnet',
+      rpcUrl: 'https://mainnet.infura.io/v3/',
+      ticker: 'ETH',
       viewOnly: true,
     },
     {
-      blockExplorerUrl: "https://ropsten.etherscan.io",
-      chainId: "0x3",
+      blockExplorerUrl: 'https://ropsten.etherscan.io',
+      chainId: '0x3',
       iconColor: 'var(--ropsten)',
       isATestNetwork: true,
-      labelKey: "ropsten",
-      providerType: "ropsten",
-      rpcUrl: "https://ropsten.infura.io/v3/",
-      ticker: "ETH",
+      labelKey: 'ropsten',
+      providerType: 'ropsten',
+      rpcUrl: 'https://ropsten.infura.io/v3/',
+      ticker: 'ETH',
       viewOnly: true,
     },
     {
-      blockExplorerUrl: "https://rinkeby.etherscan.io",
-      chainId: "0x4",
+      blockExplorerUrl: 'https://rinkeby.etherscan.io',
+      chainId: '0x4',
       iconColor: 'var(--rinkeby)',
       isATestNetwork: true,
-      labelKey: "rinkeby",
-      providerType: "rinkeby",
-      rpcUrl: "https://rinkeby.infura.io/v3/",
-      ticker: "ETH",
+      labelKey: 'rinkeby',
+      providerType: 'rinkeby',
+      rpcUrl: 'https://rinkeby.infura.io/v3/',
+      ticker: 'ETH',
       viewOnly: true,
     },
     {
-      blockExplorerUrl: "https://goerli.etherscan.io",
-      chainId: "0x5",
+      blockExplorerUrl: 'https://goerli.etherscan.io',
+      chainId: '0x5',
       iconColor: 'var(--goerli)',
       isATestNetwork: true,
-      labelKey: "goerli",
-      providerType: "goerli",
-      rpcUrl: "https://goerli.infura.io/v3/",
-      ticker: "ETH",
+      labelKey: 'goerli',
+      providerType: 'goerli',
+      rpcUrl: 'https://goerli.infura.io/v3/',
+      ticker: 'ETH',
       viewOnly: true,
     },
     {
-      blockExplorerUrl: "https://kovan.etherscan.io",
-      chainId: "0x2a",
+      blockExplorerUrl: 'https://kovan.etherscan.io',
+      chainId: '0x2a',
       iconColor: 'var(--kovan)',
       isATestNetwork: true,
-      labelKey: "kovan",
-      providerType: "kovan",
-      rpcUrl: "https://kovan.infura.io/v3/",
-      ticker: "ETH",
+      labelKey: 'kovan',
+      providerType: 'kovan',
+      rpcUrl: 'https://kovan.infura.io/v3/',
+      ticker: 'ETH',
       viewOnly: true,
     },
     {
-      blockExplorerUrl: "",
-      chainId: "0x539",
+      blockExplorerUrl: '',
+      chainId: '0x539',
       iconColor: 'var(--localhost)',
       isATestNetwork: true,
-      label: "Localhost 8545",
-      providerType: "rpc",
-      rpcUrl: "http://localhost:8545",
-      ticker: "ETH",
+      label: 'Localhost 8545',
+      providerType: 'rpc',
+      rpcUrl: 'http://localhost:8545',
+      ticker: 'ETH',
     },
     {
-      blockExplorerUrl: "https://bscscan.com",
-      chainId: "0x38",
+      blockExplorerUrl: 'https://bscscan.com',
+      chainId: '0x38',
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: "Binance Smart Chain",
-      providerType: "rpc",
-      rpcUrl: "https://bsc-dataseed.binance.org/",
-      ticker: "BNB",
+      label: 'Binance Smart Chain',
+      providerType: 'rpc',
+      rpcUrl: 'https://bsc-dataseed.binance.org/',
+      ticker: 'BNB',
     },
     {
-      blockExplorerUrl: "https://cchain.explorer.avax.network/",
-      chainId: "0xa86a",
+      blockExplorerUrl: 'https://cchain.explorer.avax.network/',
+      chainId: '0xa86a',
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: "Avalanche",
-      providerType: "rpc",
-      rpcUrl: "https://api.avax.network/ext/bc/C/rpc",
-      ticker: "AVAX",
+      label: 'Avalanche',
+      providerType: 'rpc',
+      rpcUrl: 'https://api.avax.network/ext/bc/C/rpc',
+      ticker: 'AVAX',
     },
     {
-      blockExplorerUrl: "https://polygonscan.com",
-      chainId: "0x89",
+      blockExplorerUrl: 'https://polygonscan.com',
+      chainId: '0x89',
       iconColor: 'var(--localhost)',
       isATestNetwork: false,
-      label: "Polygon",
-      providerType: "rpc",
-      rpcUrl: "https://polygon-rpc.com",
-      ticker: "MATIC",
+      label: 'Polygon',
+      providerType: 'rpc',
+      rpcUrl: 'https://polygon-rpc.com',
+      ticker: 'MATIC',
     },
   ],
   metamask: {
@@ -132,7 +133,7 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false
+        unlisted: false,
       },
       '0xc00e94cb662c3520282e6f5717214004a7f26888': {
         address: '0xc00e94cb662c3520282e6f5717214004a7f26888',
@@ -153,23 +154,18 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false
+        unlisted: false,
       },
       '0xfffffffff15abf397da76f1dcc1a1604f45126db': {
         address: '0xfffffffff15abf397da76f1dcc1a1604f45126db',
         symbol: 'FSW',
         decimals: 18,
         name: 'Falconswap',
-        iconUrl: 'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
-        aggregators: [
-          'CoinGecko',
-          '1inch',
-          'Paraswap',
-          'Zapper',
-          'Zerion',
-        ],
+        iconUrl:
+          'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
+        aggregators: ['CoinGecko', '1inch', 'Paraswap', 'Zapper', 'Zerion'],
         occurrences: 12,
-        unlisted: false
+        unlisted: false,
       },
       '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f': {
         address: '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
@@ -192,70 +188,70 @@ const state = {
           '0x',
         ],
         occurrences: 12,
-        unlisted: false
+        unlisted: false,
       },
       '0x6b175474e89094c44da98b954eedeac495271d0f': {
         address: '0x6b175474e89094c44da98b954eedeac495271d0f',
         symbol: 'META',
         decimals: 18,
         image: 'metamark.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0xB8c77482e45F1F44dE1745F52C74426C631bDD52': {
         address: '0xB8c77482e45F1F44dE1745F52C74426C631bDD52',
         symbol: '0X',
         decimals: 18,
         image: '0x.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984': {
         address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
         symbol: 'AST',
         decimals: 18,
         image: 'ast.png',
-        unlisted: false
+        unlisted: false,
       },
       '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2': {
         address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
         symbol: 'BAT',
         decimals: 18,
         image: 'BAT_icon.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1': {
         address: '0xe83cccfabd4ed148903bf36d4283ee7c8b3494d1',
         symbol: 'CVL',
         decimals: 18,
         image: 'CVL_token.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e': {
         address: '0x0bc529c00C6401aEF6D220BE8C6Ea1667F6Ad93e',
         symbol: 'GLA',
         decimals: 18,
         image: 'gladius.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0x467Bccd9d29f223BcE8043b84E8C8B282827790F': {
         address: '0x467Bccd9d29f223BcE8043b84E8C8B282827790F',
         symbol: 'GNO',
         decimals: 18,
         image: 'gnosis.svg',
-        unlisted: false
+        unlisted: false,
       },
       '0xff20817765cb7f73d4bde2e66e067e58d11095c2': {
         address: '0xff20817765cb7f73d4bde2e66e067e58d11095c2',
         symbol: 'OMG',
         decimals: 18,
         image: 'omg.jpg',
-        unlisted: false
+        unlisted: false,
       },
       '0x8e870d67f660d95d5be530380d0ec0bd388289e1': {
         address: '0x8e870d67f660d95d5be530380d0ec0bd388289e1',
         symbol: 'WED',
         decimals: 18,
         image: 'wed.png',
-        unlisted: false
+        unlisted: false,
       },
     },
     networkDetails: {
@@ -281,83 +277,84 @@ const state = {
       swapsFeatureIsLive: false,
       swapsQuoteRefreshTime: 60000,
     },
-    "snapStates": {},
-    "snaps": {
-      "local:http://localhost:8080/": {
-        "enabled": true,
-        "id": "local:http://localhost:8080/",
-        "initialPermissions": {
-          "snap_confirm": {}
+    snapStates: {},
+    snaps: {
+      'local:http://localhost:8080/': {
+        enabled: true,
+        id: 'local:http://localhost:8080/',
+        initialPermissions: {
+          snap_confirm: {},
         },
-        "manifest": {
-          "description": "An example MetaMask Snap.",
-          "initialPermissions": {
-            "snap_confirm": {}
+        manifest: {
+          description: 'An example MetaMask Snap.',
+          initialPermissions: {
+            snap_confirm: {},
           },
-          "manifestVersion": "0.1",
-          "proposedName": "MetaMask Example Snap",
-          "repository": {
-            "type": "git",
-            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
+          manifestVersion: '0.1',
+          proposedName: 'MetaMask Example Snap',
+          repository: {
+            type: 'git',
+            url: 'https://github.com/MetaMask/snaps-skunkworks.git',
           },
-          "source": {
-            "location": {
-              "npm": {
-                "filePath": "dist/bundle.js",
-                "iconPath": "images/icon.svg",
-                "packageName": "@metamask/example-snap",
-                "registry": "https://registry.npmjs.org/"
-              }
+          source: {
+            location: {
+              npm: {
+                filePath: 'dist/bundle.js',
+                iconPath: 'images/icon.svg',
+                packageName: '@metamask/example-snap',
+                registry: 'https://registry.npmjs.org/',
+              },
             },
-            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
+            shasum: '3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE=',
           },
-          "version": "0.6.0"
+          version: '0.6.0',
         },
-        "permissionName": "wallet_snap_local:http://localhost:8080/",
-        "sourceCode": "(...)",
-        "status": "stopped",
-        "svgIcon": "<svg>...</svg>",
-        "version": "0.6.0"
-      },
-      "Filecoin Snap": {
-        "enabled": true,
-        "id": "npm:http://localhost:8080/",
-        "initialPermissions": {
-          "snap_confirm": {},
-          "eth_accounts": {},
-          "snap_manageState": {},
+        permissionName: 'wallet_snap_local:http://localhost:8080/',
+        sourceCode: '(...)',
+        status: 'stopped',
+        svgIcon: '<svg>...</svg>',
+        version: '0.6.0',
+      },
+      'Filecoin Snap': {
+        enabled: true,
+        id: 'npm:http://localhost:8080/',
+        initialPermissions: {
+          snap_confirm: {},
+          eth_accounts: {},
+          snap_manageState: {},
         },
-        "manifest": {
-          "description": "This swap provides developers everywhere access to an entirely new data storage paradigm, even letting your programs store data autonomously. Learn more.",
-          "initialPermissions": {
-            "snap_confirm": {},
-            "eth_accounts": {},
-            "snap_manageState": {},
+        manifest: {
+          description:
+            'This swap provides developers everywhere access to an entirely new data storage paradigm, even letting your programs store data autonomously. Learn more.',
+          initialPermissions: {
+            snap_confirm: {},
+            eth_accounts: {},
+            snap_manageState: {},
           },
-          "manifestVersion": "0.1",
-          "proposedName": "Filecoin Snap",
-          "repository": {
-            "type": "git",
-            "url": "https://github.com/MetaMask/snaps-skunkworks.git"
+          manifestVersion: '0.1',
+          proposedName: 'Filecoin Snap',
+          repository: {
+            type: 'git',
+            url: 'https://github.com/MetaMask/snaps-skunkworks.git',
           },
-          "source": {
-            "location": {
-              "npm": {
-                "filePath": "dist/bundle.js",
-                "iconPath": "images/icon.svg",
-                "packageName": "@metamask/example-snap",
-                "registry": "https://registry.npmjs.org/"
-              }
+          source: {
+            location: {
+              npm: {
+                filePath: 'dist/bundle.js',
+                iconPath: 'images/icon.svg',
+                packageName: '@metamask/example-snap',
+                registry: 'https://registry.npmjs.org/',
+              },
             },
-            "shasum": "3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE="
+            shasum: '3lEt0yUu080DwV78neROaAAIQWXukSkMnP4OBhOhBnE=',
           },
-          "version": "0.6.0"
+          version: '0.6.0',
         },
-        "permissionName": "wallet_snap_npm:http://localhost:8080/",
-        "sourceCode": "(...)",
-        "status": "stopped",
-        "svgIcon": "<svg>...</svg>",
-        "version": "0.6.0"
+        permissionName: 'wallet_snap_npm:http://localhost:8080/',
+        sourceCode: '(...)',
+        status: 'stopped',
+        svgIcon: '<svg>...</svg>',
+        version: '0.6.0',
       },
     },
     accountArray: [
@@ -486,32 +483,46 @@ const state = {
     ],
     detectedTokens: [
       {
-        address: "0x514910771AF9Ca656af840dff83E8264EcF986CA",
+        address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
         decimals: 18,
-        symbol: "LINK",
-        image: "https://crypto.com/price/coin-data/icon/LINK/color_icon.png",
-        aggregators:[
-          "coinGecko","oneInch","paraswap","zapper","zerion"
-        ]
+        symbol: 'LINK',
+        image: 'https://crypto.com/price/coin-data/icon/LINK/color_icon.png',
+        aggregators: ['coinGecko', 'oneInch', 'paraswap', 'zapper', 'zerion'],
       },
       {
-        address: "0xc00e94Cb662C3520282E6f5717214004A7f26888",
+        address: '0xc00e94Cb662C3520282E6f5717214004A7f26888',
         decimals: 18,
-        symbol: "COMP",
-        image: "https://crypto.com/price/coin-data/icon/COMP/color_icon.png",
-        aggregators:[
-          "bancor","cmc","cryptocom","coinGecko","oneInch","paraswap","pmm","zapper","zerion","zeroEx"
-        ]
+        symbol: 'COMP',
+        image: 'https://crypto.com/price/coin-data/icon/COMP/color_icon.png',
+        aggregators: [
+          'bancor',
+          'cmc',
+          'cryptocom',
+          'coinGecko',
+          'oneInch',
+          'paraswap',
+          'pmm',
+          'zapper',
+          'zerion',
+          'zeroEx',
+        ],
       },
       {
-        address: "0xfffffffFf15AbF397dA76f1dcc1A1604F45126DB",
+        address: '0xfffffffFf15AbF397dA76f1dcc1A1604F45126DB',
         decimals: 18,
-        symbol: "FSW",
-        image: "https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184",
-        aggregators:[
-          "aave", "cmc","coinGecko","oneInch","paraswap","zapper","zerion"
-        ]
-      }
+        symbol: 'FSW',
+        image:
+          'https://assets.coingecko.com/coins/images/12256/thumb/falconswap.png?1598534184',
+        aggregators: [
+          'aave',
+          'cmc',
+          'coinGecko',
+          'oneInch',
+          'paraswap',
+          'zapper',
+          'zerion',
+        ],
+      },
     ],
     pendingTokens: {},
     customNonceValue: '',
@@ -559,18 +570,18 @@ const state = {
     swapsWelcomeMessageHasBeenShown: true,
     defaultHomeActiveTabName: 'Assets',
     provider: {
-      type: 'ropsten',
+      type: 'rinkeby',
       ticker: 'ETH',
       nickname: '',
       rpcUrl: '',
-      chainId: '0x3',
+      chainId: '0x4',
     },
     previousProviderStore: {
-      type: 'ropsten',
+      type: 'rinkeby',
       ticker: 'ETH',
       nickname: '',
       rpcUrl: '',
-      chainId: '0x3',
+      chainId: '0x4',
     },
     network: '3',
     accounts: {
@@ -1304,7 +1315,7 @@ const state = {
     subjects: {
       'https://app.uniswap.org': {
         permissions: {
-          'eth_accounts': {
+          eth_accounts: {
             invoker: 'https://app.uniswap.org',
             parentCapability: 'eth_accounts',
             id: 'a7342e4b-beae-4525-a36c-c0635fd03359',
@@ -1318,14 +1329,14 @@ const state = {
           },
         },
       },
-      "local:http://localhost:8080/": {
+      'local:http://localhost:8080/': {
         permissions: {
-          'snap_confirm': {
-            invoker: "local:http://localhost:8080/",
+          snap_confirm: {
+            invoker: 'local:http://localhost:8080/',
             parentCapability: 'snap_confirm',
             id: 'a7342F4b-beae-4525-a36c-c0635fd03359',
             date: 1620710693178,
-            caveats: []
+            caveats: [],
           },
         },
       },
@@ -1423,30 +1434,30 @@ const state = {
     pendingApprovals: {},
     pendingApprovalCount: 0,
     subjectMetadata: {
-      "http://localhost:8080": {
+      'http://localhost:8080': {
         extensionId: null,
         iconUrl: null,
-        name: "Hello, Snaps!",
-        origin: "http://localhost:8080",
-        subjectType: "website"
+        name: 'Hello, Snaps!',
+        origin: 'http://localhost:8080',
+        subjectType: 'website',
       },
-      "https://metamask.github.io": {
+      'https://metamask.github.io': {
         extensionId: null,
         iconUrl: null,
-        name: "Snaps Iframe Execution Environment",
-        origin: "https://metamask.github.io",
-        subjectType: "website"
+        name: 'Snaps Iframe Execution Environment',
+        origin: 'https://metamask.github.io',
+        subjectType: 'website',
       },
-      "local:http://localhost:8080/": {
+      'local:http://localhost:8080/': {
         extensionId: null,
         iconUrl: null,
-        name: "MetaMask Example Snap",
-        origin: "local:http://localhost:8080/",
-        subjectType: "snap",
-        svgIcon: "<svg>...</svg>",
-        version: "0.6.0"
-      }
-    }
+        name: 'MetaMask Example Snap',
+        origin: 'local:http://localhost:8080/',
+        subjectType: 'snap',
+        svgIcon: '<svg>...</svg>',
+        version: '0.6.0',
+      },
+    },
   },
   appState: {
     shouldClose: false,
@@ -1455,7 +1466,14 @@ const state = {
       open: false,
       modalState: {
         name: null,
-        props: {},
+        props: {
+          token: {
+            address: '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
+            symbol: 'DAI',
+            decimals: 18,
+          },
+          history: {},
+        },
       },
       previousModalState: {
         name: null,
@@ -1507,6 +1525,12 @@ const state = {
     amount: {
       error: 'amount',
     },
+    currentTransactionUUID: 'test-uuid',
+    draftTransactions: {
+      'test-uuid': {
+        ...draftTransactionInitialState,
+      },
+    },
   },
   confirmTransaction: {
     txData: {
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d271b47a3b86..06e058fbfbe4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,182 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.18.0]
+### Added
+- Add setApprovalForAll confirmation view so granted permissions are displayed in a digested manner, instead of a simple contract interaction([#15010](https://github.com/MetaMask/metamask-extension/pull/15010)) 
+- Add warning when performing a Send directly to a token contract([#13588](https://github.com/MetaMask/metamask-extension/pull/13588))
+
+### Changed
+- Update Optimism ChainID from Kovan to Goerli ([#15119](https://github.com/MetaMask/metamask-extension/pull/15119))
+
+### Fixed
+- Fix one of the possible causes for "Sending to a random cached address", by removing the global transaction state from the Send flow ([#14777](https://github.com/MetaMask/metamask-extension/pull/14777))
+- Fix Chinese translation for the message of Importing repeated tokens ([#14994](https://github.com/MetaMask/metamask-extension/pull/14994))
+- Fix Japanese translation for the word Sign ([#15078](https://github.com/MetaMask/metamask-extension/pull/15078))
+- Fix partially the error "Seedphrase is invalid" by disabling Seedphrase Import button after switching the Seedphrase length ([#15139](https://github.com/MetaMask/metamask-extension/pull/15139))
+- Fix Edit Transaction flow by ensuring that changing a tx from a Transfer to a Send resets data and updates tx type ([#15248](https://github.com/MetaMask/metamask-extension/pull/15248))
+- Fix UI on Import Seedphrase page by disabling Import button, if any of the characters of the Seedphrase is in uppercase ([#15186](https://github.com/MetaMask/metamask-extension/pull/15186))
+
+## [10.17.0]
+### Added
+- Add cost estimation for canceling a Smart Transaction on Awaiting Swap page ([#15011](https://github.com/MetaMask/metamask-extension/pull/15011))
+- Add missing subtitles for Secret Recovery Phrase video, including French, Greek, Turkish, Chinese
+ ([#14943](https://github.com/MetaMask/metamask-extension/pull/14943))
+
+### Changed
+- Consolidate all Error Messages in one style component ([#14945](https://github.com/MetaMask/metamask-extension/pull/14945))
+- Improve accessibility by allowing keyboard navigation on Accounts menu ([#14936](https://github.com/MetaMask/metamask-extension/pull/14936))
+- Allow using locally hosted RPCs and Block Explorer Urls when adding an Ethereum Chain programmatically ([#14272](https://github.com/MetaMask/metamask-extension/pull/14272))
+- **[FLASK] BREAKING:** Snaps [are now required](https://github.com/MetaMask/snaps-skunkworks/discussions/590) to export `onRpcRequest` to receive RPC requests ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
+  - All existing snaps will have to be updated to conform to this new standard.
+- **[FLASK] BREAKING:** Snap state [is now encrypted](https://github.com/MetaMask/snaps-skunkworks/discussions/590) by default ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
+  - Breaks existing installed snaps that use `snap_manageState`. All such Snaps must be reinstalled.
+
+### Fixed
+- Fix German translation for `statusConnected` ([#14997](https://github.com/MetaMask/metamask-extension/pull/14997))
+- Fix Account Search functionality returning inconsistent results ([#14914](https://github.com/MetaMask/metamask-extension/pull/14914))
+- Fix Notifications icon color on the Account menu ([#14941](https://github.com/MetaMask/metamask-extension/pull/14941))
+- Fix broken UI for Network Settings page on small browser sizes ([#14857](https://github.com/MetaMask/metamask-extension/pull/14857))
+- Fix scanner for animated QR codes on dark mode, by removing bottom black line from the QR ([#14900](https://github.com/MetaMask/metamask-extension/pull/14900))
+- Fix displaying wrong balance on the first seconds after switching network ([#14354](https://github.com/MetaMask/metamask-extension/pull/14354))
+- Fix Contact name display on Edit tx page ([#14613](https://github.com/MetaMask/metamask-extension/pull/14613))
+- Fix infinite loading when transferring non-standard ERC721 (without name and/or symbol) ([#14756](https://github.com/MetaMask/metamask-extension/pull/14756))
+- **[FLASK]:** Fix multiple bugs related to snap installation ([#14952](https://github.com/MetaMask/metamask-extension/pull/14952))
+
+## [10.16.2]
+### Changed
+- This release restores the changes from v10.16.0, which was temporarily reverted in v10.16.1.
+
+## [10.16.1]
+### Changed
+- This release is a patch for v10.15.2, so all changes in v10.16.0 have been temporarily reverted. They will be restored in a future v16 release. ([#15063](https://github.com/MetaMask/metamask-extension/pull/15063))
+
+### Fixed
+- Fix bug that could cause an incorrect recipient address after pasting an address, without a 0x prefix, in the send flow while sending a token ([#15064](https://github.com/MetaMask/metamask-extension/pull/15064)
+
+## [10.16.0]
+### Added
+- Add friendly error handling screen, when UI fails to connect to background ([#14461](https://github.com/MetaMask/metamask-extension/pull/14461))
+- Add fiat onboarding for AVAX and MATIC through Wyre ([#14683](https://github.com/MetaMask/metamask-extension/pull/14683))
+- Add Coinbase Pay as fiat onramp option ([#14648](https://github.com/MetaMask/metamask-extension/pull/14648))
+- Add search information for Theme dropdown ([#14476](https://github.com/MetaMask/metamask-extension/pull/14476))
+- **[FLASK]** Add in-app notifications for snaps ([#14605](https://github.com/MetaMask/metamask-extension/pull/14605))
+- **[FLASK]** Add `long-running` snap permission ([#14700](https://github.com/MetaMask/metamask-extension/pull/14700))
+
+### Changed
+- Update caret icon color on Home Page for darkmode, from black to white ([#14835](https://github.com/MetaMask/metamask-extension/pull/14835))
+- Update the color of the ledger alert text to adhere to design system guidelines ([#14674](https://github.com/MetaMask/metamask-extension/pull/14674))
+- Standardize display of connected site's origin data on all confirmation screens ([#14720](https://github.com/MetaMask/metamask-extension/pull/14720))
+- Improved app loading performance
+  - Improve loading performance by patching the "secp256k1" package ([#14677](https://github.com/MetaMask/metamask-extension/pull/14677))
+  - Patch gridplus-sdk module for improving performance ([#14582](https://github.com/MetaMask/metamask-extension/pull/14582))
+- Swaps: ensure that native currency swap amounts are properly displayed on all networks, avoiding a bug where swap received amounts could equal gas costs ([#14821](https://github.com/MetaMask/metamask-extension/pull/14821))
+- Swaps: reduce the default slippage from 3% to 2% ([#14863](https://github.com/MetaMask/metamask-extension/pull/14863))
+- Swaps: update STX status content page ([#14805](https://github.com/MetaMask/metamask-extension/pull/14805))
+  - Make STX status timer behaviour dependent on API values
+  - Change "Swap complete in < X:XX" to "Swap will complete in < X:XX"
+  - Change "Privately submitting the Swap..." to "Privately submitting your Swap..."
+- Swaps: disable STX if a regular tx is in progress ([#14554](https://github.com/MetaMask/metamask-extension/pull/14554))
+- Swaps: remove gas editing ([#14673](https://github.com/MetaMask/metamask-extension/pull/14673))
+- **[FLASK]** Improve snap install screen ([#14803](https://github.com/MetaMask/metamask-extension/pull/14803), ([#14752](https://github.com/MetaMask/metamask-extension/pull/14752)))
+- **[FLASK] BREAKING** Bump `@metamask/key-tree` used by snaps to `4.0.0` ([#14700](https://github.com/MetaMask/metamask-extension/pull/14700))
+- **[FLASK]** Stopped showing confirmations for terminated snaps ([#14566](https://github.com/MetaMask/metamask-extension/pull/14566))
+
+### Fixed
+- Fix line-wrapping in Edit Nickname screen by decreasing the padding ([#14842](https://github.com/MetaMask/metamask-extension/pull/14842))
+- Fix 'Currency Symbol' detection in network settings when using Firefox ([#14810](https://github.com/MetaMask/metamask-extension/pull/14810))
+- Fix switching between ETH and USD in the amount field on the send screen ([#13827](https://github.com/MetaMask/metamask-extension/pull/13827))
+- Fix addition of 'add recipient' events to the send flow change logs so that 'contact' and 'recent' recipient are correctly distinguished ([#14771](https://github.com/MetaMask/metamask-extension/pull/14771))
+- Fix lock button sizing for text exceeding button boundaries ([#14335](https://github.com/MetaMask/metamask-extension/pull/14335))
+- Fix all "MetaMask" instances wrongly written as "Metamask" 
+  - ([#14851](https://github.com/MetaMask/metamask-extension/pull/14851))
+  - ([#14848](https://github.com/MetaMask/metamask-extension/pull/14848))
+- Fix design break on the Settings navbar for certain locales ([#14012](https://github.com/MetaMask/metamask-extension/pull/14012))
+- Fix missing white spacing for keystone transaction qrcode in darkmode ([#14798](https://github.com/MetaMask/metamask-extension/pull/14798))
+- Fix rare bug that could cause unexpected accounts to be generated from Ledger and connected to MetaMask ([#14799](https://github.com/MetaMask/metamask-extension/pull/14799))
+- Fix bug that could cause the incorrect token to be selected after editing the token via the send edit flow ([#14721](https://github.com/MetaMask/metamask-extension/pull/14721))
+- Fix chain ID field to use the same color pattern as the currency symbol field warning message ([#14627](https://github.com/MetaMask/metamask-extension/pull/14627))
+- Fix currency conversion rate on the Edit tx screen ([#14713](https://github.com/MetaMask/metamask-extension/pull/14713))
+- Fix sign button so it is enabled after scrolling all the way to the bottom on the sign type data confirmation screen ([#14745](https://github.com/MetaMask/metamask-extension/pull/14745))
+- Fix wrong tx type text for `Safe Transaction From` ([#14769](https://github.com/MetaMask/metamask-extension/pull/14769))
+- Fix "Site Suggested" tooltip in `EditGasFeeBtn` to only display the origin of dapp suggested gas fee if the origin is provided ([#14734](https://github.com/MetaMask/metamask-extension/pull/14734))
+- Fix incorrect line breaks on footer buttons from NetworksTab ([#14733](https://github.com/MetaMask/metamask-extension/pull/14733))
+- Fix incorrect currency symbol in the send flow history state logs ([#14726](https://github.com/MetaMask/metamask-extension/pull/14726))
+- Fix batch cancel/reject for signature requests ([#13786](https://github.com/MetaMask/metamask-extension/pull/13786))
+- Fix "Learn more" dialog broken link from Eth Sign ([#14667](https://github.com/MetaMask/metamask-extension/pull/14667))
+- Fix mixed text for Speed up/Cancel information ([#14551](https://github.com/MetaMask/metamask-extension/pull/14551))
+- Fix SRP paste duplication ([#14625](https://github.com/MetaMask/metamask-extension/pull/14625))
+- Fix onboarding functionality so that users of dapps using our onboarding library are redirected to the dapp after completing onboarding ([#14550](https://github.com/MetaMask/metamask-extension/pull/14550))
+- Fix error handling for signature methods so that proper errors are returned to dapps when there is a permissions error ([#14126](https://github.com/MetaMask/metamask-extension/pull/14126))
+- Fix `Speed Up` and `Cancel` button styles from `TransactionListItem` consolidating them with `TransactionListItemDetails` buttons ([#14659](https://github.com/MetaMask/metamask-extension/pull/14659))
+- Fix to prevent display of misleading or malicious contract method names ([#14937](https://github.com/MetaMask/metamask-extension/pull/14937))
+- Swaps: fix wrong colour for the high price impact notification ([#14697](https://github.com/MetaMask/metamask-extension/pull/14697))
+- Swaps: fix edge case when missing top assets ([#14688](https://github.com/MetaMask/metamask-extension/pull/14688))
+- **[FLASK]** Fix issues with the snap startup process and usage of `WebAssembly` ([#14772](https://github.com/MetaMask/metamask-extension/pull/14772))
+- **[FLASK]** Fix issues with snap id encoding ([#14693](https://github.com/MetaMask/metamask-extension/pull/14693))
+- **[FLASK]** Fix multiple smaller bugs with snaps ([#14670](https://github.com/MetaMask/metamask-extension/pull/14670))
+
+## [10.15.1]
+### Fixed
+- Fix Ledger connection failures that can occur after remove all hardware wallet accounts and reconnecting  ([#14993](https://github.com/MetaMask/metamask-extension/pull/14993))
+- Fix bug that could cause MetaMask to crash in some cases when interacting with tokens or NFTs ([#14962](https://github.com/MetaMask/metamask-extension/pull/14962))
+
+## [10.15.0]
+### Added
+- Add warning when multiple instances of MetaMask are running ([#13836](https://github.com/MetaMask/metamask-extension/pull/13836))
+- Add "What's New" announcement text for Dark Mode ([#14346](https://github.com/MetaMask/metamask-extension/pull/14346))
+- Theme: Add OS option in theme selection dropdown ([#14379](https://github.com/MetaMask/metamask-extension/pull/14379))
+
+### Changed
+- Use testname as the base currency prefix for preloaded test networks ([#14454](https://github.com/MetaMask/metamask-extension/pull/14454))
+- Update UI of "Add Network" page ([#13866](https://github.com/MetaMask/metamask-extension/pull/13866))
+- Update UI of network switch permissions prompt ([#13450](https://github.com/MetaMask/metamask-extension/pull/13450))
+- Show token approval details on approval screens by default ([#14523](https://github.com/MetaMask/metamask-extension/pull/14523))
+- Ensure theme selection dropdown is discoverable via settings search([#14379](https://github.com/MetaMask/metamask-extension/pull/14379))
+- Stop using the 4bytes registry to name contract deployment transactions in the activity list, preventing false method names from being shown for deployments ([#14598](https://github.com/MetaMask/metamask-extension/pull/14598))
+- Save send flow user action history in transaction state logs ([#14510](https://github.com/MetaMask/metamask-extension/pull/14510))
+- Update GridPlus to use https://github.com/GridPlus/gridplus-sdk/compare/v1.1.6...v1.2.4 ([#14467](https://github.com/MetaMask/metamask-extension/pull/14467))
+
+
+### Fixed
+- Fix `wallet_watchAsset method` ([#14545](https://github.com/MetaMask/metamask-extension/pull/14545))
+- Do not show failed off-chain transactions details when grouped with another valid transaction of same nonce ([#14497](https://github.com/MetaMask/metamask-extension/pull/14497))
+- Fix bug that could have caused some ledger transactions to fail after connecting Ledger then locking and unlocking ([#14563](https://github.com/MetaMask/metamask-extension/pull/14563))
+- Fix bug that could cause MetaMask to crash in some cases when attempting to send a transaction ([#14608](https://github.com/MetaMask/metamask-extension/pull/14608))
+
+## [10.14.7]
+### Changed
+- Make JavaScript bundles more reproducible between environments.
+  - The bundles no longer include absolute paths to each module included.
+
+## [10.14.6]
+### Changed
+- Move phishing warning page to external site.
+  - The page shown when a site is blocked has been extracted from the extension and moved to an external site. This site is eagerly cached with a service worker upon extension startup, so it should continue to work even while offline.
+- Make build .zip files reproducible (#14623)
+  - The ordering of files within each .zip file was non-deterministic before this change. We fixed this to comply with Firefox store policies.
+
+## [10.14.5]
+### Fixed
+- This release was deployed to fix a configuration issue.
+
+## [10.14.4]
+### Fixed
+- This release was deployed to fix a configuration issue.
+
+## [10.14.3]
+### Fixed
+- This release was deployed to fix a configuration issue.
+
+## [10.14.2]
+### Fixed
+- Make build deterministic (#14610)
+    - The ordering of modules within each bundle was non-deterministic before this change. We fixed this to comply with Firefox store policies.
+
+## [10.14.1]
+### Changed
+- This version was used to rollback from v10.14.0 to v10.13.0.
+
 ## [10.14.0]
 ### Added
 - **[FLASK]** Add snap version to details page ([#14110](https://github.com/MetaMask/metamask-extension/pull/14110))
@@ -2908,7 +3084,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.14.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.18.0...HEAD
+[10.18.0]: https://github.com/MetaMask/metamask-extension/compare/v10.17.0...v10.18.0
+[10.17.0]: https://github.com/MetaMask/metamask-extension/compare/v10.16.2...v10.17.0
+[10.16.2]: https://github.com/MetaMask/metamask-extension/compare/v10.16.1...v10.16.2
+[10.16.1]: https://github.com/MetaMask/metamask-extension/compare/v10.16.0...v10.16.1
+[10.16.0]: https://github.com/MetaMask/metamask-extension/compare/v10.15.1...v10.16.0
+[10.15.1]: https://github.com/MetaMask/metamask-extension/compare/v10.15.0...v10.15.1
+[10.15.0]: https://github.com/MetaMask/metamask-extension/compare/v10.14.7...v10.15.0
+[10.14.7]: https://github.com/MetaMask/metamask-extension/compare/v10.14.6...v10.14.7
+[10.14.6]: https://github.com/MetaMask/metamask-extension/compare/v10.14.5...v10.14.6
+[10.14.5]: https://github.com/MetaMask/metamask-extension/compare/v10.14.4...v10.14.5
+[10.14.4]: https://github.com/MetaMask/metamask-extension/compare/v10.14.3...v10.14.4
+[10.14.3]: https://github.com/MetaMask/metamask-extension/compare/v10.14.2...v10.14.3
+[10.14.2]: https://github.com/MetaMask/metamask-extension/compare/v10.14.1...v10.14.2
+[10.14.1]: https://github.com/MetaMask/metamask-extension/compare/v10.14.0...v10.14.1
 [10.14.0]: https://github.com/MetaMask/metamask-extension/compare/v10.13.0...v10.14.0
 [10.13.0]: https://github.com/MetaMask/metamask-extension/compare/v10.12.4...v10.13.0
 [10.12.4]: https://github.com/MetaMask/metamask-extension/compare/v10.12.3...v10.12.4
diff --git a/README.md b/README.md
index 1a4e7ca7011d..1174ddced850 100644
--- a/README.md
+++ b/README.md
@@ -14,14 +14,17 @@ To learn how to contribute to the MetaMask project itself, visit our [Internal D
 
 ## Building locally
 
-- Install [Node.js](https://nodejs.org) version 14
+- Install [Node.js](https://nodejs.org) version 16
     - If you are using [nvm](https://github.com/creationix/nvm#installation) (recommended) running `nvm use` will automatically choose the right node version for you.
 - Install [Yarn](https://yarnpkg.com/en/docs/install)
 - Install dependencies: `yarn setup` (not the usual install command)
 - Copy the `.metamaskrc.dist` file to `.metamaskrc`
     - Replace the `INFURA_PROJECT_ID` value with your own personal [Infura Project ID](https://infura.io/docs).
-    - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask](./development/README.md).
+    - If debugging MetaMetrics, you'll need to add a value for `SEGMENT_WRITE_KEY` [Segment write key](https://segment.com/docs/connections/find-writekey/), see [Developing on MetaMask - Segment](./development/README.md#segment).
+    - If debugging unhandled exceptions, you'll need to add a value for `SENTRY_DSN` [Sentry Dsn](https://docs.sentry.io/product/sentry-basics/dsn-explainer/), see [Developing on MetaMask - Sentry](./development/README.md#sentry).
+    - Optionally, replace the `PASSWORD` value with your development wallet password to avoid entering it each time you open the app.
 - Build the project to the `./dist/` folder with `yarn dist`.
+    - Optionally, you may run `yarn start` to run dev mode.
 
 Uncompressed builds can be found in `/dist`, compressed builds can be found in `/builds` once they're built.
 
@@ -115,3 +118,4 @@ Whenever you change dependencies (adding, removing, or updating, either in `pack
 - [How to generate a visualization of this repository's development](./development/gource-viz.sh)
 
 [1]: http://www.nomnoml.com/#view/%5B%3Cactor%3Euser%5D%0A%0A%5Bmetamask-ui%7C%0A%20%20%20%5Btools%7C%0A%20%20%20%20%20react%0A%20%20%20%20%20redux%0A%20%20%20%20%20thunk%0A%20%20%20%20%20ethUtils%0A%20%20%20%20%20jazzicon%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20account-detail%0A%20%20%20%20%20accounts%0A%20%20%20%20%20locked-screen%0A%20%20%20%20%20restore-vault%0A%20%20%20%20%20identicon%0A%20%20%20%20%20config%0A%20%20%20%20%20info%0A%20%20%20%5D%0A%20%20%20%5Breducers%7C%0A%20%20%20%20%20app%0A%20%20%20%20%20metamask%0A%20%20%20%20%20identities%0A%20%20%20%5D%0A%20%20%20%5Bactions%7C%0A%20%20%20%20%20%5BbackgroundConnection%5D%0A%20%20%20%5D%0A%20%20%20%5Bcomponents%5D%3A-%3E%5Bactions%5D%0A%20%20%20%5Bactions%5D%3A-%3E%5Breducers%5D%0A%20%20%20%5Breducers%5D%3A-%3E%5Bcomponents%5D%0A%5D%0A%0A%5Bweb%20dapp%7C%0A%20%20%5Bui%20code%5D%0A%20%20%5Bweb3%5D%0A%20%20%5Bmetamask-inpage%5D%0A%20%20%0A%20%20%5B%3Cactor%3Eui%20developer%5D%0A%20%20%5Bui%20developer%5D-%3E%5Bui%20code%5D%0A%20%20%5Bui%20code%5D%3C-%3E%5Bweb3%5D%0A%20%20%5Bweb3%5D%3C-%3E%5Bmetamask-inpage%5D%0A%5D%0A%0A%5Bmetamask-background%7C%0A%20%20%5Bprovider-engine%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bid%20store%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%3E%5Bhooked%20wallet%20subprovider%5D%0A%20%20%5Bhooked%20wallet%20subprovider%5D%3C-%3E%5Bid%20store%5D%0A%20%20%5Bconfig%20manager%7C%0A%20%20%20%20%5Brpc%20configuration%5D%0A%20%20%20%20%5Bencrypted%20keys%5D%0A%20%20%20%20%5Bwallet%20nicknames%5D%0A%20%20%5D%0A%20%20%0A%20%20%5Bprovider-engine%5D%3C-%5Bconfig%20manager%5D%0A%20%20%5Bid%20store%5D%3C-%3E%5Bconfig%20manager%5D%0A%5D%0A%0A%5Buser%5D%3C-%3E%5Bmetamask-ui%5D%0A%0A%5Buser%5D%3C%3A--%3A%3E%5Bweb%20dapp%5D%0A%0A%5Bmetamask-contentscript%7C%0A%20%20%5Bplugin%20restart%20detector%5D%0A%20%20%5Brpc%20passthrough%5D%0A%5D%0A%0A%5Brpc%20%7C%0A%20%20%5Bethereum%20blockchain%20%7C%0A%20%20%20%20%5Bcontracts%5D%0A%20%20%20%20%5Baccounts%5D%0A%20%20%5D%0A%5D%0A%0A%5Bweb%20dapp%5D%3C%3A--%3A%3E%5Bmetamask-contentscript%5D%0A%5Bmetamask-contentscript%5D%3C-%3E%5Bmetamask-background%5D%0A%5Bmetamask-background%5D%3C-%3E%5Bmetamask-ui%5D%0A%5Bmetamask-background%5D%3C-%3E%5Brpc%5D%0A
+
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index bfbbac952138..6a3d69bc2d0f 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -131,10 +131,10 @@
     "message": "ማሰሺያዎት አልተደገፈም..."
   },
   "buyWithWyre": {
-    "message": "ETH በ Wyre ይግዙ"
+    "message": "$1 በ Wyre ይግዙ"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ክሬዲት ካርድ ተጠቅመው ETH በቀጥታ በ MetaMask መለያዎ ላይ እንዲያስቀምጡ ያስችልዎታል።"
+    "message": "Wyre ክሬዲት ካርድ ተጠቅመው $1 በቀጥታ በ MetaMask መለያዎ ላይ እንዲያስቀምጡ ያስችልዎታል።"
   },
   "bytes": {
     "message": "ባይት"
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index e87624ee26cb..6d99fc54b78a 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -148,7 +148,7 @@
     "message": "قم بشراء عملة إيثير بواسطة Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "يتيح لك Wyre استخدام بطاقة ائتمان لإيداع ETH مباشرة في حساب MetaMask الخاص بك."
+    "message": "يتيح لك Wyre استخدام بطاقة ائتمان لإيداع 1$ مباشرة في حساب MetaMask الخاص بك."
   },
   "bytes": {
     "message": "بايتات"
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index 9d4534adbe72..49b76836583e 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -137,10 +137,10 @@
     "message": "Браузърът ви не се поддържа ..."
   },
   "buyWithWyre": {
-    "message": "Купете ETH с Wyre"
+    "message": "Купете $1 с Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ви позволява да използвате кредитна карта, за да депозирате ETH право във вашата MetaMask сметка."
+    "message": "Wyre ви позволява да използвате кредитна карта, за да депозирате $1 право във вашата MetaMask сметка."
   },
   "bytes": {
     "message": "Байта"
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 7dd74c5ebeab..88fedac63b1f 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -137,10 +137,10 @@
     "message": "আপনার ব্রাউজার সমর্থিত নয়..."
   },
   "buyWithWyre": {
-    "message": "Wyre দিয়ে ETH ক্রয় করুন"
+    "message": "Wyre দিয়ে $1 ক্রয় করুন"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre আপনার MetaMask অ্যাকাউন্টে সরাসরি ETH জমা করতে আপনাকে একটি ক্রেডিট কার্ড ব্যবহার করতে দেয়।"
+    "message": "Wyre আপনার MetaMask অ্যাকাউন্টে সরাসরি $1 জমা করতে আপনাকে একটি ক্রেডিট কার্ড ব্যবহার করতে দেয়।"
   },
   "bytes": {
     "message": "বাইটস"
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index 34abb31dc6ae..3bdaf93ba630 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -137,10 +137,10 @@
     "message": "El teu navegador no és suportat..."
   },
   "buyWithWyre": {
-    "message": "Compra ETH amb Wyre"
+    "message": "Compra $1 amb Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre et permet utilitzar una targeta de crèdit per dipositar ETH directe al teu compte MetaMask."
+    "message": "Wyre et permet utilitzar una targeta de crèdit per dipositar $1 directe al teu compte MetaMask."
   },
   "cancel": {
     "message": "Cancel·la"
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 248404f43e82..4b642ef37499 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -137,10 +137,10 @@
     "message": "Din browser er ikke understøttet..."
   },
   "buyWithWyre": {
-    "message": "Køb ETH med Wyre"
+    "message": "Køb $1 med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre lader dig bruge et kreditkort til at indbetale ETH på din MetaMask-konto."
+    "message": "Wyre lader dig bruge et kreditkort til at indbetale $1 på din MetaMask-konto."
   },
   "bytes": {
     "message": "Byte"
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index ed85a38cf280..7951a4640983 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 kann auf dieses Asset zugreifen und es ausgeben",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Greifen Sie mit Ihrer geheimen Wiederherstellungsphrase auf Ihr Wallet zu"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask kann Ihr Passwort nicht wiederherstellen. Wir verwenden Ihre geheime Wiederherstellungsphrase, um Ihr Eigentum zu bestätigen, Ihr Wallet wiederherzustellen und ein neues Passwort festzulegen. Geben Sie zunächst die geheime Wiederherstellungsphrase ein, die Sie erhalten haben, als Sie Ihr Wallet erstellt haben. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Zugriff auf Ihre Kamera …"
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Netzwerk hinzufügen"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Diese Netzwerkverbindung ist von Dritten abhängig. Diese Verbindung könnte unzuverlässiger sein oder Dritten erlauben, Ihre Aktivitäten zu verfolgen. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Vorgeschlagene Token hinzufügen"
   },
@@ -400,6 +411,14 @@
     "message": "$1 kaufen",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "1 $ mit Coinbase Pay kaufen",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Sie können mit Ihrem Coinbase-Konto bequem Kryptowährungen kaufen oder überweisen.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "$1 mit MoonPay kaufen",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "ETH mit Wyre kaufen"
+    "message": "$1 mit Wyre kaufen"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ermöglicht Ihnen die Verwendung einer Kreditkarte zum direkten Einzahlen von ETH auf Ihr MetaMask-Konto."
+    "message": "Wyre ermöglicht Ihnen die Verwendung einer Kreditkarte zum direkten Einzahlen von $1 auf Ihr MetaMask-Konto."
   },
   "bytes": {
     "message": "Bytes"
@@ -447,9 +466,6 @@
     "message": "Für eine Transaktion im Wert von $1 muss die Gasgebühr um mindestens 10 % erhöht werden, damit sie vom Netz erkannt wird.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Swap abbrechen"
-  },
   "cancellationGasFee": {
     "message": "Stornierungs-Gasgebühr"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Weiter"
   },
+  "continueToCoinbasePay": {
+    "message": "Weiter zu Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Weiter zu MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Vertragsinteraktion"
   },
   "convertTokenToNFTDescription": {
-    "message": "Wir haben festgestellt, dass dieses Asset eine NFT ist. Metamask hat jetzt volle native Unterstützung für NFTs. Möchten Sie es aus Ihrer Tokenliste entfernen und als NFT hinzufügen?"
+    "message": "Wir haben festgestellt, dass dieses Asset eine NFT ist. MetaMask hat jetzt volle native Unterstützung für NFTs. Möchten Sie es aus Ihrer Tokenliste entfernen und als NFT hinzufügen?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Wir haben festgestellt, dass dieses Asset als NFT hinzugefügt wurde. Möchten Sie es aus Ihrer Token-Liste entfernen?"
@@ -1225,6 +1244,10 @@
     "message": "Alle Flask-APIs sind experimentell. Sie können ohne Vorankündigung geändert oder entfernt werden oder sie können auf unbestimmte Zeit in Flask bleiben, ohne jemals in die stabile MetaMask migriert zu werden. Die Verwendung erfolgt auf eigene Gefahr.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Stellen Sie sicher, dass Sie Ihre normale MetaMask-Erweiterung deaktivieren, wenn Sie Flask verwenden.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Ich akzeptiere die Risiken",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Ausblenden"
   },
+  "hideFullTransactionDetails": {
+    "message": "Vollständige Transaktionsdetails ausblenden"
+  },
   "hideSeedPhrase": {
     "message": "Seed-Phrase ausblenden"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Verlauf"
   },
+  "ignoreAll": {
+    "message": "Alle ignorieren"
+  },
+  "ignoreTokenWarning": {
+    "message": "Wenn Sie Token ignorieren, werden Sie nicht in Ihrem Wallet angezeigt. Sie können sie jedoch weiterhin hinzufügen, indem Sie nach ihnen suchen."
+  },
   "import": {
     "message": "Importieren",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Wallet importieren"
   },
+  "importWithCount": {
+    "message": "$1 importieren",
+    "description": "$1 will the number of detected tokens that are selected for importing, if all of them are selected then $1 will be all"
+  },
   "importYourExisting": {
     "message": "Ihre bestehende Wallet mit einer Geheime Wiederherstellungsphrase importieren"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "Richtungspfeil"
   },
+  "lightTheme": {
+    "message": "Leicht"
+  },
   "likeToImportTokens": {
     "message": "Möchtest du diese Token hinzufügen?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "6M+ Benutzern beitreten um MetaMask zu verbessern"
   },
-  "mismatchedChain": {
-    "message": "Die Netzwerkdetails für diese Ketten-ID stimmen nicht mit unseren Aufzeichnungen überein. Wir empfehlen Ihnen $1, bevor Sie fortfahren.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "die Netzwerkdetails überprüfen",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Neu bei MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Sie haben $1 erfolgreich importiert.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token importiert"
+  },
   "newTotal": {
     "message": "Neue Summe"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Nicht genügend Gas"
   },
+  "notifications": {
+    "message": "Benachrichtigungen"
+  },
   "notifications10ActionText": {
     "message": "Einstellungen ansehen",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Wir machen Transaktionen leichter lesbar."
   },
+  "notificationsEmptyText": {
+    "message": "Hier gibt es nichts zu sehen."
+  },
+  "notificationsHeader": {
+    "message": "Benachrichtigungen"
+  },
+  "notificationsInfos": {
+    "message": "$1 von $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Alle als gelesen markieren"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 neue Tokens in diesem Konto gefunden\n",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Ursprung"
   },
+  "osTheme": {
+    "message": "System"
+  },
+  "padlock": {
+    "message": "Schloss"
+  },
   "parameters": {
     "message": "Parameter"
   },
@@ -2371,6 +2435,10 @@
     "message": "Siehe Adresse, Kontostand, Aktivität und Einleitung von Transaktionen",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Für unbestimmte Zeit ausführen.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Verwalten Sie Ihre „$1“-Konten und Vermögenswerte.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 mehr",
     "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": "Beliebte benutzerdefinierte Netzwerke"
+  },
   "preferredLedgerConnectionType": {
     "message": "Bevorzugter Ledger-Verbindungstyp",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Vergewissern Sie sich, dass Sie die richtige geheime Wiederherstellungsphrase verwenden, bevor Sie fortfahren. Sie können dies nicht mehr rückgängig machen."
   },
+  "restartMetamask": {
+    "message": "MetaMask neu starten"
+  },
   "restore": {
     "message": "Wiederherstellen"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Betrag senden"
   },
+  "sendBugReport": {
+    "message": "Übermitteln Sie uns einen Fehlerbericht."
+  },
   "sendSpecifiedTokens": {
     "message": "$1 senden",
     "description": "Symbol of the specified token"
@@ -2998,7 +3075,7 @@
     "message": "Status"
   },
   "statusConnected": {
-    "message": "Verbinden"
+    "message": "Verbunden"
   },
   "statusNotConnected": {
     "message": "Nicht verbunden"
@@ -3031,6 +3108,9 @@
     "message": "Verbinden Sie Ihre Wallet direkt mit Ihrem Computer.  Entsperren Sie Ihren Ledger und öffnen Sie die Ethereum-App. Für weitere Informationen zur Verwendung Ihres Hardware-Wallet-Geräts, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Erhalten Sie diese Meldung immer noch?"
+  },
   "storePhrase": {
     "message": "Speichern Sie diesen Schlüssel in einem Passwortmanager wie 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Sie können Ihre Token immer noch tauschen, selbst während intelligente Transaktionen nicht verfügbar sind."
   },
-  "stxPendingFinalizing": {
-    "message": "Wird finalisiert ..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Ihr Swap wird privat eingereicht ..."
   },
-  "stxPendingOptimizingGas": {
-    "message": "Gas wird optimiert ..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Swap wird privat eingereicht ..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Ihr Swap wird öffentlich eingereicht ..."
   },
   "stxSubDescription": {
     "message": "* Intelligente Transaktionen versuchen mehrmals, Ihre Transaktion privat zu übermitteln. Wenn alle Versuche fehlschlagen, wird die Transaktion öffentlich übertragen, um sicherzustellen, dass Ihr Swap erfolgreich durchgeführt wird."
@@ -3102,6 +3179,10 @@
     "message": "Ihr $1 ist jetzt verfügbar.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Swap abgeschlossen in <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Simulieren Sie Transaktionen vor der Übermittlung, um die Transaktionskosten zu senken und Ausfälle zu vermeiden."
   },
@@ -3180,10 +3261,6 @@
     "message": "Keine Token verfügbar mit $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"
   },
-  "swapCompleteIn": {
-    "message": "Swap abgeschlossen in <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Mit Ihrer Hardware-Wallet bestätigen"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Slippage muss größer oder gleich Null sein"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Liquiditätsquelle"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Tokensymbol"
   },
+  "tokensFoundTitle": {
+    "message": "$1 neue Token gefunden",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Ich verstehe"
   },
@@ -3719,6 +3804,9 @@
     "message": "Wir hatten Probleme mit der Verbindung zu Ihrem $1, versuchen Sie, $2 zu überprüfen und versuchen es erneut.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "Beim Starten von MetaMask ist ein Problem aufgetreten. Dies könnte ein vorübergehendes Problem sein. Versuchen Sie daher, die Erweiterung neu zu starten."
+  },
   "troubleTokenBalances": {
     "message": "Wir haben Schwierigkeiten dein Tokenguthaben zu laden. Du kannst es hier anzeigen lassen",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Passwort eingeben"
   },
+  "typeYourSRP": {
+    "message": "Geben Sie Ihre geheime Wiederherstellungsphrase ein"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Dieses benutzerdefinierte Netzwerk ist nicht erkannt. Wir empfehlen, dass Sie $1 bevor Sie fortfahren",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "die Netzwerkdetails überprüfen",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Verwenden von Sammelbaren (ERC-721) Token wird derzeit nicht unterstützt",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Wallet-Erstellung erfolgreich"
   },
+  "warning": {
+    "message": "Warnung"
+  },
   "weak": {
     "message": "Schwach"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index fec2fcdc217f..649655d5e878 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -62,6 +62,13 @@
     "message": "Το $1 ίσως αποκτήσει πρόσβαση και δαπανήσει αυτό το περιουσιακό στοιχείο",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Αποκτήστε πρόσβαση στο πορτοφόλι σας με τη Μυστική σας Φράση Ανάκτησης"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "Το MetaMask δεν μπορεί να ανακτήσει τον κωδικό σας. Θα χρησιμοποιήσουμε τη Μυστική σας Φράση Ανάκτησης για να επιβεβαιώσουμε την κυριότητά σας, να ανακτήσουμε το πορτοφόλι σας και να ορίσουμε ένα νέο κωδικό. Πρώτα, εισάγετε τη Μυστική Φράση σας Ανάκτησης που σας δόθηκε όταν δημιουργήσατε το πορτοφόλι σας. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Πρόσβαση στην κάμερά σας..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Προσθήκη Δικτύου"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Αυτή η σύνδεση δικτύου βασίζεται σε τρίτους. H σύνδεση ενδέχεται να είναι λιγότερο αξιόπιστη ή να επιτρέπει σε τρίτους να παρακολουθούν τη δραστηριότητα. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Προσθέστε τα Προτεινόμενα Tokens"
   },
@@ -400,6 +411,14 @@
     "message": "Αγορά $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Αγορά $1 με Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Μπορείτε να αγοράσετε ή να μεταφέρετε εύκολα κρυπτονομίσματα με τον λογαριασμό σας στο Coinbase.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Αγορά $1 με MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Αγοράστε ETH με το Wyre"
+    "message": "Αγοράστε $1 με το Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Το Wyre σας επιτρέπει να χρησιμοποιήσετε μια πιστωτική κάρτα για να καταθέσετε ETH απευθείας στον λογαριασμό σας MetaTask."
+    "message": "Το Wyre σας επιτρέπει να χρησιμοποιήσετε μια πιστωτική κάρτα για να καταθέσετε $1 απευθείας στον λογαριασμό σας MetaTask."
   },
   "bytes": {
     "message": "Bytes"
@@ -447,9 +466,6 @@
     "message": "Για να $1 τη συναλλαγή, τα τέλη συναλλαγής πρέπει να αυξηθούν κατά τουλάχιστον 10% ώστε να αναγνωριστούν από το δίκτυο.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Ακύρωση ανταλλαγής"
-  },
   "cancellationGasFee": {
     "message": "Ακύρωση Χρέωσης Αερίου"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Συνέχεια"
   },
+  "continueToCoinbasePay": {
+    "message": "Συνέχεια στο Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Συνέχεια στη MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Αλληλεπίδραση Σύμβασης"
   },
   "convertTokenToNFTDescription": {
-    "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο είναι NFT. Το Metamask υποστηρίζει πλέον εξ'ορισμού πλήρως τα NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας και να το προσθέσετε ως NFT;"
+    "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο είναι NFT. Το MetaMask υποστηρίζει πλέον εξ'ορισμού πλήρως τα NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας και να το προσθέσετε ως NFT;"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Εντοπίσαμε ότι αυτό το περιουσιακό στοιχείο προστέθηκε ως NFT. Θέλετε να το αφαιρέσετε από τη λίστα των token σας;"
@@ -1225,6 +1244,10 @@
     "message": "Όλα τα API του Flask είναι πειραματικά. Μπορεί να αλλάξουν ή να αφαιρεθούν χωρίς προειδοποίηση ή μπορεί να παραμείνουν στο Flask επ' αόριστον, χωρίς ποτέ να μεταφερθούν στο σταθερό MetaMask. Χρησιμοποιήστε τα με δική σας ευθύνη.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Βεβαιωθείτε ότι έχετε απενεργοποιήσει την κανονική σας επέκταση MetaMask όταν χρησιμοποιείτε το Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Αποδέχομαι τον κίνδυνο",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Απόκρυψη"
   },
+  "hideFullTransactionDetails": {
+    "message": "Απόκρυψη αναλυτικών στοιχείων συναλλαγών"
+  },
   "hideSeedPhrase": {
     "message": "Απόκρυψη φράσης ανάκτησης"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Ιστορικό"
   },
+  "ignoreAll": {
+    "message": "Αγνόηση όλων"
+  },
+  "ignoreTokenWarning": {
+    "message": "Εάν κάνετε απόκρυψη των token, δεν θα εμφανίζονται στο πορτοφόλι σας. Ωστόσο, μπορείτε ακόμα να τα προσθέσετε εάν κάνετε αναζήτηση για αυτά."
+  },
   "import": {
     "message": "Εισαγωγή",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Εισαγωγή Πορτοφολιού"
   },
+  "importWithCount": {
+    "message": "Εισαγωγή $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"
+  },
   "importYourExisting": {
     "message": "Εισαγωγή υπάρχοντος πορτοφολιού με Μυστική Φράση Ανάκτησης"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "βέλος αλλαγής επιπέδου"
   },
+  "lightTheme": {
+    "message": "Ανοιχτόχρωμο"
+  },
   "likeToImportTokens": {
     "message": "Θέλετε να προσθέσετε αυτά τα token;"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Συμμετάσχετε σε 6εκ+ χρήστες για να βελτιώσετε το MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Οι λεπτομέρειες δικτύου για αυτό το αναγνωριστικό αλυσίδας δεν ταιριάζουν με τις εγγραφές μας. Σας συνιστούμε να $1 πριν συνεχίσετε.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "επαληθεύστε τα στοιχεία δικτύου",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Καινούριος στο MetaMask;"
   },
+  "newTokensImportedMessage": {
+    "message": "Εισάγατε επιτυχώς το $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Τα token εισήχθησαν"
+  },
   "newTotal": {
     "message": "Νέο Σύνολο"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Δεν Υπάρχει Αρκετό Αέριο"
   },
+  "notifications": {
+    "message": "Ειδοποιήσεις"
+  },
   "notifications10ActionText": {
     "message": "Μετάβαση στις Ρυθμίσεις",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Κάνουμε τις συναλλαγές ευκολότερες στο διάβασμα."
   },
+  "notificationsEmptyText": {
+    "message": "Δεν υπάρχει κάτι να δείτε εδώ."
+  },
+  "notificationsHeader": {
+    "message": "Ειδοποιήσεις"
+  },
+  "notificationsInfos": {
+    "message": "$1 από $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Επισήμανση όλων ως αναγνωσμένων"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 νέα token βρέθηκαν σε αυτόν τον λογαριασμό",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Προέλευση"
   },
+  "osTheme": {
+    "message": "Σύστημα"
+  },
+  "padlock": {
+    "message": "Padlock"
+  },
   "parameters": {
     "message": "Παράμετροι"
   },
@@ -2371,6 +2435,10 @@
     "message": "Βλέπε διεύθυνση, υπόλοιπο λογαριασμού, δραστηριότητα και έναρξη συναλλαγών",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Εκτέλεση επ' αόριστον.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Ελέγξτε τους λογαριασμούς και τα περιουσιακά σας στοιχεία σας στο \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 ακόμη",
     "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": "Δημοφιλή προσαρμοσμένα δίκτυα"
+  },
   "preferredLedgerConnectionType": {
     "message": "Προτιμώμενος Τύπος Σύνδεσης Ledger",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Βεβαιωθείτε ότι χρησιμοποιείτε τη σωστή Μυστική Φράση Ανάκτησης πριν συνεχίσετε. Αυτή η ενέργεια είναι μη αναστρέψιμη."
   },
+  "restartMetamask": {
+    "message": "Επανεκκίνηση MetaMask"
+  },
   "restore": {
     "message": "Επαναφορά"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Αποστολή Ποσού"
   },
+  "sendBugReport": {
+    "message": "Στείλτε μας μια αναφορά σφάλματος."
+  },
   "sendSpecifiedTokens": {
     "message": "Αποστολή $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Συνδέστε το πορτοφόλι σας απευθείας στον υπολογιστή σας. Ξεκλειδώστε το Ledger και ανοίξτε την εφαρμογή Ethereum. Για περισσότερες πληροφορίες σχετικά με τη χρήση της συσκευής πορτοφολιού σας, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Λαμβάνετε ακόμα αυτό το μήνυμα;"
+  },
   "storePhrase": {
     "message": "Αποθηκεύστε αυτήν τη φράση σε έναν διαχειριστή κωδικών πρόσβασης όπως το 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Μπορείτε να ανταλλάξετε ακόμα τα token σας, ακόμα και αν οι Έξυπνες Συναλλαγές δεν είναι διαθέσιμες."
   },
-  "stxPendingFinalizing": {
-    "message": "Ολοκλήρωση..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Ιδιωτική υποβολή της Ανταλλαγής σας..."
   },
-  "stxPendingOptimizingGas": {
-    "message": "Βελτιστοποίηση τελών συναλλαγής..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Ιδιωτική υποβολή της Ανταλλαγής..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Δημόσια υποβολή της Ανταλλαγής σας..."
   },
   "stxSubDescription": {
     "message": "* Οι Έξυπνες Συναλλαγές θα προσπαθήσουν να υποβάλουν τη συναλλαγή σας ιδιωτικά, πολλές φορές. Εάν όλες οι προσπάθειες αποτύχουν, η συναλλαγή θα μεταδοθεί δημόσια για να διασφαλιστεί η επιτυχής πραγματοποίηση της ανταλλαγής σας."
@@ -3102,6 +3179,10 @@
     "message": "Τα $1 σας είναι πλέον διαθέσιμα.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Η Ανταλλαγή θα ολοκληρωθεί σε <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Προσομοίωση συναλλαγών πριν από την υποβολή για μείωση του κόστους συναλλαγής και των αποτυχιών."
   },
@@ -3180,10 +3261,6 @@
     "message": "Δεν υπάρχουν διαθέσιμα tokens που να ταιριάζουν σε $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"
   },
-  "swapCompleteIn": {
-    "message": "Η ανταλλαγή θα ολοκληρωθεί σε <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Επιβεβαιώστε με το υλικό πορτοφόλι σας"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Η ολίσθηση πρέπει να είναι μεγαλύτερη ή ίση με το μηδέν"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Πηγή ρευστότητας"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Σύμβολο Token"
   },
+  "tokensFoundTitle": {
+    "message": "Βρέθηκαν $1 νέα tokens",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Καταλαβαίνω"
   },
@@ -3719,6 +3804,9 @@
     "message": "Είχαμε πρόβλημα να συνδεθούμε με το $1 σας, δοκιμάστε να ξαναδείτε το $2 και προσπαθήστε ξανά.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "Το MetaMask αντιμετώπισε πρόβλημα κατά την εκκίνηση. Αυτό το σφάλμα μπορεί να είναι τυχαίο, γι' αυτό προσπαθήστε να επανεκκινήσετε την επέκταση."
+  },
   "troubleTokenBalances": {
     "message": "Είχαμε πρόβλημα να φορτώσουμε τα υπόλοιπα του διακριτικού σας. Μπορείτε να τα δείτε ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Πληκτρολογήστε τον κωδικό πρόσβασής σας MetaMask"
   },
+  "typeYourSRP": {
+    "message": "Πληκτρολογήστε τη Μυστική σας Φράση Ανάκτησης"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Αυτό το προσαρμοσμένο δίκτυο δεν αναγνωρίζεται. Σας συνιστούμε να $1 πριν προχωρήσετε",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "επαληθεύστε τα στοιχεία δικτύου",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Η αποστολή συλλεκτικών (ERC-721) δεν υποστηρίζεται προς το παρόν",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Επιτυχής δημιουργία πορτοφολιού"
   },
+  "warning": {
+    "message": "Προειδοποίηση"
+  },
   "weak": {
     "message": "Αδύναμος"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index a34af875bb96..e425103f27d9 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -160,6 +160,9 @@
   "addMemo": {
     "message": "Add memo"
   },
+  "addMoreNetworks": {
+    "message": "add more networks manually"
+  },
   "addNetwork": {
     "message": "Add Network"
   },
@@ -230,6 +233,10 @@
   "alerts": {
     "message": "Alerts"
   },
+  "allOfYour": {
+    "message": "All of your $1",
+    "description": "$1 is the symbol or name of the token that the user is approving spending"
+  },
   "allowExternalExtensionTo": {
     "message": "Allow this external extension to:"
   },
@@ -266,6 +273,10 @@
   "approve": {
     "message": "Approve spend limit"
   },
+  "approveAllTokensTitle": {
+    "message": "Give permission to access all of your $1?",
+    "description": "$1 is the symbol of the token for which the user is granting approval"
+  },
   "approveAndInstall": {
     "message": "Approve & Install"
   },
@@ -414,6 +425,14 @@
     "message": "Buy $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Buy $1 with Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "You can easily buy or transfer crypto with your Coinbase account.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Buy $1 with MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -433,10 +452,10 @@
     "message": "Buy Now"
   },
   "buyWithWyre": {
-    "message": "Buy ETH with Wyre"
+    "message": "Buy $1 with Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre lets you use a debit card to deposit ETH right in to your MetaMask account."
+    "message": "Easy onboarding for purchases up to $ 1000. Fast interactive high limit purchase verification. Supports Debit/Credit Card, Apple Pay, Bank Transfers. Available in 100+ countries. Tokens deposit into your MetaMask Account"
   },
   "bytes": {
     "message": "Bytes"
@@ -464,8 +483,12 @@
     "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'"
   },
-  "cancelSwap": {
-    "message": "Cancel swap"
+  "cancelSwapForFee": {
+    "message": "Cancel swap for ~$1",
+    "description": "$1 could be e.g. $2.98, it is a cost for cancelling a Smart Transaction"
+  },
+  "cancelSwapForFree": {
+    "message": "Cancel swap for free"
   },
   "cancellationGasFee": {
     "message": "Cancellation Gas Fee"
@@ -623,6 +646,9 @@
   "continue": {
     "message": "Continue"
   },
+  "continueToCoinbasePay": {
+    "message": "Continue to Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Continue to MoonPay"
   },
@@ -648,7 +674,7 @@
     "message": "Contract Interaction"
   },
   "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?"
+    "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?"
@@ -1278,6 +1304,9 @@
   "functionApprove": {
     "message": "Function: Approve"
   },
+  "functionSetApprovalForAll": {
+    "message": "Function: SetApprovalForAll"
+  },
   "functionType": {
     "message": "Function Type"
   },
@@ -1618,6 +1647,9 @@
   "invalidSeedPhrase": {
     "message": "Invalid Secret Recovery Phrase"
   },
+  "invalidSeedPhraseCaseSensitive": {
+    "message": "Invalid input! Secret Recovery Phrase is case sensitive."
+  },
   "ipfsGateway": {
     "message": "IPFS Gateway"
   },
@@ -1889,14 +1921,23 @@
   "metametricsTitle": {
     "message": "Join 6M+ users to improve MetaMask"
   },
-  "mismatchedChain": {
-    "message": "The network details for this chain ID do not match our records. We recommend that you $1 before proceeding.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "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."
+  },
+  "mismatchedRpcUrl": {
+    "message": "According to our records the submitted RPC URL value does not match a known provider for this chain ID."
+  },
   "missingNFT": {
     "message": "Don't see your NFT?"
   },
@@ -1948,6 +1989,9 @@
   "network": {
     "message": "Network:"
   },
+  "networkAddedSuccessfully": {
+    "message": "Network added successfully!"
+  },
   "networkDetails": {
     "message": "Network Details"
   },
@@ -2064,6 +2108,9 @@
     "message": "Nonce is higher than suggested nonce of $1",
     "description": "The next nonce according to MetaMask's internal logic"
   },
+  "nft": {
+    "message": "NFT"
+  },
   "nftTokenIdPlaceholder": {
     "message": "Enter the Token ID"
   },
@@ -2130,6 +2177,9 @@
   "notEnoughGas": {
     "message": "Not Enough Gas"
   },
+  "notifications": {
+    "message": "Notifications"
+  },
   "notifications10ActionText": {
     "message": "Visit in settings",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2161,6 +2211,16 @@
   "notifications12Title": {
     "message": "Wen dark mode? Now dark mode! 🕶️🦊"
   },
+  "notifications13ActionText": {
+    "message": "Show custom network list"
+  },
+  "notifications13Description": {
+    "message": "You can now add the following popular custom networks easily: Arbitrum, Avalanche, Binance Smart Chain, Fantom, Harmony, Optimism, Palm and Polygon! To enable this feature, go to Settings -> Experimental and turn \"Show custom network list\" on!",
+    "description": "Description of a notification in the 'See What's New' popup. Describes popular network feature."
+  },
+  "notifications13Title": {
+    "message": "Add Popular Networks"
+  },
   "notifications1Description": {
     "message": "MetaMask Mobile users can now swap tokens inside their mobile wallet. Scan the QR code to get the mobile app and start swapping.",
     "description": "Description of a notification in the 'See What's New' popup. Describes the swapping on mobile feature."
@@ -2250,6 +2310,19 @@
   "notifications9Title": {
     "message": "👓 We are making transactions easier to read."
   },
+  "notificationsEmptyText": {
+    "message": "Nothing to see here."
+  },
+  "notificationsHeader": {
+    "message": "Notifications"
+  },
+  "notificationsInfos": {
+    "message": "$1 from $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Mark all as read"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 new tokens found in this account",
     "description": "$1 is the number of new tokens detected"
@@ -2424,6 +2497,10 @@
     "message": "See address, account balance, activity and suggest transactions to approve",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Run indefinitely.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Control your \"$1\" accounts and assets.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2630,6 +2707,9 @@
   "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"
   },
@@ -2658,6 +2738,14 @@
   "revealTheSeedPhrase": {
     "message": "Reveal seed phrase"
   },
+  "revokeAllTokensTitle": {
+    "message": "Revoke permission to access all of your $1?",
+    "description": "$1 is the symbol of the token for which the user is revoking approval"
+  },
+  "revokeApproveForAllDescription": {
+    "message": "By revoking permission, the following $1 will no longer be able to access your $2",
+    "description": "$1 is either key 'account' or 'contract', and $2 is either a string or link of a given token symbol or name"
+  },
   "rinkeby": {
     "message": "Rinkeby Test Network"
   },
@@ -2814,6 +2902,9 @@
   "sendAmount": {
     "message": "Send Amount"
   },
+  "sendBugReport": {
+    "message": "Send us a bug report."
+  },
   "sendSpecifiedTokens": {
     "message": "Send $1",
     "description": "Symbol of the specified token"
@@ -2831,12 +2922,23 @@
     "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"
+  },
   "setAdvancedPrivacySettings": {
     "message": "Set advanced privacy settings"
   },
   "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"
+  },
   "settings": {
     "message": "Settings"
   },
@@ -2856,6 +2958,12 @@
   "showAdvancedGasInlineDescription": {
     "message": "Select this to show gas price and limit controls directly on the send and confirm screens."
   },
+  "showCustomNetworkList": {
+    "message": "Show Custom Network List"
+  },
+  "showCustomNetworkListDescription": {
+    "message": "Select this to show a list of networks with prefilled details when adding a new network."
+  },
   "showFiatConversionInTestnets": {
     "message": "Show Conversion on test networks"
   },
@@ -2965,6 +3073,9 @@
   "snapsToggle": {
     "message": "A snap will only run if it is enabled"
   },
+  "someNetworksMayPoseSecurity": {
+    "message": "Some networks may pose security and/or privacy risks. Understand the risks before adding & using a network."
+  },
   "somethingWentWrong": {
     "message": "Oops! Something went wrong."
   },
@@ -3087,6 +3198,9 @@
     "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?"
+  },
   "storePhrase": {
     "message": "Store this phrase in a password manager like 1Password."
   },
@@ -3112,7 +3226,7 @@
     "message": "Swap would have failed"
   },
   "stxCancelledDescription": {
-    "message": "Your transaction would have failed and was canceled to protect you from paying unnecessary gas fees."
+    "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."
@@ -3139,14 +3253,11 @@
   "stxFallbackUnavailable": {
     "message": "You can still swap your tokens even while Smart Transactions are unavailable."
   },
-  "stxPendingFinalizing": {
-    "message": "Finalizing..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimizing gas..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Privately submitting your Swap..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Privately submitting the Swap..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Publicly submitting your Swap..."
   },
   "stxSubDescription": {
     "message": "* Smart Transactions will attempt to submit your transaction privately, multiple times. If all attempts fail, the transaction will be broadcast publicly to ensure your Swap successfully goes through."
@@ -3158,6 +3269,10 @@
     "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"
+  },
   "stxTooltip": {
     "message": "Simulate transactions before submitting to decrease transaction costs and reduce failures."
   },
@@ -3177,10 +3292,10 @@
     "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 canceled"
+    "message": "Swap cancelled"
   },
   "stxUserCancelledDescription": {
-    "message": "Your transaction has been canceled and you did not pay any unnecessary gas fees."
+    "message": "Your transaction has been cancelled and you did not pay any unnecessary gas fees."
   },
   "stxYouCanOptOut": {
     "message": "You can opt-out in advanced settings any time."
@@ -3236,10 +3351,6 @@
     "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"
   },
-  "swapCompleteIn": {
-    "message": "Swap complete in <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Confirm with your hardware wallet"
   },
@@ -3421,6 +3532,10 @@
   "swapSlippageNegative": {
     "message": "Slippage must be greater or equal to zero"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Liquidity source"
   },
@@ -3523,6 +3638,10 @@
   "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"
   },
@@ -3779,6 +3898,9 @@
     "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."
+  },
   "troubleTokenBalances": {
     "message": "We had trouble loading your token balances. You can view them ",
     "description": "Followed by a link (here) to view token balances"
@@ -3826,6 +3948,9 @@
   "unknownCameraErrorTitle": {
     "message": "Ooops! Something went wrong...."
   },
+  "unknownCollection": {
+    "message": "Unnamed collection"
+  },
   "unknownNetwork": {
     "message": "Unknown Private Network"
   },
@@ -3842,13 +3967,9 @@
     "message": "The decentralized web awaits"
   },
   "unrecognizedChain": {
-    "message": "This custom network is not recognized. We recommend that you $1 before proceeding",
+    "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "verify the network details",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Sending collectible (ERC-721) tokens is not currently supported",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3941,7 +4062,7 @@
     "description": "$1 is the action type. e.g (Account, Transaction, Swap)"
   },
   "visitWebSite": {
-    "message": "Visit our web site"
+    "message": "Visit our website"
   },
   "walletConnectionGuide": {
     "message": "our hardware wallet connection guide"
@@ -3966,6 +4087,9 @@
   "walletCreationSuccessTitle": {
     "message": "Wallet creation successful"
   },
+  "wantToAddThisNetwork": {
+    "message": "Want to add this network?"
+  },
   "warning": {
     "message": "Warning"
   },
@@ -4028,6 +4152,10 @@
   "yesLetsTry": {
     "message": "Yes, let's try"
   },
+  "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."
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index e31832da592f..ffe4d6aebee4 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 puede acceder y gastar este activo",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Acceda a su billetera con la frase secreta de respaldo"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask no puede recuperar su contraseña. Usaremos su frase secreta de respaldo para validar su propiedad, restaurar su billetera y configurar una nueva contraseña. Primero, ingrese la frase secreta de respaldo que recibió cuando creó su billetera. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Accediendo a la cámara…"
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Agregar red"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Esta conexión de red depende de terceros. Y puede ser menos confiable o permite que terceros rastreen la actividad. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Agregar tokens sugeridos"
   },
@@ -400,6 +411,14 @@
     "message": "Comprar $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Comprar $1 con Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Puede comprar o transferir criptomonedas fácilmente por medio de su cuenta de Coinbase.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Comprar $1 con MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Comprar ETH con Wyre"
+    "message": "Comprar $1 con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre le permite usar una tarjeta de débito para depositar ETH directamente en su cuenta de MetaMask."
+    "message": "Acceso fácil a transacciones de $ 1,000 o menos con verificación rápida y efectiva. Aceptamos tarjetas débito, crédito, Apple Pay y transferencias bancarias en más de 100 países. Tokens serán depósitados en su MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -447,9 +466,6 @@
     "message": "Para $1 una transacción, la tarifa de gas debe aumentar al menos un 10% para que sea reconocida por la red.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Cancelar swap"
-  },
   "cancellationGasFee": {
     "message": "Cuota de gas por cancelación"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Continuar"
   },
+  "continueToCoinbasePay": {
+    "message": "Continuar a Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Continuar a MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Interacción con el contrato"
   },
   "convertTokenToNFTDescription": {
-    "message": "Hemos detectado que este activo es un NFT. Metamask ahora tiene soporte nativo completo para NFTs. ¿Quieres eliminarlo de tu lista de tokens y añadirlo como un NFT?"
+    "message": "Hemos detectado que este activo es un NFT. MetaMask ahora tiene soporte nativo completo para NFTs. ¿Quieres eliminarlo de tu lista de tokens y añadirlo como un NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Hemos detectado que este recurso se ha agregado como NFT. ¿Quiere eliminarlo de su lista de tokens?"
@@ -1225,6 +1244,10 @@
     "message": "Todas las API de Flask son experimentales. Se pueden cambiar o eliminadar sin previo aviso o pueden permanecer en Flask indefinidamente sin ser migradas a MetaMask estable. Úselas bajo su propia responsabilidad.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Asegúrese de deshabilitar su extensión recurrente de MetaMask cuando use Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Acepto los riesgos",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Ocultar"
   },
+  "hideFullTransactionDetails": {
+    "message": "Esconder los detalles completos de la transacción"
+  },
   "hideSeedPhrase": {
     "message": "Ocultar frase inicial"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Historial"
   },
+  "ignoreAll": {
+    "message": "Ignorar todo"
+  },
+  "ignoreTokenWarning": {
+    "message": "Si oculta tokens, estos no se mostrarán en su billetera. Sin embargo, aún puede agregarlos buscándolos."
+  },
   "import": {
     "message": "Importar",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Importar cartera"
   },
+  "importWithCount": {
+    "message": "Importar $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"
+  },
   "importYourExisting": {
     "message": "Importar la cartera existente con una frase secreta de recuperación"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "flecha de nivel"
   },
+  "lightTheme": {
+    "message": "Claro"
+  },
   "likeToImportTokens": {
     "message": "¿Le gustaría agregar estos tokens?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Únase a más de 6 millones de usuarios para mejorar MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Los detalles de la red de este identificador de cadena no coinciden con nuestros registros. Antes de continuar, le recomendamos que $1.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "verifique los detalles de la red",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "¿Es nuevo en MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Ha importado $1 exitosamente.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token importado"
+  },
   "newTotal": {
     "message": "Total nuevo"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "No hay gas suficiente"
   },
+  "notifications": {
+    "message": "Notificaciones"
+  },
   "notifications10ActionText": {
     "message": "Vaya a configuración",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2109,7 +2154,7 @@
     "message": "Habilitar modo oscuro"
   },
   "notifications12Description": {
-    "message": "Se habilitará el modo oscuro para los nuevos usuarios según las preferencias de su sistema. Para usuarios existentes, habilite el modo oscuro de forma manual en Configuración -> Experimental."
+    "message": "¡El modo oscuro en Extension finalmente está aquí! Para encenderlo, vaya a Configuración -> Experimental y seleccione una de las opciones de visualización: Claro, Oscuro, Sistema."
   },
   "notifications12Title": {
     "message": "¿Cuándo estará disponible el modo oscuro? ¡Ahora! 🕶️🦊"
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Estamos facilitando la lectura de las transacciones."
   },
+  "notificationsEmptyText": {
+    "message": "Nada que ver aquí."
+  },
+  "notificationsHeader": {
+    "message": "Notificaciones"
+  },
+  "notificationsInfos": {
+    "message": "$1 de $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Marcar todo como leído"
+  },
   "numberOfNewTokensDetected": {
     "message": "Se encontraron tokens nuevos de $1 en esta cuenta",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Origen"
   },
+  "osTheme": {
+    "message": "Sistema"
+  },
+  "padlock": {
+    "message": "Candado"
+  },
   "parameters": {
     "message": "Parámetros"
   },
@@ -2371,6 +2435,10 @@
     "message": "Ver las direcciones de las cuentas permitidas (requerido)",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Ejecutar indefinidamente.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Controle sus cuentas y activos \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 más",
     "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": "Redes populares personalizadas"
+  },
   "preferredLedgerConnectionType": {
     "message": "Tipo de conexión de Ledger preferida",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Asegúrese de usar la frase de recuperación secreta correcta antes de continuar. No podrá deshacer esto."
   },
+  "restartMetamask": {
+    "message": "Reiniciar MetaMask"
+  },
   "restore": {
     "message": "Restaurar"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Enviar monto"
   },
+  "sendBugReport": {
+    "message": "Envíenos un informe de error."
+  },
   "sendSpecifiedTokens": {
     "message": "Enviar $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Conecte la cartera directamente al equipo.  Desbloquee su Ledger y abra la aplicación de Ethereum. Para más información sobre el uso de su dispositivo de cartera de hardware, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "¿Sigue recibiendo este mensaje?"
+  },
   "storePhrase": {
     "message": "Guarde esta frase en un administrador de contraseñas como 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Todavía puede intercambiar sus tokens incluso cuando las transacciones inteligentes no están disponibles."
   },
-  "stxPendingFinalizing": {
-    "message": "Finalizando…"
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimizando gas..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Enviando su swap de forma privada..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Enviando el Swap de forma privada..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Enviando su swap de forma pública..."
   },
   "stxSubDescription": {
     "message": "* Transacciones inteligentes intentará enviar su transacción de forma privada varias veces. Si todos los intentos fallan, la transacción se transmitirá públicamente para garantizar que su swap se realice con éxito."
@@ -3102,6 +3179,10 @@
     "message": "Su $1 ya está disponible.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "El swap finalizará en <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Simule transacciones antes de enviarlas para disminuir los costos de transacción y reducir las fallas."
   },
@@ -3180,10 +3261,6 @@
     "message": "No hay tokens disponibles que coincidan con $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"
   },
-  "swapCompleteIn": {
-    "message": "Swap finalizado en <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Confirmar con la cartera de hardware"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "El desfase debe ser mayor o igual que cero"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Fuente de liquidez"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Símbolo del token"
   },
+  "tokensFoundTitle": {
+    "message": "$1 nuevos tokens encontrados",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Comprendo"
   },
@@ -3719,6 +3804,9 @@
     "message": "Tuvimos problemas al conectar su $1. Pruebe revisar $2 e inténtelo de nuevo.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask tuvo problemas para iniciar. Este error podría ser intermitente, así que intente reiniciar la extensión."
+  },
   "troubleTokenBalances": {
     "message": "Tuvimos problemas al cargar los saldos de token. Puede verlos ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Escriba su contraseña de MetaMask"
   },
+  "typeYourSRP": {
+    "message": "Escriba la frase secreta de respaldo"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "No se reconoce esta red personalizada. Antes de continuar, le recomendamos que $1",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "verifique los detalles de la red",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "El envío de tokens coleccionables (ERC-721) no se admite actualmente",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Creación exitosa de la cartera"
   },
+  "warning": {
+    "message": "Advertencia"
+  },
   "weak": {
     "message": "Débil"
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 25ff367a3649..f92e60f3da65 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -363,10 +363,10 @@
     "message": "Comprar"
   },
   "buyWithWyre": {
-    "message": "Comprar ETH con Wyre"
+    "message": "Comprar $1 con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre le permite usar una tarjeta de débito para depositar ETH directamente en su cuenta de MetaMask."
+    "message": "Wyre le permite usar una tarjeta de débito para depositar $1 directamente en su cuenta de MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -1643,10 +1643,6 @@
   "metametricsTitle": {
     "message": "Únase a más de 6 millones de usuarios para mejorar MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Los detalles de la red de este ID de cadena no coinciden con nuestros registros. Antes de continuar, le recomendamos que $1.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "verifique los detalles de la red",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3215,10 +3211,6 @@
     "message": "No se reconoce esta red personalizada. Antes de continuar, le recomendamos que $1",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "verifique los detalles de la red",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "El envío de tokens coleccionables (ERC-721) no se admite actualmente",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index bb5be3a52a86..1b1a3872061c 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -137,10 +137,10 @@
     "message": "Teie lehitsejat ei toetata..."
   },
   "buyWithWyre": {
-    "message": "Ostke ETH-d Wyre'iga"
+    "message": "Ostke $1 -d Wyre'iga"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre võimaldab kasutada krediitkaarti, et teha ETH sissemakse otse MetaMaski kontole."
+    "message": "Wyre võimaldab kasutada krediitkaarti, et teha $1 sissemakse otse MetaMaski kontole."
   },
   "bytes": {
     "message": "Baidid"
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index 2669d73217be..ab74d3482c0d 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -137,10 +137,10 @@
     "message": "مرورگر شما پشتیبانی نمیشود"
   },
   "buyWithWyre": {
-    "message": "ETH را توسط Wyre خریداری نمایید"
+    "message": "$1 را توسط Wyre خریداری نمایید"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre به شما اجازه میدهد تا یک کردیت کارت را جهت پرداخت ETH مستقیمًا به حساب MetaMask تان استفاده نمایید."
+    "message": "Wyre به شما اجازه میدهد تا یک کردیت کارت را جهت پرداخت 1$ مستقیمًا به حساب MetaMask تان استفاده نمایید."
   },
   "bytes": {
     "message": "بایت ها"
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 08e7342378c1..496475976a3b 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -137,10 +137,10 @@
     "message": "Selaintasi ei tueta..."
   },
   "buyWithWyre": {
-    "message": "Osta ETH:ta Wyrella"
+    "message": "Osta $1 :ta Wyrella"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre antaa sinun käyttää luottokorttia, jotta voit tallettaa ETH:ta suoraan MetaMask-tilillesi."
+    "message": "Wyre antaa sinun käyttää luottokorttia, jotta voit tallettaa $1 :ta suoraan MetaMask-tilillesi."
   },
   "bytes": {
     "message": "Tavua"
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 54a59f2ad04a..6ed19fecdfa0 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -122,10 +122,10 @@
     "message": "Hindi sinusuportahan ang iyong Browser..."
   },
   "buyWithWyre": {
-    "message": "Bumili ng ETH gamit ang Wyre"
+    "message": "Bumili ng $1 gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Binibigyang-daan ka ng Wyre na gumamit ng credit card para magdeposito ng ETH nang direkta sa iyong MetaMask account."
+    "message": "Binibigyang-daan ka ng Wyre na gumamit ng credit card para magdeposito ng $1 nang direkta sa iyong MetaMask account."
   },
   "cancel": {
     "message": "Kanselahin"
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index ffed6ee1b854..9d2367dae7f7 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 peut accéder à cet actif et le dépenser",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Accédez à votre portefeuille en utilisant votre phrase secrète de récupération"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask ne peut pas récupérer votre mot de passe. Nous utiliserons votre phrase secrète de récupération pour vérifier votre identité, restaurer votre portefeuille et définir un nouveau mot de passe. Veuillez tout d’abord saisir la phrase secrète de récupération qui vous a été fournie lorsque vous avez créé votre portefeuille. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Accès à votre appareil photo..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Ajouter un réseau"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Cette connexion réseau repose sur des tiers. Elle peut être moins fiable ou permettre à des tiers de suivre l’activité des utilisateurs. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Ajouter les jetons suggérés"
   },
@@ -400,6 +411,14 @@
     "message": "Acheter $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Achetez des $1 avec Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Vous pouvez facilement acheter et transférer des cryptomonnaies en utilisant votre compte Coinbase.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Acheter $1 avec MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Acheter des ETH avec Wyre"
+    "message": "Acheter des $1 avec Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vous permet d’utiliser une carte de crédit pour déposer des ETH directement sur votre compte MetaMask."
+    "message": "Wyre vous permet d’utiliser une carte de crédit pour déposer des $1 directement sur votre compte MetaMask."
   },
   "bytes": {
     "message": "Octets"
@@ -447,9 +466,6 @@
     "message": "Pour $1 la transaction, les gas fees doivent être augmentés d’au moins 10 % pour être reconnus par le réseau.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Annuler le swap"
-  },
   "cancellationGasFee": {
     "message": "Frais d’annulation de carburant"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Continuer"
   },
+  "continueToCoinbasePay": {
+    "message": "Accéder à Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Continuer vers MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Interaction avec un contrat"
   },
   "convertTokenToNFTDescription": {
-    "message": "Nous avons détecté que cet actif est un NFT. Metamask prend désormais nativement en charge les NFT. Voulez-vous le retirer de votre liste de tokens et l’ajouter comme un NFT ?"
+    "message": "Nous avons détecté que cet actif est un NFT. MetaMask prend désormais nativement en charge les NFT. Voulez-vous le retirer de votre liste de tokens et l’ajouter comme un NFT ?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Nous avons détecté que cet actif a été ajouté en tant que NFT. Souhaitez-vous le retirer de votre liste de tokens ?"
@@ -860,7 +879,7 @@
     "message": "Téléchargez cette phrase de sauvegarde secrète et conservez-la en lieu sûr sur un disque dur ou un support de stockage externe chiffré."
   },
   "downloadStateLogs": {
-    "message": "Télécharger les Logs d'état"
+    "message": "Télécharger les Logs d’état"
   },
   "dropped": {
     "message": "Déconnecté"
@@ -1225,6 +1244,10 @@
     "message": "Toutes les API de Flask sont expérimentales. Elles peuvent être modifiées ou supprimées sans préavis. Elles peuvent aussi rester sur Flask indéfiniment sans jamais être migrées vers le MetaMask stable. Utilisez-les à vos risques et périls.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Assurez-vous de désactiver l’extension MetaMask que vous utilisez habituellement lorsque vous utilisez Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "J’accepte les risques",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1280,7 +1303,7 @@
     "message": "La limite de carburant est la quantité maximale d’unités d’essence que vous consentez à dépenser."
   },
   "gasLimitRecommended": {
-    "message": "La limite recommandée de gas est de $1. Si la limite de gas est inférieure à cette valeur, l'opération peut échouer."
+    "message": "La limite recommandée de gas est de $1. Si la limite de gas est inférieure à cette valeur, l’opération peut échouer."
   },
   "gasLimitTooLow": {
     "message": "La limite de carburant doit être d’au moins 21000"
@@ -1376,7 +1399,7 @@
     "message": "Réseau de test Goerli"
   },
   "gotIt": {
-    "message": "J'ai compris !"
+    "message": "J’ai compris !"
   },
   "grantedToWithColon": {
     "message": "Accordé à :"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Masquer"
   },
+  "hideFullTransactionDetails": {
+    "message": "Masquer tous les détails de la transaction"
+  },
   "hideSeedPhrase": {
     "message": "Masquer la phrase mnémonique"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Historique"
   },
+  "ignoreAll": {
+    "message": "Ignorer tout"
+  },
+  "ignoreTokenWarning": {
+    "message": "Si vous masquez des jetons, ils n’apparaîtront pas dans votre portefeuille. Cependant, vous pouvez toujours les ajouter en les recherchant."
+  },
   "import": {
     "message": "Importer",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Importer le portefeuille"
   },
+  "importWithCount": {
+    "message": "Importer $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"
+  },
   "importYourExisting": {
     "message": "Importez votre portefeuille existant à l’aide d’une phrase secrète de récupération"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "flèche de niveau"
   },
+  "lightTheme": {
+    "message": "Clair"
+  },
   "likeToImportTokens": {
     "message": "Souhaitez-vous ajouter ces jetons ?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Rejoignez plus de 6 M d’utilisateurs pour améliorer MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Les détails du réseau pour cet ID de chaîne ne correspondent pas à nos registres. Nous vous recommandons de $1 avant de poursuivre.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "vérifier les détails du réseau",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Nouveau sur MetaMask ?"
   },
+  "newTokensImportedMessage": {
+    "message": "Vous avez importé avec succès $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Jeton importé"
+  },
   "newTotal": {
     "message": "Nouveau total"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Pas assez de carburant"
   },
+  "notifications": {
+    "message": "Notifications"
+  },
   "notifications10ActionText": {
     "message": "Ouvrir les paramètres",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Nous simplifions la lisibilité des transactions."
   },
+  "notificationsEmptyText": {
+    "message": "Rien à voir ici."
+  },
+  "notificationsHeader": {
+    "message": "Notifications"
+  },
+  "notificationsInfos": {
+    "message": "Le $1 de $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Marquer tout comme lu"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 nouveaux jetons trouvés dans ce compte",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Origine"
   },
+  "osTheme": {
+    "message": "Système"
+  },
+  "padlock": {
+    "message": "Cadenas"
+  },
   "parameters": {
     "message": "Paramètres"
   },
@@ -2371,6 +2435,10 @@
     "message": "Consultez l’adresse, le solde du compte et l’activité, et lancez des transactions",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Fonctionner indéfiniment.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Contrôlez vos comptes et actifs « $1 ».",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 de plus",
     "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": "Réseaux personnalisés populaires"
+  },
   "preferredLedgerConnectionType": {
     "message": "Type de connexion Ledger préféré",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Vérifiez que vous avez saisi correctement la phrase de récupération secrète avant de continuer. Vous ne pourrez pas annuler cette action."
   },
+  "restartMetamask": {
+    "message": "Redémarrer MetaMask"
+  },
   "restore": {
     "message": "Restaurer"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Envoyer le montant"
   },
+  "sendBugReport": {
+    "message": "Envoyez-nous un rapport de bogue."
+  },
   "sendSpecifiedTokens": {
     "message": "Envoyer $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Connectez votre portefeuille directement à votre ordinateur. Déverrouillez votre Ledger et ouvrez l’application Ethereum. Pour en savoir plus sur l’utilisation de votre portefeuille matériel, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Vous recevez toujours ce message ?"
+  },
   "storePhrase": {
     "message": "Stockez cette phrase dans un gestionnaire de mots de passe comme 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Vous pouvez toujours faire un swap de tokens, même si les transactions intelligentes ne sont pas disponibles."
   },
-  "stxPendingFinalizing": {
-    "message": "Finalisation..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Optimisation des gas fees..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Soumission privée de votre Swap..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Soumission privée du swap..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Soumission publique de votre Swap..."
   },
   "stxSubDescription": {
     "message": "* Avec les transactions intelligentes, votre transaction sera soumise plusieurs fois en privé. Si toutes les tentatives échouent, la transaction sera diffusée publiquement pour s’assurer de la réussite de votre swap."
@@ -3102,6 +3179,10 @@
     "message": "Votre $1 est maintenant disponible.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Le Swap sera effectué dans <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Simulez les transactions avant de les soumettre pour réduire les coûts et les échecs de transaction."
   },
@@ -3180,10 +3261,6 @@
     "message": "Aucun jeton disponible correspondant à $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"
   },
-  "swapCompleteIn": {
-    "message": "Swap terminé dans <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Confirmez avec votre portefeuille matériel"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Le glissement doit être supérieur ou égal à zéro"
   },
+  "swapSlippagePercent": {
+    "message": "$1 %",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Source de liquidité"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Symbole du jeton"
   },
+  "tokensFoundTitle": {
+    "message": "$1 nouveaux jetons trouvés",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Je comprends"
   },
@@ -3719,6 +3804,9 @@
     "message": "Nous avons eu des difficultés à nous connecter à votre $1. Essayez de vérifier votre $2 et réessayez.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "Impossible de démarrer MetaMask. Cette erreur peut être occasionnelle, essayez donc de redémarrer lextension."
+  },
   "troubleTokenBalances": {
     "message": "Nous avons eu du mal à charger votre balance de jetons, vous pouvez la consulter ici :",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Entrez votre mot de passe"
   },
+  "typeYourSRP": {
+    "message": "Saisissez votre phrase secrète de récupération"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Ce réseau personnalisé n’est pas reconnu. Nous vous recommandons de $1 avant de continuer",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "vérifier les détails du réseau",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "L’envoi de jetons collectibles (ERC-721) n’est pas pris en charge actuellement",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Portefeuille créé avec succès"
   },
+  "warning": {
+    "message": "Avertissement"
+  },
   "weak": {
     "message": "Faible"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 1a9b8a265122..9bfd09d99abe 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -140,7 +140,7 @@
     "message": "רכישת את'ר עם Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre מאפשרת לך להשתמש בכרטיס אשראי כדי להפקיד ETH ישירות בחשבון ה-MetaMask שלך."
+    "message": "Wyre מאפשרת לך להשתמש בכרטיס אשראי כדי להפקיד $1 ישירות בחשבון ה-MetaMask שלך."
   },
   "bytes": {
     "message": "בייטים"
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 1b55a7c66bf8..2d643f1aa13b 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 एक्सेस कर सकता है और इस एसेट को खर्च कर सकता है",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "अपने गुप्त रिकवरी वाक्यांश का इस्तेमाल कर अपने वॉलेट तक पहुंच प्राप्त करें"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "मेटामास्क आपका पासवर्ड रिकवर नहीं कर सकता। हम आपके स्वामित्व को मान्य करने, आपके वॉलेट को रीस्टोर करने और एक नया पासवर्ड सेट करने के लिए आपके गुप्त रिकवरी वाक्यांश का उपयोग करेंगे। सबसे पहले, अपना वह गुप्त रिकवरी वाक्यांश दर्ज करें जिसे आपको अपना बटुआ बनाते समय दिया गया था। $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "आपके कैमरे तक पहुँच रहा है..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "नेटवर्क जोड़ें"
   },
+  "addNetworkTooltipWarning": {
+    "message": "यह नेटवर्क कनेक्शन तृतीय पक्षों पर निर्भर करता है। यह कनेक्शन संभवतः कम विश्वसनीय है या तृतीय-पक्षों को एक्टिविटी को ट्रैक करने में सक्षम कर सकता है। $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "सुझाए गए टोकन जोड़ें"
   },
@@ -400,6 +411,14 @@
     "message": "$1 खरीदें",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "कॉइनबेस पे से $1 खरीदें",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "अपने कॉइनबेस अकाउंट के साथ आप क्रिप्टो को आसानी से खरीद या ट्रांसफर कर सकते हैं।",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay से $1 खरीदें",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre के जरिए ETH खरीदें"
+    "message": "Wyre के जरिए $1 खरीदें"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre आपको अपने MetaMask खाते में ETH जमा करने के लिए डेबिट कार्ड का उपयोग करने की सुविधा देता है।"
+    "message": "Wyre आपको अपने MetaMask खाते में $1 जमा करने के लिए डेबिट कार्ड का उपयोग करने की सुविधा देता है।"
   },
   "bytes": {
     "message": "बाइट"
@@ -447,9 +466,6 @@
     "message": "किसी लेनदेन को $1 करने के लिए गैस शुल्क में कम से कम 10% की वृद्धि की जानी चाहिए ताकि उसे नेटवर्क द्वारा मान्यता मिल सके।",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "स्वैप रद्द करें"
-  },
   "cancellationGasFee": {
     "message": "रद्दीकरण गैस शुल्क"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "जारी रखें"
   },
+  "continueToCoinbasePay": {
+    "message": "कॉइनबेस-पे पर जारी रहें"
+  },
   "continueToMoonPay": {
     "message": "MoonPay के लिए जारी रखें"
   },
@@ -1225,6 +1244,10 @@
     "message": "सभी Flask के API प्रयोगात्मक हैं। उन्हें बिना किसी सूचना के बदला या हटाया जा सकता है, या वो स्थायी MetaMask में माइग्रेट किए बिना अनिश्चित काल तक Flask पर रह सकते हैं। अपने जोखिम पर उनका उपयोग करें।",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Flask का उपयोग करते समय अपने नियमित MetaMask एक्सटेंशन को निष्क्रिय करना अवश्य सुनिश्चित करें।",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "जोख़िमों को मैं स्वीकर करता हूं।",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "छिपाएं"
   },
+  "hideFullTransactionDetails": {
+    "message": "लेन-देन की पूर्ण जानकारी छिपा कर रखें"
+  },
   "hideSeedPhrase": {
     "message": "सीड फ्रेज़ छुपा दें"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "इतिहास"
   },
+  "ignoreAll": {
+    "message": "सभी को अनदेखा करें"
+  },
+  "ignoreTokenWarning": {
+    "message": "यदि आप टोकन छिपाते हैं, तो वे आपके वॉलेट में नहीं दिखाए जाएंगे। हालांकि, आप अभी भी उन्हें खोज कर जोड़ सकते हैं।"
+  },
   "import": {
     "message": "आयात करें",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "वॉलेट आयात करें"
   },
+  "importWithCount": {
+    "message": "$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"
+  },
   "importYourExisting": {
     "message": "गुप्त रिकवरी फ्रेज का उपयोग करके अपने मौजूदा वॉलेट को आयात करें"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "लेवल ऐरो"
   },
+  "lightTheme": {
+    "message": "हल्की"
+  },
   "likeToImportTokens": {
     "message": "क्या आप इन टोकन को इंपोर्ट करना चाहते हैं?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "MetaMask को बेहतर बनाने के लिए 6M+ उपयोगकर्ताओं से जुड़ें"
   },
-  "mismatchedChain": {
-    "message": "इस चेन ID के लिए नेटवर्क विवरण हमारे रिकॉर्ड से मेल नहीं खाता। हम अनुशंसा करते हैं कि आप आगे बढ़ने से पहले $1।",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "नेटवर्क विवरण सत्यापित करें",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "MetaMask पर नए हैं?"
   },
+  "newTokensImportedMessage": {
+    "message": "आपने सफलतापूर्वक $1 इम्पोर्ट कर लिया है।",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "टोकन इम्पोर्ट हो गया"
+  },
   "newTotal": {
     "message": "नया कुलयोग"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "पर्याप्त गैस नहीं"
   },
+  "notifications": {
+    "message": "सूचनाएं"
+  },
   "notifications10ActionText": {
     "message": "सेटिंग्स में जाएं",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 हम लेन-देन को पढ़ना आसान बना रहे हैं।"
   },
+  "notificationsEmptyText": {
+    "message": "यहाँ देखने के लिए कुछ नहीं है।"
+  },
+  "notificationsHeader": {
+    "message": "सूचनाएं"
+  },
+  "notificationsInfos": {
+    "message": "$1 से $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "सभी को पढ़ा हुआ मार्क करें"
+  },
   "numberOfNewTokensDetected": {
     "message": "इस खाते में $1 के नए टोकन पाए गए",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "उत्पत्ति"
   },
+  "osTheme": {
+    "message": "सिस्टम"
+  },
+  "padlock": {
+    "message": "पैडलॉक"
+  },
   "parameters": {
     "message": "पैरामीटर"
   },
@@ -2371,6 +2435,10 @@
     "message": "पता, खाते की शेषराशि, गतिविधि देखें और लेन-देन शुरू करें",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "अनिश्चित काल तक चलाएं।",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "आपके \"$1\" अकाउंट्स और एसेट्स नियंत्रित करें।",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 अधिक",
     "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": "लोकप्रिय कस्टम नेटवर्क"
+  },
   "preferredLedgerConnectionType": {
     "message": "वरीयता वाले लेजर कनेक्शन के प्रकार",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "आगे बढ़ने से पहले ये सुनिश्चित करें कि आप सही सीक्रेट रिकवरी फ़्रेज़ का इस्तेमाल कर रहे हैं। इसे आप अनडू नहीं कर पाएंगे।"
   },
+  "restartMetamask": {
+    "message": "मेटामास्क को पुनरारंभ करें"
+  },
   "restore": {
     "message": "पुनर्स्थापित करें"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "राशि भेजें"
   },
+  "sendBugReport": {
+    "message": "हमें एक बग रिपोर्ट भेजें।"
+  },
   "sendSpecifiedTokens": {
     "message": "$1 भेजें",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "अपने वॉलेट को सीधे अपने कंप्यूटर से कनेक्ट करें। अपने Ledger को अनलॉक करें और Ethereum ऐप खोलें। अपने हार्डवेयर वॉलेट डिवाइस के उपयोग के बारे में अधिक जानकारी के लिए, $1।",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "अभी भी यह संदेश मिल रहा है?"
+  },
   "storePhrase": {
     "message": "इस फ्रेज को 1Password जैसे किसी पासवर्ड मैनेजर में संग्रहीत करें।"
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "स्मार्ट लेनदेन अनुपलब्ध होने पर भी आप अपने टोकनों को स्वैप कर सकते हैं।"
   },
-  "stxPendingFinalizing": {
-    "message": "फ़ाइनलाइज़ कर रहा है..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "गैस ऑप्टिमाइज़ कर रहा है..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "आपका स्वैप निजी रूप से भेजा जा रहा है..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "स्वैप को निजी तौर पर सबमिट कर रहा है..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "आपका स्वैप सार्वजनिक रूप से भेजा जा रहा है..."
   },
   "stxSubDescription": {
     "message": "* स्मार्ट लेनदेन आपके लेनदेन को निजी तौर पर, अनेक बार जमा करने का प्रयास करेंगे। यदि सभी प्रयास विफल हो जाते हैं, तो लेनदेन को सार्वजनिक रूप से प्रसारित किया जाएगा ताकि यह सुनिश्चित हो सके कि आपका स्वैप सफलतापूर्वक पूरा हो।"
@@ -3102,6 +3179,10 @@
     "message": "आपका $1 अब उपलब्ध है।",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "स्वैप < में पूरा होगा",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "लेनदेन की लागतें घटाने और विफलताओं को कम करने के लिए सबमिट करने से पहले लेनदेन को सिम्युलेट करें।"
   },
@@ -3180,10 +3261,6 @@
     "message": "$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"
   },
-  "swapCompleteIn": {
-    "message": "स्वैप पूरा होगा <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "अपने हार्डवेयर वॉलेट से पुष्टि करें"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "स्लिपेज शून्य से अधिक या बराबर होना चाहिए"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "चलनिधि का स्रोत"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "टोकन का प्रतीक"
   },
+  "tokensFoundTitle": {
+    "message": "$1 नए टोकन मिले",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "मैं समझता हूं"
   },
@@ -3719,6 +3804,9 @@
     "message": "हमें आपके $1 से कनेक्ट करने में परेशानी हुई, $2 की समीक्षा करने का प्रयास करें और दोबारा कोशिश करें।",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "मेटामास्क को शुरू करने में दिक्कत हुई। यह त्रुटि रुक-रुक कर हो सकती है, इसलिए एक्सटेंशन को पुनरारंभ करने का प्रयास करें।"
+  },
   "troubleTokenBalances": {
     "message": "हमें आपके टोकन की शेषराशि लोड करने में परेशानी हुई। आप उन्हें देख सकते हैं ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "अपना MetaMask पासवर्ड टाइप करें"
   },
+  "typeYourSRP": {
+    "message": "अपना गुप्त रिकवरी वाक्यांश लिखें"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "यह कस्टम नेटवर्क पहचाना नहीं गया है। हम अनुशंसा करते हैं कि आप आगे बढ़ने से पहले $1",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "नेटवर्क विवरण सत्यापित करें",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "वर्तमान में संग्रहणीय (ERC-721) टोकन भेजना समर्थित नहीं है",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "वॉलेट का निर्माण सफल हुआ"
   },
+  "warning": {
+    "message": "चेतावनी"
+  },
   "weak": {
     "message": "कमज़ोर"
   },
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 49c2704063f4..551b1f15aa21 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš se preglednik ne podržava..."
   },
   "buyWithWyre": {
-    "message": "Kupi ETH Wyerom"
+    "message": "Kupi $1 Wyerom"
   },
   "buyWithWyreDescription": {
-    "message": "Wyreom vam se omogućava korištenje kreditnom karticom za polaganje ETH-a izravno na vaš račun za MetaMask."
+    "message": "Wyreom vam se omogućava korištenje kreditnom karticom za polaganje $1 -a izravno na vaš račun za MetaMask."
   },
   "bytes": {
     "message": "Bajtovi"
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 10f60bba47c6..590b77f86e22 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -137,7 +137,7 @@
     "message": "Az ön böngészője nem támogatott..."
   },
   "buyWithWyre": {
-    "message": "Vásároljon ETH-t a Wyre-rel"
+    "message": "Vásároljon $1 -t a Wyre-rel"
   },
   "buyWithWyreDescription": {
     "message": "A Wyre segítségével egyensen a MetaMaks fiókjában tehet letétbe ETH-t."
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index f7109be0ddfb..83c6ea82d6e2 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 dapat mengakses dan membelanjakan aset ini",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Akses dompet Anda dengan Frasa Pemulihan Rahasia"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask tidak dapat memulihkan kata sandi Anda. Kami akan menggunakan Frasa Pemulihan Rahasia untuk memvalidasi kepemilikan Anda, memulihkan dompet Anda, dan mengatur kata sandi baru. Pertama, masukkan Frasa Pemulihan Rahasia yang diberikan saat membuat dompet. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Mengakses kamera Anda..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Tambahkan Jaringan"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Koneksi jaringan ini mengandalkan pihak ketiga. Koneksi ini mungkin kurang bisa diandalkan atau memungkinkan pihak ketiga melacak aktivitas. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Tambahkan Token yang Disarankan"
   },
@@ -400,6 +411,14 @@
     "message": "Beli $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Beli $1 melalui Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Anda dapat dengan mudah membeli atau mentransfer kripto dengan akun Coinbase Anda.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Beli $1 melalui MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,7 +435,7 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Beli ETH dengan Wyre"
+    "message": "Beli $1 dengan Wyre"
   },
   "buyWithWyreDescription": {
     "message": "Wyre memungkinkan Anda menggunakan kartu debit untuk menyetorkan ETH langsung di akun MetaMask Anda."
@@ -447,9 +466,6 @@
     "message": "Untuk $1 suatu transaksi, biaya gas harus dinaikkan minimal 10% agar dapat dikenali oleh jaringan.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Batalkan pertukaran"
-  },
   "cancellationGasFee": {
     "message": "Biaya Pembatalan Gas"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Lanjutkan"
   },
+  "continueToCoinbasePay": {
+    "message": "Lanjutkan ke Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Lanjutkan ke MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Interaksi Kontrak"
   },
   "convertTokenToNFTDescription": {
-    "message": "Kami mendeteksi bahwa aset ini merupakan NFT. Kini Metamask memiliki dukungan asli penuh untuk NFT. Anda ingin menghapusnya dari daftar token dan menambahkannya sebagai NFT?"
+    "message": "Kami mendeteksi bahwa aset ini merupakan NFT. Kini MetaMask memiliki dukungan asli penuh untuk NFT. Anda ingin menghapusnya dari daftar token dan menambahkannya sebagai NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Kami mendeteksi bahwa aset ini telah ditambahkan sebagai NFT. Anda ingin menghapusnya dari daftar token?"
@@ -1225,6 +1244,10 @@
     "message": "Semua API Flask bersifat eksperimental. API dapat diubah atau dihapus tanpa pemberitahuan, atau tetap berada di Flask tanpa batas waktu dan tanpa pernah dimigrasikan ke MetaMask yang stabil. Gunakan API dengan risiko Anda sendiri.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Pastikan untuk menonaktifkan ekstensi MetaMask reguler Anda saat menggunakan Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Saya menerima risikonya",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Sembunyikan"
   },
+  "hideFullTransactionDetails": {
+    "message": "Sembunyikan detail transaksi lengkap"
+  },
   "hideSeedPhrase": {
     "message": "Sembunyikan frasa seed"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Riwayat"
   },
+  "ignoreAll": {
+    "message": "Abaikan semua"
+  },
+  "ignoreTokenWarning": {
+    "message": "Jika Anda menyembunyikan token, token tersebut tidak akan ditampilkan di dompet Anda. Namun, Anda masih dapat menambahkannya dengan mencarinya."
+  },
   "import": {
     "message": "Impor",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Impor dompet"
   },
+  "importWithCount": {
+    "message": "Impor $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"
+  },
   "importYourExisting": {
     "message": "Impor dompet Anda yang ada menggunakan Frasa Pemulihan Rahasia"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "panah tingkat"
   },
+  "lightTheme": {
+    "message": "Terang"
+  },
   "likeToImportTokens": {
     "message": "Apakah Anda ingin menambahkan token ini?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Bergabunglah bersama 6 Jt+ pengguna untuk meningkatkan MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Detail jaringan untuk ID rantai ini tidak cocok dengan catatan kami. Kami menyarankan agar Anda $1 sebelum melanjutkan.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "memverifikasi detail jaringan",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Baru menggunakan MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Anda berhasil mengimpor $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token diimpor"
+  },
   "newTotal": {
     "message": "Total Baru"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Gas Tidak Cukup"
   },
+  "notifications": {
+    "message": "Notifikasi"
+  },
   "notifications10ActionText": {
     "message": "Lihat di pengaturan",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": ".👓 Kami membuat transaksi lebih mudah untuk dibaca."
   },
+  "notificationsEmptyText": {
+    "message": "Tak ada yang bisa dilihat di sini."
+  },
+  "notificationsHeader": {
+    "message": "Notifikasi"
+  },
+  "notificationsInfos": {
+    "message": "$1 dari $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Tandai semua telah dibaca"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 token baru ditemukan di akun ini",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Asal"
   },
+  "osTheme": {
+    "message": "Sistem"
+  },
+  "padlock": {
+    "message": "Gembok"
+  },
   "parameters": {
     "message": "Parameter"
   },
@@ -2371,6 +2435,10 @@
     "message": "Lihat alamat, saldo akun, aktivitas, dan mulai transaksi",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Operasikan sepanjang waktu.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Kontrol akun dan aset \"$1\" Anda.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 lagi",
     "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": "Jaringan khusus populer"
+  },
   "preferredLedgerConnectionType": {
     "message": "Jenis Koneksi Ledger Pilihan",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Pastikan Anda menggunakan Frasa Pemulihan Rahasia yang benar sebelum melanjutkan. Anda tidak dapat membatalkan tindakan ini."
   },
+  "restartMetamask": {
+    "message": "Mulai ulang MetaMask"
+  },
   "restore": {
     "message": "Pulihkan"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Kirim Jumlah"
   },
+  "sendBugReport": {
+    "message": "Kirimi kami laporan bug."
+  },
   "sendSpecifiedTokens": {
     "message": "Kirim $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Hubungkan dompet Anda langsung ke komputer.  Buka Ledger dan buka aplikasi Ethereum. Untuk selengkapnya seputar penggunaan perangkat dompet perangkat keras Anda, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Masih menerima pesan ini?"
+  },
   "storePhrase": {
     "message": "Simpan frasa ini dalam pengelola kata sandi seperti 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Anda masih bisa menukar token meskipun Transaksi Pintar tidak tersedia."
   },
-  "stxPendingFinalizing": {
-    "message": "Menyelesaikan..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Kirimkan Swap Anda secara pribadi..."
   },
-  "stxPendingOptimizingGas": {
-    "message": "Mengoptimalkan gas..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Mengirimkan Pertukaran secara pribadi..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Kirimkan Swap Anda secara publik..."
   },
   "stxSubDescription": {
     "message": "* Transaksi Pintar akan mencoba mengirimkan transaksi Anda secara pribadi, beberapa kali. Jika semua upaya gagal, transaksi akan disiarkan secara publik untuk memastikan Pertukaran telah berhasil dilakukan."
@@ -3102,6 +3179,10 @@
     "message": "$1 kini telah tersedia.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Swap akan selesai dalam <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Simulasikan transaksi sebelum dikirim untuk mengurangi biaya transaksi dan mengurangi kegagalan."
   },
@@ -3180,10 +3261,6 @@
     "message": "Tidak ada token yang cocok yang tersedia $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"
   },
-  "swapCompleteIn": {
-    "message": "Pertukaran selesai di <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Konfirmasikan dengan dompet perangkat keras Anda"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Slippage harus lebih besar atau sama dengan nol"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Sumber likuiditas"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Simbol Token"
   },
+  "tokensFoundTitle": {
+    "message": "$1 token baru ditemukan",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Saya paham"
   },
@@ -3719,6 +3804,9 @@
     "message": "Kami mengalami masalah saat mencoba terhubung ke $1 Anda, tinjau kembali $2 dan coba lagi.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask mengalami masalah saat memulai. Kesalahan ini dapat terjadi berselang, coba mulai ulang ekstensi."
+  },
   "troubleTokenBalances": {
     "message": "Kami mengalami masalah saat memuat saldo token Anda. Anda dapat melihatnya ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Ketikkan kata sandi MetaMask Anda"
   },
+  "typeYourSRP": {
+    "message": "Ketik Frasa Pemulihan Rahasia"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Jaringan kustom ini tidak dikenali. Kami menyarankan agar Anda $1 sebelum melanjutkan",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "memverifikasi detail jaringan",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Tidak mendukung pengiriman token koleksi (ERC-721) untuk saat ini",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Dompet berhasil dibuat"
   },
+  "warning": {
+    "message": "Peringatan"
+  },
   "weak": {
     "message": "Lemah"
   },
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index faaa3079f5bf..9f6f93e56e23 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -189,10 +189,10 @@
     "message": "Compra"
   },
   "buyWithWyre": {
-    "message": "Compra ETH con Wyre"
+    "message": "Compra $1 con Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ti consente di usare la carta di credito per depositare ETH direttamente nel tuo account MetaMask."
+    "message": "Wyre ti consente di usare la carta di credito per depositare $1 direttamente nel tuo account MetaMask."
   },
   "canToggleInSettings": {
     "message": "Puoi riabilitare questa notifica in Impostazioni -> Avvisi."
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 302b7f7c4f7d..bf140ebfd67e 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 はこのアセットにアクセスし、使用できます",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "秘密のリカバリーフレーズでウォレットにアクセス"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMaskはユーザーのパスワードを復元できません。代わりに秘密のリカバリーフレーズを使用して所有者を確認し、ウォレットを復元して新しいパスワードを設定します。まずはじめに、ウォレットの作成時に提供された秘密のリカバリーフレーズを入力してください。$1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "カメラにアクセス中..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "ネットワークを追加"
   },
+  "addNetworkTooltipWarning": {
+    "message": "このネットワーク接続はサードパーティに依存しているため、信頼性が低かったり、サードパーティによるアクティビティの追跡が可能になる可能性があります。$1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "推奨されたトークンを追加"
   },
@@ -400,6 +411,14 @@
     "message": "$1 を購入",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Coinbase Pay で $1 を購入",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Coinbase アカウントで簡単に仮想通貨を購入または送金できます。",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay で $1 を購入",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "WyreでETHを購入"
+    "message": "Wyreで $1 を購入"
   },
   "buyWithWyreDescription": {
-    "message": "Wyreを使用すると、デビット カードを使用して、ETHをMetaMaskアカウントに直接デポジットできます。"
+    "message": "Wyreを使用すると、デビット カードを使用して、$1 をMetaMaskアカウントに直接デポジットできます。"
   },
   "bytes": {
     "message": "バイト"
@@ -447,9 +466,6 @@
     "message": "トランザクションを$1するには、ネットワークに認識されるようにガス代を 10% 以上増額する必要があります。",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "スワップをキャンセル"
-  },
   "cancellationGasFee": {
     "message": "キャンセルのガス代"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "続行"
   },
+  "continueToCoinbasePay": {
+    "message": "Coinbase Pay に進む"
+  },
   "continueToMoonPay": {
     "message": "MoonPay に進む"
   },
@@ -1225,6 +1244,10 @@
     "message": "Flask API はすべて実験的なものです。これらは通知なしに変更または削除される可能性があり、安定した MetaMask に移行することなく永久に Flask に残る可能性もあります。自己責任でご使用ください。",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Flask の使用中は、通常の MetaMask 拡張機能を無効にしてください。",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "リスクを受け入れる",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "非表示"
   },
+  "hideFullTransactionDetails": {
+    "message": "完全なトランザクション情報を非表示"
+  },
   "hideSeedPhrase": {
     "message": "シードフレーズを非表示"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "履歴"
   },
+  "ignoreAll": {
+    "message": "すべて無視"
+  },
+  "ignoreTokenWarning": {
+    "message": "トークンを非表示にするとウォレットに表示されなくなりますが、検索して追加することはできます。"
+  },
   "import": {
     "message": "インポート",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "ウォレットをインポート"
   },
+  "importWithCount": {
+    "message": "$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"
+  },
   "importYourExisting": {
     "message": "シークレットリカバリーフレーズを使用して既存のウォレットをインポート"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "水平矢印"
   },
+  "lightTheme": {
+    "message": "ライト"
+  },
   "likeToImportTokens": {
     "message": "これらのトークンを追加しますか?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "6百万人以上のユーザーと共に、MetaMaskの改善にご協力ください"
   },
-  "mismatchedChain": {
-    "message": "このチェーンIDのネットワーク詳細が、レコードと一致しません。続行する前に$1をお勧めします。",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "ネットワークの詳細の確認",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "MetaMaskを初めてご利用の場合"
   },
+  "newTokensImportedMessage": {
+    "message": "$1 をインポートしました。",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "トークンがインポートされました"
+  },
   "newTotal": {
     "message": "新しい総額"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "ガスが不足しています"
   },
+  "notifications": {
+    "message": "通知"
+  },
   "notifications10ActionText": {
     "message": "設定に移動",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 トランザクションが読みやすくなりました。"
   },
+  "notificationsEmptyText": {
+    "message": "ここに表示する内容はありません。"
+  },
+  "notificationsHeader": {
+    "message": "通知"
+  },
+  "notificationsInfos": {
+    "message": "$2 から $1 ",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "すべて既読にする"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 の新しいトークンがこのアカウントで見つかりました",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "起点"
   },
+  "osTheme": {
+    "message": "システム"
+  },
+  "padlock": {
+    "message": "南京錠"
+  },
   "parameters": {
     "message": "パラメーター"
   },
@@ -2371,6 +2435,10 @@
     "message": "アドレス、アカウント残高、アクティビティを表示してトランザクションを開始",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "無期限で実行。",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "「$1」アカウントとアセットをコントロールします。",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "他 + $1",
     "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": "人気のカスタムネットワーク"
+  },
   "preferredLedgerConnectionType": {
     "message": "優先Ledger接続タイプ",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "続行する前に、正しい秘密のリカバリーフレーズを使用していることを確認してください。これは元に戻せません。"
   },
+  "restartMetamask": {
+    "message": "MetaMask を再起動"
+  },
   "restore": {
     "message": "復元"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "送金額"
   },
+  "sendBugReport": {
+    "message": "バグレポートをお送りください。"
+  },
   "sendSpecifiedTokens": {
     "message": "$1を送金",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "コンピューターにウォレットを直接接続します。Ledgerのロックを解除し、イーサリアムアプリを開きます。ハードウェアウォレットデバイスの使い方の詳細については、$1",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "まだこのメッセージが表示されますか？"
+  },
   "storePhrase": {
     "message": "このフレーズを1Passwordのようなパスワードマネージャーに保存します。"
   },
@@ -3083,15 +3163,12 @@
   "stxFallbackUnavailable": {
     "message": "スマートトランザクションが利用できなくても、トークンのスワップは可能です。"
   },
-  "stxPendingFinalizing": {
-    "message": "最終処理中..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "ガス代を最適化中..."
-  },
-  "stxPendingPrivatelySubmitting": {
+  "stxPendingPrivatelySubmittingSwap": {
     "message": "スワップを非公開で送信中..."
   },
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "スワップを公開で送信中..."
+  },
   "stxSubDescription": {
     "message": "* スマートトランザクションは、非公開でトランザクションのの送信を数回試みます。すべての試みが失敗した場合、スワップが成功するようトランザクションが公開されます。"
   },
@@ -3102,6 +3179,10 @@
     "message": "$1 が利用可能になりました。",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "スワップ完了まで残り <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "送信前にトランザクションのシミュレーションを行い、トランザクションのコストと失敗率を減らします。"
   },
@@ -3180,10 +3261,6 @@
     "message": "$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"
   },
-  "swapCompleteIn": {
-    "message": "スワップ完了まで <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "ハードウェアウォレットで確定"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "スリッページは0以上でなければなりません。"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "流動性ソース"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "トークンシンボル"
   },
+  "tokensFoundTitle": {
+    "message": "$1 種類の新しいトークンが見つかりました",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "理解しました"
   },
@@ -3719,6 +3804,9 @@
     "message": "$1に接続できませんでした。$2を確認してから、もう一度実行してください。",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask がうまく起動しませんでした。このエラーは断続的に発生する可能性があるため、拡張機能を再起動してみてください。"
+  },
   "troubleTokenBalances": {
     "message": "トークンバランスのロードに問題があります。トークンバランスを表示できます",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "MetaMaskパスワードを入力してください"
   },
+  "typeYourSRP": {
+    "message": "秘密のリカバリーフレーズを入力してください"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "このカスタムネットワークは認識されません。続行する前に$1をお勧めします",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "ネットワークの詳細の確認",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "コレクティブル (ERC-721) トークンの送信は現在サポートされていません",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "ウォレットが作成されました"
   },
+  "warning": {
+    "message": "警告"
+  },
   "weak": {
     "message": "弱"
   },
@@ -3963,7 +4053,7 @@
     "message": "この機能を使用するには、カメラへのアクセスを許可する必要があります。"
   },
   "youSign": {
-    "message": "著名しています"
+    "message": "署名しています"
   },
   "yourPrivateSeedPhrase": {
     "message": "秘密のシークレットリカバリーフレーズ"
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index 1edff554cc06..762b250c7ff6 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -137,10 +137,10 @@
     "message": "ನಿಮ್ಮ ಬ್ರೌಸರ್ ಬೆಂಬಲಿಸುತ್ತಿಲ್ಲ..."
   },
   "buyWithWyre": {
-    "message": "Wyre ನೊಂದಿಗೆ ETH ಖರೀದಿಸಿ"
+    "message": "Wyre ನೊಂದಿಗೆ $1 ಖರೀದಿಸಿ"
   },
   "buyWithWyreDescription": {
-    "message": "ನಿಮ್ಮ MetaMask ಖಾತೆಗೆ ETH ಅನ್ನು ಜಮಾ ಮಾಡಲು ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಬಳಸಲು Wyre ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."
+    "message": "ನಿಮ್ಮ MetaMask ಖಾತೆಗೆ $1 ಅನ್ನು ಜಮಾ ಮಾಡಲು ಕ್ರೆಡಿಟ್ ಕಾರ್ಡ್ ಬಳಸಲು Wyre ನಿಮಗೆ ಅನುಮತಿಸುತ್ತದೆ."
   },
   "bytes": {
     "message": "ಬೈಟ್‌ಗಳು"
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 6325712eeae6..8a5ba0a7b0c1 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -62,6 +62,13 @@
     "message": "$1(은)는 이 자산에 접근하여 사용할 수 있습니다",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "비밀 복구 구문으로 지갑에 액세스하세요"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask는 사용자의 비밀번호를 복구할 수 없습니다. 사용자의 비밀 복구 구문을 이용하여 사용자의 소유권을 확인한 후, 지갑을 복구하고 새 비밀번호를 설정해 드립니다. 먼저 지갑을 생성할 때 받은 비밀 복구 구문을 입력하세요. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "카메라에 접근 중..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "네트워크 추가"
   },
+  "addNetworkTooltipWarning": {
+    "message": "이 네트워크 연결은 타사 서비스를 이용합니다. 연결의 보안이 취약하거나 타사에 연결 내용이 노출될 수 있습니다. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "추천 토큰 추가"
   },
@@ -400,6 +411,14 @@
     "message": "$1 구매",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Coinbase Pay로 $1 구매",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Coinbase 계정으로 손쉽게 암호화폐를 구매하거나 전송할 수 있습니다.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "문페이(MoonPay)로 $1 구매",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre로 ETH 구매"
+    "message": "Wyre로 $1 구매"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre를 사용하면 체크카드를 이용하여 ETH를 MetaMask 계정에 바로 예치할 수 있습니다."
+    "message": "Wyre를 사용하면 체크카드를 이용하여 $1 를 MetaMask 계정에 바로 예치할 수 있습니다."
   },
   "bytes": {
     "message": "바이트"
@@ -447,9 +466,6 @@
     "message": "거래를 $1하려면 가스비를 최소 10%를 인상해야 네트워크에서 인식될 수 있습니다.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "스왑 취소"
-  },
   "cancellationGasFee": {
     "message": "가스 수수료 취소"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "계속"
   },
+  "continueToCoinbasePay": {
+    "message": "Coinbase Pay로 계속하기"
+  },
   "continueToMoonPay": {
     "message": "문페이로 계속하기"
   },
@@ -1225,6 +1244,10 @@
     "message": "모든 플라스크의 API는 실험 단계입니다. 따라서 예고 없이 변경, 제거되거나 안정적인 MetaMask로 마이그레이션되지 않고 플라스크에 무기한 남아 있을 수 있습니다. 사용 시 위험은 자기 책임입니다.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Flask를 사용할 때는 정규 MetaMask 익스텐션을 비활성화하세요.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "본인은 위험을 감수합니다",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "숨기기"
   },
+  "hideFullTransactionDetails": {
+    "message": "전체 거래 세부정보 숨기기"
+  },
   "hideSeedPhrase": {
     "message": "시드 구문 숨기기"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "기록"
   },
+  "ignoreAll": {
+    "message": "모두 무시"
+  },
+  "ignoreTokenWarning": {
+    "message": "토큰을 숨기면 지갑에 표시되지 않습니다. 하지만 이를 검색하여 추가할 수 있습니다."
+  },
   "import": {
     "message": "가져오기",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "지갑 가져오기"
   },
+  "importWithCount": {
+    "message": "$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"
+  },
   "importYourExisting": {
     "message": "비밀 복구 구문을 사용하여 기존 지갑 가져오기"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "수평 화살표"
   },
+  "lightTheme": {
+    "message": "라이트"
+  },
   "likeToImportTokens": {
     "message": "이 토큰을 추가할까요?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "6백만 명 이상의 사용자와 함께 MetaMask 기능 향상에 동참하세요."
   },
-  "mismatchedChain": {
-    "message": "이 체인 ID의 네트워크 세부 정보가 기록과 일치하지 않습니다. 진행하기 전에 $1을(를) 권장합니다.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "네트워크 세부 정보 검증",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "MetaMask가 처음이세요?"
   },
+  "newTokensImportedMessage": {
+    "message": "$1 토큰을 성공적으로 불러왔습니다.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "불러온 토큰"
+  },
   "newTotal": {
     "message": "새 합계"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "가스 부족"
   },
+  "notifications": {
+    "message": "알림"
+  },
   "notifications10ActionText": {
     "message": "설정으로 이동하기",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 사용자가 거래를 이해하기 쉽게 도와드립니다."
   },
+  "notificationsEmptyText": {
+    "message": "표시할 항목이 없습니다."
+  },
+  "notificationsHeader": {
+    "message": "알림"
+  },
+  "notificationsInfos": {
+    "message": "$1($2)",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "모두 읽음으로 표시"
+  },
   "numberOfNewTokensDetected": {
     "message": "계정에서 $1개의 새로운 토큰이 발견됨",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "원본"
   },
+  "osTheme": {
+    "message": "시스템"
+  },
+  "padlock": {
+    "message": "패드락"
+  },
   "parameters": {
     "message": "매개변수"
   },
@@ -2371,6 +2435,10 @@
     "message": "허용되는 계정의 주소 보기(필수)",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "무기한 운용됩니다.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "'$1' 계정과 자산을 통제합니다.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ 그 외 $1개",
     "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": "인기 사용자 정의 네트워크"
+  },
   "preferredLedgerConnectionType": {
     "message": "선호하는 Ledger 연결 유형",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "계속하기 전에 비밀 복구 구문이 정확한지 확인하세요. 이 작업은 취소할 수 없습니다."
   },
+  "restartMetamask": {
+    "message": "MetaMask 재시작"
+  },
   "restore": {
     "message": "복구"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "송금"
   },
+  "sendBugReport": {
+    "message": "버그 리포트 전송"
+  },
   "sendSpecifiedTokens": {
     "message": "$1 보내기",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "지갑을 컴퓨터에 바로 연결합니다.  Ledger를 잠금 해제하고 이더리움 앱을 엽니다. 하드웨어 지갑 장치를 사용하는 방법에 관한 자세한 내용은 $1 링크를 참조하세요.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "아직 이 메시지가 표시되시나요?"
+  },
   "storePhrase": {
     "message": "이 구문을 1Password 같은 비밀번호 관리자에 저장하세요."
   },
@@ -3083,15 +3163,12 @@
   "stxFallbackUnavailable": {
     "message": "스마트 거래를 사용할 수 없을 때도 토큰 스왑은 가능합니다."
   },
-  "stxPendingFinalizing": {
-    "message": "마무리 중..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "가스비 최적화 중..."
-  },
-  "stxPendingPrivatelySubmitting": {
+  "stxPendingPrivatelySubmittingSwap": {
     "message": "스왑을 비공개로 제출하는 중..."
   },
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "스왑을 공개로 제출하는 중..."
+  },
   "stxSubDescription": {
     "message": "*스마트 거래는 비공개로 거래를 제출하기 위해 여러 번 시도할 것입니다. 모든 시도가 실패하면 성공적인 스왑을 위해 거래는 공개적으로 브로드캐스트될 것입니다."
   },
@@ -3102,6 +3179,10 @@
     "message": "현재 $1(을)를 사용할 수 있습니다.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "스왑 완료까지 남은 시간:",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "제출하기 전에 거래를 시뮬레이션하면 거래 비용을 줄이고 실패율을 낮출 수 있습니다."
   },
@@ -3180,10 +3261,6 @@
     "message": "$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"
   },
-  "swapCompleteIn": {
-    "message": "스왑 완료까지 남은 시간:",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "하드웨어 지갑으로 확인합니다."
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "슬리패지는 0보다 크거나 같아야 합니다."
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "유동성 소스"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "토큰 기호"
   },
+  "tokensFoundTitle": {
+    "message": "$1개의 새 토큰을 찾았습니다",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "이해했습니다"
   },
@@ -3719,6 +3804,9 @@
     "message": "$1 연결 도중 문제가 발생했습니다. $2을(를) 검토하고 다시 시도해 보세요.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask 실행 중 오류가 발생했습니다. 일시적인 오류일 수 있으니 확장 프로그램을 재시작해 보세요."
+  },
   "troubleTokenBalances": {
     "message": "토큰 잔액을 로드하는 도중 문제가 발생했습니다. 다음에서 잔액을 확인하세요. ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "MetaMask 비밀번호를 입력하세요"
   },
+  "typeYourSRP": {
+    "message": "비밀 복구 구문을 입력하세요"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "이 맞춤형 네트워크는 인식되지 않습니다. 진행하기 전에 $1을(를) 권장합니다.",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "네트워크 세부 정보 검증",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "수집 가능한(ERC-721) 토큰 전송은 현재 지원되지 않습니다.",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "지갑 생성 성공"
   },
+  "warning": {
+    "message": "경고"
+  },
   "weak": {
     "message": "약함"
   },
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index f2866345ce83..68dd08edc238 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -137,10 +137,10 @@
     "message": "Jūsų naršyklė neatpažįstama..."
   },
   "buyWithWyre": {
-    "message": "Pirkti ETH su „Wyre“"
+    "message": "Pirkti $1 su „Wyre“"
   },
   "buyWithWyreDescription": {
-    "message": "„Wyre“ leidžia naudotis kreditine kortele norint įnešti ETH tiesiai į jūsų „MetaMask“ paskyrą."
+    "message": "„Wyre“ leidžia naudotis kreditine kortele norint įnešti $1 tiesiai į jūsų „MetaMask“ paskyrą."
   },
   "bytes": {
     "message": "Baitai"
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 13233a066c4b..30e65fd68b1e 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -137,10 +137,10 @@
     "message": "Jūsu pārlūkprogramma netiek atbalstīta..."
   },
   "buyWithWyre": {
-    "message": "Pirkt ETH ar Wyre"
+    "message": "Pirkt $1 ar Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre ļauj noguldīt ETH tieši jūsu MetaMask kontā, izmantojot kredītkarti."
+    "message": "Wyre ļauj noguldīt $1 tieši jūsu MetaMask kontā, izmantojot kredītkarti."
   },
   "bytes": {
     "message": "Baiti"
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index bc42b1bc2c7b..8923fb8bfcb9 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -137,10 +137,10 @@
     "message": "Pelayar anda tidak disokong..."
   },
   "buyWithWyre": {
-    "message": "Beli ETH dengan Wyre"
+    "message": "Beli $1 dengan Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre membolehkan anda menggunakan kad kredit untuk mendeposit ETH secara terus ke dalam akaun MetaMask anda."
+    "message": "Wyre membolehkan anda menggunakan kad kredit untuk mendeposit $1 secara terus ke dalam akaun MetaMask anda."
   },
   "bytes": {
     "message": "Bait"
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index ceb83e98285b..8d1cc1eab29e 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -137,10 +137,10 @@
     "message": "Nettleseren din støttes ikke ..."
   },
   "buyWithWyre": {
-    "message": "Kjøp ETH med Wyre"
+    "message": "Kjøp $1 med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre lar deg bruke et kredittkort for å sette inn ETH rett på MetaMask-kontoen din."
+    "message": "Wyre lar deg bruke et kredittkort for å sette inn $1 rett på MetaMask-kontoen din."
   },
   "cancel": {
     "message": "Avbryt"
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 9855e4452367..9d64198d3b0e 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -228,10 +228,10 @@
     "message": "Bumili"
   },
   "buyWithWyre": {
-    "message": "Bumili ng ETH gamit ang Wyre"
+    "message": "Bumili ng $1 gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Binibigyang-daan ka ng Wyre na gumamit ng debit card para mag-deposit ng ETH sa mismong MetaMask account mo."
+    "message": "Binibigyang-daan ka ng Wyre na gumamit ng debit card para mag-deposit ng $1 sa mismong MetaMask account mo."
   },
   "bytes": {
     "message": "Bytes"
@@ -1039,10 +1039,6 @@
   "metametricsOptInDescription": {
     "message": "Gustong kunin ng MetaMask ang data ng paggamit para mas maunawaan kung paano ginagamit ng mga user namin ang extension. Gagamitin ang data na ito para patuloy na mapahusay ang kakayahang magamit at karanasan ng user sa paggamit ng produkto namin at Ethereum ecosystem."
   },
-  "mismatchedChain": {
-    "message": "Ang mga detalye ng network para sa chain ID na ito ay hindi tumutugma sa aming mga record. Inirerekomenda naming $1 ka bago magpatuloy.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "i-verify ang mga detalye ng network",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2161,10 +2157,6 @@
     "message": "Hindi kinikilala ang custom na network na ito. Inirerekomenda naming $1 ka bago magpatuloy",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "i-verify ang mga detalye ng network",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "updatedWithDate": {
     "message": "Na-update noong $1"
   },
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index d8637876aa8e..0025ba5fa3ed 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -137,10 +137,10 @@
     "message": "Twoja przeglądarka nie jest obsługiwana..."
   },
   "buyWithWyre": {
-    "message": "Kup ETH poprzez Wyre"
+    "message": "Kup $1 poprzez Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Dzięki Wyre możesz użyć karty kredytowej, aby wpłacić ETH bezpośrednio na swoje konto MetaMask."
+    "message": "Dzięki Wyre możesz użyć karty kredytowej, aby wpłacić $1 bezpośrednio na swoje konto MetaMask."
   },
   "bytes": {
     "message": "Bajty"
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 8337211df462..b8b40ee7a01f 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 pode(m) acessar e usar esse ativo",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Acesse sua carteira com sua Frase de Recuperação Secreta"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "A MetaMask não consegue recuperar sua senha. Usaremos sua Frase de Recuperação Secreta para validar sua posse, restaurar sua carteira e definir uma nova senha. Primeiro, insira a Frase de Recuperação Secreta que você recebeu ao criar sua carteira. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Acessando sua câmera..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Adicionar rede"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Esta conexão de rede depende de terceiros. Esta conexão pode ser menos confiável ou permitir que terceiros rastreiem atividades. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Adicionar tokens sugeridos"
   },
@@ -400,6 +411,14 @@
     "message": "Comprar $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Comprar $1 com o Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Você pode comprar ou transferir criptomoedas facilmente com sua conta na Coinbase.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Compre $1 com o MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Comprar ETH com Wyre"
+    "message": "Comprar $1 com Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Com o Wyre, você pode usar um cartão de débito para depositar ETH diretamente na sua conta da MetaMask."
+    "message": "Com o Wyre, você pode usar um cartão de débito para depositar $1 diretamente na sua conta da MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -447,9 +466,6 @@
     "message": "Para $1 uma transação, a taxa de gás deve ser aumentada em pelo menos 10% para que seja reconhecida pela rede.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Cancelar swap"
-  },
   "cancellationGasFee": {
     "message": "Taxa de gás por cancelamento"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Continuar"
   },
+  "continueToCoinbasePay": {
+    "message": "Prosseguir para o Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Continuar para o MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Interação com contrato"
   },
   "convertTokenToNFTDescription": {
-    "message": "Detectamos que esse ativo é um NFT. A Metamask agora oferece suporte nativo a NFTs. Gostaria de removê-lo da sua lista de tokens e adicioná-lo como NFT?"
+    "message": "Detectamos que esse ativo é um NFT. A MetaMask agora oferece suporte nativo a NFTs. Gostaria de removê-lo da sua lista de tokens e adicioná-lo como NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Detectamos que esse ativo foi adicionado como NFT. Deseja removê-lo da sua lista de tokens?"
@@ -1225,6 +1244,10 @@
     "message": "Todas as APIs do Flask são experimentais. Elas podem ser alteradas ou removidas sem aviso prévio, ou podem permanecer no Flask indefinidamente, sem jamais serem migradas para a MetaMask estável. Use-as com cautela.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Certifique-se de desativar sua extensão MetaMask regular ao usar o Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Eu aceito os riscos",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Ocultar"
   },
+  "hideFullTransactionDetails": {
+    "message": "Ocultar detalhes completos da transação"
+  },
   "hideSeedPhrase": {
     "message": "Ocultar seed phrase (frase de recuperação)"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Histórico"
   },
+  "ignoreAll": {
+    "message": "Ignorar tudo"
+  },
+  "ignoreTokenWarning": {
+    "message": "Se você ocultar tokens, eles não serão exibidos em sua carteira. No entanto, você ainda pode pesquisá-los para adicioná-los."
+  },
   "import": {
     "message": "Importar",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Importar carteira"
   },
+  "importWithCount": {
+    "message": "Importar $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"
+  },
   "importYourExisting": {
     "message": "Importe sua carteira existente usando uma Frase de Recuperação Secreta"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "seta de nível"
   },
+  "lightTheme": {
+    "message": "Claro"
+  },
   "likeToImportTokens": {
     "message": "Gostaria de adicionar estes tokens?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Junte-se a mais de 6 milhões de usuários para melhorar a MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Os detalhes da rede para esse ID da cadeia não correspondem aos dos nossos registros. Recomendamos que você $1 antes de continuar.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "verifique os detalhes da rede",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Novo na MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Você importou $1 com sucesso.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token importado"
+  },
   "newTotal": {
     "message": "Novo total"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Não há gás suficiente"
   },
+  "notifications": {
+    "message": "Notificações"
+  },
   "notifications10ActionText": {
     "message": "Veja em configurações",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Estamos facilitando a leitura das transações."
   },
+  "notificationsEmptyText": {
+    "message": "Nada para ver aqui."
+  },
+  "notificationsHeader": {
+    "message": "Notificações"
+  },
+  "notificationsInfos": {
+    "message": "$1 de $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Marcar todas como lidas"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 novos tokens encontrados nesta conta",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Origem"
   },
+  "osTheme": {
+    "message": "Sistema"
+  },
+  "padlock": {
+    "message": "Cadeado"
+  },
   "parameters": {
     "message": "Parâmetros"
   },
@@ -2371,6 +2435,10 @@
     "message": "Ver endereço, saldo da conta, atividade e iniciar transações",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Executar indefinidamente.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Controlar suas contas e ativos do \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "E mais $1",
     "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": "Redes personalizadas populares"
+  },
   "preferredLedgerConnectionType": {
     "message": "Tipo de conexão preferencial com o Ledger",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Certifique-se de usar a frase secreta de recuperação correta antes de prosseguir. Você não poderá desfazer isso."
   },
+  "restartMetamask": {
+    "message": "Reiniciar a MetaMask"
+  },
   "restore": {
     "message": "Restaurar"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Enviar valor"
   },
+  "sendBugReport": {
+    "message": "Envie-nos um relatório de erros."
+  },
   "sendSpecifiedTokens": {
     "message": "Enviar $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Conecte sua carteira diretamente ao seu computador.  Desbloqueie seu Ledger e abra o aplicativo do Ethereum. Para obter mais informações sobre como usar seu dispositivo de carteira de hardware, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Ainda está recebendo essa mensagem?"
+  },
   "storePhrase": {
     "message": "Guarde essa frase em um gerenciador de senhas, como o 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Você ainda pode fazer swap com seus tokens mesmo quando as Transações Inteligentes estiverem indisponíveis."
   },
-  "stxPendingFinalizing": {
-    "message": "Finalizando..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Otimizando as taxas de gás..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Enviando seu swap de forma privada..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Enviando a Swap de forma privada..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Enviando seu swap de forma pública..."
   },
   "stxSubDescription": {
     "message": "* A função de Transações Inteligentes tentará enviar a sua transação várias vezes de forma privada. Se todas as tentativas falharem, a transação será transmitida publicamente para garantir que sua Swap seja realizada com sucesso."
@@ -3102,6 +3179,10 @@
     "message": "Seu $1 já está disponível.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "O swap será concluído em <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Simule as transações antes de finalizar para diminuir os custos de transação e reduzir a possibilidade de falhas."
   },
@@ -3180,10 +3261,6 @@
     "message": "Nenhum token disponível correspondente a $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"
   },
-  "swapCompleteIn": {
-    "message": "Swap concluído em <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Confirme com sua carteira de hardware"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "O slippage deve ser maior ou igual a zero"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Fonte de liquidez"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Símbolo do Token"
   },
+  "tokensFoundTitle": {
+    "message": "$1 novos tokens encontrados",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Eu compreendo"
   },
@@ -3719,6 +3804,9 @@
     "message": "Tivemos dificuldade para conectar-nos à sua $1. Revise $2 e tente novamente.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "A MetaMask teve problemas para iniciar. Esse erro pode ser intermitente, por isso tente reiniciar a extensão."
+  },
   "troubleTokenBalances": {
     "message": "Tivemos um problema a carregar o balanço dos seus tokens. Pode vê-los em ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Digite a sua Palavra-passe"
   },
+  "typeYourSRP": {
+    "message": "Digite sua Frase de Recuperação Secreta"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Essa rede personalizada não foi reconhecida. Recomendamos que você $1 antes de continuar",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "verifique os detalhes da rede",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "O envio de tokens colecionáveis (ERC-721) não é suportado no momento",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Carteira criada com sucesso"
   },
+  "warning": {
+    "message": "Atenção"
+  },
   "weak": {
     "message": "Fraca"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 3062c1574fec..35a8c9b30350 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -363,10 +363,10 @@
     "message": "Comprar"
   },
   "buyWithWyre": {
-    "message": "Comprar ETH com Wyre"
+    "message": "Comprar $1 com Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Com o Wyre, você pode usar um cartão de débito para depositar ETH diretamente na sua conta da MetaMask."
+    "message": "Com o Wyre, você pode usar um cartão de débito para depositar $1 diretamente na sua conta da MetaMask."
   },
   "bytes": {
     "message": "Bytes"
@@ -1627,10 +1627,6 @@
   "metametricsTitle": {
     "message": "Junte-se a mais de 6 milhões de usuários para melhorar a MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Os detalhes da rede para esse ID da cadeia não correspondem aos dos nossos registros. Recomendamos que você $1 antes de continuar.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "verifique os detalhes da rede",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3199,10 +3195,6 @@
     "message": "Essa rede personalizada não foi reconhecida. Recomendamos que você $1 antes de continuar",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "verifique os detalhes da rede",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "O envio de tokens colecionáveis (ERC-721) não é suportado no momento",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 929bede12e3d..002236935c12 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -137,10 +137,10 @@
     "message": "Browserul dvs. nu este compatibil..."
   },
   "buyWithWyre": {
-    "message": "Cumpărați ETH cu Wyre"
+    "message": "Cumpărați $1 cu Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vă permite să folosiți un card de credit pentru a depune ETH direct în contul dvs. MetaMask."
+    "message": "Wyre vă permite să folosiți un card de credit pentru a depune $1 direct în contul dvs. MetaMask."
   },
   "bytes": {
     "message": "Octeți"
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index c61d7d9a5d64..16fa10c056e9 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 может получить доступ к этому активу и потратить его",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Получайте доступ к кошельку с помощью секретной фразы для восстановления"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask не может восстановить ваш пароль. Мы используем вашу cекретную фразу для восстановления, чтобы подтвердить ваше право собственности, восстановить ваш кошелек и установить новый пароль. Сначала введите секретную фразу для восстановления, которую вы получили при создании кошелька. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Доступ к камере..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Добавить сеть"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Это сетевое подключение зависит от третьих сторон. Оно может быть менее надежным или позволять третьим лицам отслеживать активность. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Добавить рекомендованные токены"
   },
@@ -400,6 +411,14 @@
     "message": "Купить $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Купите $1 с помощью Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Вы можете легко купить или перевести криптовалюту с помощью своего счета Coinbase.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Купить $1 с помощью MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Купить ETH с помощью Wyre"
+    "message": "Купить $1 с помощью Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre позволяет использовать дебетовую карту для внесения ETH прямо на ваш счет MetaMask."
+    "message": "Wyre позволяет использовать дебетовую карту для внесения $1 прямо на ваш счет MetaMask."
   },
   "bytes": {
     "message": "Байты"
@@ -447,9 +466,6 @@
     "message": "Чтобы $1 транзакции плата за газ должна быть увеличена как минимум на 10%. Это позволит обеспечить прием транзакции сетью.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Отменить обмен"
-  },
   "cancellationGasFee": {
     "message": "Плата за газ при отмене"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Продолжить"
   },
+  "continueToCoinbasePay": {
+    "message": "Перейти на Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Перейти в MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Взаимодействие по контракту"
   },
   "convertTokenToNFTDescription": {
-    "message": "Мы обнаружили, что этот актив является NFT. Metamask теперь имеет полную встроенную поддержку NFT. Хотите удалить его из списка токенов и добавить в качестве NFT?"
+    "message": "Мы обнаружили, что этот актив является NFT. MetaMask теперь имеет полную встроенную поддержку NFT. Хотите удалить его из списка токенов и добавить в качестве NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Мы обнаружили, что этот актив был добавлен как NFT. Хотите удалить его из списка токенов?"
@@ -1225,6 +1244,10 @@
     "message": "Все API Flask являются экспериментальными. Они могут быть изменены или удалены без предварительного уведомления или могут оставаться во Flask на неопределенный срок без переноса в стабильную версию MetaMask. Используйте их на свой страх и риск.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Обязательно отключите свое обычное расширение MetaMask при использовании Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Я принимаю риски",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Скрыть"
   },
+  "hideFullTransactionDetails": {
+    "message": "Скрыть полную информацию о транзакции"
+  },
   "hideSeedPhrase": {
     "message": "Скрыть сид-фразу"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "История"
   },
+  "ignoreAll": {
+    "message": "Игнорировать все"
+  },
+  "ignoreTokenWarning": {
+    "message": "Если вы скроете токены, они не будут отображаться в вашем кошельке. Однако вы все равно можете добавить их, выполнив поиск по ним."
+  },
   "import": {
     "message": "Импорт",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Импорт кошелька"
   },
+  "importWithCount": {
+    "message": "Импортировать $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"
+  },
   "importYourExisting": {
     "message": "Импортируйте существующий кошелек, используя начальную секретную фразу восстановления"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "стрелка «уровень»"
   },
+  "lightTheme": {
+    "message": "Светлая"
+  },
   "likeToImportTokens": {
     "message": "Вы хотели бы импортировать эти токены?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Присоединяйтесь к более чем 6 млн пользователей, чтобы улучшить MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Сведения о сети для этого ID цепочки не совпадают с указанными в записях. Мы рекомендуем $1 до того, как продолжить.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "проверить сведения о сети",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Впервые в MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Вы успешно импортировали $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Токен импортирован"
+  },
   "newTotal": {
     "message": "Новая общая сумма"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Недостаточно газа"
   },
+  "notifications": {
+    "message": "Уведомления"
+  },
   "notifications10ActionText": {
     "message": "Смотреть в настройках",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Мы упрощаем просмотр реквизитов транзакций."
   },
+  "notificationsEmptyText": {
+    "message": "Здесь не на что смотреть."
+  },
+  "notificationsHeader": {
+    "message": "Уведомления"
+  },
+  "notificationsInfos": {
+    "message": "$1 из $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Отметить все как прочитанные"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 новых токена(-ов) найдены в этом аккаунте",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Источник"
   },
+  "osTheme": {
+    "message": "Системная"
+  },
+  "padlock": {
+    "message": "Замок"
+  },
   "parameters": {
     "message": "Параметры"
   },
@@ -2371,6 +2435,10 @@
     "message": "См. адрес, баланс счета, активность и инициируйте транзакции",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Выполнять бесконечно.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Контролируйте свои счета и активы «$1».",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ еще $1",
     "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": "Популярные пользовательские сети"
+  },
   "preferredLedgerConnectionType": {
     "message": "Предпочтительный тип подключения к леджеру",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Прежде чем продолжить, убедитесь, что вы используете правильную секретную фразу восстановления. Вы не сможете отменить это."
   },
+  "restartMetamask": {
+    "message": "Перезапустить MetaMask"
+  },
   "restore": {
     "message": "Восстановить"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Сумма для отправки"
   },
+  "sendBugReport": {
+    "message": "Отправьте нам сообщение об ошибке."
+  },
   "sendSpecifiedTokens": {
     "message": "Отправить $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Подключите кошелек напрямую к компьютеру. Разблокируйте леджер и откройте приложение Ethereum. Для получения дополнительной информации об использовании аппаратного кошелька $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Все еще получаете это сообщение?"
+  },
   "storePhrase": {
     "message": "Сохраните эту фразу в диспетчере паролей, например, в 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Вы по-прежнему можете обменивать свои токены, даже если смарт-транзакции недоступны."
   },
-  "stxPendingFinalizing": {
-    "message": "Завершение..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Приватная отправка вашей операции обмена..."
   },
-  "stxPendingOptimizingGas": {
-    "message": "Оптимизация газа..."
-  },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Конфиденциальная отправка ооперации обмена..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Публичная отправка вашей операции обмена..."
   },
   "stxSubDescription": {
     "message": "* Смарт-транзакции попытаются несколько раз отправить вашу транзакцию в конфиденциальном порядке. Если все попытки не увенчаются успехом, транзакция будет показана публично, чтобы гарантировать успешное завершение вашего обмена."
@@ -3102,6 +3179,10 @@
     "message": "Ваши $1 уже доступны.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Обмен завершится через <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Моделируйте транзакции перед отправкой, чтобы снизить транзакционные издержки и сократить число отказов."
   },
@@ -3180,10 +3261,6 @@
     "message": "Нет доступных токенов, соответствующих $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"
   },
-  "swapCompleteIn": {
-    "message": "Обмен завершится через <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Подтвердите с помощью аппаратного кошелька"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Проскальзывание должно быть больше нуля или равно нулю"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Источник ликвидности"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Символ токена"
   },
+  "tokensFoundTitle": {
+    "message": "Найдены $1 новых токена(-ов)",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Я понимаю"
   },
@@ -3719,6 +3804,9 @@
     "message": "Не удалось подключиться к вашему $1, попробуйте проверить $2 и повторите попытку.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "У MetaMask возникли проблемы с запуском. Эта ошибка может быть непостоянной, поэтому попробуйте перезапустить расширение."
+  },
   "troubleTokenBalances": {
     "message": "У нас возникли проблемы с загрузкой вашего баланса токенов. Вы можете просмотреть их ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Введите свой пароль MetaMask"
   },
+  "typeYourSRP": {
+    "message": "Введите секретную фразу для восстановления"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Эта пользовательская сеть не распознана. Мы рекомендуем $1, прежде чем продолжить",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "проверить сведения о сети",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Отправка коллекционных активов (ERC-721) сейчас не поддерживается",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Кошелек создан"
   },
+  "warning": {
+    "message": "Предупреждение"
+  },
   "weak": {
     "message": "Слабый"
   },
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index b5f1a087f71e..2bfd7e540dcc 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -131,10 +131,10 @@
     "message": "Váš prehliadač nie je podporovaný..."
   },
   "buyWithWyre": {
-    "message": "Kúpte ETH s Wyre"
+    "message": "Kúpte $1 s Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vám umožňuje použiť kreditnú kartu na vloženie depozitu ETH priamo na váš účet MetaMask."
+    "message": "Wyre vám umožňuje použiť kreditnú kartu na vloženie depozitu $1 priamo na váš účet MetaMask."
   },
   "bytes": {
     "message": "Bajty"
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index 8a49c004a919..c49155135358 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš brskalnik ni podptrt ..."
   },
   "buyWithWyre": {
-    "message": "Kupi ETH z Wyre"
+    "message": "Kupi $1 z Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vam omogoča, da s kreditno kartico nakažete ETH neposredno na svoj račun MetaMask."
+    "message": "Wyre vam omogoča, da s kreditno kartico nakažete $1 neposredno na svoj račun MetaMask."
   },
   "bytes": {
     "message": "Bajti"
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 9f29a6bf553a..5ebbd176e554 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -137,10 +137,10 @@
     "message": "Vaš pregledač nije podržan..."
   },
   "buyWithWyre": {
-    "message": "Kupite ETH preko servisa Wyre"
+    "message": "Kupite $1 preko servisa Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre vam dozvoljava da koristite kreditnu karticu kako biste deponovali ETH pravo na vaš MetaMask nalog."
+    "message": "Wyre vam dozvoljava da koristite kreditnu karticu kako biste deponovali $1 pravo na vaš MetaMask nalog."
   },
   "bytes": {
     "message": "Bajtovi"
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 2e1c5721e176..c8d77d1677ed 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -137,10 +137,10 @@
     "message": "Din webbläsare stöds inte..."
   },
   "buyWithWyre": {
-    "message": "Köp ETH med Wyre"
+    "message": "Köp $1 med Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre låter dig använda ett kreditkort för att sätta in ETH direkt på ditt MetaMask-konto."
+    "message": "Wyre låter dig använda ett kreditkort för att sätta in $1 direkt på ditt MetaMask-konto."
   },
   "cancel": {
     "message": "Avbryt"
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 990fd2e43991..9a060e45ec42 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -134,10 +134,10 @@
     "message": "Kivinjari chaku hakiwezeshwi..."
   },
   "buyWithWyre": {
-    "message": "Nunua ETH kwa kutumia Wyre"
+    "message": "Nunua $1 kwa kutumia Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre inakuwezesha kutumia kadi ya benki kuweka ETH moja kwa moja kwenye akaunti yako ya MetaMask."
+    "message": "Wyre inakuwezesha kutumia kadi ya benki kuweka $1 moja kwa moja kwenye akaunti yako ya MetaMask."
   },
   "cancel": {
     "message": "Ghairi"
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index fb3fcb92a20d..5ed22eaba946 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 maaaring i-access at gamitin ang asset na ito",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "I-access ang iyong wallet gamit ang iyong Secret Recovery Phrase"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "Hindi mabawi ng MetaMask ang iyong password. Gagamitin namin ang iyong Secret Recovery Phrase upang patunayan ang iyong pagmamay-ari, i-restore ang iyong wallet at mag-set up ng bagong password. Una, ilagay ang Secret Recovery Phrase na ibinigay sa iyo noong ginawa mo ang iyong 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": "Ina-access ang iyong camera..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Magdagdag ng Network"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Ang koneksyon sa network na ito ay umaasa sa mga third party. Ang koneksyon na ito ay maaaring hindi gaanong maaasahan o binibigyang-daan ang mga third-party na mag-track ng aktibidad. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Magdagdag ng Mga Iminumungkahing Token"
   },
@@ -400,6 +411,14 @@
     "message": "Bumili ng $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Bumili ng $1 gamit ang Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Madali kang makakabili o makakapagtransfer ng crypto gamit ang iyong Coinbase account.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Bumili ng $1 gamit ang MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Bumili ng ETH gamit ang Wyre"
+    "message": "Bumili ng $1 gamit ang Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Nagbibigay-daan sa iyo ang Wyre na gumamit ng debit card para mag-deposit ng ETH sa mismong MetaMask account mo."
+    "message": "Madaling onboarding para sa mga pagbili hanggang $ 1000. Mabilis na interactive na high limit na pag-verify ng pagbili. Sinusuportahan ang Debit/Credit Card, Apple Pay, Bank Transfers. Available sa 100+ na mga bansa. Deposito ng mga token sa iyong MetaMask Account"
   },
   "bytes": {
     "message": "Bytes"
@@ -447,9 +466,6 @@
     "message": "Sa $1 na transaksyon ang singil sa gas ay dapat tumaas nang hindi bababa sa 10% para ito ay makilala ng network.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Kanselahin ang pagpapalit"
-  },
   "cancellationGasFee": {
     "message": "Bayarin sa Gasolina para sa Pagkansela"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Magpatuloy"
   },
+  "continueToCoinbasePay": {
+    "message": "Magpatuloy sa Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Magpatuloy sa MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Interaksyon ng Kontrata"
   },
   "convertTokenToNFTDescription": {
-    "message": "Natukoy namin na ang asset na ito ay isang NFT. Ang Metamask ay mayroon na ngayong ganap na native support para sa mga NFT. Gusto mo bang alisin ito sa iyong listahan ng token at idagdag ito bilang isang NFT?"
+    "message": "Natukoy namin na ang asset na ito ay isang NFT. Ang MetaMask ay mayroon na ngayong ganap na native support para sa mga NFT. Gusto mo bang alisin ito sa iyong listahan ng token at idagdag ito bilang isang NFT?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Napansin namin na naidagdag ang asset na ito bilang NFT. Gusto mo ba itong alisin mula sa listahan ng iyong token?"
@@ -1225,6 +1244,10 @@
     "message": "Ang lahat ng API ng Flask ay eksperimental. Maaaring baguhin o alisin ang mga ito nang walang abiso, o maaari silang manatili sa Flask nang walang katapusan nang hindi nalilipat sa matatag na MetaMask. Gamitin ang mga ito sa iyong sariling pananagutan.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Siguraduhing i-disable ang iyong regular na MetaMask extension kapag ginagamit ang Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Tinatanggap ko ang mga panganib",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Itago"
   },
+  "hideFullTransactionDetails": {
+    "message": "Itago ang buong detalye ng transaksyon"
+  },
   "hideSeedPhrase": {
     "message": "Itago ang seed phrase"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "History"
   },
+  "ignoreAll": {
+    "message": "Huwag pansinin ang lahat"
+  },
+  "ignoreTokenWarning": {
+    "message": "Kung itatago mo ang mga token, hindi ipapakita ang mga ito sa iyong wallet. Gayunpaman, maaari mo pa ring idagdag ang mga ito sa pamamagitan ng paghahanap sa kanila."
+  },
   "import": {
     "message": "Mag-import",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "I-import ang wallet"
   },
+  "importWithCount": {
+    "message": "Mag-isport ng $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"
+  },
   "importYourExisting": {
     "message": "I-import ang iyong kasalukuyang wallet gamit ang isang Secret Recovery Phrase"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "arrow ng level"
   },
+  "lightTheme": {
+    "message": "Maliwanag"
+  },
   "likeToImportTokens": {
     "message": "Gusto mo bang idagdag ang mga token na ito?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Sumali sa 6M+ user upang mapabuti ang MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Ang mga detalye ng network para sa chain ID na ito ay hindi tumutugma sa aming mga talaan. Inirerekomenda namin na $1 ka bago magpatuloy.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "i-verify ang mga detalye ng network",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Bago ka ba sa MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Matagumpay mong na-import ang $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Na-import ang token"
+  },
   "newTotal": {
     "message": "Bagong Kabuuan"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Hindi Sapat ang Gas"
   },
+  "notifications": {
+    "message": "Mga Abiso"
+  },
   "notifications10ActionText": {
     "message": "Bisitahin sa mga setting",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2109,7 +2154,7 @@
     "message": "Paganahin ang dark mode"
   },
   "notifications12Description": {
-    "message": "Pagaganahin ang Dark Mode para sa mga bagong user depende sa kanilang mga kagustuhan sa sistema. Para sa mga kasalukuyang user, manu-manong paganahin ang Dark Mode sa ilalim ng Mga Setting -> Eksperimental."
+    "message": "Nandito na sa wakas ang dark mode sa Extension! Upang i-on ito, pumunta sa Mga Setting -> Eksperimental at pumili ng isa sa mga opsyon sa pagpapakita: Light, Dark, System."
   },
   "notifications12Title": {
     "message": "Wen dark mode? Ngayon dark mode! 🕶️🦊"
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Pinadadali naming mabasa ang mga transaksyon."
   },
+  "notificationsEmptyText": {
+    "message": "Walang makikita dito."
+  },
+  "notificationsHeader": {
+    "message": "Mga Abiso"
+  },
+  "notificationsInfos": {
+    "message": "$1 mula $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Markahan ang lahat bilang nabasa na"
+  },
   "numberOfNewTokensDetected": {
     "message": "$1 bagong token ang nakita sa account na ito",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Pinagmulan"
   },
+  "osTheme": {
+    "message": "Sistema"
+  },
+  "padlock": {
+    "message": "Padlock"
+  },
   "parameters": {
     "message": "Mga Parameter"
   },
@@ -2371,6 +2435,10 @@
     "message": "Tingnan ang mga address, balanse ng account, aktibidad at simulan ang iyong mga transaksyon",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Patakbuhin ng walang katapusan.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Kontrolin ang iyong mga account at asset sa \"$1\".",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 pa",
     "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": "Mga sikat na custom na network"
+  },
   "preferredLedgerConnectionType": {
     "message": "Napiling Uri ng Ledger Connection",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Tiyakin na ginagamit mo ang wastong Secret Recovery Phrase bago magpatuloy. Hindi mo na ito maaaring pawalang-bisa."
   },
+  "restartMetamask": {
+    "message": "I-restart ang MetaMask"
+  },
   "restore": {
     "message": "I-restore"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Halaga ng Ipapadala"
   },
+  "sendBugReport": {
+    "message": "Padalhan kami ng ulat ng bug."
+  },
   "sendSpecifiedTokens": {
     "message": "Magpadala ng $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Direktang ikonekta ang iyong wallet sa iyong computer. I-unlock ang iyong Ledger at buksan ang Ethereum app. Para sa higit pa sa paggamit ng iyong hardware wallet device, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Nakukuha pa rin ang mensaheng ito?"
+  },
   "storePhrase": {
     "message": "I-store ang phrase na ito sa isang password manager gaya ng 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Maaari mo parin papalitan ang iyong mga token kahit na hindi available ang mga Smart Transaction."
   },
-  "stxPendingFinalizing": {
-    "message": "Isinasapinal..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Pinapahusay ang gas..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Pribadong isinusumite ang iyong Swap..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Pribadong isinusumite ang Pagpapalit..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Pampublikong isinusumite ang iyong Swap..."
   },
   "stxSubDescription": {
     "message": "* Susubukan ng mga Smart Transaction na isumite nang pribado ang iyong transaksyon, maraming beses. Kapag nabigo ang lahat ng pagsubok, ipapakita sa publiko ang transaksyon upang matiyak na ang Pagpapalit ay naging matagupay."
@@ -3102,6 +3179,10 @@
     "message": "Ang iyong $1 ay available na ngayon.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Matatapos ang Swap sa <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Gayahin ang mga transaksyon bago isumite upang bumaba ang gastos sa transaksyon at mabawasan ang mga pagkabigo."
   },
@@ -3180,10 +3261,6 @@
     "message": "Walang available na token na tumutugma sa $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"
   },
-  "swapCompleteIn": {
-    "message": "Kumpleto na ang pagpapalit sa <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Kumpirmahin gamit ang iyong hardware wallet"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Ang slippage ay dapat mas malaki o katumbas ng zero"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Pinagkunan ng liquidity"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Simbolo ng Token"
   },
+  "tokensFoundTitle": {
+    "message": "$1 bagong token ang nakita",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Nauunawaan ko"
   },
@@ -3719,6 +3804,9 @@
     "message": "Nagkaproblema kami sa pagkonekta sa iyong $1, subukang suriin ang $2 at subukan ulit.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "Nagkaproblema ang MetaMask sa pagsisimula. Maaaring paulit-ulit ang error na ito, kaya subukang i-restart ang extension."
+  },
   "troubleTokenBalances": {
     "message": "Nagkaproblema kami sa pag-load ng mga balanse ng iyong token. Puwede mong tingnan ang mga iyon ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Uri ng password ng iyong MetaMask"
   },
+  "typeYourSRP": {
+    "message": "I-type ang iyong 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."
@@ -3779,10 +3870,6 @@
     "message": "Hindi nakikilala ang custom network na ito. Nirerekomenda namin na ikaw ay $1 bago magpatuloy",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "i-verify ang mga detalye ng network",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Ang pagpapadala ng collectible (ERC-721) token ay kasalukuyang hindi magagamit",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Matagumpay ang paggawa ng wallet"
   },
+  "warning": {
+    "message": "Babala"
+  },
   "weak": {
     "message": "Madali"
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index df04f15ba167..05719bd53a38 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 bu varlığa erişebilir ve harcayabilir",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Gizli Kurtarma İfadenizle cüzdanınıza erişin"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask parolanızı kurtaramaz. Sahipliğinizi doğrulamak, cüzdanınızı yenilemek ve yeni bir parola belirlemek için Gizli Kurtarma İfadenizi kullanırız. İlk olarak, cüzdanınızı oluştururken size verilmiş olan Gizli Kurtarma İfadenizi girin. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Kameranıza erişim sağlanıyor..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Ağ ekle"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Bu ağ bağlantısı üçüncü taraflara dayalıdır. Bu bağlantı daha az güvenli olabilir veya üçüncü tarafların aktiviteleri takip etmesine olanak sağlayabilir. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Önerilen Tokenleri ekle"
   },
@@ -400,6 +411,14 @@
     "message": "$1 satın al",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Coinbase Pay ile 1 USD al",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Coinbase hesabınla kolayca kripto para satın alabilir veya transfer edebilirsin.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "MoonPay ile $1 satın al",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Wyre ile ETH satın al"
+    "message": "Wyre ile $1 satın al"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre, doğrudan MetaMask hesabınıza ETH yatırma işlemleri için banka kartı kullanmanıza izin verir."
+    "message": "Wyre, doğrudan MetaMask hesabınıza $1 yatırma işlemleri için banka kartı kullanmanıza izin verir."
   },
   "bytes": {
     "message": "Bayt"
@@ -447,9 +466,6 @@
     "message": "İşlemi $1 için, gaz ücretinin ağ tarafından tanınması amacıyla en az %10 oranında artırılması gerekir.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Takası iptal et"
-  },
   "cancellationGasFee": {
     "message": "İptal İşlemi Gaz Ücreti"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Devam et"
   },
+  "continueToCoinbasePay": {
+    "message": "Coinbase Pay'e devam et"
+  },
   "continueToMoonPay": {
     "message": "MoonPay'e devam et"
   },
@@ -631,7 +650,7 @@
     "message": "Sözleşme Etkileşimi"
   },
   "convertTokenToNFTDescription": {
-    "message": "Bu varlığın bir NFT olduğunu tespit ettik. Metamask artık NFT'ler için tam yerel desteğe sahiptir. Bunu token listenden çıkarmak ve bir NFT olarak eklemek ister misin?"
+    "message": "Bu varlığın bir NFT olduğunu tespit ettik. MetaMask artık NFT'ler için tam yerel desteğe sahiptir. Bunu token listenden çıkarmak ve bir NFT olarak eklemek ister misin?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Bu varlığın bir NFT olarak eklendiğini tespit ettik. Token listenden çıkarmak ister misin?"
@@ -1225,6 +1244,10 @@
     "message": "Tüm Flask API'leri deneyseldir. Önceden haber verilmeksizin değiştirilebilir veya kaldırılabilirler ya da kararlı MetaMask'e taşınmadan süresiz olarak Flask'ta kalabilirler. Bunları kendi sorumluluğunda kullan.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Flask kullanırken normal MetaMask uzantınızı devre dışı bıraktığınızdan emin olun.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Riskleri kabul ediyorum",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Gizle"
   },
+  "hideFullTransactionDetails": {
+    "message": "Tam işlem bilgilerini gizle"
+  },
   "hideSeedPhrase": {
     "message": "Tohum ifadesini gizle"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Geçmiş"
   },
+  "ignoreAll": {
+    "message": "Tümünü yoksay"
+  },
+  "ignoreTokenWarning": {
+    "message": "Gizlediğiniz tokenler cüzdanınızda gösterilmez. Ancak, yine de onları bulup ekleyebilirsiniz."
+  },
   "import": {
     "message": "İçe Aktar",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Cüzdanı içe aktar"
   },
+  "importWithCount": {
+    "message": "$1 tokeni içe aktar",
+    "description": "$1 will the number of detected tokens that are selected for importing, if all of them are selected then $1 will be all"
+  },
   "importYourExisting": {
     "message": "Gizli Kurtarma İfadesi kullanarak mevcut cüzdanınızı içe aktarın"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "seviye oku"
   },
+  "lightTheme": {
+    "message": "Aydınlık"
+  },
   "likeToImportTokens": {
     "message": "Bu tokenleri içe aktarmak ister misiniz?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "MetaMask'i geliştirmek için 6 milyondan fazla kullanıcıya katılın"
   },
-  "mismatchedChain": {
-    "message": "Bu zincir kimliği için ağ ayrıntıları kayıtlarımızla uyumlu değil. Devam etmeden önce şunu yapmanızı öneriyoruz: $1.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "ağ bilgilerini doğrula",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "MetaMask'te yeni misiniz?"
   },
+  "newTokensImportedMessage": {
+    "message": "$1 tokeni başarılı bir şekilde içe aktardın.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Token içe aktarıldı"
+  },
   "newTotal": {
     "message": "Yeni Toplam"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Yeterli Gaz Yok"
   },
+  "notifications": {
+    "message": "Bildirimler"
+  },
   "notifications10ActionText": {
     "message": "Ayarlarda ziyaret et",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 İşlemlerin okunmasını daha kolay hale getiriyoruz."
   },
+  "notificationsEmptyText": {
+    "message": "Burada gösterilecek bir şey yok."
+  },
+  "notificationsHeader": {
+    "message": "Bildirimler"
+  },
+  "notificationsInfos": {
+    "message": "$1 tarihli bildirim: $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Tümünü okundu olarak işaretle"
+  },
   "numberOfNewTokensDetected": {
     "message": "Bu hesapta $1 yeni token bulundu",
     "description": "$1 is the number of new tokens detected"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Köken"
   },
+  "osTheme": {
+    "message": "Sistem"
+  },
+  "padlock": {
+    "message": "Asma Kilit"
+  },
   "parameters": {
     "message": "Parametreler"
   },
@@ -2371,6 +2435,10 @@
     "message": "Adrese, hesap bakiyesine, aktiviteye bakın ve işlemleri başlatın",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Süresiz çalıştır.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "\"$1\" hesaplarını ve varlıklarını kontrol et.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 tane daha",
     "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": "Popüler özel ağlar"
+  },
   "preferredLedgerConnectionType": {
     "message": "Tercih Edilen Kayıt Defteri Bağlantı Türü",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Devam etmeden önce doğru Gizli Kurtarma İfadesini kullandığından emin ol. Bunu geri alamazsın."
   },
+  "restartMetamask": {
+    "message": "MetaMask'i yeniden başlat"
+  },
   "restore": {
     "message": "Geri Yükle"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Tutarı Gönder"
   },
+  "sendBugReport": {
+    "message": "Bize bir hata raporu gönder."
+  },
   "sendSpecifiedTokens": {
     "message": "$1 Gönder",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Cüzdanınızı doğrudan bilgisayara bağlayın. Kayıt defterinizin kilidini açın ve Ethereum uygulamasını açın. Donanım cüzdanı cihazınızın kullanımı hakkında daha fazla bilgi için $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Bu mesajı almaya devam mı ediyorsun?"
+  },
   "storePhrase": {
     "message": "Bu ifadeyi 1Password gibi bir parola yöneticisinde saklayın."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Akıllı İşlemler kullanılamazken bile token'larını değiştirebilirsin."
   },
-  "stxPendingFinalizing": {
-    "message": "Sonuçlandırılıyor..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Gas optimize ediliyor..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Swap işlemin özel olarak gönderiliyor..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Takas özel olarak gönderiliyor..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Swap işlemin herkese açık olarak gönderiliyor..."
   },
   "stxSubDescription": {
     "message": "* Akıllı İşlemler, işlemini birden çok kez özel olarak göndermeye çalışır. Tüm denemeler başarısız olursa Takas'ının başarılı bir şekilde gerçekleşmesini sağlamak için işlem herkese açık olarak yayınlanacaktır."
@@ -3102,6 +3179,10 @@
     "message": "$1 artık kullanılabilir.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Swap işleminin tamamlanmasına kalan süre <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "İşlem maliyetlerini azaltmak ve arızaları azaltmak için göndermeden önce işlemleri simüle et."
   },
@@ -3180,10 +3261,6 @@
     "message": "$1 ile eşleşen token yok",
     "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"
   },
-  "swapCompleteIn": {
-    "message": "Değiştirme işlemi şu süre içinde tamamlandı <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Donanım cüzdanınızla onaylayın"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Fark en az sıfır olmalıdır"
   },
+  "swapSlippagePercent": {
+    "message": "%$1",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Likidite kaynağı"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Token Sembolü"
   },
+  "tokensFoundTitle": {
+    "message": "$1 yeni token bulundu",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Anladım"
   },
@@ -3719,6 +3804,9 @@
     "message": "$1 ile bağlantı kurmada sorun yaşıyoruz, $2 kısmını inceleyip tekrar deneyin.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask başlatılırken bir sorun oldu. Bu hata sürekli bir hata olmayabilir; bu yüzden uzantıyı yeniden başlatmayı dene."
+  },
   "troubleTokenBalances": {
     "message": "Token bakiyeleriniz yüklenirken sorun yaşadık. Burada görüntüleyebilirsiniz ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "MetaMask parolanızı girin"
   },
+  "typeYourSRP": {
+    "message": "Gizli Kurtarma İfadenizi girin"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Bu özel ağ tanınmadı. Devam etmeden önce $1 öneririz",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "ağ bilgilerini doğrula",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Toplanabilir (ERC-721) tokenlerin gönderilmesi şu anda desteklenmiyor",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Cüzdan oluşturma başarılı"
   },
+  "warning": {
+    "message": "Uyarı"
+  },
   "weak": {
     "message": "Zayıf"
   },
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index c2e046eb4016..2b47cd8d45ef 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -137,10 +137,10 @@
     "message": "Ваш браузер не підтримується..."
   },
   "buyWithWyre": {
-    "message": "Купити ETH через Wyre"
+    "message": "Купити $1 через Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre дає змогу використовувати кредитну картку для внесення валюти ETH безпосередньо у свій гаманець MetaMask."
+    "message": "Wyre дає змогу використовувати кредитну картку для внесення валюти $1 безпосередньо у свій гаманець MetaMask."
   },
   "bytes": {
     "message": "Байти"
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 02eaddd38a02..a38862ed5fb6 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -62,6 +62,13 @@
     "message": "$1 có thể truy cập và chi tiêu tài sản này",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "Truy cập ví của bạn bằng Cụm từ khôi phục bí mật"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask không thể khôi phục mật khẩu của bạn. Chúng tôi sẽ sử dụng Cụm từ khôi phục bí mật của bạn để xác thực quyền sở hữu, khôi phục ví và thiết lập mật khẩu mới. Trước tiên, hãy nhập Cụm từ khôi phục bí mật mà bạn đã được cấp khi tạo ví. $1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "Đang truy cập máy ảnh..."
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "Thêm mạng"
   },
+  "addNetworkTooltipWarning": {
+    "message": "Kết nối mạng này dựa vào các bên thứ ba. Kết nối này có thể kém tin cậy hơn hoặc cho phép các bên thứ ba theo dõi hoạt động. $1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "Thêm token được đề xuất"
   },
@@ -400,6 +411,14 @@
     "message": "Mua $1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "Mua $1 bằng Coinbase Pay",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "Bạn có thể dễ dàng mua hoặc chuyển khoản tiền điện tử bằng tài khoản Coinbase của mình.",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "Mua $1 bằng MoonPay",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "Mua ETH qua Wyre"
+    "message": "Mua $1 qua Wyre"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre cho phép bạn dùng thẻ ghi nợ để nạp ETH trực tiếp vào tài khoản MetaMask của mình."
+    "message": "Wyre cho phép bạn dùng thẻ ghi nợ để nạp $1 trực tiếp vào tài khoản MetaMask của mình."
   },
   "bytes": {
     "message": "Byte"
@@ -447,9 +466,6 @@
     "message": "Để $1 một giao dịch, phí gas phải tăng tối thiểu 10% để mạng nhận ra giao dịch này.",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "Hủy hoán đổi"
-  },
   "cancellationGasFee": {
     "message": "Phí gas hủy"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "Tiếp tục"
   },
+  "continueToCoinbasePay": {
+    "message": "Tiếp tục đến Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "Tiếp tục đến MoonPay"
   },
@@ -631,7 +650,7 @@
     "message": "Tương tác với hợp đồng"
   },
   "convertTokenToNFTDescription": {
-    "message": "Chúng tôi phát hiện tài sản này là một NFT. Metamask hiện đã hỗ trợ gốc đầy đủ cho NFT. Bạn có muốn xóa tài sản khỏi danh sách token và thêm tài sản dưới dạng NFT không?"
+    "message": "Chúng tôi phát hiện tài sản này là một NFT. MetaMask hiện đã hỗ trợ gốc đầy đủ cho NFT. Bạn có muốn xóa tài sản khỏi danh sách token và thêm tài sản dưới dạng NFT không?"
   },
   "convertTokenToNFTExistDescription": {
     "message": "Chúng tôi phát hiện tài sản này đã được thêm dưới dạng NFT. Bạn có muốn xóa tài sản khỏi danh sách token không?"
@@ -1225,6 +1244,10 @@
     "message": "Tất cả các API của Flask đều là thử nghiệm. Chúng có thể bị thay đổi hoặc xóa mà không cần thông báo, hoặc chúng có thể ở trên Flask vô thời hạn mà không bao giờ được chuyển sang phiên bản MetaMask ổn định. Bạn phải tự chịu rủi ro khi sử dụng chúng.",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "Đảm bảo bạn đã tắt tiện ích mở rộng MetaMask thông thường khi sử dụng Flask.",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "Tôi chấp nhận những rủi ro này",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1416,6 +1439,9 @@
   "hide": {
     "message": "Ẩn"
   },
+  "hideFullTransactionDetails": {
+    "message": "Ẩn chi tiết giao dịch đầy đủ"
+  },
   "hideSeedPhrase": {
     "message": "Ẩn cụm từ khôi phục bí mật"
   },
@@ -1445,6 +1471,12 @@
   "history": {
     "message": "Lịch sử"
   },
+  "ignoreAll": {
+    "message": "Bỏ qua tất cả"
+  },
+  "ignoreTokenWarning": {
+    "message": "Nếu bạn ẩn token, chúng sẽ không hiển thị trong ví của bạn. Tuy nhiên, bạn vẫn có thể thêm chúng thông qua tìm kiếm."
+  },
   "import": {
     "message": "Nhập",
     "description": "Button to import an account from a selected file"
@@ -1494,6 +1526,10 @@
   "importWallet": {
     "message": "Nhập ví"
   },
+  "importWithCount": {
+    "message": "Nhập $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"
+  },
   "importYourExisting": {
     "message": "Nhập ví hiện tại của bạn bằng Cụm mật khẩu khôi phục bí mật"
   },
@@ -1688,6 +1724,9 @@
   "levelArrow": {
     "message": "mũi tên cấp độ"
   },
+  "lightTheme": {
+    "message": "Sáng"
+  },
   "likeToImportTokens": {
     "message": "Bạn có muốn nhập những token này không?"
   },
@@ -1849,10 +1888,6 @@
   "metametricsTitle": {
     "message": "Tham gia cùng hơn 6 Triệu người dùng để cải thiện MetaMask"
   },
-  "mismatchedChain": {
-    "message": "Thông tin về mạng cho mã chuỗi này không khớp với hồ sơ của chúng tôi. Bạn nên $1 trước khi tiếp tục.",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "xác minh thông tin về mạng",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2001,6 +2036,13 @@
   "newToMetaMask": {
     "message": "Bạn mới sử dụng MetaMask?"
   },
+  "newTokensImportedMessage": {
+    "message": "Bạn đã nhập thành công $1.",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "Đã nhập token"
+  },
   "newTotal": {
     "message": "Tổng mới"
   },
@@ -2083,6 +2125,9 @@
   "notEnoughGas": {
     "message": "Không đủ gas"
   },
+  "notifications": {
+    "message": "Thông báo"
+  },
   "notifications10ActionText": {
     "message": "Xem trong cài đặt",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2203,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 Chúng tôi đang làm cho các giao dịch dễ đọc hơn."
   },
+  "notificationsEmptyText": {
+    "message": "Không có gì ở đây."
+  },
+  "notificationsHeader": {
+    "message": "Thông báo"
+  },
+  "notificationsInfos": {
+    "message": "$1 từ $2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "Đánh dấu đã đọc tất cả"
+  },
   "numberOfNewTokensDetected": {
     "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"
@@ -2301,6 +2359,12 @@
   "origin": {
     "message": "Nguồn gốc"
   },
+  "osTheme": {
+    "message": "Hệ thống"
+  },
+  "padlock": {
+    "message": "Ổ khóa"
+  },
   "parameters": {
     "message": "Tham số"
   },
@@ -2371,6 +2435,10 @@
     "message": "Xem địa chỉ, số dư tài khoản, hoạt động và bắt đầu giao dịch",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "Chạy không giới hạn.",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "Kiểm soát các tài khoản và tài sản \"$1\" của bạn.",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2400,6 +2468,9 @@
     "message": "+ $1 khác",
     "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": "Mạng tùy chỉnh phổ biến"
+  },
   "preferredLedgerConnectionType": {
     "message": "Dạng Kết Nối Ledger Ưu Tiên",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2574,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "Đảm bảo bạn đang sử dụng đúng Cụm từ khôi phục bí mật trước khi tiếp tục vì bạn sẽ không thể hoàn tác."
   },
+  "restartMetamask": {
+    "message": "Khởi động lại MetaMask"
+  },
   "restore": {
     "message": "Khôi phục"
   },
@@ -2758,6 +2832,9 @@
   "sendAmount": {
     "message": "Gửi khoản tiền"
   },
+  "sendBugReport": {
+    "message": "Gửi báo cáo lỗi."
+  },
   "sendSpecifiedTokens": {
     "message": "Gửi $1",
     "description": "Symbol of the specified token"
@@ -3031,6 +3108,9 @@
     "message": "Kết nối ví của bạn trực tiếp với máy tính.  Mở khóa Ledger của bạn và mở ứng dụng Ethereum. Để biết thêm thông tin về cách sử dụng thiết bị ví cứng của bạn, $1.",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "Vẫn nhận được thông báo này?"
+  },
   "storePhrase": {
     "message": "Lưu trữ cụm mật khẩu này trong trình quản lý mật khẩu chẳng hạn như 1Password."
   },
@@ -3083,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "Bạn vẫn có thể hoán đổi token ngay cả khi Giao dịch thông minh không khả dụng."
   },
-  "stxPendingFinalizing": {
-    "message": "Đang hoàn thành..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "Đang tối ưu gas..."
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "Đang bí mật gửi yêu cầu Hoán đổi của bạn..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "Đang gửi yêu cầu Hoán đổi riêng tư..."
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "Đang công khai gửi yêu cầu Hoán đổi của bạn..."
   },
   "stxSubDescription": {
     "message": "* Giao dịch thông minh sẽ cố gắng gửi giao dịch của bạn nhiều lần theo cách riêng tư. Nếu tất cả các lần thử đều không thành công, giao dịch sẽ được phát công khai để đảm bảo Hoán đổi của bạn được thực hiện thành công."
@@ -3102,6 +3179,10 @@
     "message": "$1 của bạn hiện đã có sẵn.",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Hoán đổi sẽ hoàn tất sau <",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "Mô phỏng giao dịch trước khi gửi để giảm chi phí giao dịch và tỷ lệ thất bại."
   },
@@ -3180,10 +3261,6 @@
     "message": "Không có token nào khớp với $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"
   },
-  "swapCompleteIn": {
-    "message": "Hoán đổi xong sau <",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "Xác nhận ví cứng của bạn"
   },
@@ -3365,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "Mức trượt giá phải lớn hơn hoặc bằng 0"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "Nguồn thanh khoản"
   },
@@ -3598,6 +3679,10 @@
   "tokenSymbol": {
     "message": "Ký hiệu token"
   },
+  "tokensFoundTitle": {
+    "message": "Đã tìm thấy $1 token mới",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "Tôi đã hiểu"
   },
@@ -3719,6 +3804,9 @@
     "message": "Chúng tôi đã gặp phải sự cố khi kết nối với $1 của bạn, hãy thử xem lại $2 và thử lại.",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask đã gặp sự cố khi khởi động. Lỗi này có thể xảy ra không liên tục, vì vậy hãy thử khởi động lại tiện ích."
+  },
   "troubleTokenBalances": {
     "message": "Chúng tôi đã gặp phải vấn đề khi tải số dư token của bạn. Bạn có thể xem số dư ",
     "description": "Followed by a link (here) to view token balances"
@@ -3741,6 +3829,9 @@
   "typePassword": {
     "message": "Nhập mật khẩu MetaMask của bạn"
   },
+  "typeYourSRP": {
+    "message": "Nhập Cụm từ khôi phục bí mật của bạn"
+  },
   "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."
@@ -3779,10 +3870,6 @@
     "message": "Không nhận ra mạng tùy chỉnh này. Bạn nên $1 trước khi tiếp tục",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "xác minh thông tin về mạng",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "Hiện không hỗ trợ gửi token sưu tập (ERC-721)",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3900,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "Tạo ví thành công"
   },
+  "warning": {
+    "message": "Cảnh báo"
+  },
   "weak": {
     "message": "Yếu"
   },
diff --git a/app/_locales/zh/messages.json b/app/_locales/zh/messages.json
index 5e6bfd118063..66984cbd436f 100644
--- a/app/_locales/zh/messages.json
+++ b/app/_locales/zh/messages.json
@@ -62,6 +62,13 @@
     "message": "$1可以访问并使用此资产",
     "description": "$1 is the url of the site requesting ability to spend"
   },
+  "accessYourWalletWithSRP": {
+    "message": "使用账户助记词访问钱包"
+  },
+  "accessYourWalletWithSRPDescription": {
+    "message": "MetaMask无法恢复您的密码。我们将使用您的助记词来验证您的所有权、恢复您的钱包并设置新密码。首先，请输入创建钱包时获得的助记词。$1",
+    "description": "$1 is the words 'Learn More' from key 'learnMore', separated here so that it can be added as a link"
+  },
   "accessingYourCamera": {
     "message": "正在访问您的相机……"
   },
@@ -153,6 +160,10 @@
   "addNetwork": {
     "message": "添加网络"
   },
+  "addNetworkTooltipWarning": {
+    "message": "此网络连接依赖于第三方。此连接可能不太可靠，或使第三方可进行活动跟踪。$1",
+    "description": "$1 is Learn more link"
+  },
   "addSuggestedTokens": {
     "message": "添加推荐代币"
   },
@@ -400,6 +411,14 @@
     "message": "购买$1",
     "description": "$1 is the ticker symbol of a an asset the user is being prompted to purchase"
   },
+  "buyCryptoWithCoinbasePay": {
+    "message": "用Coinbase Pay购买$1",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
+  "buyCryptoWithCoinbasePayDescription": {
+    "message": "您可以使用Coinbase账户轻松购买或转移加密货币。",
+    "description": "$1 represents the crypto symbol to be purchased"
+  },
   "buyCryptoWithMoonPay": {
     "message": "用MoonPay购买$1",
     "description": "$1 represents the cypto symbol to be purchased"
@@ -416,10 +435,10 @@
     "description": "$1 represents the crypto symbol to be purchased"
   },
   "buyWithWyre": {
-    "message": "使用 Wyre 购买 ETH"
+    "message": "使用 Wyre 购买 $1"
   },
   "buyWithWyreDescription": {
-    "message": "您可以通过 Wyre 使用借记卡将 ETH 存入您的 MetaMask 账户。"
+    "message": "您可以通过 Wyre 使用借记卡将 $1 存入您的 MetaMask 账户。"
   },
   "bytes": {
     "message": "字节"
@@ -447,9 +466,6 @@
     "message": "若要$1交易，燃料费用必须增加至少10%才能被网络认可。",
     "description": "$1 is string 'cancel' or 'speed up'"
   },
-  "cancelSwap": {
-    "message": "取消交换"
-  },
   "cancellationGasFee": {
     "message": "取消燃料费用"
   },
@@ -606,6 +622,9 @@
   "continue": {
     "message": "继续"
   },
+  "continueToCoinbasePay": {
+    "message": "继续使用Coinbase Pay"
+  },
   "continueToMoonPay": {
     "message": "继续使用MoonPay"
   },
@@ -718,9 +737,6 @@
   "customGasSubTitle": {
     "message": "提升费用可能会缩短处理时间，但不能保证。"
   },
-  "customNetworks": {
-    "message": "自定义网络"
-  },
   "customSpendLimit": {
     "message": "自定义消费限额"
   },
@@ -1228,6 +1244,10 @@
     "message": "所有Flask API都是实验性的。它们可能会在未事先通知的情况下被更改或删除，它们也可能会无限期地留在Flask上而不会迁移到稳定的MetaMask。您需要自行承担使用它们的风险。",
     "description": "This message warns developers about unstable Flask APIs"
   },
+  "flaskWelcomeWarning4": {
+    "message": "确保在使用Flask时禁用常规MetaMask扩展程序。",
+    "description": "This message calls to pay attention about multiple versions of MetaMask running on the same site (Flask + Prod)"
+  },
   "flaskWelcomeWarningAcceptButton": {
     "message": "我接受风险",
     "description": "this text is shown on a button, which the user presses to confirm they understand the risks of using Flask"
@@ -1419,6 +1439,9 @@
   "hide": {
     "message": "隐藏"
   },
+  "hideFullTransactionDetails": {
+    "message": "隐藏完整的交易细节"
+  },
   "hideSeedPhrase": {
     "message": "隐藏助记词"
   },
@@ -1448,6 +1471,12 @@
   "history": {
     "message": "历史记录"
   },
+  "ignoreAll": {
+    "message": "忽略所有"
+  },
+  "ignoreTokenWarning": {
+    "message": "如果您隐藏代币，它们将不会在您的钱包中显示。但您仍然可以通过搜索代币来添加它们。"
+  },
   "import": {
     "message": "导入",
     "description": "Button to import an account from a selected file"
@@ -1497,6 +1526,10 @@
   "importWallet": {
     "message": "导入钱包"
   },
+  "importWithCount": {
+    "message": "导入$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"
+  },
   "importYourExisting": {
     "message": "使用账户助记词导入您的现有钱包"
   },
@@ -1613,7 +1646,7 @@
     "message": "已知合约地址。"
   },
   "knownTokenWarning": {
-    "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
+    "message": "此操作将编辑已经在您的钱包中列出的代币，有可能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
   },
   "kovan": {
     "message": "Kovan 测试网络"
@@ -1691,6 +1724,9 @@
   "levelArrow": {
     "message": "水平箭头"
   },
+  "lightTheme": {
+    "message": "浅色"
+  },
   "likeToImportTokens": {
     "message": "您想导入这些代币吗？"
   },
@@ -1852,10 +1888,6 @@
   "metametricsTitle": {
     "message": "和600多万用户一起改进 MetaMask"
   },
-  "mismatchedChain": {
-    "message": "此链 ID 的网络信息与我们的记录不符。我们建议您在继续操作之前 $1。",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "验证网络信息",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -2004,6 +2036,13 @@
   "newToMetaMask": {
     "message": "MetaMask 的新用户？"
   },
+  "newTokensImportedMessage": {
+    "message": "您已成功导入$1。",
+    "description": "$1 is the string of symbols of all the tokens imported"
+  },
+  "newTokensImportedTitle": {
+    "message": "已导入代币"
+  },
   "newTotal": {
     "message": "新总额"
   },
@@ -2086,6 +2125,9 @@
   "notEnoughGas": {
     "message": "燃料不足"
   },
+  "notifications": {
+    "message": "通知"
+  },
   "notifications10ActionText": {
     "message": "在设置中访问",
     "description": "The 'call to action' on the button, or link, of the 'Visit in settings' notification. Upon clicking, users will be taken to settings page."
@@ -2206,6 +2248,19 @@
   "notifications9Title": {
     "message": "👓 我们正在使交易更容易阅读。"
   },
+  "notificationsEmptyText": {
+    "message": "此处无内容。"
+  },
+  "notificationsHeader": {
+    "message": "通知"
+  },
+  "notificationsInfos": {
+    "message": "$1，来自$2",
+    "description": "$1 is the date at which the notification has been dispatched and $2 is the link to the snap that dispatched the notification."
+  },
+  "notificationsMarkAllAsRead": {
+    "message": "将所有标记为已读"
+  },
   "numberOfNewTokensDetected": {
     "message": "在此账户中发现 $1 新代币",
     "description": "$1 is the number of new tokens detected"
@@ -2285,9 +2340,6 @@
   "onlyConnectTrust": {
     "message": "只连接您信任的网站。"
   },
-  "onlyInteractWith": {
-    "message": "仅与您信任的实体互动。"
-  },
   "openFullScreenForLedgerWebHid": {
     "message": "全屏打开 MetaMask 以通过 WebHID 连接您的 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."
@@ -2307,6 +2359,12 @@
   "origin": {
     "message": "来源"
   },
+  "osTheme": {
+    "message": "系统"
+  },
+  "padlock": {
+    "message": "挂锁"
+  },
   "parameters": {
     "message": "参数"
   },
@@ -2377,6 +2435,10 @@
     "message": "查看您允许的账户的地址（必填）",
     "description": "The description for the `eth_accounts` permission"
   },
+  "permission_longRunning": {
+    "message": "无限期运行。",
+    "description": "The description for the `endowment:long-running` permission"
+  },
   "permission_manageBip44Keys": {
     "message": "控制您的“$1”账户和资产。",
     "description": "The description for the `snap_getBip44Entropy_*` permission. $1 is the name of a protocol, e.g. 'Filecoin'."
@@ -2406,6 +2468,9 @@
     "message": "另外 $1 项",
     "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": "流行自定义网络"
+  },
   "preferredLedgerConnectionType": {
     "message": "首选 Ledger 连接类型",
     "description": "A header for a dropdown in the advanced section of settings. Appears above the ledgerConnectionPreferenceDescription message"
@@ -2580,6 +2645,9 @@
   "resetWalletWarning": {
     "message": "在继续之前，请确保您所使用的助记词正确无误。您将无法撤消此操作。"
   },
+  "restartMetamask": {
+    "message": "重新启动MetaMask"
+  },
   "restore": {
     "message": "恢复"
   },
@@ -2764,6 +2832,9 @@
   "sendAmount": {
     "message": "发送金额"
   },
+  "sendBugReport": {
+    "message": "向我们发送错误报告。"
+  },
   "sendSpecifiedTokens": {
     "message": "发送 $1",
     "description": "Symbol of the specified token"
@@ -3037,6 +3108,9 @@
     "message": "将您的钱包直接连接到电脑。解锁 Ledger 并打开 Ethereum 应用程序。若要了解有关使用您的硬件钱包设备的更多信息，$1。",
     "description": "$1 represents the `hardwareWalletSupportLinkConversion` localization key"
   },
+  "stillGettingMessage": {
+    "message": "仍然收到此消息？"
+  },
   "storePhrase": {
     "message": "通过如 1Password 等密码管理工具保存该账户助记词。"
   },
@@ -3089,14 +3163,11 @@
   "stxFallbackUnavailable": {
     "message": "即使智能交易不可用，您仍然可以交换代币。"
   },
-  "stxPendingFinalizing": {
-    "message": "最终确定中..."
-  },
-  "stxPendingOptimizingGas": {
-    "message": "正在优化燃料......"
+  "stxPendingPrivatelySubmittingSwap": {
+    "message": "正在秘密提交您的Swap..."
   },
-  "stxPendingPrivatelySubmitting": {
-    "message": "正在隐秘提交交换......"
+  "stxPendingPubliclySubmittingSwap": {
+    "message": "正在公开提交您的Swap..."
   },
   "stxSubDescription": {
     "message": "*智能交易将尝试多次隐秘提交您的交易。如果所有尝试都失败，交易将会公开广播，以确保您的交换能成功进行。"
@@ -3108,6 +3179,10 @@
     "message": "您的$1现在可用。",
     "description": "$1 is a token symbol, e.g. ETH"
   },
+  "stxSwapCompleteIn": {
+    "message": "Swap距离完成尚有<",
+    "description": "'<' means 'less than', e.g. Swap will complete in < 2:59"
+  },
   "stxTooltip": {
     "message": "在提交前模拟交易，以降低交易成本并减少失败。"
   },
@@ -3186,10 +3261,6 @@
     "message": "没有与 $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"
   },
-  "swapCompleteIn": {
-    "message": "交换将在此时间內完成<",
-    "description": "'<' means 'less than', e.g. Swap complete in < 2:59"
-  },
   "swapConfirmWithHwWallet": {
     "message": "使用您的硬件钱包确认"
   },
@@ -3371,6 +3442,10 @@
   "swapSlippageNegative": {
     "message": "滑点必须大于或等于0"
   },
+  "swapSlippagePercent": {
+    "message": "$1%",
+    "description": "$1 is the amount of % for slippage"
+  },
   "swapSource": {
     "message": "流动性来源"
   },
@@ -3604,6 +3679,10 @@
   "tokenSymbol": {
     "message": "代币符号"
   },
+  "tokensFoundTitle": {
+    "message": "发现$1新代币",
+    "description": "$1 is the number of new tokens detected"
+  },
   "tooltipApproveButton": {
     "message": "我理解"
   },
@@ -3725,6 +3804,9 @@
     "message": "我们在连接您的 $1 时遇到问题，尝试检查 $2 并重试。",
     "description": "$1 is the wallet device name; $2 is a link to wallet connection guide"
   },
+  "troubleStarting": {
+    "message": "MetaMask无法启动。可能发生间歇性错误，因此请尝试重新启动扩展程序。"
+  },
   "troubleTokenBalances": {
     "message": "我们在加载您的代币余额时遇到问题。您可以查看它们 ",
     "description": "Followed by a link (here) to view token balances"
@@ -3747,6 +3829,9 @@
   "typePassword": {
     "message": "输入您的 MetaMask 密码"
   },
+  "typeYourSRP": {
+    "message": "输入助记词"
+  },
   "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."
@@ -3785,10 +3870,6 @@
     "message": "这个自定义网络无法识别。我们建议您在继续操作之前 $1",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "验证网络信息",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "当前不支持发送可收藏的 (ERC-721) 代币",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
@@ -3906,6 +3987,9 @@
   "walletCreationSuccessTitle": {
     "message": "钱包创建成功"
   },
+  "warning": {
+    "message": "警告"
+  },
   "weak": {
     "message": "弱"
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 8e5ed751e5fe..64633eb4ba1b 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -363,10 +363,10 @@
     "message": "购买"
   },
   "buyWithWyre": {
-    "message": "使用 Wyre 购买 ETH"
+    "message": "使用 Wyre 购买 $1"
   },
   "buyWithWyreDescription": {
-    "message": "您可以通过 Wyre 使用信用卡将 ETH 存入您的 MetaMask 账户。"
+    "message": "您可以通过 Wyre 使用信用卡将 $1 存入您的 MetaMask 账户。"
   },
   "bytes": {
     "message": "字节"
@@ -1377,7 +1377,7 @@
     "message": "已知接收方地址。"
   },
   "knownTokenWarning": {
-    "message": "此操作将编辑已经在您的钱包中列出的代币，有肯能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
+    "message": "此操作将编辑已经在您的钱包中列出的代币，有可能被用来欺骗您。只有确定要更改这些代币的内容时，才通过此操作。了解更多关于 $1"
   },
   "kovan": {
     "message": "Kovan 测试网络"
@@ -1597,10 +1597,6 @@
   "metametricsTitle": {
     "message": "加入 6M+ 用户来改进MetaMask"
   },
-  "mismatchedChain": {
-    "message": "此链路的网络详细信息与我们的记录不匹配。我们建议您在继续操作之前$1。",
-    "description": "$1 is a clickable link with text defined by the 'mismatchedChainLinkText' key"
-  },
   "mismatchedChainLinkText": {
     "message": "验证网络详细信息",
     "description": "Serves as link text for the 'mismatchedChain' key. This text will be embedded inside the translation for that key."
@@ -3157,10 +3153,6 @@
     "message": "这个自定义网络无法识别。我们建议您在继续操作之前$1",
     "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."
   },
-  "unrecognizedChainLinkText": {
-    "message": "验证网络详细信息",
-    "description": "Serves as link text for the 'unrecognizedChain' key. This text will be embedded inside the translation for that key."
-  },
   "unsendableAsset": {
     "message": "当前不支持发送可收藏的 (ERC-721) 代币",
     "description": "This is an error message we show the user if they attempt to send a collectible asset type, for which currently don't support sending"
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 94a79bdb3474..4bed5f928ef6 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -140,10 +140,10 @@
     "message": "買"
   },
   "buyWithWyre": {
-    "message": "用 Wyre 購買 ETH"
+    "message": "用 Wyre 購買 $1"
   },
   "buyWithWyreDescription": {
-    "message": "Wyre 讓你使用信用卡在 MetaMask 帳號中直接存入 ETH。"
+    "message": "Wyre 讓你使用信用卡在 MetaMask 帳號中直接存入 $1 。"
   },
   "bytes": {
     "message": "位元組"
diff --git a/app/home.html b/app/home.html
index 97334c73c762..46bbb857e374 100644
--- a/app/home.html
+++ b/app/home.html
@@ -8,7 +8,10 @@
     <link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
   </head>
   <body>
-    <div id="app-content"></div>
+    <div id="app-content">
+      <img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" />
+      <img class="loading-spinner" src="./images/spinner.gif" alt="" />      
+    </div>
     <div id="popover-content"></div>
     <script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
     <script src="./sentry-install.js" type="text/javascript" charset="utf-8"></script>
diff --git a/app/images/fantom-opera.svg b/app/images/fantom-opera.svg
new file mode 100644
index 000000000000..02297ee3a331
--- /dev/null
+++ b/app/images/fantom-opera.svg
@@ -0,0 +1 @@
+<svg width="1024" height="1024" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><circle fill="#1969FF" cx="512" cy="512" r="512"/><path d="M480.953 162.82c17.25-9.093 43.496-9.093 60.746 0l176.016 92.795c10.39 5.477 16.095 13.638 17.117 22.063H735V744.11c-.23 9.19-5.988 18.32-17.285 24.275L541.7 861.18c-17.25 9.093-43.497 9.093-60.746 0l-176.017-92.795c-11.249-5.93-16.647-15.123-16.914-24.275a32.372 32.372 0 0 1-.001-2.35V280.82a24 24 0 0 1 0-1.937v-1.204h.08c.781-8.518 6.228-16.47 16.835-22.063l176.017-92.795ZM707 537l-165.355 87.46c-17.225 9.111-43.433 9.111-60.658 0L316 537.195v205.474l164.987 86.802c9.75 5.217 19.888 10.3 29.76 10.521l.569.008c9.852.032 19.418-4.978 29.117-9.72L707 741.92V537ZM260.424 734c0 17.88 2.06 29.633 6.15 37.912 3.389 6.863 8.475 12.107 17.761 18.489l.53.362c2.038 1.387 4.283 2.839 7.016 4.545l3.223 1.992 9.896 6.025L290.806 827l-11.076-6.75-1.862-1.153c-3.202-1.995-5.857-3.707-8.333-5.392-26.467-18.003-36.337-37.63-36.532-78.461L233 734h27.424ZM498 413c-1.28.44-2.481.951-3.575 1.53l-175.748 93.094c-.185.097-.36.194-.528.29L318 508l.276.159.4.217 175.749 93.094c1.094.579 2.294 1.09 3.575 1.53V413Zm28 0v190a25.085 25.085 0 0 0 3.576-1.53l175.747-93.094c.184-.097.36-.194.528-.29L706 508l-.276-.159-.401-.217-175.747-93.094A25.085 25.085 0 0 0 526 413Zm181-102-158 83 158 83V311Zm-391 0v166l158-83-158-83Zm213.422-123.373c-9.147-4.836-25.697-4.836-34.844 0l-175.9 92.997c-.185.098-.362.194-.529.29L318 281l.276.158.401.218 175.9 92.996c9.148 4.837 25.698 4.837 34.845 0l175.9-92.996c.185-.098.361-.194.528-.29L706 281l-.276-.158-.402-.218-175.9-92.997ZM733.194 197l11.076 6.75 1.862 1.152c3.202 1.995 5.857 3.709 8.333 5.393 26.467 18.003 36.337 37.63 36.532 78.461L791 290h-27.424c0-17.882-2.06-29.633-6.15-37.913-3.388-6.862-8.474-12.107-17.76-18.488l-.531-.362a212.559 212.559 0 0 0-7.016-4.545l-3.223-1.992-9.896-6.025L733.194 197Z" fill="#FFF" fill-rule="nonzero"/></g></svg>
\ No newline at end of file
diff --git a/app/images/harmony-one.svg b/app/images/harmony-one.svg
new file mode 100644
index 000000000000..e8466d96d255
--- /dev/null
+++ b/app/images/harmony-one.svg
@@ -0,0 +1 @@
+<svg data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><defs><linearGradient id="a" x1="71.37" y1="228.63" x2="228.63" y2="71.37" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#00aee9"/><stop offset="1" stop-color="#69fabd"/></linearGradient></defs><path d="M201.17 60a38.81 38.81 0 0 0-38.84 38.71v42.92c-4 .27-8.09.44-12.33.44s-8.31.17-12.33.41V98.71a38.84 38.84 0 0 0-77.67 0v102.58a38.84 38.84 0 0 0 77.67 0v-42.92c4-.27 8.09-.44 12.33-.44s8.31-.17 12.33-.41v43.77a38.84 38.84 0 0 0 77.67 0V98.71A38.81 38.81 0 0 0 201.17 60ZM98.83 75.86a22.91 22.91 0 0 1 22.92 22.85v45.45a130.64 130.64 0 0 0-33 9.33 60 60 0 0 0-12.8 7.64V98.71a22.91 22.91 0 0 1 22.88-22.85Zm22.92 125.43a22.92 22.92 0 0 1-45.84 0V191c0-9.09 7.2-17.7 19.27-23.06a113 113 0 0 1 26.57-7.77Zm79.42 22.85a22.91 22.91 0 0 1-22.92-22.85v-45.45a130.64 130.64 0 0 0 33-9.33 60 60 0 0 0 12.8-7.64v62.42a22.91 22.91 0 0 1-22.88 22.85Zm3.65-92.14a113 113 0 0 1-26.57 7.77V98.71a22.92 22.92 0 0 1 45.84 0V109c0 9.05-7.2 17.66-19.27 23Z" style="fill:url(#a)"/><path style="fill:none" d="M0 0h300v300H0z"/></svg>
\ No newline at end of file
diff --git a/app/images/info-fox.svg b/app/images/info-fox.svg
new file mode 100644
index 000000000000..57660c1fe6bc
--- /dev/null
+++ b/app/images/info-fox.svg
@@ -0,0 +1 @@
+<svg width="60" height="45" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path fill="url(#a)" d="M0 0h60v45H0z"/><defs><pattern id="a" patternContentUnits="objectBoundingBox" width="1" height="1"><use xlink:href="#b" transform="matrix(.00101 0 0 .00135 -.001 0)"/></pattern><image id="b" width="990" height="741" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA94AAALlCAYAAAAypz7xAAAACXBIWXMAAAWJAAAFiQFtaJ36AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAOdxSURBVHgB7P1fkF3lmef5vjtFI1NgIcuWWxywKkHUwdYYO0VXCyqsKMnqhqarRkbqQxxPlyMOEn1zfNMg903PTSOfqzMRZQuuKiaihpQnjuu4zqFLkpmpwrgDi2o8hTW2JQ8u2a6SIBHQqCwshCwbSw25Z/32zlfaSuVe77PWXn/etdb3E06nRK6UlHuvvfZ63ud5n8c51KLf7z+efDzmAAAAAABAsZKAe6Z/2SvJx7QDAAAAAADFWAi2F5slAAcAAAAAYEJJcL2zP94rycdDDgAAAAAAZKeM9phs92LfIfsNAAAAAEBGaqbWz4bmawAAAAAAWCxku/N4Jfl4wAEAAAAAgPGS4HlffzKzfcrPAQAAAAC4WhIwb+kX45Xk41EHAAAAAAAu69saqmUNwKcdAAAAAABd108fHzapvcnHSgcAAAAAQBf17ePDJvFKn9nfAAAAAIAu6mcfHzaJ2T7l5wAAAACArujnHx82KWZ/AwAAAADarz/5+LBJvJJ8zDgAAAAAANooCXq39+Mw26f8HAAAAADQNv3yG6pl8Uqf5msAAAAAgLbolzs+bBJH+mS/AQAAAABN1q9mfNikaL4GAAAAABWacijSI8nHtIvbnj7l5wAAAABQmZ5DIfrDMu5XXLPsSz6+3Ov15hwAAAAAoBRkvIuzxzXPzuTjO8miwaMOAAAAAFAKMt4FSALXncmnWddsc8nHZ8l+AwAAAECxCLwLoD3TLv693VaPJx9PEIADAAAAQDEoNZ/QQrZ72rWHys6/Q/M1AAAAACgGGe8JLDRU+45rV+A9ap+j+RoAAAAATITAO+Ars/t3TrneQ/1+b9+XHn7ga6NfSwLvfcmnLmSG9yTB95cdAAAAACAzAu+AvbMHlNHesvDbueTjUBJyf/nRndv1+6aND5vEXPKxKwnADzkAAAAAgBmBd4q9s/tnkofoyFJfW7nihrmNn/qd6fW3r3Uds89Rfg4AAAAAZgTeKb765P59SYCZWkq+4obfcres+Yi7Z+aOwa87Ys4Ny8+/5gAAAAAAqQi8x0iy3dML2e6V1u9RAL7+9o+5DmXB5xyzvwEAAAAg1TUOS5p3bstUhqBbXj/11uDjxaM/60oWfDr5eKXf7+9xw9nfZx0AAAAA4ApkvMfYO3tAjdOm3YTWrb1pkAXX55abc5SfAwAAAMBVCLyXsHd2/5bkofmOK5Ay3ypBVxDe8iz4PkfzNQAAAAC4hMB7CZamapPoQBZcJecKvh93AAAAANBxBN6LLDRVq2Q+dwey4HOO5msAAAAAOm7K4QpqquYqcu78r92LR3/qnnzq2+7ZF44MGrO1zLQbNl+bTT6mHQAAAAB0EBnvRYpqqpaXMt/qhq6u6C3Lgs85mq8BAAAA6CAC7xF//Kf7ty9b1tufdoyC4XVr17gjx152ZfNl6ArCW+RA8rGb8nMAAAAAXcEc7xFJ0B1sqKZstAJiBeCa133h4n91ZTl2/OTgo2VZ8O360OzvJPj+sgMAAACAliPjvcDaVO3hB++9FPxqj/ZTz3x38LkqLcuCzyUfjyYB+EEHAAAAAC1F4L3AMkJMAe99m+664r8p460GaVWUno9qWRZ8n2P2NwAAAICWotR8QRL0bQ4do2zzYsuv/Udu88Y7B8Hv84d/7KqiLLs6oft/V8Oz4DuTjy0L5ec0XwMAAADQKmS8E1+Z3b9zyvVm045RYK0y8zR1lJ6PakkWfM4x+xsAAABAixB4u8EIse+4wPzu+zZtWDLjvZhKz58//JI7dvw1V6cWZMH3JB9PJAH4WQcAAAAADdb5wDtPUzUL7ftW1/O6NTwLPueY/Q0AAACg4TofeOdtqmZRd+n5KO1FX7f2Jrdh/W1u9aobXcPsczRfAwAAANBQZLxnDyjbPZ12zBc+tyV3sKqgW9nvPKXno2PLiqSfRQG4AnEF5A2hkvPHmf0NAAAAoGk6HXhbmqopSFXgPam8pecb1q9zt6z5cBK4n3QnTp5yRWpoFnzO0XwNAAAAQIN0OvBOst2axzWTdoy1qZrF6TPvuKefO5w5g63M94P3f2bwawXgyp6XlQUv6metwD5H+TkAAACABuhs4L13dn8ScPeOpB1jGSGWlQJmdT3Pmr32TdJ8YDwMwE+610/9whVJf48asenvakAztjlH8zUAAAAAkets4F1mUzWLvKXn98x8fBAUe34PuQLworPgCsD1GDQgC34o+dhF9hsAAABAjDoZeJc1Qiyr10+95Z594Uju0vPF/zay4IPsN83XAAAAAESlk4G3pamaAk2/r7pMCrqffeGHmYNlBcCbN35y0BxtqT+zw1nwOUf5OQAAAICIdDTjHR4hVmRTNYuiSs8X63AWfJ+j+RoAAACACHQu8N47u39L8mN/J+2YMpqqWZw4+aZ7/vCPM2ep1ZF829aNqQFwR7Pgc8nHE0nw/bgDAAAAgJp0LvCuu6laiIJijRzT6LEsFHQrS68gOKSDWfA5x+xvAAAAADXpVOAdS1M1i7JKz0d1MAuuzLfKz886AAAAAA7V6FTg/ZXZ/Y9Oud7etGPWrV3jtm2928VAWWkF31mDYgW9yn5nWTzoUBZ8ztF8DQAAAECFOpbxDjdV017ppTqF10VB91PPfDfXyDH9LNr/nfXvKzMLvmH9bbE8vvsczdcAAAAAVKAzgfcf/+n+7cuW9fanHVNXUzWL5w+/5I4ce9lllaX0fNSFi/910OztyLET7vSZc65IepxVgq5S9Aiy4Mz+BgAAAFCqzgTeSbZbncy3pB1T9QixrFQKrq7nCoqzUIZZM7/zBrlq9KYA/MTJU5n/bsu/TQF4zVnwueRjRxKAH3UAAAAAULBOBN5NaqoWMknp+YP3f2ain68DWfB9jvJzAAAAAAXrROAd+wixrBQAax92laXni/ks+LHjr7mi+QDcMhqtBHOO5msAAEQvSaysTD7NJB9Hd+/awcQSAFHrSMY73FRN2eCaAr3cFPiq63nW8m8Ftio9X37tP3KTUub99VNv5eq+HqLMtxYJ9LzUkAVX2fkOst8AAMQhCbRn+m5qc8/1FWxvcQv3dlP93vZHHn7goAOAiLU+8P7K7P6dU643m3ZMzE3VQuosPV9MAfhwLFmrsuA0XwMAoGI+m93vu+3J+/Cn3TCzvXKpY+fn+7v/3b/Z8bgDgIi1PvBuQ1O1EGW81fU8T8CrzPeG9etckVqYBZ9zlJ8DAFCaYT8etyUJtGeS99vNbhhoW+3bvWv7LgcAEWt14G1pqqZy6y98bkv0TdUsVHqurudZKfBWMFtE6fliLcuC73M0XwMAYGK6R+u7qQcWl43n0e/3D37p4R3bHQBErNWBd9uaqlnEVHq++N/Vkiz4XPLxRHJeUdIGAIDRyP7sLW4YaK90xZlLMt63OgCIWGsD77975fWZ//S//ehIqPGYst2rV93o2kSBrbqeZ80yK+OtALbo0vPFWpIFn0s+Pkv2GwCAK13an+2mPp0E2spEj92fXZQk8O5Ew2AAzdXai9SRYydeOfS9l6bTjlFwpixvWyn4VoY5KwXe2vtdtpZkwZX5foIAHADQVSOBts9olx5oX+U3/Vt3f3HHnAOASLUy8O73+zuffOrbs6FgrulN1Sw0b/vp5w5HV3q+WMOz4HOO5msAgI5YCLTVCG3LQsfxLa5mjBQDELvWBd5J0L1y7vV/OHLgP704nXZck0eIZaWgW13PT5w8len7VHquzHeVixMNz4LvczRfAwC0zKJAO2vH8UowUgxA7K5x7fPI3839l+nQQbes+bDrCgWZ27benbn0XPvjn33hSBIAvzsIWKugf+swQ712EICrU3vWBYNxFMjr5xH9+RvW31b0/v6d+kgWf5j9DQBorIVAe/vCaK8H3ELH8V7E6Zrk3zbtACBircp4JwHPdBJcvfLkU98OHqtsdxtGiGWlYHYYTMddej5K/1Zfhl50FlyBtwLwdWtvKnqc2lzysSu5YTnkAACImJ+hndwWbnYTjvaqCyPFAMSubYH3viRAe8hnNcdpe1O1kGHm94dJEP6LTN+noFul5wpS63Li5JuDILyoLLinoFs/VwlZ8H2O8nMAQESKnKEdEUaKAYhaawLvJOjeknz6jrLdNFWzydv1/J6Zj1dWej5OFVnwAs+ROUfzNQBATUZmaCvQVla42o7ji6xetWLwXlt0Q1VGigGIWZsC71deP/XW9FPPfDf1uC41VbNQBvn5wz/OHLzqDXPb1o1RlOsPA/CTmTP4IfrZVB2hRYaCfs45x+xvAEDJRgLtLW6Y0a410FZfHd036D1VH5q4kmfbWxAjxQBErBWBt8aHJZ9mdRFXAJYmhmxtbPTGp5FjeiPMIobS81H6OZTFVwBe9Ju5bhQ0kqygLPgeN5z9fdYBADChJNDekgTan44h0NbWLWW0fZCtgHu0h4oW+9U4NSvdc4Te2xkpBiBmjQ+81VAt+fSd5GI8TVO1yTS59HyxBmTB5xzl5wCAHEYCbZWNq3y89kBbi/AKshcH2p6fLKImr1npPkOL36H7PEaKAYhZG8aJPZR8TIcy3aKLNkH3eHpj0+OTdYb2MMv81mDvfCyPrx9JVnQW/PLe8pOTZsGnk499C70JaL4GAFjSwmiv0dLxQaCd/NrVQUG1SsdHM9oh2tamoFtjSrPQPYXuLfT3WDBSDEDMGp3xXsh2v6JfW5qqqZO59eLdZXoctVc+z8gx7fsuuCt4YSLOgqvkXME3q/QA0HHjAm1Xk+HUjzWX9mhneY9XoK3F/Dyl5fo779t01xXZ89C9HiPFAMSs6YH3vuTTQwqmQiPEaKqWXZtKz0dFvBd8ztF8DQA65VKg3Xfbk+v/p91wj3ZthovJw2ZoKh/PW8mWdxFfgbbuITasX3fV19SPRtnzFIwUAxCtxpaaL5ToqszcWcrMaaiWnS89VyOULOVhCmrVqE2N12Is7R+Wrt01+HXRWXCV3OtDCxY5suDTyccrCwtKlJ8DQAuNC7R7NaVCfKDtS8eLeN9Whlvvg3lKy9Mq51bccF3oj5h2ABCpxma8NT4s+TStlVSaqpVrktJzlfc34XGPMAs+52i+BgCNtxBob0kC7S3JNX2zG5aO10bvyaOl40W+RyvQVgViICu9JGW4tVi9VGM2TwG9kgGpGCkGIFKNDLz9+DD92jJCTEGPz3Aiv+cPv5S86b3ssmraCLfI9oIfSD52k/0GgGaILdD2o7186XhaYDsJVXvlmc2tf48q5CyL0wroVW6ehpFiAGLVuFLzhYZqj/nfW8ZSFDR7ufM2b7zzUtfzrKXneiMuYARXJSLriK4mMduT817Z7y87AEBUFgLt5DrtZkYD7bpKx0dnaOujrEB7lCkTvQQtBqi03HpvYGns9l5/nj3eAKLUxD3ej7iFPTwKYEIBkc8yohgqBdOKedbS82EG+a3GlJ7L4r3gurE4feacK8LoXvBhoB8cdbdnodLj0eTGjpV8AKjJokD7AbdwT1JXoO0boVUZaHuTzObW/YQy3VlYfjZGigGIVaNKzUfHh8lTz7wQLAfW/Ecy3sUbjgj5aa7Sc73RLtWttAnUNE4B+ImTpzI3jQnRgoYCcH0O2OdovgYAlRgXaNdltOO4PlcZaI9SsK2y76zvhfr3KsudNynCSDEATdW0jPce/wsFQKGgezh7MhjEIIfhnqw7L3U9z0LHK3OsALyuG4a8dJOjLLhuNLTXrMgsuP48fegxDWTBd7rB/sE+zdcAoGBJoD3tBp3GB2Xjyef6Mtp6jxwtHa8z0B6l9/E8s7m1aKD30Ekq3/QYpAXeC53iASA6jcl4J0GGVi/3+9/TVC0eXeh6nsZnwY8df80VzQfgKZmBOcfsbwDIbVygXYdYA21P7/PKcut9L6uiqt2efeGHwffb3bu2N3ZqD4D2alLgPRgfpl/rwv/1bx4KljcxQqw6ei7U9Txr8KkbCjVda2rp+Sidl37fdtEjyXQe63FKGf2yJ/l4IgnAzzoAwFgxBtq+bDzmnjRKdijTnWc2t7b9FfWzMVIMQFM1otR8oanUtP+9gpvQhb/o2ZRIp5sHXz6mwNNqGLD/OAlU3w3O74zd5RLxtYNzdNjBvJgsuG9gI2Oy4HuSj52UnwPAlRRo993UAz3XV7dxVc+tdDVpUqDtDXu6/CxXabnmheveoMj3dsu93dTyKZWbzzkAiEj0gffi8WFiCewUmKB6mtmtwDBr6fmwYdmbrSg9F18mqMej6Cy4H0m2RBZ8OvnYl7xmtjiarwHoqKUC7eTXrg4KOLWvebR0vElUUq7S8jyzucuqZjOOFPuQA4DIRF9qngQR+5JPD/nfK4hRUJdGQYjKzFEfvUmr9Fzdv7MYNm37ZCs70RedBR+1RBZcJeePM/sbQNvFltFucqA9SgviWjTOU1pe5iK6/j1/8md/mXpMcu/4xJce3vGoA4CIRB14Lx4fJjRVaxaNHMtSeu7lme/ZFBXvBZ9zNF8D0CJJoD2TBNqbk0B7ixvu0a410FY5tS8bb3Kg7Smw1b2WqtCy0nt3FdvGGCkGoIliD7z3uZFsty6yutiG0FQtLnlL1drS9TxNhVnwfY7ycwANFGugrX3abXt/0nuSgu48peVqoFbVCNennnkhNFJ2bveu7bc6AIhItIH3QkO12dH/pgDFN5gaR0GGgjXEZdgc7IfB2euL+QxuG0vPR1WRBf+/fPTDcytXXE/zNQBRI9CuR94KtSJmc2dlGCl2Ngm82ecNICoxB96Xxod5odIi2bZ1Y2Urrsgu7xu7mpQpeOyCsrPgt97y0UO/M33zLrLfAGIQU6Ct4HF0j3YXquf81Ay992RV17YwRooBaKIoA++lst3aa6Ry5TQ0VWuGvKVsyjhoYaUr2wjKzoKvuOH6Pa+f+vnXdu/ixgRAdZJAe0sSaH86CbS1B1cN0Qi0a6J7K70f1z2bOytLBeRUv7f9kYcfOOgAIBLRBd4LDdW+4xZluxV0hxp9aNW1jNEVKJ4CST2n2v+dhd7s9Tx3raqhzCy4G+z/7j+RBOBHHQAUjEA7PpPM5tbjt23r3aU3UEuje4evf/NQ6jHz8/1d/+7f7NjnACASMQbe+9xIQzWhqVp7UXqejV4LPgAvOgueONrv9x7v9eYPJkH4WQcAOcQWaI92HeceIf/Ct8SS4GCkGIAmiirwXmp8mDBCrN1UyaC9WlkDSd1EqdStqzdSetz0usg6K91AQfcBsuAALGINtFUZVWdWNkaTzObWVq+YxqUxUgxA08QWeO9PPl11kbQ0VVMn87r2GmFyen6feua7uUaO1bnPLAZVZMG/9PADdEIHoCBbQfVoMzQC7QZQoK0F7lASYylqyqlMd2yPrUrNA1l7RooBiEo0gfdSDdXE0kCDpmrtQen5ZIYB+MnMY9sM5pKPQ8kr9cs0YwO6I7ZAe/WqFYOFVgJtOwWnKi3PM5tb76ux9s5hpBiApokp8L5qfJg89cwLwSBCGc+2z3nuEgWOWpnPWgqnmzCtyrOHb5gF1yKGXjslZMEPJVnwfWTBgfaJNdD2HwTa2ZjGbi2hCVNEGCkGoGmucRFIgu5H3BJB93CcUjhzR4l5u2gRRc9p1tJz7XnWyn5s+9DqMCzBH/Y8KCELvqXX62/ZO3tgjyMLDjTauEA7+bWrA4F2MbRwrSx33tncynTH/tib/n0fGNxbzjkAiEDtGe9x48OEpmp4/vBLyar2yy4rSs+vVnoW3PUO9Ny8NtzNuWGDtjm6owNxIaPdfgq2df+Up7RcFYRNGdfJSDEATRNDxnuPWyLoFstKLXO7223zxjsH2dusXVgVYOqmQ8E3pedDpWfBBzfxV67lJVlxfZpzw0B8EIwni23v9Pvu7NTU4L9f+hpZc6B4sWW0NQPaj/Yi0C6eSq/zzubW+0OT3i8t/9Zeb3C+A0AUag28F7LdDy31NQUFodVavXl3vaS4C7S4ohX4rKXnw8DyrUHHe4LvK6mcXx8lZ8G96dHf9JI7od4StTYLQfogOF/4fDa5Rry6KEiXOYJ0YGmXAu2+25681j6d/HqL/nvdgbau4fpMoF0OXb+V5c5TWt7UCjGdS3pvT3vvSl4D3CQCiEatpebjxoeJYUwETdU6RhlvBYl5Ss/VdI3qiHQldkQvS1qQfinDTpCONhsXaNeFQLt66m+ioDvPbO6mj+M03Cse3b1r+wYHABGoLeO9MD5syaBbF9FQ0K03DILubtENnC89z9qlVcefPnMuylmksag4C16EQcDhfxPIpMucGwnU5+f7r/ampt7uuflX3ZWBOvvSEa2xGe2altEJtOszXIz+Wa7Scs0+V2l5058v9QgI3C9OOwCIRG0Z73Hjw4SmaghRQJi19FwUtFN6btfALHhR5txIaTtBOupCRhtLyfseGPts7qy0SKzFh1SMFAMQiVoC74W93a8s9TW9iTz51LddyMMP3kvw1HFa7VfX82PHX8v0fW278ahCg7LgdZhzI8H4SJA+2uGd5nEwiSnQ1rVSGUUC7bgow5214ajonqlt4za1MKxkTbr+huT6e9QBQM3qKjUfmyWyNAbRfiSCbgxHn9x1qeu51TBg/3ESQL7biFmlMVjcEV03firdx8D06G+mprSeqUZWS3Z4H92XvlSHd2FfeofEVDruA23fcZxAOy5671KQqT3dWTVlNndWlkWE+fnBliQCbwC1qyXwTm4u1Ahpya9ZAiiVmQOeOrJqb3LWsjsFj7qBofQ8G78XPO+M9Y7Lsi+dDu8tRKCNPCaZza3eJm3ticNIMQBNUuc4sTm3KFOkN5bQmwpN1bAUv3db5dBZSs91vqkraptvTMqiRncnTp4y3Qjq5l43gKoyoFTdLGuQfilQH9fh3Q1L3tmXXqGFQHtL8nxsIdBGHlokztpQVPT8qrS8zQvLOn/1kVZ2z0gxALGoM/C+6ubPEjCpsQuwFF8Onaf0XJkE3/UcdhpFo0qDkFvWrL7isdVjrgBcn0d/rc8+MCdIz2Tlwse0fjMuSJeFQH3O0eG9FIsC7c1uYfGEQBtZTTKbW6XlXXk/03t+oLM5GW8AUagz8P6RG7kY6g0m1MlcVFYMpNE5okZATz93mNLzkg1v6D8c7Hqux1bja/y82GFAYEtCLBWcXx24v3vp1zCZdiMVR4F96XOODu9jEWijDAq29R7WxdncWTFSDEBT1DlO7PHk0yP+95bOlLpx37b1bgdYKDDTPmSVQ2ehGxc1oaH03MaX64duEHUjqEWNKv4947LpiwN1FG7OtbzD+7hAuw4+0PYdxwm020Fl5Xlmc2sR1Fd9dYlppJjrf4gKHgB1i6bU3NZUjUAIdsPRKXcb35Qv8+V9vus50ulx3rD+tuBjrAyObibLHuOmf4/1xvPK0vZfE6RPbnr0N23o8B5jRtsH2l3KanaBrjvKcgeyt0tSWXlXR2Qar/fTjs7mAGpWd3O1AZX3Wpqq6WYDyEql57pBzdoRdtio7SSl5wa64VOPhtDjq+BcC2ixZOWyBumjWfSlsuoXLr7HvnS7KDu8E2ijDpPM5u5aaflijBQD0BRRZLwtJVVkHjEJX+acNZugIErNw5RNYOFnvOFM9XCjNd1U6uayiU1/siy+jC9xp3lcThN3eF+0L33wNZWeEmijTv6amKe0XIuYupZ2fXtBhow3ANSq9oy3bjxDjZmEGxBMSm/OX/jcllyl5wrYlTlnAWi8LI3W1t/+MXNztSbK2jyODu+FGtPhfWzJuxse5ypHoN1tWgTO2gRUdN7ovairpeWLWUaKTU31ftsBQM1qz3jb9nZ/jFJfFEYBtG5y1cAma+m5tkW0fS7qJNTYx9JoTY99FY3WmoAO791BoA0vb2l5F2Zz58FIMQBNUFvgnWQh1EzHNJ+Spmoomr/xzVp6rmNVTt31PXXjZGm0pv3zvLaz8ZmdrM3j6PBeDwJtLKbXmt538s7mVqabzvVXY6QYgCaobZyYJCu+rxz63kvTacfoBvPhB+91QFmylp57lJ4vTTeWynqHqgl086jXNjeRcaDD++QItJFGwXbWJp/ie2jQZ2Q8RooBaII6S811kQxeAAlsUDYF0Frg0Zt21tJz3Ujphoiyv8t0k6iGP8rqpFEAd+TYy7zGIzFph3f/37vU4Z1AG1bM5i4XI8UANEFtgffe2f3Tv7lwMXXPjW5quJFBFVTyrHNNZeRZggUF3voe7blrc7OwrBSIWBqtafGCHg7Nk7fDe9ObxxFoIyud18py5y0tb+IEiDowUgxAE9QWePf7bk+oi+y6tWu4IUdl/LaG5w+/NMjEWunGSqXVlJ5fSVmaJ5/6dvA43ZTSaK29iurwPlruXlWQTqCNSagZp65vzOYuHyPFADRBLYH3cG5q74HQcYzKQB02b7zzUtfzLDdMyt6quYsyFCwYXW60FlrEUCZIN6jsX8QkHd6X7vaevcO7/n5VYSjooYoFeUwym1uVQtu23k3vi4wYKQagCWoJvOed2z41nLM6Fjc9qFPe0nMFkAq+lcEl+B7unz92/DXTeDE93txswipPh3ff3CqNFovoto+8dJ5lnZbhadGWhEN+jBQDELspV4Mp13ssdIwyDkCd9Cb+hc9tGdyIZ6EbL5VY5+mU3ja+0VqIHrMs5f1AVtbmcSyYIS9luLXtKGvQffm9hqB7EtoWEjDtAKBGlQfee2f3b3GBi5/ehMg4IAbDwPHOQfCYNRur0vM8+/vaZlg98OHgcbppbXsXbADto2u8rvVZtyeJgm0F3VT4Tc6waLZyuNURAOpReeDd77udoWMsN+lAlfzNUdZs2LHjJ00zrdtOJech/uYVKAszyFE0Zbd1jde1PgtfDZRnURdLo8EagNhVGnhrhFiv13sodJzlJh2omi8HzLoNwpee52m00xbav20p2dce3DxjdwALS+BNqTmsfGl51oVVZbcpLS9ehpFiAFCLSgPveee2hI7RDTo3PoiVMhMak5VntqrKEPOUIraFFtQsmR3K8wHETIG2Gm/qep5V3uophBkrB6YdANSk0sCbpmpoC908aeZ31punvBmSNtBNkWXOOY3WUBbL646ACGlUkaOgO2tljq5/mnaRZ9EWNnrthoJvRooBqFNlgTdN1dA2Ol91I5Wn9FzBdxdLz7VgQaM1AE2kDHfWEZOia56y3KroQ7kMC2eUmgOoTWWBt6WpGkE3mkZv8io9t2RyR6mU2peedw2N1lAXtjAgj0kWS5XhfvD+TVRSVISRYgBiVkngbW2qRpk5mkrBZJ59e7qRU+O1LmV3abSGuoQCb4IjLOYnU+SZza2KKBqoVcuwz5uRYgBqU0ngPT/vtoeOUdDNTQ+aTB1VdaO1bu2aTN/nsylZx9E0WZZGawBQNV+VlKfZo94DKC2vh3Ee+rQDgBpUPsd7HMrM0QZaPNq29e5cpee6wXvx6M9cF2RptNaVxwTlC1WWsPgL8bO5s5aW+9nceg9gNnc9GCkGIGbVBN5T7mzoEN6k0CbK6Cr7nfVG/sWjP+1M6blKMC03STRaA1AVXW/yNFCjtDwOjBQDELNKAu/kLzkaOibr/ikgdioz1I2YpYv3KD8j9sTJN13bWUbr+JJPACiLrjNPP3d4cK3JWlruZ3Mby5xRIkaKAYhZVaXmwYw33WbRRsMsyKbMpecKvnUT2PYyay1OWJoqahGCRmuY1Lnz76Z+fcUN1zl0j64tKi3PutipAO++TRsGC4hU7cWDkWIAYlVJ4L1714650DGhGyKgyVR6vm3rxlyl57ohbHOp9eaNd5puWsl6Ayha3tJyZbeV5aY/TXwMI8Xoag6gFlU2V5tL++K5879yQJutW3vToPQ8azmitmHoxrCtGV8F3ZbxYnoc8szRBbxQcLX82msdusFv6cmzoOdLy2nGFyfDQu40I8UA1CGiwJuMN9pPN2q6YctTeq6bxLaWnqsiwHITq5+fbSkoy/Jrr3FoP19annUx0zdQs/SmQH0YKQYgVpUF3v1+/9W0r9O1GF2iQFN7A/OUnucpi2wCPR4hNFoDMAldP3QNzbqApyaZw2aZzOaOnWXrEiPFANShwsA7PeOtN0EyWegS7Q3MM3JMWRrdOLZtEoBuaNetXRM87tjxkzRaQ2aWxSpKh9tLz3+e2dyiDLeaZHJ+NIMx402pOYDKVVdqPpUeeAuBN7pGN3IPP3ivaY/zKH8T2bbSc2ujtbZ3ewdQHAXbul5mXaz0W4OYzd0sxpFin3YAULHqMt7vh0eKMcsbXaWAU6XWWUfSqPRcY8faUnquGybLIoQy3jRaQxaWhV1GQrWL35qSZza3KpKYzd1chtcypeYAKldZ4L1smTsaOoaMN7rM3+hlLWfU7Nk27ftWdolGaygagXe3aCE/T2m5zgGVludZCEU8DAsmlJoDqFyVXc0NGe9zDuiySUrPn3zq260owdbNrrXRGiXnABbzpeV5Z3NTWt58K264LnQII8UAVK6ywHv3rh0KvOfSjrlw8aIDMCw9V9YlT+n5sy8caXz2W43W1EU4RDfYNFqDheU1QYaz2bQYN8ls7jzNLhEnRooBiFGVGW9JzXqT8QYu041gntJzdf1uQ+n5fZvuotEaKkXg3Vx5Z3PrOd+2dWOuhU7Ei5FiAGJUaeDd7/d/lPZ19msCV/Jdddff/rFM3+dLz5vcgIxGaygS7y/t5WdzZ11sVFWNrq/r1t7k0C6MFAMQo6gy3m1pDgUUabjn+a5BRiYr3ZCq9LypQQeN1lAUy/lBmXGz6J5BAXeehbd7Zj7ObO4WY6QYgBhVnPEOz/Im+AaWpiBUjdfylJ7naTQUAxqtAViKpjnkKS3X9VN7ue+ZucOh3UKBd7/f/5ADgAoReAMN4m8a85Se5xmtE4MsjdY0QghYSijjzf7eZvCzuZ9+7nDmKhdfWq5rCtovVG7e65HxBlCtSgPvZcsIvIFJKfhW6XnWjI2/YdVH08qy9fNa5OlmjG4g8G6+vAuIfja3Sst5nruDkWIAYlP1Hu+50AEE3oCN9ijmKT3PO+O2TvoZLQsNKjtVaT2w2IWL7zk0V97rlq8SYjZ395jeG39DgzUA1ak08F6Y5U2DNaAg/qZy3do1mb7PZ46aFKTSaA2TuHDxYurXabIVJ72W1SAyT6WOH8lo7HCNlrG8pqeWT1FuDqAyVWe8JTXw5oYZyEY3F9u23p2r9Nzf0DaBLxcN0aLCkWMvOwDN5mdzZ10g9NcKZnN3m2XB5b3+/K0OACpSR+B9NO2Lp8+ccwCyU+m5sjt5Ss8187sJ1Saat2tptPbi0Z9SPYMrUGreLLou5ZnNrWBL10FKy2HKeDNSDECFKg+8+/1+atthMt5AfrrpVOm5JTgd5efhNqH0fPPGO03HKZsPeKH3FkMjJlTAX4vyVOL40nK2DcALnQuMFANQpRoC7/SMt26OyFQB+Q33fW/KXHqu152C1djnYWtxYcP624LHqUw164xfAPXR61VBd9bXrcrJteBo2YqC7tB7Wuh+stfr0QAAQGWqLzWfSt/jLWS9gcmp9Fw3o1mzPyrTjr3ruX42y95NLSRwPYGEzmeypPVShjtPaTmzuTGOZQFnfr5/0AFARSoPvKcCe7zl9Jl3HIDJ6WZUwXfWrr56Deom+MTJN12MaLQGtEPe2dziZ3OzaIKlnDh5KnjM1JQ75ACgItF1NRcyVEBxdFOqjFCe0vOnnzscben5+tvXmvay64ae7SvdxntKnNRTQkF31sV2ZnPDwpDxntu9a0cwGQQARak88E4ucnOhY86df9cBKJbKs7dt3Zir9DxPCWgV9DOF+LFp6C5L4E3WtDp6PlRanmcryLq1aygtR5CCbsO5dcgBQIXqyHjLXNoXz53/lQNQPI3jyrPvO2/To7Lp5ptGa0BzKLudp7Tcby/ZtvVuZnMjyLZNqv81BwAVijTwJuMNlEVB98MP3pur9FzBd2yl5zRaQ4ilWoOMd/nyzub222UoLYfV66d+ETxm964dhxwAVKiWwLvf77+a9nX2YwLlU8B636YNmbNHKj3X3u9YXqf691sWEWi0BtRDC166Zqi8POviF7O5kZWu9Ya+AYccAFSspsA7PeOtN2YyU0D51KAsz02tyviUuYplAoFuzmm0BsRHWzxUWp51QoIW1NSTQuXllJYjC8u2oql+b58DgIrVU2o+lR54C4E3UA1fem7ZKz3KjwGKpfTc2mhNWTd0C6Xm9cjbmNHP5lZPCiArdcsPme/NP+8AoGL1ZLzfD48UY5Y3UK3NG+/MlV3SzbX2T9edSbY2WlPmjUZrQHkm6Qeh6hVmc2MShv3dRy0TdgCgaLUE3suWueDcRDLeQPXy7qdUhiGGkWNZGq2hOyznJeXMxdDCliphsi5u+dncWvwD8rJsaej3+2S7AdSirq7mwYw3+zCBelzuIJy99PzJp76deUxQkbI0WoutOzvqReA9Gb+NQ03Usi6c+9JyZnNjUidOngoe0+u5Aw4AalBL4L171w4F3qnBN4E3UJ/hzNw7c2WfdPNd5+guZe1Xr7oxeJwWCKisASbnS8vzLLrpGqPSchY+UARDpcVZxogBqEtdGW+ZS/sis7yB+imIVeO1PKXnKjetawHNsmBAo7XuCJ2H7CfOT8G2XutZ+7IwmxtF0zkYeq1TZg6gThEH3mS8gRj4G+T1t38s0/f5rud1lJ6rZHXd2jXB47RAQKM1IDstXKmyJc9sbj/G0FKZAlhZruXL3NR+BwA1qS3wTlYdX037OoE3EA+Vgd636S7T/ulRPquc5+Z8UiqVt5SvkvVuvwsX30v9OmXO2SizqEU1y9imUcMtLJ9MriUbeMxROEtjNcaIAahTjYF3eJY3wTcQF3UNz1N67stRq3xN699oaRCnIKLOhnAo34WLF1O/ThBol/e1rOw2peUoixZ2GSMGIHb1lZpPhTub0/gIiI8f+2Mp5R7lS8+zZskmoYUCyyKBOpxzvQHG0+tDDdTyVIgMZ3N/hr30KI2lzJz93QDqVlvgnfzFwVneWZu1AKiGbqC3bb07V+m53xdaFZW1hujfxXix9go161x+7TUO4ymoyTObW5UE27ZuHJSXU1WAMjFGDEATRNtcTSg1B+KmjLLKR/OUnmvmdxWvcTVa05xgy7+JRmvdRFA4nhbJlOnO+lr1s7nXrb3JAWVjjBiAJqgt8GaWN9AO2ruZt/RcN/RVlJ6rMZwluCLr3U5sI8huktncWpDTbG5Ky1EFxogBaIo6M96SGnhzswQ0Q97Sc90sqfS87IDX2mhNWRMarbVP6L2EAPFK6g6dp7Tc93/Ieh0AJsEYMQBNUXfgnbrP+/SZcw5AcwwzXdmbKL149Kell56rwRON1oDx/Pi/p587nPk1oIoXlZZrawdQJcaIAWiKWgPvfr+f2j2Nm1+geXTjreBbJehZ+NJWy01UHsNZ5DRa6xrL+wh7vC9PHcha8eFnc6vihccRVdN5axgjdogxYgBiUHPgnd5gTTdMBN9A8yizrOxXntJzZdvKCnxptNY9BN5heWdz+9JyZnOjLpbr9Pw8+7sBxKHeUvMpOpsDbabSc40TylN6nicQsKDRWreweDueHhstdKm8POvjpGBbi2tZK1uAIhmy3W5qijFiAOJQa+A9xUgxoPU0TijPvm91qlXpedGZ5yyN1qrouI5yWQLKLjZX87O5s27t8Fs2mM2NGBjeH+Z279px1AFABOpurjYXOoDAG2g+BTYPP3hvrtJzBd9FZ5+tjdbyZAKB2Km0PM9sbmW3leVef/taB9RNQbfhHD7kACAStQbelmYX586/6wC0g0rPlS3LU3quktiiFuJ8Q6gQGq01Hwsnl/mFLC0oZeVLyxm9hlhYqjWm+j3KzAFEo+6Mt8ylffHCxYsOQHsoW5an9Fw3WQoaVIJeBJXAWxutFfV3onqUmg/50vK8s7ktC1VAlSz7uxkjBiAmMQTeZ9O+yCxvoH186bllr/UoP/KoqCy0Gq1Z5MkQArHQ+atFq6zZfy1MKehmNjdio/cCw4KoxoiddQAQidoD736//6O0r1MmCLTX5o13DkrPszZpKqr0XAsAln3nyhKWNV8c5bKcI23NeOedzS3KcD94/yZKyxEl4xixgw4AIhJ9xls3DgTfQHup9DzP3lFfej5p8K29q5bAn0ZraBI/mzvrNglmc6MJTpw8FTxmaorGagDiUn/Gu+eCYx642QXaTTf7Cr7zlJ4/+dS3Jyo9tzZa09915NjLDs3StfcP/bxaJMqzUOQXwSgtR+wYIwagieoPvN93wf03NDYC2m8YAN+Zaz6wSs+ffeFI7iBLAYe10RojDpsldE60qZRa75V5Ssv94lOebR9A1RR0G671hxwARKb2wHvZMjLeAC7LO7bo2PGTg6Ajb2CsoD9E1yIF+EBs8s7mvlxtQmk5moExYgCaKvo93kKGCegWHwysv/1jmb7Pl57naSa1etWNplJ3ZVuyjmRCfULvH03PeGsxyM/mzrpIzWxuNBFjxAA0Ve2B98Koh2CDNQDdopJXjfvKMz847x7Xe2Y+biq1naSsHShK3tncOse3bd2Ya1sHUCfGiAFoshgy3jKX9sVz5991ALpJWTnN/M6alfNdnbMs3CkIsYwXo9Ea6qa+BnlKy9XLQFnudWtvckDTWBaZpvq9fQ4AItSQwJuMN9BlfsRRntLzrM2mFOjTaK09Qgu3K264zjWJzjkF3Hk6+evcZjY3mswyRowycwCxiiLw7vf7r6Z9nZtbAAoWVHpuyUiPGh2vZKWSc8ufS6M1VElNpfKUlvuFqzzbNoCYGBqraYzYnAOACEUSeKdnvIXgG4AoKM7TEEoZajVes1xLNMeYRmvtEHq+l197rYudXzx6+rnDmXsL+NJyZnOj6YzX2kMOACIVR6n5VLizOY2MAHjqQK4M3rq1azJ9ny891+ixEBqtdcPya69xMfOl5Xk69SvDrdJyGqihDY4df81wVP9rDgAiFUXgnfwjgrO8DV0sAXSIMt7btt6dq/RcwXJojyyN1lA33yAw6/sfs7nRRoaM99ndu3YccgAQqViaq5HxBpCLMtPKfmctPVdX6FDpOY3Wms3ynMTYaMwvDk0ym1tVIUBbaPEp9Hru9/s0VQMQtSgC74VGGKnBNxlvAONo/6qCb0uQPMqX8aY17LE2WsvSvA0YR+911u0Qo1ShodJyZnOjjSz7u5e5qf0OACIWS8ZbUgNvMt4A0gw7N2/KXHqu4FtNq8aVniuot4wxU/BOo7W4WN43YgpS88yeF2W3KS1Hmxm6mTNGDED0Ygq8U/d5nz5zzgFAiDLU27ZuzFV6Pi7o2bzxTlOARtY7Lk0JvH3lRZ7zx5eWM5sbbaXX8eunfhE67ChjxADELprAu9/vp9aSk/EGYLVu7U2D0vOs+1xV5qsAaHHm2tpoTd+fp/s0ukvn2lLnXIjOSWZzowssrw32dwNogogC7/RZ3gq8Cb4BWPnOznlKzxUILS49V2bRklXU93GtioOlZLvOjLcy3DrXspaWM5sbXXLi5KngMb2eO+AAIHLxlJpPpQfeQtdgAFmp9Py+TRtylZ4vDor054TQaK1Z6gi8/Tz5SWZzU1qOrmCMGIC2iCbwTv4hc6FjCLwB5LH+9rW5Ro75MmA/VUEZxnVr1wS/Tx2pabRWvxgrD3Ru5J3NrXOYBmroEsaIAWiTmJqrzYUOIPAGkJcCl4cfvDcJXG7L9H0+O+lLz62N1sZ1SUd1LIF3VZljXwmh+dxZFwS02ENpObqIMWIA2iSawNvSjfLc+XcdAExCgbNKxrOWGKv0XGPHxBK864aRRmsQP5s76/ngZ3Nv23o3s7nRSYwRA9AmMWW8ZS7tixcuXnQAMCmVnucZwaSbQJWeq2s6jdbiF3rsqwhmFWznaaBGaTm6jjFiANomtsD7bNoXmeUNoCi+63ne0nNL4K0bR0rO61Nn4K2/WxUSKi/PuvjiZ3NnHYcHtImlzHx+vn/QAUBDXOMi0u/3f9Tr9WbGfZ3MEYAiDUt57xwE0Vmz09bmacp4ao8u+3Ord+Hie64OOje0lztrltuXlqsiA+g6yxixqSl3yAFAQzQq401zNQBl8BnGshptkfWuR2h7UhnPd97ScmW3dQ4SdANDhsXNOcaIAWiSqALvfp/O5gDq4UvP19/+MVc0Gq21n96bFHDnmeFe9sIP0DS6Zhru9w45AGiQyErNbYE3NycAyqBS3/s23TXIPuYJoNIo661sJt2pq1NVqbmCBO3nzrodSu9l6rDPNgTgSpatPFP93gEHAA0SVcZ72TIy3gDqpwykZn4XuchHo7XqhQLhFTdc5yalBRplurMG3bes+fCgazlBN3A1U2M1xogBaJhGjRMTAm8AVfDjnIosPVe5uWY6o/l8d/s8WwjUQO3B+zdRvQUsQa8twxixQ7t37TjrAKBBogq8Fy6iNFgDEIVhKfBd7p6ZO1xRii5hx3ih94u8ga+CbQXdWRdRLo+wYzY3MA5jxAC0VWwZb0kNvBkpBqBq98x8vLDSc91UHjt+0qF59P6jhZM8s7m1v5/Z3EAYY8QAtFWMgffRtC+ePnPOAUDVfOm5ZnJPKk/ghmyKfnyV3c5TWu5nc6uJGo31gDDjGLGjDgAaJrrAu9/vv5r2dUrNAdRFwfe2rXdPXHquoPDIsZcdymMJvK0VDL60PO9sbkrLARsF3YbX7iEHAA0UYeBNgzUAcVPp+aRzl188+lOuZZFTADDJbG5VSNBADbA7cfLN4DGMEQPQVPGVmk+5YJdKSjQB1E3ZzOE4qA+7vJ594YhDOSyLGmlBsTJvynJbGj2NUjn5tq0bB+XllJYD2Ri6mTNGDEBjRRd4TwX2eAvjeADEYLjve1Pu0nMFdZYMD6rlZ3NnrUjQIowqIdatvckByEavN8P9HWPEADTWNS4+ZLwBNIpKz29Z85FBBjtrsKYgT99LdrR+eu70HGbNcovOgSLHzgFdwxgxAG0XXcY7WcmcCx1z7vy7DgBiouBZpedZx0Up2KPRWvGylpqr8iBPabnvdk/QDUyGMWIA2i7GcWIyl/bFc+d/5QAgNgrCVGqcNQhjrnd9/Gzup587nLmaypeWa9EFwGQYIwag7WIsNZe55GN63BfJeAOImcqOT585Z96/reysPuiAXRxLxtt3Lc+6PUDbArS4wpgwoBiMEQPQBVFmvJnlDaCpdPOofcJZm6bRZK16eYJuX1pO0A0U59jx1wxH9b/mAKDBosx4a5Z3rzf+67qx1QfNiADERB15VbKcZ3GQaQ3Vy1parmBbmW7ee4BiWXor7N6145ADgAaLs9R8Kn2PtxB4A4jJkWMn3ItHf5Z76oKlsRDsiqyMorQcKI/fahNwyAFAw8WZ8X7fnXXL0o9Rdoj9kADq5ptzTdogTX+OrmtZu6KjXHo+tm3dyPsNUBJLtnuq39vnAKDhogy8ly1zwa6VzPIGUDdlafLsEx5HN6AE3sUo4jlRhnvzxk86AOWxLFrO9+afdwDQcLF2NT8bOkAdgwGgLpOWli9F5eaUM9dPpeXKcjMmDCiXrp+vn/pF6LCju3ftmHMA0HBRdjVPLrAKvOfSjrlw8aIDgKr50nJ9ZA26Q30paLBWP2ZzA9WxlJn3+32y3QBaIdaMt6Rmvcl4A6ha3tJy7Q++b9OGwciwI8deHnvcMPvzFkFfAS5cfM9ltWH9bW7zxjsdgGpYmkr2eu6AA4AWiDLjLckK54/Svs4ebwBVUmn51795KHPQPZpBXbf2puDxhrJLGOhxz0pBAO8tQHUMGe+zjBED0BbRBt4ukPEuclQMAIwzSWm5GnM9eP+mSyXmlsZpltJLhOVpUqf3lWdfOOIAlE9ba0L3cpSZA2iTiDPe4VneBN8AyuRLy5XtzkKl5Q/e/5mrGqUpAA9lYnUzStZ1cnm7w2s7gJrmASiXZZFxmZva7wCgJQi8AWAJGnGj0vKsDc8UWCvoHrdPO7R/28/zxmQUeIea2Y3z4tGfZl5sAZCNFrlCGCMGoE2iDbyXLSPwBlA9X1qukuOsmed7Zj4+KC1XxnscS+M0S8MhhKU9DyE6B1gAAcrBGDEAXRRvxttNPRA6hsAbQJEmLS2/Z+aO4LGWTCwBXzFWr1rhJvH0c4d5nwFKwBgxAF0UZeC9d/bA3p7r7wkdxw0RgKKo7LGM0vLFFHSHAkLdlLLPe3J593l7fiGG5wIoFmPEAHRRVHO8987un04utWqkMTPmEHU6X+l/w80QgCKorDjPnl6Vlluy3ItprFiozFLBt2X8GMYrYh6673S+betGB6AYhoz3HGPEALRNNBnvJOhOgu3ed9z4oFtWjv7m9JlzDgDyUlClLHfWoFtZa2tp+VJsY8WY5z2pSfZ4j6LTOVAcyxixxCEHAC0TReD91dmDjyRBt4anTlu/Rze+923a4AAgj0lKy7/wuS0TZVP1vaF93paOv0g3LOufrNzco9M5UAzLtW2q3zvkAKBlag+8F/ZzP57le5TFmPTGF0B3qbRcjbOyblfRXO5Q13Kr0PVLGSG200zO0mDN+nzS6RyYnKWxGmPEALRRbXu8Dfu5l7T+9rVu88ZP5p7PCqC7/H5dy43fKF1vtMe3yMU+Zc5DmR99Xdc85DfMeL+Weoy2DKiU3NKwUws22mZQVBk70CV6jRm20RxijBiANqol423cz30VNTJSeTlBN4CsFGyrtDxr0K3ArYwKG0vjtKz/VlzNUmquygItrFjeW+h0DuRnynbP9w86AGihygPvvPu5J2lkBKDbVCKcJ1hSabmC7jKym/ozQ4EeDdYmZwm8VT6u41RNZeErJwBkYxkjNjVFYzUA7VRp4M1+bgBV8tnJPF3LlQG1BmJ5rVu7JvXr+vdbyp8xnp7L0MKJn5Chsn7rAi+dzoHsjGPEjjoAaKFK9niznxtA1XSDp6xk1sBVmU8F3VXs4dWC4rHj6fuPFeAp8478tJ/+2PHx54Ey3qqG0HuNtjSdO/9ucvxJF6JO58uvvYbnBzDQNdlQdXTIAUBLlR54L+znVtA9neX7dPNDaTmAPBQQ5clGKoAqO8s9ylLJQxftyVkarGmBxpel6xxQkGBZtNF5puexqLFlQFsZx4gdcADQUqWWmufZzy3s5waQhy8tzxp0K9Opxo1VBt2irHoos27ZE4l01n3enu8rYql6UAZPnc7ZEgCks/SsYIwYgDYrLfBOMt0rXX9+g8tBpZd0jAWQhTKUCrrzdi2va2xXaJ+3roVkvSdjC7zPXfF7Bd3acmChoDvPXHigK/QaMVzHNEbsrAOAliot8NbF80sP79jpXH+3y0h76zT2hwwCAAs1T1PQnfWaodLyumcyW4JCxopNxtJgbanHOEuncwUV6p4P4GrGMWJkuwG0WuldzZMA/PEk+L41+eVclu/TDfSTT32brrEAxlKGUQF31oBntLS87uaNlnnelJtPLrTAMW7RRosz1q1PWjTmPQu4mm2MWO+RYV8gAGinSsaJJcH3XBJ8b+j3+0+4jNQkif1zABZTBkWVMVmzwX5EYV2l5Ysp8A8FhZSaT06dzdOklfSr2WdoS4Cn9yxLR3SgS4zX6ZVqxjuchAMA7VPZHO+F0vNHkwB8l8uY/VYnTGW1LB0xAbTfJKXlCrrrLC1fiiUopNx8MpbnPG2B475Nd5nPG1VgsFgCXLZh/W3WQ6eT4Ps7BN8A2qiywNtLAvB9SfD92eSXR7N8n29eQxkf0F2TlJarrDyG0vKlWMrNLR2BMZ5tdNu5sV+j0zmQX8YRsdMLme+VDgBapPLAW1R6vnvX9g1JAP5ll5HK+LT3mxsaoFuUQZyktFzZ7ljRYK18lgZroSw1nc6B/BR8Z9jiM6Pg2wFAi9QSeHtJAL5nIfs9l+X7dEOjG3D20QHdoNLyPJMOYi0tX0xBYajcXIE3QdxkithLT6dzID81tQxd60Zs2Tt7YNYBQEssczX71sE/n7t/++cP9vvuQ71ez9zN8v335wddMs+df3dQQnjNstp/FAAFU6D5V8//IAm8X870fQpkN/2T9YMMS1OuDVpUCJWTT9/80egXEWJ26vSZ5OPtsV/X+4oycqHtCDetXjX4bCn/HwbzPVOpO9AF2lrz6hs/d79+94Ll8Jl/sf1fJ/eK32DUGIDGi+KONAm+zyYfB5IAPLlD6d2f5Xt1U/N3r7wxuJDHuHcTQD56bWs/d1qgtBQFpjvu/T3TvunYHDv+WurXl1977SD4Rj4KrPV+kUYZbUvpvwJpnaNvv3M+eKyqFXReWv5coO20GKrrmJInliqeXpL5JvgG0Aa1lpovxsxvAJK3tFzZSpWWNzHA0b85tHjIPu/JWM6LtAZri9HpHMhHrxtrs0Lpuf6eJ548+JADgAaLKvAWZn4D3aXsx7MvHMndtVz7B5ta+TKc570i9RgFbuzzzk83+aHzI0twTKdzID/frNB6zZ7v9fftnd2/xQFAQ0UXeAszv4Hu8V3LszZN9JmTmLuWW9nGipH1noRlcSMLOp0D+WVpVjg0GDM27QCggaIMvD1mfgPdoNJyLZhlzQauW7umsaXlS7E04GKe92RC54qC4qznIZ3Ogfy0RShD8L0yCb6/Q/ANoImiDryFmd9Ae42WlmfNAupGbdvWu1vVVNGyz5tqnsnY9nln34utiot7Zu4wHauqDhaGgSFd+9VoLYPpheB7pQOABmnMDK5vHfzzQ/dv//zzycV2ixuseNrogq5Owddft5yOskBEtCD25//rf85cOu1Ly5vYtdxCXdzTOmXrmqYgjxGK+WhhIzSe7vrrPpCrezydzoFs/PtAxsWus0ky5r9PEjMvOgBokEbduTHzG2gHlZZrPrdxjuslKi3XqLA2z7L+9bu/Gcy4TbPqxhsI2HLygbfeF8bRQu0dt97i8pi++R8PRpZZKji0bUABvgJ9oGu0+KQtRhnfB+aSoPtfJkH3Mw4AGqZxEWgRM7+1n4jgG6iegpHv/uAngzLbtMBnKSot37zxzta/dhWEhTKyCh7bmvGvwqtv/MNgIXYcBQL/9M7fcXno/NRzY5lRrNeAFll0fJu2TAAhfvE14/vA0YWg+6cOABoo+j3e4+Sd+a2MNzc4QPVUUqiu5brhyqJNXcstLCOvMu6HxCJlNFgbRadzYDz19MjeYLD/NTXbHY6cBYBmamzgLQsX4APW43WzpTm/AKqlYFtBd9Zg5pY1Hx50Lbd0+24TldSnmTQw7LqyGqwt/jvodA5cpuuWSsuzLr6quW5yv7dTo2YdADRYo2s2vzp78LGec//ecqwyENobSrYbqM6kpeX/7PdmOrktxNLlV9e0m1avcsjO0mDtptUfmvjx9d9vGQE3DPR7nVtkQjdM0ETti8MKRwBovsbe0Q6D7v4ey7G+VLXNDZmA2OhG68C3X8w8/sqX6eZtbtUGegy+/9Lfpx5zzbKpTj9Gk7A0WCvq8aXTObqOJmoAMNTIUvOvPnnwIWvQrRssgm6gWppTrNLyrOW6Ki3X67XrWT9dt0LXLEsWFeOFHt/TZ865oty36S7ze5BKzictcwdiobJyBd0ZexgcXdjPfdQBQIs0LuO9d3b/TK/nvpH80jR/5b/7w993q278oANQPl9a/t0fHMtcWn7PzMcHAQrbQYZUMaCZ3uPo8dUCBYuK+bz9zi9TH98i56XT6RxdpEUkbTPKpv9EEnDv0AQbBwAt06iMdxJ0TzvX25/8cqXleDVSo2QPqIYCxTyNc/xWkHtm7nC4zJL1JzOan+W9QSWyRaHTObpiwiZqjzoAaKnGBN4LQfd3kl9OW45X9kzzugGUT/u4KS0vluUxYaxYfpbAu+jO8XQ6R9v5sZEZF63URG1HEnTvcQDQYo0oNU+C7iTD3fsblyHoJnsGVMPPZKW0vFgqT9bN67nz7449RpmlT90x3cnO75O6/roPBBusXX/d8kHJd5HodI62mqCJ2u8lQfeLDgBariEZb3umW3vyCLqB8vnMRtZyQt/wkNdpWCgrq8CbcvP86mpgp0Wn0Kx278WjPx00KwRiNmETtTkHAB0QfeC9d/bAbPJpxnKsbmSsZXwA8puktPwLn9tCBs/Ikm2lu3l+q1etSP26FpfK2mdNp3O0ha96ykZN1LZvIOgG0CVRB96a1Z182mk5Vpkh3cgAKJdusPI0flI1yoP3b6ILdwa6roVK8YtsANY1ln3eZQW8WUZd6rWm11zRe86BST393PdoogYARtEG3gq6rbO6fbdY9ooC5cnbtdwHGFSjZKfHLpSVVeBN9+t86u4cT6dzNJ22TWS895pLPh53ANBBUQbeSdD9SJag25o1AJCPgrscnWoHGUVKyyfDWLHyWN43yn5s6XSOJtP5q3uwDMH3tPr2DJvmAkC3RBd4//Hs/u1J0G1aDc1SqgcgH93o52iaMygtV9DN63MyjBUrj95D6mqwNipLU1A1Wnvx6M8cEIscwfcMwTeALooq8E4uwjPLXG/WerxK9LipB8oxSWm5XpuUlhdDgTf7vMujhn9pymywNopO52gygm8ACIsm8E4uvtPJRXh/8kvTRVg39ZSvAuXw81jzlpYXPfu460L7vFWCzN7ffCwN1qpqakanczQZwTcApIsi8F4Ius2zupUZUGkegOIpm6agO2uwQWl5eSwLGRrxhuwsgXdVFQV0OkfTEXwDwHi1B97Di222oNu6Fw6AnS8tz7p/VDdY923aQGl5iWwN1s45ZFfnSLGl0OkcTUfwDQBLiyDjPSgvn7Ycuf72tQTdQAkmLS3XaxPlsczzJuOdj6XBWtWLGnQ6R9PpHLYuIC0g+AbQerUG3ntnD+xNPm2xHKuLuLJqAIo1SWk5UwWqE2q8peePsuN8Qg3W6thDT6dzNJ0qdTLetxF8A2i12gLvr84efCz59KjlWD+rG0BxFEhMWlqeoZQQE4ppL3LbxNRgbRSdztF0qoYi+AaAoVoCbwXdPdffYznWB93c4APFUYD29W8eyhyo6fVIaXk9LA3WCLzziW2f9yg6naPpCL4BYKjywPurTx58yBp0Ayie5nLTtbx59LiHHvsTJ085ZGcLvOtpXkenc7QBwTcA1BB493rzWo4/az3ed1pmFR+YjC8tz9qISTf+KiuntLx+ob3Ieo4JurKzNFirs5qATudoA4JvAF1XeeC9e9eOA871deWds36PbiRUFqtMHYDstHA1SWm5st2on2WsGN3N8wllvete0KDTOdogCb7Prlxxw1yGbyH4BtAay1wNvnXwz8/ev/3zB5OLaXJBtY0Sk1ff+Hny/z3TzSeAIS1Y5cmAKdj+g82/666/7gMOcdBCyPdf+vvUY65ZNuXuuPUWh2x+/e5vFt5jlvb++/ODjF2dVR83rV41+Pz6qV8Ejx1WifF+iXgk70Fn/z8HD509e+78tMuk/z8kSZtDDgAarpbAWxR8f+vgN76WBOC95OZgi/X7lLHTPsbpmz9K2SuQQoH2Xz3/gyTwfjnT9+l1temfrB90VL5mWW2XCCxBz8ex46+lLqL8+t0L7p/e+TsO2ehx+7tX3kg9Rllny37wMimQVlD99jvng8fq/VKLNXX/m4F3fvmrs3/+l/95ZfI5S+b6bBJ0/8sk6P6GA4AWqHWOtyQX1D3JhXV3lu/RTUee5lBAV/jS8qxlx36KAKXl8QqNl1JQTnfz7CyZ4boarC1Gp3M0yRv/8NaP/uzp57Pes81pWyKZbgBtUnvgLcmF9fG8+77ZzwhcSaXlem1kXZhSGa32c5Mdi5stQCTQysrSYC2Wx9V3OrdUfdHpHHU6+pOX5/7/f/Xd307OwyyZ7qMLQfecA4AWiSLwluQCqwvtZ12G4NvfULx49GcO6Dq9Hp594UjuruXqNsv2jfjZGqwxViyP0KJTTAsadDpH7F74wbGzh7730nTyywxBd/+J3bu2K+g2T78BgKaIagPnQtO1r/X77rper3eP9ftUVnnh4nvuptUfYk8qOslvv8jTtXzHvb/n1q29yaEZdI3T83zu/Ltjj1GA9ak7prkeZnTq9Jnk4+2xX4+hwdoovX71b0lrCudpD7s+eK2jbLr+/C/P/e9zx46fXJPtO/tfTgLuf+8AoKWiuytLgu/fJB/PZG26ppslNcbRTQVZO3SJSsuV6dZNdRbaK6yg27pXFPHQQksoQFQDSp7bbPS4NaHB2ih1Olegk3Y+eHQ6R9lUXfH/+8sXzv7DW29nCbrVRO2Lw22HANBe0ZSaL7bQdG2HG1yQbXTBV9aP/Y3ogtHS8qwlpCot37b1bhapGsqStbSMnMKVLAF1LA3WRm3eeGcSTH/YdOyLR3/qkkykA4qmzuW6B8vYuXxO2wyTe759DgBaLtrAW5IL8YG8TdeUBQTayp/nWW+glQFVAzW6ljebAsTQogmdzbPzpdtpYl3Y1UIanc5Rl7nXfz73Z08/vzJH5/LPDnv8AED7RR14y7Cr5aDpWqYLs24saLqGNsrbtVyl5XQtbwcFh6tXrUg9Ztj7gmZaWYUe11gDVjqdoy56Tzrwn/5mOuP15gCdywF0TSM676jp2rcOfuN/zLrvWzeeKgtU0zVKatF0uqn57g9+MlhQ0l7ULFRarnJUmm21h4KmUDk5+7yzs+yfj6nB2ij9m/R+d+z4a8Fjh/Pef+HuuPVmrgvILV+SQ53Ld+xSTx8HAB3SqHfb5CJ9KGvw/fY75wejdWi6hiZTkPXn/+t/NnUvHuVHDt1x6y0O7RMKsJZfe+0g+IadmhSGxrGpOdmqGz/oYkSnc1RBCzd/9fwPcvQL6O8e9vABgO5p3DL3QvB9MAm+73fG2ZB6g9AN6qobb4j2ZgkYR2V8usHJ2rVczZYevH8T53xLKcA6cuzl1OoHfU1jxWCnoFWPa5rrr/tA1AsadDpHmfxCsOX8GqHO5f8yCbq/4QCgo6Lf472UYSOOwb7vOev3+D1t7PtGU+icVRlf3q7lCrqp8mg3y35k9nlnY2mwdu78r1zs6HSOMuiaos7lOZqoaT/3IQcAHdbIwFsWmq6p4/kBB7SMH42XtTu/ggY1WKJreTdYSoRPnHzTIZtw47pmjGqj0zmKpMWZHEH30YXO5XMOADqusYG3JBdylS7tcsZZ3+tv/5i7Z+YOB8RMNzfqWp71JnhYWv4ZSkY7xPJcxzh3Onahzv+qImhCR3A6naMoqop49oUjGSto+l8j6AaAyxodeEu/7x53hr3eWvW/Z+bjDoiVLy3PfnPjBue2SsvpYN0tlnneZLyzs4zca0p22DdYtFDQreCb7QkYpWtIjm16jycB985hggQAII0OvL86e/CRXq/3kOVYrfoTlCBWk5aWU8nRXZrPnkbnFlnMbCyVBE16TPXzqO+DhRYUtAAIeNrSkuM9Zvve2f3TDgBwSWMDb13Qe67/uOVYZQMJuhErZRMoLUdeluwsWe9sLA3WXj/1lmsS9X3YsP4207Ha7kIjUozSfVTG4Hvaud53CL4B4LJGBt7JhXylLuiWY5UNIhuIGCljpsxSntJOSsvhWRqs0TQru9Brq4l75+l0jknkDL6PJPdsMw4A0NSMd+8xN7igp9ONk240gFgoS6ZMksrKn3zq25lLy32zJBaT4Ok6FwoST5w85ZBNKEDVwlkT90Jn7XSuaxQLN/AUfN+3aUOWb1Gi5MgTTx40bQsEgDZb5hpmsK/buT2WYxWgrLrxgw6ok4LtI8deds/9zY8Gn/X7PPtDFQjsuPf3TKXF6BadT6dOvz326++/Pz/IjF9/3QccbH797oXggsX0zR9tXNXJNcuWDc6FY8dfG5wXafT1V9/4uXvpZ3OD45Xl1+IflTbdpvcgnUN/98obwXPI6/fc9n+x/V+7bx38xvMOADqqUYH3cF+3+0byy+Ddo1Zl77j1ZgfUwQfbf/X89wc3rQqKJsmOaX/mH2z+XdNYIHSPJUhcdeMN7qbVqxzs9NpNowCkiY+priM3rf7QIJi20vVLmW99j6p2FIS///77gz+L61L3aBFP91i67ljf25L7ty0E3wC6rDGB98K+7r9JfrkmdKwyg/dtussBVdGNh4LrxcG2NRswjm5oleX+1B3TDhhHGcjvv/T3qcfoXFx/+1oHGwUWoQZj11+33LTHPka+gZwy2nm8/c75QdCla54+6/fXLJsiG94hOn90/hN8A4DNNa4x7Pu6CbpRBd1oqFu0sttZbjyslE3T/F1uZBGiG2CdL2l7cdmnm13oMX391C9ck6mSRtsUFDxPQo+RPrQfXNcrTVrQAriCMrLh7eZHWqpviXULVc/19+ydPTC9e9f2XQ4AOqTnGuArs/t3TrnerOVYxiuhTAqu1elXgbZuNMtqrqRu/GqCBFg9f/ilYADF9TGbZ1/4YbAc+4t/9AeNDy6feuaF0hYRdL7peqbP9KdoLwXdmtCRcYHvkHP9Hbt37TjrAKADoi81H+7r7u13xn3dlFKiaAquVTr+3R/8ZNAgTaWZusmYtIw8jfbOESAhC52PanaUZsUN13NeZaDXeagUu4kN1hbzjbLKWEj0jyEN2tpNz6net95+55eDbQdG00n+5/77t3/+W986+OcE3wBarwGl5oN53StDR6msjRFLKIpuFlVGrsy2SsmB2FkC6uG5zHXSyvKYKsPX9MUMP6YwS7lwHvqzVTHk54Mr4PfZcALx5tN5pEotS/XNiBnd5yVJls8mme85BwAtFnXgvXf2wF7Hvm5UREGJyi2Hnwm20Sy66dUCZFrJsN8ewb5bG0sw2Ja9836vbo5y4dyGi5tvDn6tMvTRsnQ01+aNdw6uMaHmhCOmCb4BdEG0peba191zvf+35Vg1oGLvGPJQgK3yx2dfODLRjG0rBUZqaBQqXx02J+LmE9no3E0LvFWO3obS6Kpo5rWuD2kl2Bcuvjd4TbeBLxfWeLqqFxT0d2oShB5vX5Kux13nqp4HNIt//8rQO0CTa7bfv/3zByk7B9BW0Wa8p1zvActxvpsvYOW7kKvcsazmaN7w/FwxKKlU/wGfaXz+8I8dULThzW56lknnPos6dlosO3Z8/GKcFjvaVEWgn+O+TRuSgPe6LBnLQl1Zkn6EBm0Npb47Op8yvN/NkfEG0GYRl5r3dyernzMuUGquGx5lK5X1Bpaic0TZmyqDbX+TyDgdVElBic63tHOcsWLZDAO99M7mChTbFhAqaJK6gu9Ro9t//Liy9bd/jAWkBsjwfjuX3PcxXgxAq0UbeGvVc+/s/l0LzdVSaY+Y5oe2pdwPkyt7xvZiPthWVtsHP0DVfIVFWnmnXhPs87azBNR6TNuYiY0p+PZo0NYcWuSznjtT/d6eRx7ePucAoMWibq6WBN+HkuBbme+9oWNVyuSbs6CbfLA93B/4TiXBtrIuuvHjvEMsdD6G9lUqUNRxCLME1G2uIlDwrYBW77FZrqnDkWHXDfZql4kGbXHyc71t+l9Ogu6vOQBouejHiSXB9+N7Zw9sTn65PXSsSs7VlZVV7+7QjaAyH1WN/dK5pZs6gm3Eypah/QWBt5GfOZ3WdLHs4LJuvpJHgZS1+aSuzevWrhuMlxpWHr05OO/KXBDVAog+VAHnS9K1R58tP9VTptt4rmhf9x4HAB3QgDneon0/4f3eusj74BvtVfWMbd8cjU7jaAKdo6F93nr9bN74SQebUIO1LoxpU+Cdddb3i0d/OnhcdK4peJfhJImTgyC8upnhNGirkhY+/FaAgLPJ/d1nHQB0RCMC72Q19Oze2f07FvZ7r0w7Vm/qKonjprJdqp6xrRvtYQOftVRQoHF07vry26W0rRN32braYG0xP+s7S/CtIEzHqlP6cNb85QVMLViMZsPLRIO2aui5tncx73+ZLuYAuqQxwzG/dfDPT92//fMXkuD7/tCxmgVKo5Xmq2vG9h9s/l33qTtuvZQ5LEOo4QzZdUzi1+/+JjgrftWNN5D5M9L8c12L0ty0+kOdeDyHjSSHfQQ0e9vi7XfOD85HzZAfvaZef90Hksdt1WCBU9dePYbXLJsazEYvsyTdT7rQc6prsbYKvP/++4N/G4tRk/n6Nw9Zn7t9SdD93zsA6JDGBN6SBN8v/ovtn7+1Nyw7T6Uy5DtuvZk30YZRcK0g+6+e/7576Wdzlzowl0Hnhm70RoNt3QRes6z8lwWBN8qkgEavozQ+gEKYHqvvv/T3qcesuOH6QWDZBXo89P6qwNvaWE7H6n153H5rXXdX3fjBwdd1TfYLnwqIrQF+XloY0L9Nrxl91u+1AMDifTbKdIcW/BbMJdnuHck93W8cAHRIQ/Z4X9Zz7tHkk5qtTacdp2BNjWC+8LktDvGqY8a2b7ZDwx20lQKG0D7vskt728TSYK2KLTAx0WMyLB+/JrjI4+nxU5m6pQnq6OKjvo8GbXHT+7ceM5v+Z7WF0AFAxzQq4y1aIb1/++cPJiH4zuS3H0g7VqvkKlnrShaiKXTTpFVxZZCe+5v/Y5DZ1vYAlXOWwWdnNm+80236J+svdeitIrM9DhlvlO3td36Z2m1br0O9FggmbBTwKRM6jq5f//TO33FdM33zPx58ti7kDCdRvDZ4X1ZlhsVwPv2NyXX8lsFj7K+NVZWka2FY71c+6Nd7h/Xf3gW+sa3tuRjs6z7gAKCDGhd4SxJ8n02C739Igu/giDEFdFq1Zi9jvfSG/HevvDEoRfvuD44tzNo+V2qw/ak7pgeB9j/7vU8PshU6D+oMtkcReKNsw7n2p1KP0WtC2ysQFto3r2tZVxcy/LXKGnzrsdKCa9735uFYx2FJuj6rX4FK0s+df9eVSQGmzgH92/17mK+G6DJVMaQtSo04lATduxwAdFTjSs295OK976tP7p/p9XqPhI5VsEezteoxYxuoj+U1YN2fC2d6/9B1zo/N6pp7Zj4+eIyU+bTSsQqW75m5w+WlwF0fCsL1njNakl7duDK3sH1pTefuNTQyzngdmRuOhm2XvbP7NWlneuFj5fy8m56a6v32wpcH/81dnsYz+mvAYm7h89mFj8F/m5/vv9qbmnq75+ZfXfjvc0wIaIbGBt7ypYd3PLp39oD2e6c2W9ObsVZktd+bsspyMWMbiINu/kP7kkMZcVxmW8g457rMb+PR+621BFyBm0wSfHu+YaBvGng5CH+r9Odm+L43HOGnx2B0bnhb6XENVW9d1t/d5MAgCbCnk09bRgJr3Xfqv10RSE9NOaBI00v9x+QcTP6/7wadrxYk8ZA+HU0+zvb7/R+53tQrSWD+I/03eirEo9GB91Bf8721xJ66iuhnS6oZDIrl98AxYxuIi2780xpf+T2sbMUJ86Om0gJKKgiGQacWubPM+lbwrcd188ZPuiLRoK08fl+3TbP2dSdBtoLqmX7fqarSN/Md3GMSWCNyg0Rkct5uGQ3Mk6B8Lvl0NMmU/2hqyh1yBOO16bkWSC6SW5If5TuWY/XGrpI0TGYYZP9iUGZXZjmf529a2rKH8vF9B1O/ruyPSjeBSej1Gbo55ppop0kZPqu5FF2bvvhHf+BwuYN5lvcHXeOHndLLv8brPUyvj7JL0hcbzYQ3ecFL1xVfZh8wt3vX9ltdxHQP2XdTn+65vvoGKXChHBxdcHT40dcN6VFK1avRgoz3YL/3oa8+uf8Jy35vlUU1/Q2vLsNsQXVjv3wZOZ2XgXyGJbfpgbde0wTeNituuC7167ouKoijEme41UFjw7RYYa0E0KLGU8/82m3burH0x3A0G65/32g2vEyjlWE+G77+9o81qiRdFQrGoPusRoe5yKhsPAm0H0gC7S3Jb/WxsjfIDgKdMjP8GEyJUlb8aL/ff77XcwcUVzmUohUZby85aZT13hI6Tm927PcOY8Z2ech4oypf/+ah1MCHLK2dAjMFkmmUse1qg7Wl6H3j2Rd+mKmfgA/a61jAqLJB22JNaNCmx+PJp75tOnaq39v5yMMPfM1FYCGrvXkkqw1gPJWhH+r3ewd6vfmDlKUXpxUZ78vUMXNQcj6ddpTfm6RVdVxp9KZDN0pVBNu60fBNeVgMAYqlxay0wNu/5mlOGGaplOp6g7XFdE3ftvVu9/zhl1L7DYzyZep1BN80aBvPN6o12ld30D0SbO9MfjtNVhsw03aL7b2eFqp6SmweIAgvRqsCb+1PSC60uyz7vfXmpsYnlFj6eb9vLswlfaeSYFuldYz9Asqn11ko4FFmj9dimIJAGqzls3njnYPHztoFW8G3qjUUfNe5NYwGbZfpuTNWAMypi7mrgcZ7JcH2I76MnGAbKMRoEL4veX1/jXL0fFpVau4lF95Hkx9tr+VYval38YaTGdv1otQcVdFr/U/+7C9Tj9FrUtdChD31zAup+4Ap3U+n/cH2EVRDsZbvd6lBm6VR42X9W6tu1LTQZPcxZ9huWLbl117jrr12WfJ52eDXK25Yfulro78GQs6dvzD4fOHi+8nHewsf77tfLvz3ms0lr7l9zs1/jcZsdq0MvCVZkdmffNoeOq7OvWRVq3rGth5T3zSGYPtKBN6okiVYfPjBe9nqYWApmdZjSYO18bIFcUO6HhYx67ssVTZoG1VFgzZffWDL8A9Gh+1xFRjJbifJluo6kSuY/uAN1yaLHtcPAukVN3wg+f3ywa99sA2UTUH46TO/HnxWIH7u/G8u/f6tM9UtBC7YRxbcpsVXh8F+bzXQmE47yu/3bmu2Rz+fSsiZsQ10l16TacGAb6TIAlmYbZ/3O1z/UvieHtovbC3XVqZcYg2+9fPoQ9vXqmzQNnyPP3mpy3gZDdoyPE8Hqgi6NWe733c7k3u8h5Kgu9SAWwH1LWtWDIJs/doH20DdtMCjc3Oc10+dGwTkp8+cHwTkb5wqtUfFTnVHT5Ker/T7vS9/KZKmijFqbcZbdHFOfkTTsrreLDXPtg2YsR0/Mt6okq4JoaZIbboGlsnS1ZnH0ibPrO8mPrZVNmgbVUSDtgxbA+Y0OqzMktMqyslvHgTZv5V8vnEQ1JC9RpsMA/B3BkH56TO/KrNknQB8jFYH3tKV/d7M2G4WAm9USdcEBYtp1wb2edtpz3zaY6lAR528EZYn+NZ7j/Z9N/G9p8oGbaPyNGizLNhdNgi6D7kSlBlwK4u9bu2HCLTRST4QP3HyTFkZ8Tn2gV+p9YG3fHV2/76e6z0UOk5vRJrv3YQSwTpmbCvYVqDd9hnbVSDwRtVC+7xFTcF4bYfRYK1YCkY1Hz1LR3hlczUStOkl/bE2aMu2IFLOvu6yAm5ltdetXeVuSz4oGwcuUwD+cvLhy9QLNDc/33/i3/2bHY+7jutE4K0GHAsl59OhY/UGpOA7Rj7Y9t3ImbHdXATeqJrGEj1/+MepxyiQ8fOLMZ6lwRqLGNno/ezZF344eG+zaltz1JgatGkhxM8UD5jbvWv7ra5AyT3bdHLPNusKDLh9sP2J21eT1QYMFHz/5PjPiw7CO1+C3onAWxYu5Aq+g404YtpDxoztdiLwRtXY510cS1duFjHysSxqjGrrZJIqG7SNGla33WhtxjpX5L7uhSSJMtyPugIowJ5Zf1PysYZgG5iAMuE/OX56kA0vSGcD8M4E3pJc1HcurKIG1Tk3lBnb7UfgjTqE9ibrWqBRWEhnabCmBQwtZCC7rLO+FSwq+K5qpnUd6mrQlmaq39v5SEE3zl+dPaixYHtcAWPBVEKugDut4zOA7DRXXHvBXzz6WlFZ8H0LW1XmXEd0KvCWrz65//Fer/dI6Liq93szY7tbCLxRB0v5KCXSNjRYK1fW4FvqXDCvUl0N2q7UfyK5WZ44M13UPm6y20C1VIJ+9NibRWTB+8k1IAm+H/iy64DOXZ16Pbcn+bQ5+ZhJO05vZCrLVPBd1k0oM7YBVEnXgFDgra93IXiZlK6hac3AYslKNpUWHvUYh0r6R+nYc+ffjXbWd1GGC+drL71Oa2jQNpd87HETKKqsXHu319++epDlJuAGqqOKEn0oC/69JAOuUvSckiRwf8/e2QMPdaH8vHMZb8my31tvbFpFLwoztiFkvFEHS4m0KmHu23SXQzoarFVDixtaBM+S1dW1s+3B9zjVNGjr3zpJaehCllvb/qZdTgq47575GOXkQCR8AF5AM7Z9bS4/72TgLcmFf3vy4++3HDvpXr0qZ2wLwXb8CLxRl1CJNKOwbCwN1rTvmK08k8sz65tGgWU1aOvvTm6Ic40EKiLLTcANxE0BuLLfCsIn0Nrma50NvCXLfu8sjVuYsY0QAm/URSObtMUljRqssR0lna7xX//modRjaLBWnDzBt94PVbHGe+JQAQ3aco8OmzTLTcANNEsBJeiSXDP6X0oW+866luh04C17Zw98xxmaeugmNG2/NzO2kQWBN+piydQSMIbpGq/qgTSU7RdLQbcaBKbtrV9M748a7cZC0pXyNmhLAu9M942TZrm1b/v3N/62+8TtH3UAmqeAAPyVJPje2pbScwLv4X5vBd/ToWO1eq43cI8Z28iLwBt1sezzpiO3jTLeaUEg49mKp/dZVW1ogduqrbO+i6Qg/MixE+HH9Tf9W3d/0XYDvHB/pS19My4jupQD7aIA/D8+87d593+3pvN5569mWkFJ3hx2LQTfqRRka7yJ3gSqGvtFsA2gSAo+9JFWslteU6Z20RaftMBbj7ECRSqSiqPHUotCluZ2ni9TJ/geT/cXw2RCeuA9tXzq027Y1TzVV588+FByr6y94Jnncqus/N5NtyfP1XIHoB30et714F2DzHeOOeC+8/mnF0rP51xDTTko+D6khiGWYzVb9PnDPy416NaNgTKeuklQk6PNG+8k6AZQGGW00/itM0hn6fvB41gOvS9m6Vyu4DtUodB1lvP5vf58cI93cnO8t9fr73MZg27dmP+r+/8b939LPgi6gXb6xO2rB69xfc5hRxKDPzespmkmAu8FC106D7maqBO5biJUlqgPlRkTbAMog+XaUkVFT9NZHkcCvfJkHRumBSUF3+pzgKtp0T9UnTE11fv0uK/pZjgJutVAIvN+bpWV/+vPfYrmaUAHaGFNVS1aaPtg9kW2ZPGv9/JX/qf9uacj1ImNM1fo71iY7z3tKsDYLwB1sASMKjmlwVo6S9kygXe5FHzreQg1DBylY8+df7ezs77T6LEMnLNL7tdOgu6Zhf3c0y7T37fc/fPkBpyAG+geve7/KFlw+97R193RY29m+dZesgj41b2zB29s2r5vAu8RalefvHn44LsUBNsA6jYcQXhj6g02AWOYHkf2y9fPT/fQPm5rk1NtGxOC7yuF+ha4JQLrvPu5leW+e+YWmqcBHTacXDDtblu7yn37heNZ9n77fd+bk8//qikjxyg1XyR54o5a93tb6MZMwbZmiWq/9oP3bxpkkQi6AdRJ16U0CmAoNw8LPY6+wRrKpcBbIz+zNE/zPVtwmWGf98q9f3J5f+VXZw8+lnU/t260/3DrHYObbYJuAKLsd869359NYvAfNmXfN4H3Ehb2ex91OflO5GqOpv3aCrbJcAOIiSpvQsjWhlkaUqVlxFGcPGPDNEJLs8FZHBmy3KcsdDYfNlFLMk4uA3Us117udUl2CwBG+b3fWpTL6NamNF0j8F7CwhOXae6k3qw2rL/tUify+zbdNdhHSbANIEaWgJGMdxiPY1x88G15XjyNClWZOgsktv4P6myeBN2zLmMTNZWW07EcQIiuFTsfvCtr47VbFzLfmeK3qhF4L2HeuS2W4xYH24z9AtAUfhtMGgWMZALTMVIsPj74Do3NG6XniODb1jBwaqq3N/m00xmNlpYDgIUW6NR47bZs1TEfUvD9xKDvRJwIvJcw5XqPhY7ZvPGTBNsAGo1xWJPzDdbSnD5zzqFael62bb17sDhupaCb4NtlKtUP/1nLKS0HkIsW7f7bZNHu7pmPZfm23nyvPxtr8E3gvchCicJ02jF6U2LMDoCms44VQ7pQ5QCLF/XR4niWzuU++O7yc5alTD+N389NaTmASWj6gapmMjRjHATfMc76JvBepN8P71kK3WQBQBNY+lCwPzmMcvO4adZ3nuD72PGTrotW3HCdm5Tfz03XcgBFUNWMFvIy7PsezPqOLfgm8F6k1+s9EDpGb+IA0Aaa25tGASP7vNMReMdP79sa62mlc/7ZF464F4/+zHXNpBlvlYWynxtA0VQ9owW9rMF3TGXnBN4jvjK7f6cLzKJUhqjI/U8AUCfLWDF1fcZ4tsCbfd5101hPzfrOMm1Es767FnxPEnhrFJDKQgGgDD74/sgqcywW1Z5vAu8RU64XfFI0nxsA2sLWYI2gMY2lwRol+3FQUKngO8sCeteC7zzJBZWU/6vkZvgTt692AFAmH3xn6Hg+CL73zu7f7mpG4L1gYXb3lrRj9GakFXMAaAsFIqEMIBnvsFCWkBnR8fDjxrIG3yo978K2C8tC0pXHD4PuW9ascABQBd/x/BO3f9T6Lb3kf0/WPeebwHtBv+/2hI6hqRqANgrNO1bQSOCYLvT+oICNxzAePvjOUlatZmtdGTdmfVx80L16FVvwAFTv3k3rsgTfmvP93EKytRYE3gt6vd7m0DGMEAPQRpabbEql01kyhDyGcfHBd2jhaZSa5HUh+LZ0NifoBhCDJgXfBN7uUlO16bRjdGNa1GxLAIiJpcEaQWM6Gqw1k8qqt229O1lYv838PX7cWJuDb8v5/M+Tm12CbgAxyBh835oE33+RBN8rXcUIvN2gqVpwhFiWN2UAaBJl/kIZ2xMnTzmMp8cvtFeekWLx2rzxzlyzvtv6nFoC74sX33MAEIuMwfeGJPj+qqtY5wPvhVKDYJc7S+dfAGgq9ihPLvQ+QeAdN836zhN8a+9321i2Tpw+8ysHADFR8J1h1NjOvbMHH3MV6nzgPT8fDro1QozZ3QDazLK4SHfzdKF9sSxexE/B932bNpiP13OqbudtGzem6o1QBce58xcdAMQmw5zvnnP9x6ocM9b5wHtqqvdI6BhGiAFoO/Z5T86yeMFjGA8tgqgKQc+JstZHjp0YjA3T77NWuel722b1qvTxYG+R8QYQoeGosY+7D96w3HK4HzM27Spwjeuw5EHe4gJN1ZTppswcQNv52b1pGdnXT/3CYTwarNVHmWdfUXDlr99LPi4OPo9+reh53G0cN6rzOe01f+78hcHjqptcAIjJiiToVub7//vN/2NwnQr40EKzta27d+0460rU6atlv+929nrpx2TZ7wUU5QJNa1ADjVU6cuzlsV9XsJInG9gVvsFaWlDHPu+w0eB4cbDsF4bOnX935Nf1l+9bKkaaxrLFTuXmq1cReAOIj4LvP9x6h/uLZ/7Wcriarf2H5POXXIk6e7UclhT0Hgodxw0m6qCyRV+6OLrXbvRGyO8nXX7ttZcyDv7ro9/jf23Zs4du0/UuLfAWBY5cF8dTeW5alrCLgfdogDz6a5+NVhC9OLBumjaOG7UE3m+dOc9IMQDRumXNCvf7G6fdXx+esxz+6BNPHvzRIw8/8DVXks4G3vPObQltcFf2h6ZqqNtoWWRRN6VLBfPD/3ZlAD/666X+G8F8u9garJ1yG9avc1haqDzXB5dNfW8JZaOHwfSVX2s7PZdtDLwtP5PKzQEgZjPrbxpcq44eCzaI7c33+nuT5Ozzu3ftmHMl6GzgPeV6wfbxNFVDW5URzI/Pto/PxhPMx0WPu/aqhjK2Ond4jpZm2+f9TjSB9+I90f6/xVrSHaM27u8Wy9YJAm8ATaCs9+un3nFvnQm+j2m/95PJ562uBJ0MvJOVjBlnaKrWxj1bQFnKuClPC+ZHS+yXKqcfF+AjnSVjS7n5eLbO5r8o5f2l7gZjXdXm14KunWnbI944RbNAAM2gTufGZmtbvvI/7X/03/2bHY+7gnUy8O733aOhpmptXcEGmqTMYH6S/fKLv79NFBCG9nkrcCTwXpotSxgew9TEBmNd1ebXgnoWpAXeFy6+7wCgCTI0W+tNTfX+Q5KoPVB0yXknA+9er/dA6Jh7Zj7ugLKEynlRnqIDlVDzu1A5fWwl9sp4hwLH4SxqJj6ME2qwpq9pbjTZ6ObT67fNFTXDrROvjf368Ly9MLihBYDYqdma9nwb9nuXUnLeucD7K7P7dyafVqYdo9VrSlNRJi3sPPXMdx2ar8zmd3Xsl9fx4cDxLfZ5p7CU6z/7whGHalyucrnuioqX0V/rXH7x6E8HzQOzaHt1nOVe6PSZXxF4A2iMDPu9Cy8571zgPWUYIbb+9o85oExa3Nmw/rZgSS+6qYyMZ5bmd8kqb/DPY5/3eG3scB0Lf/4qiL7869+6YqFq8e8ttJiUNeiWtveCsZzLv6TBGoCGMe73LrzkvFOB93B2t9uSdozesOlmjioo633s+Gu5AixlJP3Fgr2dsCj6PFGQQuC9NB4Xm8vB8TVXBczjMtNlyVuB0PZFFkvPAmW8AaBJVKVz98wtlvnehZacdyrw7vfdHpqqIRa6mbln5g73/OEfu6xuWbPabd74yav++1L7l/2vlyqJHv1vw18TzMNmuM8bS7EEK200rqR70mx02fx++6wUdHdhW1qos7mhXBMAoqO93idOnrFMZ9iSJG+3JFnvQ25CnQq8e73e5tAxG9avc0BVdL6dOPlm5kZrR46dGNwo3rdpwxU3r0VnhsbtX84azNMsqn2Y550uFKzEbjQbnRY8j/66qV48+jOXR1cqG0KdzZnlDaCp7t10u6nkXFnvJPi+Kwm+z7oJdCbw/uM/3b/dBWZ3a/WavXmoWt5GawrYn3rm1+7B+z9T2k1vGeOzRrs2Xxmgjw/wr/xv7171PaiHMoUsVi5N1VMxBd6hbPRSZd5doIZqeSt8ulIhFzof6GwOoKkylJzfOj/vHk0+73ET6EzgvWxZuKmaml0BVZuk0Zpu7L/+zUOD4LspN8tlZMfGZ9vHZ+OXCuYpsc9G+7wJvJdW5iJuWQ3Gukavd/XZyKsrGW86mwNoM2vJ+dRU798mWe99kzRa60TgvdBUbXvoOBrioC6TNFrTzaMy5k0KvotWxs+dFszb/lv798szVmy8LIH3MEiuv8FY16jEPH+2+yOdOe8t90Z0NgfQZHfPfMz9xTN/GzpMjdb+Q/L5YZdTJwLveee2TAWO0QgxbmhQl0karYkPvrdt3ch2iYIUfT0oar/84u+vG+XmS9PrMNRgTQGNFsxQvWG2+6TLq0vXWcsCA53NATTZLWtWDDLfR4+9GTp0Z5LQ/Z/zNlrrROA95XqPhY5hhBjqlrfRmjcafFO9EZ8y98tLeG98OfvlKTcfT02p0l7PTW6+1nR5G6p569aucV3hqy/SFvxosAag6bTX+yfHT1sarSnrfcjl0PrAW+3fXaCpmt5QCFQQg7yN1jwFT/p+dTtnMan9ygzmtQhkqcCg3Hw8ZUXTAm89bgq+qVKp1qTZbunac6afNy3wZqQYgKbTlq+Z9Wvc946+Hjo093ixUAV24/X7bmfoGJX4AjHwjdYm9ewLRybO6KCbRvcZW00axLTVurU3BY9hHnr1nn7usJtEl/Z3e2rkl2Y4NjI1SwQA0dNe7w+GG0X6rHdmrQ681VSt1wt3MyfbjZgo613ETZ3G5BB8owoqN8fVLFlRys2rpUWiSR/zrowRG2U5l8+dv+gAoOk029tgy0JVdSatDrzVVC10jPZp0VQNMfGN1opA8I28suz5VtaWUWxXs8zEztvTAfkUcT3s4mK9JfB+68x5BwBNp0ZrNycfAbmy3q0OvKdc75HQMeyDRYzUrKqorIqCb5WeA1lkbbY2yTzkNgu9jrVgkbexHbJRtnvSBSItpnQx8LbO8gaANlDJuUHmrHdrA+/kgZhJPs2kHaM3EssePKAOKjkvim44v/7NQ9zgozTsVV6aJUjjsSufAu4ist1dbYRnqd6g1BxAW2TIev9bl0FrA+9+3z0aOqaL+7TQHEU1WvO0r1HBNyXBKIOCRwLIq9kCb8rNy1ZEtlu6NEZssdCiw1tkvAG0iDHrvT1J9q50Rq0NvHu93ubQMUVmFIEyFNVozfOzvgm+EZLnHCGAvJqlQzwN1spVVLZbujz6LdTZXLO86WwOoC2sWe/5+XCy12tl4P2V2f07XWB2t7IQNFVD7IpstOYRfKMsjBVbWijrrcCbbSDlsQbdoQWSru7v9uhsDqBrLFnvqanev7VmvVsZeE+58Aix9bebygeA2qnRWtFZFgXdKjsn04Zx8mSudF5Rbn610LYmBd28Fsuhc9KyIKR7gtDiR9e3p1mSFXQ2B9Amynob5nqvTLLeO51B6wJvze52gTFievOgmzmaZPPGT7qi6SZTwTdZSizlwsV8mStmel+Ned71ef7wS8FjdE9geY66nO0W23nMPm8A7bL+9tWhQ3pJ1vtzzqB1gXe/7/aEjqGpGppGN3zWKg2VpmfZF65RY8z6RlFYyLmaJWChUqB4J06+aVoI0jXz9JlzweO6HnjrfSX03kKpOYC2mVl/U3LtuyZ0mGm0WOsCb0tTNZXuAk2zeeOdpoBa85QfvP8zmXoYaNY3wTeKoEoKgsgr6XUbCr5pTFe85w//OHiMr4ALnbPWrHjbhd5X6GwOoG0UdH/CkPVOkr8PhA5qVeD9x3+6f7sLNFXTGydvnmgia6M17WlUlofgG5M4d/5dlxfl5lez7POm4WFxrOPDdE3VcaFjV68KdrbthNDjoM7mANA2hsBbyd+HQk3WWhV4L1sWbqpW5FxkoGrWRmtHjp0YfM4TfKv0HJgE5eZXo9y8WpZFRD0nlmy3rFt7k4O1sznBN4B2Wb3qestoMQXdM2kHtCbwXmiqtj10XNf3aKH5LI3WlD1TmaWC7i98bkumKg8FTWq6xngj5EW5+dUs7z2WfcYI0wKiJdt936YNg8+WCg3uHYYsC7lvnKJRIID2Wbd2VeiQXvK//5B2QGsC7/lAJ3NRcypmd6PprI3W1FhIwY9K1JX5ztLJXx2WFXxT+tpdkz73lJtfSe89oR4NLFZMbjg+7LXgcbqG+gXJUEd5PXfcOwyR8QbQVSo3NzRZm0krN29N4D3leo+FjmGEGNrC2mjNl43rWGV3smy10A3sU898l+AbuVBufrVQ1lQBIJUmk1GJuW1v98cHn/WYh45nEspllgUkAm8AbWRssqaZ3mMrsFsReC+0b59OO0ZvFpSKoS2yNFob3euogN3yfaPfT/CNPCg3v5olgGOed37DbHd4wWe0+s3yeHPvcKVwZ3PeLwC0022GcvOpqd7/Y9wXWxF49/tuZ+iYLMEG0ARZGq2NBs7K9GQNvlV2TkDQHZaFFsu5R9b7SpbHrKjXWRcfe0tDNQWNPtst7O/Ojs7mALrqljUrJio3b3zgraZqat8eOo43TrRRlkZro3Tjafne0T9DwTeBFDxlDUMlpwpqKJ2+rKrO5voztM3k6ecOd6ZaRQsWtmz32isytqHHW88Z+7uvFDqPL1x8j+AbQGtZys2n+ss2L/WFxgfelqZq69au4Y0TrZS10dooZcy3bd1o2ivu6WaeWd8QnTe6tqZR0E2lxGV6zEJBy+unfuEm5R9zve61YObHC7aZFhlChtnuy9U+lj31zO++muV+6vSZXzkAaCNLufl8b/6Bpb7Q+MB7yvUeCR1DUzW0WdZGa6M0mzbPrG+C73azZEl1zliurZwrVwrt81YgOHlH+Tev+PNU8fLkU99ubfZbmW5bQ7Urt9gwvzsfS+XGL8l4A2gpY7n5kg3WGh14753dryHlqYPKdXPIGyfaTEG3pVv54kZrnm6iCL6Rh86d0KIPnbqvVHa5+bCp3dVZc73+FXy38XVr3du9eKFodIFiHLapXY2MN4Cuu23th0KHrFyIU6/Q6MC733ePho5hDAi6QHu2LTdDixutefrePMH3Ull0dIe13NwS4HSFJZA7feacyytU2q/XbZuy39Zs91I9LUKPs2VhqavobA6gy25ZE15En5+/ejt0owPvXq+3OXTMaPdSoM00pztkqUZrng++LRk5Tze92kNKRrNdLM+nD0gs5ebHjr/mMKTXWShomSTjbVnkaEv2e1wVz2Lqg7G48k2Pceg8J9s9XiipQXM1AG1myHhrrNjnFv/HxgbeX5ndv9MFZnfrTZOmaugKne+h7KMs1WjN88G35c/xlGFj1nfxFBQoqKgjOMoSeOu8C2UFLUFOl4SClknK87M0Z/PZ76bOW7fv7b56Ad62v9t+Heya0L0Vnc0BtJn2eK9eFYwx21NqPuXCI8Qs3Z6BNrE2WhuX9RZ9/7atd5v2jXsE38XxAfcwI/nTwUfsgZHlWssousvKmuet11/W79P36LWra0KTXr9Zst1LBYmW11SW6p+uYZ83gK67OVxurn3eW0b/QyMDb83udoExYtaOu0Cb6Ly3BMy6OQ+NGFIQv7gLcBp/A0/wnc/igHs046m99FVmjLNkvMXSwFIzvTFka7CWfazYJKPbdD3Q67cpCyTWSpBx281Cj6+lkqPL6GwOoOsMY8W0z/uKrHcjA+9+3+0JHUNTNXSVtdGablxDAZb+rKzBt/Z8M7vZLi3g9qzZvSL/TSGjQQnl5tlYH6+sJl3c0HmmRR59xLyApn+bZYFg3LWQbPfkLO8x587/xgFAWxlKzXu9nruiH1kjA29LU7UN69c5oKsmbbQ2SjevS3UETvtzm5Q5q4sPctIC7lHKSMZcck65eTarV61I/Xqexauizg89TzG/hp994YfBY4ZVb0ufk5YGdOzvTqeFo1DwfZrO5gBazLLPO4lZPz36+8YF3n/8p/s1kHw67RitVLNajS6zNlrTjbXlZl0LWdu2bjSXXiqIVFAZKmfvotGAW49/lixwVSXnef4Oys2zCb1H6TnIknXWsUVmqWPNfg+vWeEyfFXqjAsMLYsadDQPC53DlJoDaDvDPu/pvbP7V/rfNC7wXrYs3FQtS1MooK2KaLQ2SoFV1lnf+rObPrKoKFrgGA2486iq5DwUeC91DlBuno0lsMuSwbYcm2fPcmzZb8v5n9bjReefZX83wlbccF3q19XVXN3NAaCtVq+6PnjMVH/ZpUrtRgXeC03VtoeO400TKLbRmqcMR9bge9iZu7vBtwIiBS5FBS8xl5xbzjfKzYeKDrwt1QSqWskz7cNnv+tunmgfHza+LwVjxIpjqSw8d/6iA4C2unnNiuAx7/Xfv9X/ulGB93ygk7mMGx0CdFGRjdY8P+s7a/Btzay3xWjAXXSgXHbJeShLNS5zagkmKTcfsuyRzdLZPFQ+rb9Lz899m+4a9IDI8z6p83jYk6CehTTL36ufMW2iCY3VimN5nN46c94BQFutuGH5YK93it7UVO9T/jeNCrynXO+x0DGMEAOuVGSjNc8H31luUJWpffq5w60vNS4z4PbKLjm/cDE9S5UWeIeDybcYObcgNH1Dj5Pl9aKgO/SYjv5dep/U6zfvtiwtpCkAr/J51N9p+ftC17vQYobObarmbJjlDQC6Fl4bOmSL/0VjAu+FAeTTacf4FX0AlxXdaM3zwXeWskx1E27rrO8qAu5RsZac27qbv+Zgnef9ViHHLG5+p9ev+kBkrV7x9BquKvutv+vIsZeDx4Uq3vTnhCoDyHbbWao2KDUH0HYfCe/znva/aEzg3e+7naFjaKoGLK3oRmue/sxtW+/O9NrTjW+bgu8iA249ntqfaqlSkKq6nGdhqTqKeSxalWz7vMPl5pbxWOMCSv0bHn7w3tR90WmqyH5bt8Joa00aSzdz9ndnE1qoeIuMN4CWszRY2/sngz5lzQi81VSt1wt3M7eMswG6qIxGa6MU2Ge5cddNetOD7yIDbj0/Cra/+Ed/MAgeFLxaAoCySs7PnX839etp3YyHlUfpJdR6vAi+h0FLaEHMEiyePnPOhf6eUGZS550C8Emy31q4K3ohSH+2pSGfpb+Lpb8AVXPZ0NkcQNdpn3fI1PJlg3nejQi8LU3VdJNKUzVgPM3iLrrR2ijduOcJvi2BRUzKCLgV8CzOFKsJlqVKIcaS86IyuV2welV6R9TQ68Myos0aTOp8nCT7rXPx6988VOj5aB0fFsp2S+ix1OuNUvNsLO8plJsDaDNDqfmlzuaNCLynXO+R0DFku4F0uqkso9HaKN38bt74SfPxPvi2lMrWrciAWxnhcQG3Z32+JLaSc0u5OWPFhkKBnp7XtICxjPFYk2a/9RrROTlpRYt+Nlu2e61hr3F4f3eoUgNXo7M5gK4zZLx7vZ77bf0i+sB77+z+meTTTNoxesOlmzkQpsyX5eYya6O1UcqsK2C0ZGtFgYW6necpca+CHguV0RYVcKuZ1YP3bzJds7SgWEfJeShgCgU5lnJz/R2Um08+z7us8Vg++62FNOtreZReN5POrlfwHjLMdocz9Hka0CGMzuYA4NwHw8H3tP4v+sC733ePho5hlRqws5YwTxLI+XFFWW7YlWWvaz7wUnzAXUTmbjTgzrqHtKkl55YghpnetsB7XKZWi1ahkn39+XkCZ08LaV/43JZcTcf0utHrJ89rSK8/y/dYy+ItWxsoM89OgXfo/Lpw8X0HAG0WynonKe9Bxjt14ncMkn/o5tAxlr1dAIZ8o7VQkKsgTsGcbrzz0E2sbtizNFFTh2TJu8d0UgpkdMOv0UVFNH5TwK3r0yQNm3zJuaoCQhTg6DGfJNAqihZfQlsW9Fhn2ZrQRn4kU9r5Ni5otCy0FLEwrX+fphfo+dJ1I08QrX+rXtfW6jTr3m7rnxd6rPRnEXjno8curYz/jVPpzf9w2bnzv3Evn3w7OV/PDSoFfnn+wuC/L7/2miSjdu2ge/Ita1a429auGvy3tlEjvp8cPz342fUY+J9fPrLqt5Jz7QPJIuCH3M1rbjQ1tGoa/fwvnzwz+Nn1cTFZtPLNCZVR1c+8Lnnu9fy38edvMj0fb6QfslL/F/Wr9iuz+3e6wOxu3dDSVA3IRsG0ZimHbqB186sb27yBnJ/1nTX4VgBcZUCmv0/BthYaitgrXUTAPcqXnIcyxL7kfJLHzvI8Wa65Omf0OKRlGvVY699b10JLLPQ4HTs+/nH3ZfmLzydb4F1cl25dC/Tn6TWadRa7z37rfNDznXYOWbPd1h4ICgpDfx6Vc/mpQWBa4H1uJHjC0l4/9Y773tHXxy5SKPi6cOY999aZXw8C0xU3vD4IvmbW39SKAEznyPeOvjb42cbRz64PBabyidtXu7tnPtaKn1/P79FjbyYfp8ZOAdAihD50jvz14blk8WGFu3fT7QTgkTAshE3r/5a5iP3L7f96rwsE3noDZ5UayOaaZcsGr5vQzfP7788PPqZv/qjLSwGYAkfdcP/6XdsN2KnTbw9GJE0nf6/+rWVR4Pf9l467v3r+++7VN34++FknMWyadtcg6C56QXD65n/sXvrZXPDfqMdukgVJvwiRRs+n5bqrP0uPaxrdsH/qjulSn+fYKSgMPU4a8bY4u/vdH/wk9TWl194/+71PuyL51/Mwy3ku80KVnm9dd65ZNuVuWr3qqq/7AD3052p8mLUaR49taNFKfxb3EvlYzt9P3P7RVmZoJ6Ug63/7wUn3nb955Yrsbvj73k+u9ecHQejya5eZ5gjHSgHnM8///eDnyUJBuL5XblnT3NfuieQ5/ItnjiWvobOZ7kF0vujn17nw2zevdKjX2++8O3gO09x//+e/Fu2djmZ3O9d7PO0Y3QD8webfdQCy042zMmahmc2TBnKi1+odt96c/Flngn+f9/Y75wc3cwq+iy6dblLA7SkwXXXjDe7vXnkjeKwWORSk5Qlmiwy8V934weRx/vvUY/TY69/Z5fnJ11/3geBjruBmtBxav//uD46lfo9eO3fceosrg/4dOg+GXdezlRLrOdfrTgG4/ozR17cqIEJBnKj03Xpd0J+p60mazRvvjGKLRhNp8Sd0XVJ2btWN6TO/u0ZZ3oPf/smgtDwvBV3++5sYfH77hePuBy/9l4neg5UBbmrwqSy/Fl0m+fm1YKHg/bdv/hCLWzV6+53fXKrGGOs990S0zdX6fbcndEyeZi8ALqui0Zqnv8fazdtTdixLmXqIL21W0zRf0j6JSZqm5VFFl/OiSs1Fz7n6CYQUVeLfVJYu8DL6nFZdZr6U4Rz6uwYl33lHjw1fiz+79HvLdANlu7P8faExYvqz2LKWn2UR7peUm19Bme7/+MzfDrK2RVCZuoK4JlHQnVZanoUyv/rzmkTPl563Iug8+ovkfBpXpo7yqfIk6ANuOtrA29JULW/TJwBDvtFaiG+0VgTdpGfZ0+vnAk8SfBcdcCv4rTLgHtW0LueqAgh3Pf6vUXW0r4OlSaheA348l6VLd1XnphbT1NTPci1Zil6Tem2GmvF5WRqqsr+7fJbO5owUu9J/euFE4YsRCuJ+cjxcLRKD0H7uPPTnNWXxYfhvLSbo9lRB8b881+330Tpdawi8p/rLbowy8P7jP92/3QX2dtOBFCiGFrAs2R4FRkVlJXXjnCf4DmWuFis64FamTbONVeZaV2m073JuYdkrW7YsWe+iKhuaSOdTlqx3bF269TyrXFuvj7zZ7xMn3wwel3U7B/O7qxF6TorK7LaBgq4ToZLUnP768KvRZz2HjdSKDTo9/bmvR95FXz//iyUtEKjs3u97R7XUcT/kvf77H4oy8F62rPdQ6Jiud8EFimIN5IrOSuYNvi0352UF3Mo2x1CSqkDBEszmKTm3PFZZ98JqcaeqLQ1NpvMrxDcfizWLq9eHXitlvEdbK3RGMb+7GupsnobO5kNlBl2ioLusoLYoKrEvU+xZb/37ytx6oeefkvN4RRd4D5uque2h47rciAcomjXbVnT5soJva/ZWFBRqnvW4sncfaBYRcCtQVPDwxT/6g2gC7lHWzF/W56yMwNua9fbznrtqOJf6Y8HjfLl5mrrfI3V+5s1+j/8z78h87oXOJwXd7O+eXGjxQoEAwfcwI1n2fndl1GMNvDQ2reyf/42FGdgx0mug6BL7xfxoMkRpZXSB97xzW0LHZG2sAiCsykZro/z+0Cw31NoLOvrv8FnAIgPuYdbu45lv9KvStJLzLFsauizL/uU0MSxOF5n9Hi5K2BszioLu0HnPIn4xLNdJ9nmrCdh/cWVT4FV2cJdXVf+uWPe6v1HRgkDs5fZtZJin3nMxBt5TrvdY6Jisb74AwupotOYpW6LgO8uCmgJsBeA+4LZkAdM0JeAepaCh6JJzyz7rPI+Nf3xDdH6R9Q5nvdPElsX12e9Jyt/zBO+WnhA0ViuGZQGj653Nle08XdFe97L2kE+qqoBwkhFtZTpW0YLAcMQa5eYxiirw3ju7f4szNFVjhRooRx2N1jz9veoUniVg0AJAFwPuUWWVnKfJ+xhp0dSyn5as92TnYWi/bR3089yyZrXLQ+/5eRbcLf0guJ8ohuUa1PWM91sV/vwxNrPTwkNViy+xbm2o8nkh6x2nqALvft/tDB2Td1wJgLC6Gq15eYLvvJoecHtNKznfvPGTwWO0QGAJmtoqTxOxUTF16VYFhSpT/DaQPCznzFJCjdUUdDf1dR8jOpunqzIQVOAZW8bz3PnfuCrFFnhX/Zx0vcIkVtEE3mqq1uuFu5kz9gMoV12N1jzdvKnsvKxOw20JuEcVWXIeCswnfbys55d1pnNbWTvBLyWGLK7KvP02EF0rJu27kJXl2kQ382KFHs+uN1erOhC+cPF9h3hU/XxQah6naAJvS1O1dWvX0FQNqEBdjdY8/d0Kvovs59DGgHtUUSXnZQfeYmkgpkWConsJNIm1E/xidWdxdW5p7N/Xv3lo4m0gXp757rb53WscirPihutSvx5jFhYAqhRN4D3leo+EjiHbDVSjzkZro1RCXdQ8YAUj586/a2q41ERNKjm3Zr3L6CXQJHmy3nVlcX3ArY+iK2HKCrzJeBfL8nie7nC5+YobPuCqZOiyXKnl117juqzq5yO25x9DUQTee2f3zySfZtKOyTNKBEB+dTZaG6XsaBHBt27elYFTYKDyVwWfbeueXUTJeSgjVVQ2dfPGO4PH6Lw6cuxl11V5st5VZ3HLDLjz0nnD/u7qWQLvtzrcYO2DFQZCq1dd72JTdSC4elV8FbJVngMfrHihp+sM1Tz95ONsFIF3v+8eDR3DyA+gWnU3WhtVVPDttTkIn7Tk/MLFi6nfV1Swopt0y9isSfcHN13WrHdV+7urDLizZrwZI1YPy3Wn6gZbMVEgWFXW9yMRBp362W9eU83EBS08xJhhv2VNdRMnqvy7YN7DH0fg3ev1NoeOsewJBFCsuhutjSprX3bbgvAmlZxbnlOy3vasdxVBt14r2r9dRMBtne2eFWPE6qHnMxR8nzufvrDXZgoEqwqIb1u7ysWoqmDwtrUfcjH6xO0fdVWI9flHBKXmX5ndv9MFZnfrDZKmakA96m60Nqrs0tC2BOFFdjkvk7WXgBZ28uzzbQtr1rus98nh4seJS6+JSfskLG50GA7Wsj33oTLz4UxxAu8yhMrNu1xqLnfPhKt8JqWS7nWRBl4z66vp1VRVgJuVFh6qyMRX9TjjMks1z9SUm6s98J5y4RFilnJEAOWIpdHa8N9ynatK04PwvCXnakCXpujnwBJUVrGdIWbWrLfO1yIXKPzjrvNf490m/bN1Pmomd9bJAlmqMnRsaGGApmrlCV0fNFKsy53NFXiVXW5998wtLlYKOssOCj9x++qoG4uV/fyoqoIy83jVGnhrdrcLjBHTGzPdzIF6xdJora7Kl9Eg/E/+7C8HQbilnLVOTSk5zxJUtq0ZXhbWrHcRCxSjAfeLR3868bmh7So6FxVwL/VzWMZQWTFGrF6WRY0ul5vL72+81ZVFAWes2V5PgWdZTcb081dRVTAJLTyUufjy325la24dfmm7rtW7x9vSVE1vkHQeBeoVS6M1y7VAN/f6t5bVPEk/o4LAp587HH0QnqfkvI4AvMqgsqmqyHqXEXA/eP9nko9NqVNJll97beqfk+XnOXHyVPAYMt7lsXU2P++6TE3Wfn/jtCuags5/df9/42KnrPe9m253ZfjDrR9vxBgt/fxlLD5o0YExYvUwLRD/pubAu9frPRA6hhFiQBxiaLRmzXjruqGbfYLw7CXnoWCrjKoDa5Mt/fu6nPW2Ppc6D7MoM+C27KUucs9jqMyc/d3lspyfpzu+z1uU9SwyM6vXUFOCTlEp9D8vOPhWMBvjCLGl6HlSZrrIa5/Op5i3GbSdJfDe/cUdc8tcTf74T/dvn5rq/T/TjhnuBwvPegVQDd2wHjv+mnv//fnU47RPuIxFs7ffOR/MaOnvvf664fxK3WQPx1atHXzo1woqQvuY89Bjopv+v3vljUEXbv1bRf+Wa5bVdqkd/N36ufW8hagpVSjoGi7AFB+43LR61eDfGPr7yzq3mkLndOg1oAyxpSmpjtPe7b96/vuDBY3Q6zpkWFJ+l3mBwNPffer022O/rnPCMtlEP893f3As9Zjpmz/q7riVm9Oy6Hqj61/aufRb113r/q+3svgx3Ifbc2+cOucmoSDu//6Hd7pVN1bXA6UIGvn1keTj5BvvTHTtUfB6/+bfadw5df11/2jwbz5x8oy7aBtFNZYqKH73zpsd6vOT46fdW2dSq7POfuvgN/6H2u4G79/+3/37JOM9k3aMmrBQEgbEQzf977//frBrsG6AdayCqSINM8zpAaRurFfd+MGr/vtSQbj4ALlIo0H491/6++TX5waPm4KROoJw/b167NKCG7FkOssKvMWyQGANKtvKP0aTLFAo0FVWXEH3pB3KJW/A7em8DF1TtB0h9NrRz6XXXJpP3TFd+HUJV3r1jX9IXdzU9ZGuy0MKvrUnO2/wpcdRQef1113rmkiLBQo+lS0MBC1L0l7pB+79RPKa/qBrIi0aqAP9JD+/Mv0sZNXv6LE33S/PX0g75KdJ4P0/1jJdfthULdzNnHIwID66AdaNf2jfpUpXdeNfZI8Gy029JXjUn+MDcB2v8vDhR3h/aB7+z3fuyKBZpHpX6HOV/SsUFOnnK6IzdVn8doZQEKagUdsIukpl+aFycl+WP/o+qt/rdVlUub4mjuQNtkdZX9eh14vl9ct9Rfm0OJT2GvadzasYq9QEyljvevCuQcbs2PGfBzPgetw+cftH3G1rP9yK7tX6+RU8agFCwcvLySJEiAJOlVa36efXz/O9o68lP//bwbJl/fxadIl1bFwXXQyXmp/V/9Vy1Zt3bktoc7ne0JndDcRHN7+qRtG+5jR+36iOLfLvDskaWOrP7EIQ7hvkqTN7zBTIhf6Neo61J12LQF2kc3XY5T19gUKvvwfv/0ihAbdv8mZtiFcUy4Ja6OfTPQVVdOWz3Lups/nqVQTeozQGSx9amNA+eM08P7eQQVt+7bLkcf3AoDRb+5jbuGihIFofCjpPJ9nfN069c+nnF5WmqyFZVbOwq+YDcHk9WXwZPv+/SR6P9y99XefAbWs/xKJVhE4HKhb6/f6P9LmWZ27K9R4LHUNTNSBeChQtmUkFRwosi8oy6UZfH2k34ZNkdGMIwssso/ZdzrUHM1bWrHcZFRVNYlmgUCD69W8eKqScvMyAu4hKFr3uQ6/91auYbVsFy/OpzuZNaYRVtWGAtbyz2UwFlT4I76qu//xNY2gYmcTd7lX9ovLAe+/s/i3Jp+m0Y3TRphwMiJv2dKoLcojPuhUlFHgXNQ5rcRCuIMYH4WWM3LochA+DT1X9lBGET1pyXkUlkiWo1HOgBQRLN/Q2si5QTBp0V5HhtmVI089X2/xu9hVXwTbL+4IDgDawdDS/prfslcFnV7Ek4t/Z66UfQ7YbiJ9ulhX0hGYr64ZYZbFFva51U5d2E15Gx3IFHMOM9PDGfTQTXkYQPjo2q+ggvAkl5/5nDjVaG5ab30bWuwR1lZTnxf7ueOg6Fa5MIvAG0A6Wxnjzvferz3gn2e6VlqZquuECED9rozV1Ty5qH3Nob9OkzcMsmh6EN6Hk3GfmQ9UNZL3DWe8sdF7p3KiyjL+IjHcos6+/g74x1dFjnfacTDpCCwBiYVlI3L1rx1F9rjTwnndue6ipWpfHxABNU0ejtdD1oYzgN01Tg/C8JedVBmMKAEMVFcp6d7kZZ1FZb1/BUlfFWXgLyfhSPgV4ofNYCxSojvbTpwXeFyacWwwAsTDs8T7qf1Fp4D3leo+EjiHbDTRLlkZren1P2lXY2tm8jkBsNAj3JfZ6XMrIwk8ahOctOa+y7FgVFcpoh7LeCs71s3TRpFlvfa+C97rLsMOB98WxX7PsY6fMvFrD6/z4rSJaSFGWSE3EAKDJ3gp3NH/V/7qywHs4u9vNpB3jZ+sCaBZrozWVnD94/2fcJIqa5V22YUA0vNmPNQiPveTc7zMOZb312Oq4ro6KypP1jiXg9kILOmmvafZ3x8dynVaWiMAbQJPpOhZqrtbvux/5X1cWeCd/6Z5QUzVKwYBmqrLRmu2G7p2ogrCYg/CsJedVVxJYst5SxKJOU2XJescWcHvh3g3jmyaGOprrWsAWtmpZrr+/pMEagIYzXMf61/SWHfG/CW25Lkyv19scOkY3AwCaSQGS5eZWAdIkGWlLqXMMGe9xFPCoQuDhB+8dBIpl7k9WQPLsC0cG1Qia56xy/8UBti85j5X+fZbmaaMLDl1kff/UoleM2d+8vRu0yBZ6vTO/u3q+s3kaw75IAIja64ZGkfO99y9lvCsJvL8yu3+nC8zupqka0Gy+0VqI35Obl60DcvEjxcpQZRCuAEWLHksF4b7kPFbWRZ1Jzqum81nvkKY+RuOCa+Z3xyv0mrWM4AGAmBkWEM/u3rVjzv+mksB7ihFiQCf4RmshCvosDZHGCWfHLrqmqTsIVyY09PfVOc/ZsqhD1juc9dZii7Y6xCZvxltTBELY312PUKUBs7wBNJn2dhtGIx4d/U3pgfdCU7UtacfoZo4VaaAdFDxaKPDLKxQANiXjPU4dQbgC8FDJbp2Bt3VRZ5Lzqun8nv4QZb1j246RdwvJ6TPpNz3aa1znedtl4cWU9wi+ATSWIdvdn5/vf3P0P5QeePf77tHQMevWruGNEWgJ32gtxDcZy/t3pCmjaVldFgfhKgkvKwiPeW+8WDK6WkiIMaNbFWvWO7ZO9nkCb11DQucs2e76WDubA0ATGbLdbmqq4ox3r9d7IHQMI8SAdtGeXMuNdN5Ga6EOyLEHkHkpiNi88c5BEP6Fz20pNQhfSt0LpFn2Mbf1HAgZjuUMZ721vSCmx8hybi1eULPt717jUA/LogedzQE0laWx2u5dOw6N/r7UwHvv7P4tLtBUTTcJrEgD7VJ2ozXLftC2B14qoa06CI+hMqmpGd0qWR4jvT5ieozyZrxDujrbPQaW55SMN4AmMu7vPrT4P5QaePf7bmfoGEtJKoDmGY4tKqfRmiXA7FLGs6ogXM/TJE3xiqCFWksWM7aMbpX03Fu61Mf0GOV5TYfmlutcYRtbffTYh7cFkfEG0DyWMvP5+f5fL/5vpQXeaqrW64W7mZPtBtpLwaBF1oZYecpSu2JxEK7Kg6LmGCvweeqZ79YefFvOq9gyulVT1jv0OmnaYzQaeJPtbobQc8BIMQBNdOLkmdAh/ampCjPe84FO5lJmp14A9dNNlyXzpptoy1ggzzbLmxu64eO/LgnAPzsIxIsIwmMIvpuY0a2agu4mPUZZM96W6wX7u+u34obrUr+uck19AECTGPZ3n128v1tKC7ynXO+x0DE0VQPaz5J5kyyN1vKOHuqyYbBaTBAeQ/Btzeh2ebyYpclhTFnv8JjAy4tplnOPirr6WaoOzp2/6ACgKV4/9U6wMWS/339+qf9eSuBNUzUAnrXRWpaGWLaMd7NneZepiCC87uDbmtHVaLGuVj80Lett3Y+tf6tlfzfqZwm83zpz3gFAU/zk+OnQIf1lburAUl8oJfC2NFUj2w10h7XR2otHf2oOksKdzcmiWCwOwu/btMG8Baju4Ns6tu7ZF464rmpS1juc8R4upjFGrDmY5Q2gbSxjxOZ78weX+u+FB95JtnulbXZ3eM4ogPawNlqzBknWm3TYDWdArx00ZbM2pqoz+LZmdBWoWYK1NmpS1tsyJlBorNYcts7mLJICaAZLmXni0O5dO84u9YXCA+9557Ynn1amHaMSMJqqAd1SdKO18M0czdXy0s3yg/d/phHBt/Z6W95P8syLb4umZL2XX3tN6tcvB96/CPw5/4hS84iEO5uT8QbQDJYy86l+72vjvlh44D3lwiPEyHYD3VRkozXrTTryyRt817Hgcc/MHcFjyHrbst51LlhZFgf07wst8JDtjkuos7lmedPZHEATGMvMnx/3tUIDb83udoExYr6UEUD3FNlozVKWSvA9maYE3/YeAmS90+j5q/Mxsvz7LFUV7O+ujl8MUZWSGhmqT8ezL/zQPf3cYffkU992f/Jnf2mqpKDcHEDslO02lpnPjftiesooo37f7en10o+x3BwBaC8FSbpBC5WL6gZO1THjAmzr3F9rp2QszQff1lJy3YTrWH1PlVuKVE2hvzeNMt4697q4+Ouz3qHAWo+PKgjq2A5m+TstQRxl5sXwi5d63fsAWx/KTvv/VtTipjqbr17FFkQA8Tp2/OehQ1LLzKXQwLvX620OHaObIwDdpkZrX//moeBxarSmAG4ploBaN4n0k5icD771nFmy2XUE3wq2tLAbXtD5WZIRvamTCzLKeitwDQVLeozU3T5GocUfPa+UmodVGVRbqLP5JxwAxElbYt4Il5mfHdfN3Css8P7K7P6dLjC7m6ZqAMQ3Wgtlr3yjNQVKS/0ZITRYK85o5jvW4NuS9fbbGCz7wttGz6F+bvVQSKOst16fVQew1iqWNFTVXQ6qfTBdd1BtQak5gJh97+hrlsMOjOtm7hUWeNNUDUAWCpKOHX8teAOoIEGLdoszlNaMN4qjwCjm4Nua9VYTMQWWXc56h54/ve7GVZuUpYjnY6lFujZJC6ov/7p5vS3obA4gZoamav3kf/9z6KBCAm9LUzW9obb9DRGAnTX7Ni5DablJp1Nu8WIPvu/bdNegqVMaPzqri1lv0c+tbRxpfBf4KvdLFxF4N73M/Mpg2peCNzuotjgXblgEALUwNlWbS7Ldh0IHFRJ4z8+7nVOB/ujqMkqTIwCjlH1TKXneRmv6fVrwd+Ei5YtliDn41p9v2cbQ5ay3mstpH3foudMxD97fnMBbz33MgffioPrc+XcX/b7bFToKvlfcsNwBQExeDJeZq6nal51BIYH31JSlzJwRYgCuZtmXK0s1WgvdqJ8+E563iHxiDr4t2xj86CzLeLs20s+tkU9pqs56Txp417m/+8oMNUF1HmqwRuANICavn3rHku1Ond09auLAe+/s/i0u0FRNN1mM9wCwFF0brI3WFgcBq1etSO1yzBzvcsUafFtHZ/msdxebfmrrl7ULfJVZ71AVS5qy7jOWCqpVTaOFPYLqq+n1N+wuv2LwWc9p6LW4/NprknNylQOAmHzv6OuWw/alze4eNXHg3e+7naHZ3V3dRwfAxtpoTVnvL3xuy6XMWChDxg1x+WINvq2js9JG1rWddfZ51Xu988rzbySozmapoFoffoyb//oobScKuW3thxwAxETZ7jdsTdX+X85oosB72FQtXGZOthtAmryN1qzjh+gvUa4Yg29r1rtJgWXRssw+ryrrveKG63IFuz4AHEVQnU2eoNrixMlTwWNuI9sNIDJqqmZgznbLRIH3vHNbAj3VlmyIBACLWRutqTzYX1esI8Wa3um4CWIMvnVOqZIitiZiMYkt67382mtdHgqkn33hhwTVY5QVVFvo3En/t1FmDiAuynYbAm/TCLFREwXeU673WOgYmqoBsLIEAcMb7CPmgI3AuzqxBd++kiLG0VmxiC3rrSAsD10XtMjSRT5oVrWAD6irCqpD9LoKXQtuXrPCAUBMjHu7D1lGiI3KHXjTVA1A0bI2WrOWmqM6sQXfWvzV+ZTWhE/IeseR9WZbyNV8pnpxUD3661hZFkPWsb8bQEROnDxj2ts91Z96wmUUqhQf/7f13c7QMWS7AWSlIMByIxnKYnqUnFbPB9/WQNoH32U9V5aRYQoqjx0/6brIZ71DQvvli0DgfSW9hh5+8N7k9bTJ3bfprsH1UfdW6krvs9kxC5WZC/u7AcTkrw/PWQ6be+Thzx10GeUKvJNs98per/dA6DjtwwSALHx5cIiCNGVT6Gwep5iC75gCy1gpoAupYnGiTT1hhlV/Hx7cC6mSRwtA+rAGy/411NTFCEuZuYLuvNsLAKBo2tdtmNudZLt7X3Y55LrazTu3PYnYV6YdoxsdmqoByCNLo7UQSs3rE1PZuaWcWn+/gu8ujsDMstebaja3UOJ9zaWs81Jl4Ev5+jcPma9J27ZubPR9FGXmAJrkwsX3kvc4U6+QQ488/MDXXA65Au8pwwgxst0AJmFttBaiEUKoTyzBtzWw1GKOspNdLHm2Lk4o611W8B1DoLlUUD3aqCzvv1HjEkO9BjxlxpveFJIycwBNcvTYm6Zsd5a53YtlDryHs7vdlrRj9KbEijiASVgbrYWQ8a5fLMG39sg++dS3U4/R+TI6K75LYsh6lx14lxVUh7x49KemCh3RAoiqfpqMMnMATXIuCbiNncz3Ze1kPirzFa/fd3t6vfRjLHvpACBEN6AqV5wkeGaPdxxiCL6Hi8IfC5bAdjnrbVmc0HMzfIziCg7rCqpDtG3G2j9A909tWPShzBxAkxgbqk2U7ZbMgXev19scOsbSpAUAQnyjNZVoTkKBAj0n6hdD8L15451JIHQqdTGny1lv6+KEz3oXvThheZ6VmV+3dk0UQXWIzmHrBAb9DFr4aAPKzAE0hRqqvXzyjOVQZbvn3AQydTX/yuz+nS4wu5umagCKpKzapFU0lJvHo+5u5wrSlM0OUWlwV6slLIvnfnGiDKFgfsUN1w2uCwr8FXjHHHTr3LVcf/QzlzXLvmqUmQNoCpWYGxuqvTJptlsyBd40VQNQh0mraCg3j0vdwbeCNkumtqvjxXzWO0Tl5mUsaoWem9NnzrkmUKbbes7et2lDa5IWlJkDaIrvJUG3dXzYpNluMQfelqZqerNct/YmBwBF8o3W8iLjHZ86g29r1lvduy0ls22kxa5QAFxW1jtU4aLO4LG/plUxYT139Fi36d7J8nPfvKbZHdsBNJ9KzPVhMJd3fNhi5sB7ft7tDB3j91wBQNEsgcA4ZLzjVGfwTdY7nZ4Ty+JEGVlvyxitmF/Tekys543Owzb1ErCUmd+8ZkVyfi13AFCXDCXmaqi21RXEHHhPTVnKzBkhBqAcvtFaHgTe8aor+Nb5pFnJIQokupr1tixOlJH1tgTe1nnYVdO/y9oMUj+n5RxsEkuZ+frbVzsAqNN/PjxnKTF32tddRIm5Zwq8987u3+ICTdV006RyUAAoS95Ga5Sax62u4FuLxZa/s6tZb2tJftFZb1vgHd8+b52PTz932HSszrttWze6tqHMHEDstK/7hK2L+StJ0L3HFcgUePf74TLzLo5dAVC9PI3Wzp1/1yFudQXfamoVQta72qy3ZTxYbM+HHgPr+dimDuajKDMHEDuVmH/v6OuWQwstMfeCgbeaqvV64TJzst0AqpCn0RoZ72aoI/jW+WSporDOYm6bWLPesW0fydLBXImKNo5dpcwcQMwUdP/HZ/7WeHSxJeZeMPCeD3QyF40dYXY3gKpkbbTGHu/mqCP4tlRR6M9XcNlFdWS9Q4sh+vti2eetDuYnTr5pOlbnmh7PNqLMHEDM7Pu6iy8x96bCB/QeCx1DUzUAVcrTaI3guzmqDr6tWW/t9e5i9UQdWW/Lcx9D4J2lg7kmv7R1W56eC8rMAcQqw77uUkrMvdTAm6ZqAGKVtdEa5ebNUnXwbcl6lzW3ugmsWe+iGtFZ7ivqbrCmc8368+o8vm/TXa6tNPM+hDJzAHVQwG3c1+3KKjH3rkn7opqq9XouFdluAGlGAyHdmPsAePTXi4+78nveM31PyP/Z3t0F2VHe+R1/usF2WNtYQMhCsbACnMImOBbeRGbLlDUmZZYlMRIbquzgKuslN+Emg5ybVC4CvsyFPXC1lQszo1R5q7ZKWzpjdrcUa0sc2aLWVsWlcczKsCtgzEtQlhcJmTULWc5J/7rPozlzdE7306ffu7+fqsMZMa2XmTkvz6////4/qsi4TEtGfdjw7RqobfieZ3CVgp4um0q6TlUVTlV/591Tvqls1TspaNrvT9bLz+yAtbife5UVb/tYczmhZx/HbX7MPP/SmcRjaDMHUDZd1/0Xx50vE1suqsXcmhm8g2r3FmO8nSaBFioAmqcugbgsVLybqczwraq3AkTcY8VWvbu4k4eq3vrak55LCucu0+KT6ERZXYO3tg1zfZ3TtmFtnoNDmzmAOrLD1LRedfCiqt2mYDOD98CYXb4xW0wMVQgYqgbkq2uBuCwKDOrQ6Vqlsg3KCt861rWq28Whoq5Vb7Ud5zG5++orL48dWqbXNv2sy/45HDvxjHPo37H9ttZ32tBmDqButBZW6HYcphZe111ki7k1M3j7JnkLMard6JJZIZhA3AzRVOpuVirboKzw7VLVtdcy51HVbRp9f9SOn/QzUDhVpTcLl8CqSdplXvKmCeau0+3bPMF8HG3mAOrmT48+lyZ0f7OM0C1Tg7f27jYJ24hpIcP13WiK8aCrBePkr8fvbUDe+PX/o025JbpaqWyLMsJ3mqquHktdGy5qdxRI2tdclWqF4izfH5fgXeaANX1NrsPUNPixCyf5aDMHUDdHjp82r55xfW8Ih6k9ZkoyNXgPh+bRpKFqaaYJA1lMBuDJX0dB+f3Rse9O/T2A6LGgSpzaPwnfzVRG+E5zLfMD93RvVw+ddNfXnvT9z/r90c9LQT/u51DWdd76WpNONlhtn2A+jjZzAHWibcN+cfp118OfKnqY2qSpwdvzvB0mgcvWK+i2+Kry5tBsq8zTfg+QJ1WtdLv5hmvDfXXp3GmeosO3rerqJE0cVXSzVnWbyqXqncf3R7837jrvMoJ3mgnmeuzMM9ivqWgzB1AXCt3u24aFw9T2mZJdFLy/vXxoj0nYu1vtX1SL2m08BM8KxLRmo8lsAFe4UgjvYttwkxUdvm3Vu+iqblPphJWqna+ceTP2uOxV78tiP1/GgDWdYHA9Eazr/ruyPqLNHEBdzBG67yrruu5xFwVvl6Fquv4N9ZWlNZsqM+pgfOH6kQ9femESue7Hp5KPH+d67eUkPScUIHTTn6fwrdc49vyuv6LDt0KUjo/T7ar3pwr//uj36QRI0t9RVOeKhqnpz3eh74dO4nWFy/eFNnMARUsZus8GofsPqgjdsil4uwxVky69sZQprqo8q8pMazbKNE8g3vx7PuT0e9Jyuc7QhZ5D4yFcAVyvd3T41FeR4VuhT/NMkqq6qojue+DLpmtcvz9Zqt5VDljTMEbXE3rqkOjajgmabp+ENnMARUoZujXBfF8QutdMRTYF78HA7PH9+N+gdkz2wb3YxVVlWrNRnroG4rLMW+2Oo+en2tB1U8CwreiE8PqZJ3w/efRE+HuS3s9cqrr2hE0X5wUUXfWuasCa/syka/wtnRzQwMYu0WM+6ft+9ZUfpc0cQGF+eGLdrJ16zfVwu21Yz1RoU/D2fZe9u9u3sEjbmk2VGa66HojLoAV90c9DGxyEoWz1lDZ8KzTYyndc+Hat6tpZAV07MV1O1fvy2D8/7+BtT8y40OMu637lTRQ38M76NG3mAAqgXKbQnWJ6uSl727BZLgTvpeVDCyZhqJq9/rEu5tmbmdCMWWywtQF5POjqse+yvZBak3ds/4xBeVzaHfPEULb6suH7e9/vO3URuYZvl6qu/j69RnSt3ViKrnqrohwXvPMcsKY/y/XkTdcmmI9zed296YYrDQDkSXnuTw7/lXnjrTQZbvitsrcNm+VC8B4OzZ6kvbvzXFCkac1mb2YksQsfG5o3fv2hqSF62r2LpJZmLUa0COVyjHLYFt8kCsdauOd5sm3aUDZCePXGK995hW/7s00KG7omWCffqHpPN2/V2+0677dzCcBpJphrTdTF0E2bOYAqnH/nvTB0/yq4d1ef0C1h8I6GqiW3mdsF5eyBX7RmI53Ngfiy0f30YBwXostgtxeKW8x3uepVhaRpx6LXrbvv/Fz4sSpuCsraezbPk3eTQ9nUhq6gxuUA1VBQyzt864RaUvCm6l1M1dvleIX+rINfNcHcpYVa9PXqPaGLaDMHULbXgwr3nx59ttGhW8LgPTBmwXc4+ImDRwxgTVaZ46rK9nOTv24S/XtVzUqqemvxRugqh8sCcHz7w6gyFy3iowD+WhjC86QQrseAbgqA+vsZyla+vMO3fn4K1EnPf6re+U+Adxmwdv6dvzNZpJlgrhkPXT65Sps5gDJpgJqu6U6nfqFbwuDtG+8Rg07ZCMabq8yzqspVVZnrxqXqLVrAaQ9gFEfBOamDRo/VWVWwqCp9Q/hn2Ep4UmhIS2FOQUNsu3IXB3BVJe/w7dr1ouv/u/j8L3ICfNKAtSzP3ehkmVvo1muK7aDpItrMAZQp5eTykXqGbrnUZaga6mOyNdulykxozo9r1VsLy65e/1cWl2u7XapSG63hUQhXFVx/dt57A29MRj8Z/l2qmmVtjUWyPMM3z/94aa71Th+8ixmwZvd1d3ls2PkBXT5xRps5gDLoem61lqcbonZhn+4VU1OXugxVQz5mtWa7DP5qYmt2W1H1rp7CkUuFK+21pHq+6eerm/4OtZ/mPZRNGMpWrjzDt+vzX50O+v1dU1TVu6gBa9o2zPX5rW3Dun4y1SV402YOIItXzrxt/uzoX4czw1I4G4TuPwhCd9/U2KWe5+0wiBU3AIzW7O7Rz3XH9tsutBDPEi0sCVRFcBmqlvU6ey30J4ey5R3CJ4eyqQKuiiqvGfnLK3y7Vr2zbJ/VZK4T4PX9S3PZhcv3Me1zU5cEuO4Brtd8l/DfZtFlOfEnPGkzB5DFfK3l5sVR6F4zNadrvNdNi1vNs7RmU2XGLKrUaOGYtNCbd/sczOa6hZgqb3kZH8pm9/HOe/9wfV2qsOvGULZi5BW+7YRznv/TuUyAjx7v7hPgXQas6USH66RxDT/Uc81FlyeYj4sulYl33TUfNwCQ1pyt5XJyFLrXTQNcOhgMV33fWzA1lGVvZkIziqYFY1LVu6tVryK5LP6KDKyq0um2Y/tnLlwPzlC25sgvfPP8nyWam5D/vudJA9Zc5zLoecsE8/RcTnh++pO/aQAgDVW4f7L2StrW8sBwJfjP/iB0nzMNcanvm5XgfsnkiNZsdAFV72q4LJi16C+aXq8mJ6MrSBQ5lE3h24ZwzC+P8K2fu8tJF6res6Xd9zxpwJqeh/oz44K8jkk6YWJpLaITbHBrM1eL+dVXsn4D4EZV7iPHT5tXz8yzbqrv5PI44Vi1peXeU8HdQtyBOutrr29q097MQBYKREmDhEQLdqre2SnoJC2a9XqUdp/gPNmWce0PnvdQNouhbPmwgdolfIsN7PZ9zvX5ryGLaad4t8GxEz9PnMeg76Wery5rB5fnvwagzToxZSeYuzwv7QRzCgERl+/9tluvMV/cfqMBgDiqbNsq9xzOjiaX90wDXaL/3H3fV2/0vPh283/5mX8aXuOkRZ4WH7pd+YmPb6pWX3rJJQboEj3+tfg+/867scfp811ceOdNC/mk77WqZ9deXd1UXb0Wbr3uNy+8XoreZFzDnQv9WQqNqijqpiq7HosfvewfGbjT92vrdf/E/PWLr5oPPhgkHv/rd98zv3z1b80tN14Xvt+5Pv/189Hzv2vvkXoe/vy59djvrT6n74vrCST9efF/5xUzn/+aYO46TE0nS6p8Hakbl9feL/3uzcFziuILgNk0sXz1yLPmhZfOmjnoeu67gtD9Y9NQ4Srg9+//WvBfb0/Swbfc+FsGwGZafLsMEmJQVjb6HmoKcZJ/9bufrU3nzcak8pvDk5WXXuLn3opuQ7gCiX0cKlDSfeQmj/Dt0lKdJly2hb7mDz74ILFFWY/ff37L1sQTE/pZqYIe93PSc2zaWkXD1FwHIqpNXv8eRFxee9Vm/oXf4eQygOmi4WnPmRNBlfv99z8w6Q0fC/6jSvcZ02Dhu9z/XP3j9Xt2fe3h4MOZ5RItNlzeGIGuoepdDpetf9R6XdfvsTqEbAi/8hMfC8NY0mMmLf2ZCoUKJzbscAlQsizhWz9XPS7Pvv1O7O9xDZdtoxNOeVa99TPS9z/uz5qcQK5LP57+6S+MC/3eO3/nVoMN0U4O8WvdT3/yavPb111hAGCcOv5++vNXzV8cfz54n5xrzaPW8geDwP14kFf/3jTchRXA7+386rWe590x60C9mWlhQsUOuBhV72K5DkTSvtt1b7dWwFAYsYPZ9HERIVzfMy2WFcJVZVflsev7EMfJEr71vE66ljltS3Vb5F31Pvv2r8yZ12e3KOq5pPBs/xz9uWoxd6Hnh64Rx2a0mQNIywbuw8dOB++V55zeV6d4Kgjd9za5tXzShXe4oOL990nt5h/58IfDhQmAzah6F8ul4qJAo1kUTaJK9HgI16/1GMnzenBRNdaGcH08PhQTG+YN3wqMCpdxgVCoemeveut7nvRaYIsEOvnUO/Jjp+eTjr//y79Ld8gElzZzbfn6xe1bDQDkFLhV5f4vQeB+KKhyN2arMBfjwTv4wrz/YBLazSdbuABEqHoXRxWrpMWzhqo1uaKrBb8eG0UOZdMbIEPZ4s0bvrXtlL6nSeHSdo91Sd5V76QBa3b46x//2Y+cJpjrufe1f/1FXpencDnpqcf0L06/bj7+sY8E3/fLDIDuySlwi61yHzYtdOHdTX3zQfi+J/hw66yDtQC0VRkAm1H1LoYWfkkLbX3v1WbeFuND2WwI1+MmwxvZRRjKNts84VuhUttuJlW99fkuvo/mVfXW5//Xz//GxPnoZR8Jfnb/J/FnYWkgI9vyTefSZi7vvf+B+ZsX3wwHKF195UfDKjiA9ssxcLe2yj1u02nlu+/76hWe590T9xu0IGSLDWA616q3juN6WzdH//JniQs/DVXTFl5tZEO42uhtRS5pkFdaDGW72DzhW6FQ38uk4+32Yl2Spuqt6+ZnPfb056gCGzdgTd9f1+eIJpjTyTed604S495469fh/rxy+cf+EQEcaCltC6bn+l8cfyFr4JblUZW7b1puU/D+/fu/9qwx3n+O+w36xlKtA6ZLs68vi71krgu/e3f8i06ERJ2s0VZJZQ1lsyFJj+su7miRNnzre+d6XBcvOXGtequCopNNs5x5/a1ctuXTCTtdIoDpXNrMZ3n1zHnzwktvhR9fc/XHDYDm02uzQvZTf/lCuC3YmdffyRq4+0Hg3tuWieUuNq2kRu3mCyam3VwLhvGJoQA2c93Xl6p3sqZvIVaUyaFseiypwpf3UDYbwhWWujqUTeH72quvcN4D2lUXLzlJU/WOa8fX41IdGlnocfyVuz7PWiaGa5v5LGo/1yJd139rwU4FHGim8eq2ns+/euc9k9F4W/m66ZCL3nHuvu+rN3qetxD3m7QHLYEBmC5N1VuLSxZ+0ylEPv3TU4lhUhWrLg9FUjjR5T86IaoqoYJNGUPZuhTC9XXqNm/1bxqq3vFVkriqt14zk+Y+xNH3/IF7vsBQwRjztJnPogCuCrgW7lwDDjTD+Xf+PnzO/iSobOdU3ZZzQeD+b8H9v+tCW/k0F634f//+r5nkbcU+FNsGBnSdy76+CkZd3NfXldp7k6qMWkDTKrpBQaKsoWw2hOvP18nYtrf6KzDmH767WfW+9BI/sWKtx5gey9PCscuAtTgK3Zp6jtmytJnHsdeAvxIEcc+YMIQDqAdVtlXRVtj+0YlfhifMcqhuy3jgPtyVtvJpLgreKvnfs+trD5uYbcW0WGjafrlAmaL9mH+deB1iV/f1deGyhdiO7bfRfTNDWUPZNDlaJ5m0SFegavNQtrzDd1cHLapDQydtkp7ferxOOzGh10uX3z+NXjMoHCTL2maeRIv5F146G4TwM8HP+d3gNeOSsBUdQHmia7bPmmee+7/hVHLd5xi25dxwOPzvnmd0HXevy4Hbmrra/72dX/2053nbZv0mVU/YixiIp8V0UtXbZfucLlKrftL3rm1biBWpjKFsmjLdhaFseYfvrg5a1MmZpO9hXDu+TlqmHbCmCeYUDZLp9eHoX/7vpMPWNRTJGO+O4OMtZk56D1QVXFU23V5/6++C/zs0H73sw+GJPAD5GQ/aT//0pbCqrW0Ac2ojH3ehwv3NfWHgbu32YGlNvchmMDC9YK20O+436g2TsADMpsXi7bfelBggT556PjyO/ZM3uAyy+q1rrjJIR49JO5BNoSY6wfF8LhOix+nP1S14dId/l/a3blOV0VZhf3D8pMlKP4cfrz0XhMJbTJfoe6ivW19/HB3zwD0XrzWiLgH3gXd6DHbtezwvtZk76KuCFdz3lpYP7QkC+CMmZjCvC13/fX4UwOW6ay4Pfs6/YW664UquCwdSUsjWiSyd2NL9K/lWsmdR4H48uH8seH0gbE8x9VUsCN19E37zZp/F1AuzWrYAzKYKS1JLpD6ncM6iMKKF+KnTLyUep+8t5jcewqNrtl8KT6gmBaG09Ofqpr9PJ2s1hb4NJ23zDN9dPfmmNYQuKYljT+JMPmbStOczCyIdt26O4QH7UbDAXgnCdz/4cM8ogOdCLa/RULbo3/OPr/yNsB1dYXzjY64RR3cpXOuE1RtBsNYQQwXs6Ne/Dj9Xor4/9FYG3mCVwB3Pm/WJpeXeU8Hdgomx74Ev024OJPjx2rNh1SaOFtx6PlH1joJMUvBWeKPNvBgKOfr+q1087xBu2evPFTab/h6i71Ue4Vsnkrp48u3g4eOJ24spdGsg2jidsPzDP/pzk8ROMGet4sbx+7q+f++uG6d9IgjgW4dD86jneTtNhhb0NFQJVxCXyz/2kfBm/7+uHbc+PLqOnLC+mQKahmq9HwQ31IeCtA3P50eVav0/TRvXfQnV6yS6fvuA55leVyeUz2Nm385gMFz1/fhtxVT17uK1aUAaeo6ook3V203Uohyva5Ogy6SQY6uL0WTj1wrYw/rXYZVXN1UuFcCbOjckr8p3V6veOuFw8PDTscdMq3rb7eySTg7pNZXQ7c61zXzWJ4IF+Hpwt0cB3EQVcF22uNUUSOFElXF51eF4BXO1sX9+2/UXQnoXqaX/1Om/vfC9Axyput0LqtsHvrmP6nZaM4O37xtdu7NkYqgdieANxNMCUQvqpKo313pH1cOkhbRtWUbxVJXWTW26UQB/KbE6mZba3G1oHW9Fb1JYyiN86+SbXiO6dglXdKLnqsTH1bRrvXXdtssQRrhL22Y+yyiAP6rb6BrwxeDjbaYG7LXkmqr++W2/Zbbd2q0p96puHzn+fB0qpmiOfvC8P2a4djszL+6TS8u9F03CmcqHHryX9lgggRbVTxw8krj9TVfbTS19j5KC99133k7Fu0JFDmUbp8CvEN6koWx5tJ138RIuPZ6Sqt6ilvHxk24uv0/FAebRuMnaZp4kCOALw6HZU2YbuguFb1W/204nHI4cP02FG676o7C9MjqRhhzEjogcDoerwQvkYtwxqoKwCAbiUfVOpkW0S7WbPXirNTkZXY/ZIoay2TZ3PRdsCK97p0Mele9jJ54xX7lru+mSeaveukxBj4+4E5oMgnWXtc08yeg6UN3MqAquAL7LVOwna6+E920O3z9ZezkcUlfywC00iyrZvVHY7lHZLkZs8NYF88FdbPDWYpngDSTjWu94rluI0WFTH3ZatG5FDWXTc2JyMrpOTqWZal2mrOFb4WfaFO820eMj2kt+4z6hAS80ea23XguuvvLy2MCuP1s3Ws6T5dVm7kKT0IM7TUNX5XtXUAlfqLISrvB93TWfCB5bl5s2oa0cMRSs13zj9QZm8DMGpJUj8Z1uabl31sS8EOqNT+3mAJK5Tjj/+n0LnVooamGsNvMk7KTQDLZarYV80uUV89LjQAFc1fA6PiaytJ1Pm+LdBNMCdfTxP0yE7PlNTilXx4W6BOKo4s08mnhFt5m7Uju6b/zPDsxQlXBdE15aENfAtX97zz8zbaC28h+dWA9eg98ywMiaiYL2WhC0jwVBe82gdJcmHTBqN9896/N6sW772XkgL65Vb4VzXcvcFUkDkqSpU6+7yA5l02O5qKFsCnAKXLrVcShblsr3rL2rq1JGoE7zb9FJOhum9ThLCt4Mgk3mspuEydBm7mqsHf1x/ToI4tuCIL7jg+Hg9mAt+tumwDCua59fCW5Nr3rTVt5568FtLchvv/S8KGyb8KQZreN1kBy8PdMPyuK7447RgorgDSRzvdZbQaVL2+C4XFuo7xuaRY/38evBx9vR82SDqkSh/5paXAKVJXxPm+KdtzoF6rQUtjXcTwFclx1oOv4s+py+Fi5Tma3MNvM0RlW5TZU5hfHgbosq4/8wGFzh+95nTRTG7W2rmdMLL73Z2OCttvIfBlXuN96q53MWmZybuK0HwfrtSzz/xaB6rRe/dROF63WDWnNoNdf1N97ZuGP0pqfWWADJXCeca9Hehaq3S0uuTkCozRztoDCnky3qdCgq2NVpKNu8becasjbPMEG9tuhmA6cN0++9/34YVuscqNPSa4PWIEkn7+b9XnaF2swT3pPO7d+76wrTIKPrx211PLyWPFjPPhL3e2664Urzb+5q1owVPbcVuLUvdwYroxMr6wZ1cY4qdfskVrz1Q19a7vWDDxdmHaM3d4aXAG4UCFTNTmqP1GK9CZOcs9LXmaTLW6y1UXR99s3hTe8fuk63zUPZ5q186zViPCzaQL1RmdbH77YyULuy34skenwRvKfTSQuHWQw90zCj0DIeXNaC9ewOE7OefeOtvzNNsnbqtXAwXIa28rUgcO9nsBZQjsTgLYPBcNX3vYW4Y/TCzTVUgBt7rXfSgrGMdtMqKXS5tB1zKUt7KQjffefnwo9tK3reQ9n0PBsP4VH7+/WlniyeJ3zr3619qm3ILmpQXRfoZ8+2YtO5tJn7Q69xwXua6LrX5An6dZdDW3lwQmL4rSBwP2YAlMYpePt+eKZzKe4YhpcA6aiKm7QIr9uQpby5DFUrOyChOtF+ztFjPQrgrzlee+pOITbaXeDZ0oeyzRO+HYdeIQGDYGdzmLFxbnHfzlWDyqmyrQq3Kt0ZrIyq3LQxAyVzCt66WH9pubduYgZWMLwESEeLcFW0u1r1tlXIJHds+5RB95Q9lM2GcLUjF/k+lnWfb8yPQbAXa2ubeRvRVg40n1PwltG2YouzPm/PJnMNFeBOw9PUShqnrVVvl0oeW4hhozX8hkKHsm2E8JPh36XJ6EW9nxG+qxH9fJkXMa5LbeZNpbZyBW5tdzYntZU/HgTuRw2ASjkHb88Lz3guxh3D8BIgnai19qrESl4bq95JW6qJKpCAVcZQNpkcylbEkEOu1y6fgjedeZvRZl5fObWV90ZV7nUDoHLOwVutKUvLPV0PsmXWMQwvAdJTK3XXqt56rUgKS7bSCUwzbShb3iF8ciibTixrMnqWLgz9map0c+12NRQ0eV2J0GZeXzm0la8HgXsvbeVAvTgHbxm1m++e9XmGlwDpdbHqzRZiyNP4UDaFCTsZPU8KzKqw66bQrwCe9lII/V49j6l2V0drFIJ3hDbz+qGtHGi3dMHbM33PmN1xxzC8BEivS1XvaFgWW4ihGKpK61bkUDa1udvrs12GslHlrg+7VR3t5k5zNmgzL0lObeX9UZV73QCopVTB249ajpbjjmF4CZBel6rertd2M1QNWUwOZdN7kyrOr781dyVpqqShbFS560U/B50E+cpd202X6TGbdFnGcDg8ZlC4X5x+PdyTm7ZyoP1SBW/t+be03OsHHy7MOobhJcB8ulD1dt1CTMOzgLxMhnCFYVU+ix7KZgM/6iWajP98p19nTp1+OfGYS4x/yKAwr7/16yBwv5i5rTy4f4w9uYFmSBW8ZTAYrvq+txB3jBYeLJyBdLpQ9XbdQkzX0AJFUCjesf0z4a3ooWyoL72Odvm1xuW1eOANaDMvAG3lQHelDt6+H7abL8Udo0oCwRtIz7XqrUV9EwcEsYUY6mRyKFs0mC25EojmU2fek0dPmK/ft9C5Dj3HNvPVb+6jipq35196K2wr/9U775k5rdNWDjSXb1IanV1bjztGg2e4ng1Iz1a9k7gE2LpRqGELMdSVrsvW9mQPPXhvcH+70/MQzabXo2MnnjFdQ5t5+c4HQftPDv+V+bOjz80butVW/q3gdjuhG2iu1BVvGW0rtjjr8wrdCt9MJQbSc6l621bWJoVUXVOZRIOpgCqp+jk5lE3hjJPJ7aTX0auvvLxTXXq0mZdHbeV2T+4M+rSVA+0wV/D2vLDdfDHuGLWbE7yB9NJc6x23hVGduG4hxiUqqAM9XtWhoRPIdvsptJd9Le3CTgq0mZcnp7by/UHgZi91oCXmCt6BNRO2vZgtsw7QWeQd228zANJTy+sTB4/EHhNNZ34hqJDXf/s+thBDndkuLYVsl0si0C76+avLqAvXe9NmXjy1lR85fjrLtHITtZUzrRxom7mC99i2YrtmHaM3siZvewRUKbrW+frERVK0Jc5NtV4s2teCJFzbjTLpMWnDNnNJoJMtOkHY9oIBbebFsW3la6fOZNmTu09bOdBe81a8zcAMV33j7Yo7Rq2lBG9gPrrWOyl4KyzUvertOlSN1woUSc8VPRYVPGgfxzQ6kanrvdt6EpA28+K8cubtoMr9fJa28nP+0Ht4cd/OAwZAa80dvH0TXue9HHdMdGa1/m2wQB0pjKqarWAdp+5Vb5c28ya0y6NZxtvHbXUbSKJBejoJ2MbLXmgzz19ObeWPB/95dHHfLk54AC03d/AeazdfmHWMFjta/HRtj0wgL7bqHVedq3PV26XCwhZiyIvCta1o0z6OeYzv7902jm3mxwwS5dhWruFpawZAJ8wdvGUwGB7zfW8h7hgNWWNSMTAfnbRSNTupalzXqrdLhYX9kjGvqtvH9XzT41cVUv3dLt0dqD+dtFHlu03Xe7ucBA30ubY4WR5t5RqeFnyvHzMAOiVT8PZ9na0zj8Qdo8UQwRuYn54/qmg3rept9xpPoqo+4Gq8ou1SwcubDdr2Zh078XOD9tDJTP2stc1YG7icBPWH3orBTHm2lTOtHOimTME7eOHoLy33YrcVs+1+tJsD82lq1ZstxJAHu6d2Ve3jenzefMM1F4L2rOfX+XfeNWgXu793G9Bmns1P1l7Oo61cVe6+AdBZmYK3DIfDA57nLc76vB1ww8RiYH5NrHqzhRjmYbef064YVeyprWCtydYKXLq5nhhi7+/20eOgDWgznx9t5QDylDl4e1443Xwx7hhVKgjewPyaVvVWizlbiMGVDdrRfX3ax9MgeLdPW04M0maentrKf3RiPVi/vmXmR1s5gM0yB++ApjHGtpuratGmISVAFZpU9WYLMcSx7eM2bFcxFM22j6uqnfVElf79TFBvl2hwXjtODNJmno6mlf9k7RXaygHkLnPwHm0rpvC9MOsYLbLUbn71lZ8wAOaTpupd5bXTrluIteXaSSQb31O76vZxham834vYI7x92rLbgh6btJm7U6X7h0Gle060lQOIlUfFW9uKrSZtK6YFF8EbyMa16q1wfvedt5squG4hxsDFdqu6fVxB21a09d5T5OONanf7tGeaefLOErSZ54G2cgDJcgnevm9WgruluGOihRetpUAWrlVvLbbUyl121ZstxLqrDntq59k+ngbXd7dPW9rM9VxMQpt5JmtB6N5PWzkAF7kE71G7ed/EtJvb6/iocgHZuFS9pYqqt/5dSbSgZQux5mt7+3gaBO92actrFG3mhaKtHEBquQRvGQyGx5LbzV9j+yAgIwUOVbOPnXgm9jhVnnWtd5mVGz3Hk6hij2bSQt5WtKvcU7uM9vE0uMa7XfQYawPazKfKoxV8ZVTlpq0cQCq5BW/f1xRH80jcMVqwEbyB7GzVO6maoar3A/eUE7xdtxBjqFpz1KV9XCE7zZ7aZcsw/Rg1RJt5e7lsgRtjPQjce2krBzCv3IK3XoiWlnsJ24olvwkAcKOq9w+On4w9xg62KmMh6XZtN3Me6my8fVyPmyoquXnsqV02Ws3bQyd32jAIljbz6UZr1fXgw60pfpvayh8Pfu+jBgAyyC14y3A4POB53swziVrUlRUCgLZT94gq2nWoekctyG8mHsdzv37sntpVt4/boN20OSDs4d0ubdlGjDbzOMO9Qe37aPCBl3RgcOsFd9/kOngAecg1eLu08Ghxx+IbyMeO7beZJ4+eiD2mjKq3y1C1KvcWxwbbPv76W+fDxXkV7eO2ql3n9nFXXN/dLm25HI4289miqvehPwhWrd8JfnnjlEMUuNeDu320lQPIU67B24TbKoSDK7bMOkALPoUFANlFE52vSqw2F1n1Zgux+qt6T+0mto+7otrdHtFJoeY/PmkzTxZ87b0gfK8Nh2bR87wdwf/aZqL165pvvNWBGRxgeBqAvOUavEfbiil8L8w6Rm8GulH5AvKhQHvw8NOxxxRZ9XaZZM4WYuWy7eM2bFfVPm6HorV5G0kq3u3RljZzl5Nr3W0z3zA68bDfAEBJ8q54a1uxVZdtxTSVGUB2URWxuqq3a5s5imPnZ+gxUPWe2m1oH0+Dind7tGXHhVOnX048pqtt5gBQpdyDt+9rf0OzFHeMrj0ieAP5qarq7bqFGNsI5q8O7eO2ol2nPbXLRsW7PdoQvPV67PCY7HSbOQBUJffgPWo375uYdnPb+tjVhRqQt6qq3mwhVh7bPm63+6pqT207FI3X7wh7eLdDEyfqT+Ny6Y86Ew0AoHS5B28JXtSPubSbUwUD8lN21VtBkC3EijO+p3bV7eP6GbZhb+MiUPFuB51UagOXNnPfD3egAQCUrJDgHbyo94O7R+KO0eKf4A3kp+yqt/6cJGwhlo5eF23YrmJPbQVtW9Hucvu4K67vbo8OtZmv0WYOANUoJHhHeyT2ErYVS95jEkA6rlVvtYhnOfHluoUYsxzi2T219TOhfbx5qHa3g04OtuEEoWOb+QEDAKhEIcFbhsPhqud5u2d93k7hpQ0VyE+aqneW4O0yzIv25IuNt4/b6nbZ2ryndtmoeLdDl6aZ02YOANUpLHgPBqZ3ySVmd9wxWnyy8APy5VL1thXrecO3a5s5oqqorWhX0T5u99SmfTx/VLzboQ3Xd9NmDgD1V1jwDkJ3P7hLaDd/zezYfpsBkJ80Ve952otdBn11eQuxOrSP26p21/bULhsV7+bT86MNBQDazAGg/goL3qNtxdZMzLZiWrzrxsIQyNfdd37OPHHwSOwxeu6dPPVC6u2+Tp56PvGYtkwIdjHePm6r22WjfbwaVLybT8+dNnAJ3rSZA0C1Cgveor0iXbYVYwATkK+o4nx94jV/CtG333qTc9XbdQuxtj+n7Z7aVbeP26BN+3g12MO7+doyzdzhdZk2cwCoWKHBe3R2dSnuGC1cCd5A/nStd1LwVmBMU/Xu6hZidhikFrdV76lN+3h9UPFuvjZ0iLh02dBmDgDVKzR46+zq0nJvPfhw66xj9IahRS0VGyBfeVe97bXLSdpybbcN2tE97ePYrOyTL8hfW7pFXLZ2DAohfQMAqFShwVtG24otxh2jxXxXBzEBRdqx/TOJA75cq956nia1VDd5UJFtH7dhmz21EYfg3Q7qWmjytoeObebrQSFkzQAAKlV48Pa8sN08NnhrkUvwBvKn8KZqdlKLuEvV26XNPO2gtiqND0WjfRxpMdG8+bT2+N73+6OZCdeGHUJNC+Eu3TgqgBgAQOUKD97BWdb+0nIvYVuxMwZAMTRDQRXtLFVvLe7asIVY1e3jCtq2os2e2s3G9d3tEe3w8Hx4a1oId2kzDwogKwYAULnCg7eM2s13z/q8HVzEdYxA/vKoeiuUJ6njtjx12FOb9vF2otW8nZoUwmkzB4BmKSd4e6bvGbM77hi9eRC8gWJkqXrba5+TaIp61erUPq7XsyZfO4p4BO/2q3sIp80cAJqllODtm/A67+W4Y7RIbtL1oUCTZKl6130LMQVtW9Guck9t2se7hT28u2VaCNdrZZWzGWgzB4BmKSV47997/7ml5V4/+HBh1jFaMOuNjQFDQDHmrXq7VFXKvLa7Lu3jCtn6ugna3cQ13t01HsKj14HrSx+QSJs5ADRPKcFbBoPhqu97C3HHaDGtcAAgf2mq3raCrYqKy1C1Ii8TGW8fV9iuIvCwpzbG0WYOS69Hx07o9kypIZw2cwBontKCt++H7eZLccdoYU3wBorjWvVWOL/7ztsr20LMXldedfu4DdpUtTGO4N0aw+DmmZyUGcJpMweA5ikteO/fe//60nJvPfhw66xj7AKbRS5QDNeqtxZ1qvK6VLu1sMyqDu3jtqrNntpIwh7ezTcYDL8VFATWg3j6DbNxGVwjQjht5gDQTKUFbxltK7Y46/O2pZRWTqA4LlVv+cHxkyaJwuq8J8qq3lOb9nHMi+u7W0HBdCW4X1laPrTVhOG7GSHc8fWybwAAtVJq8Pa8sN18Me4YVbtYBAPFUVBWe7gWgVml2UKsLu3jWviypzayoNW8XdSRF9ytmIaEcJc286DUccAAAGoltzcTV0vLvbPB3ZZZn9di+KEH7zUAivXEwSOZAoROkD1wzxdmfl7B2la1q95Tm/Zx5Ong4eMurb6oscFguPc//fuw4j1T0SF8nGsI1+uoXrsTBNX8XTcaAECtlFrxllG7+e5Zn7eLdareQLFU9XZpJ59F14pPqkP7uK1os6c2inL+nXcNms33k1uxZ1TC/2Nwv210SGGVcL2+ah00GcJpMweA5io/eHumH7xT7Y47Rgt3gjdQLO1BrSFr81Si7VA12z5uw3ZVe2rboWgEbZSBVvPGOzkK1c4mQ7hv/J0DM9RappAQbk+K6rVNlXAbwmkzB4DmqqDV/NCW4K89G3dMUgsrgHwoND959IRJSxUZhewq28f1OqF/B1Amx1Zf1Jg/9PYs7tuZSzgtOoSP02ueQ8WbNnMAqKnSK97BWeNzS8u9vtm4XuoitnJG9QooVhRgr0p9vWqZU50VtG1Fm/ZxVI1qd32pIuzy8xl4g2MmJ6NK+OO6FR3CaTMHgGYrPXjLYDBc9X1vIe4YtVNp2yMAxVKgrdOgKNrHUWcE7/IpUH/kw5eO7j8U3o9/bO8dO3j6advMXZUZwmejzRwA6qqS4O0y1ERbDhG8gWKocqLnmE5wlX1d9jSqutuKNvMdUGcE73woLEeB+bKpIdp+nObEm17TkvhDb8WUoKIQrr3J+wYAUEuVBO/gjWFtabm3Hny4ddYxdp9fql1APuoUtu2e2rSPo2kI3vGmVac3QvZ8gdqFXtNcBo8NvMGqKVmJIbxvAAC1VUnwltG2YouzPq83UYVvql/AfOxzqE6VbSv6t503Wm/qYy3GGZSGJuhq8LaB2j5PZ7V7V0Vt5g5WNGfGVGhGCNdaaKvJHMBpMweAOqsseHue6QV3i3HHKDAQvAF3NmwraOv5U6ewPU7/LrvX98lTz1/4/3ZSudpPdU81HHXTpj28i2j3ropLtdsf+j1TIxMhfNtwaHYHBYmdZr4QTps5ANRcZcE7sBbcdOZ5y6wD9Ea6Y/ttBsBsCrHRXtpv1Dpsu7BhfFwUxH/jwnRzwjiq1ISKd1y7t33+NCVQu9DPxGFA5PrivvtKbzN3pUvwTLQu2j9nCO8bAECtVRa8x7YV2zXrGFsVo+oNbGbD9qnTL1+Yh9BW+vqilnm1kj4X/j8bIKJhbFfRqo5SlLmN3jR1b/euStu22ZovhNNmDgB1V2XF2wzMcNU33q64Y3QWm+ANbAwPUlW74LA9HN33h8PhL4MF328HHy+YUrbCcRPXqm6r47SqI29FPOfa1O5dlZOnXnA4qpnB1DGE02YOAA1QafD2TXid93LcMdGZ7FsM0EXjYduxqjOvC2E7OBm2OjCDA+NDiIIF30KwxvuvpmYBfNK079Fkq7oNM0BaebeZq1vj7js/x+MxA/1MHDoRWhFMY0J43wAAaq/yBfTScu8pEy3mZ3rowXs524/OKDlsK1yvTQvb0wSLvT2jAL7V1DiAJ6FVHfP48dqzwe05k5Uef3dsu8XcfuvNBtkcO/HzxIr3cDh8/Jv77n/YtFTwuryl6mntAIBklVa8ZTAYHvN9byHuGIUQFihosyrCdvDh/wjue2kWbMGxK8HdStMDOK3qmEe0BV422r9eVW4eV/nQa2YSzzOPmRYjdANAM1QevH0/bJF6JO4YLY4J3mgbtUhqONq0Sd45s2G7F3z4Q5MybE/TlgA+iVZ1xHnv/ffNvPSYufvO25lZkiM9Xx3a/0+Otu0CAKBStVgoLy33zpqYbcVUGdj3wJepEKDxKgrbqmyvFVkVaVsAT0Krejf94R/9+VwD1nTiWK3lvIfl6wfHTybu3+0PvT2L+3Yy8RsAULnKK94yHA4PeJ63OOvzWuhoeAqVAjRRFLLfDBeIBe8BHIbt6PlktF/tWlktiFMq4DeajG6+4dpw6yTHPXpLRat69+j67rShWz//Hdtv472rIC4nLwfe4JgBAKAGahG8g5Cg6eaLccfoOi4WL2iKqsJ21ZN7FcCD8N0PPtwTPLO/YTIEcO3bref8ju2fCQOMTr5FIfyN0d7e52u3fzmt6u2kx12aoWoMTyueXh8cXlv7tJkDAOqiJq3mh7YE/5QXTUy7uRaqajcH6kqhSyeIFLYLDoS1CtuzBM/rrSYK4KqAZ3qtufWTN4RBZjKw2m4YG8ajrYWyD8AqGq3qzeLS0myxRVg5aDMHADRNba7FdNlW7Ov3LbA4Ra0QtpMpgA+H5hHP83abggL4OBvGN4L427VrVZ/FhnFa1etDz22FvCRUucuj57iut082vIKJ3wCAuqhN8P72dw897PveUtwxd2z7VLiwAapUctheHw1H6zcpbE9TdgCf1IRW9WnGW9VtGKeaWg49Xg4efjqxpVmhWyeG+bmUw/FkyMr+vbv2GgAAaqJGFe+w3fxs3DG6PvKBe75ggDLZCiphOx9VB/BxtKojjmuLuQaoUekuz8HDxxO7WPyhv2tx332rBgCAmqjVtj8u7eYPPXgvrZconA1kWnQrcJcQtvtje2yvmQ6oUwAfR6s6RD/7Jw4eSTyO+SPlcvy5rAfV7sw7KwAAkKdaTDW3BoPhMd/3FuKO0SRTLbKBvNktovQYKzhsD0f3/VHYXuni5N3R17w3CODfyhrAdYJEPzu9Ntz6yeszBXAFVXXXTO6i0IRWdXvCYByt6vNRi7kLurDK5bKFmAlfWwEAqJeaVbwPLQT/pKfijtGiWhNjgTwoOClonzr9chhYygjbvvFWB2awyjY3m42e/5qAHtzP/9qkUGkr4EWjVb2dtGe3y/Zhai9XmznK873v9y86uXSx4ZfaeJkOAKDZahW8ZWm5p+u8Z24rpgWj2s2BeVUYtg8wYTdZEMB3BS9N3wk+3GoyBnCF77I7ZGhVb7Y0LeYaqEYrf3loMwcANFmtWs0l2i7JW5z1edsOPNkGCsTR48Zer+3YqjgvwnZGwferF9z1ggC+Z1QB32rmCOBapGs41rETz4SvFzffcE14X3SbNa3qzeZS6Rad1CF0l+vkqecTjwnWEAxUAwDUUg0r3snt5rT3wQVhux2yBvBJUXv1RhCv0nh1XI9RWtWr5bpnN5c8VUPV7qSt3YKX4xu5jAcAUEd1DN7aVuxFE9NuzhRZzFJy2Fa4Xhtt/dUjbBcr7wAutjpdVjXcxbRW9abtOa4w3rRWdfbsrje9njsMvDu5f+8uzogAAGqpdsFbXLYVU/Bm4QPRQtlOIidst99YAM/9Os46VcMnNaFVfZrJVvW6VsfZs7veXH4+/tDbs7hv5wEDAEAN1e4abxkMhqsu24qx+OkuBRANR1MIKSls90Zhe42wXa3g+78S3K0EAfzRIIB/w+QYwG2l2V5LOh7Cqw6LtoJ88w3XXvh/TWhVt/8+vWZbdWtVj15PkkO3/p2871TD5XV+4A2OGQAAaqqmFe9DW0ft5jNpIcz+qd0Shew3Cdu4IHqtMHvyDuDTRC3UG0G8ri3UtKqn53btMJ1WVdFJmyePnkg6rL9/764vGQAAaqqWwVuWlnuacLMt7hhtK8ZU2XazYVvVKJeFcQZh2I6m6ptV9oBtFgXw4dA84nneblPS61qdquEuaFWfznXP7ju2faqUveFxMdrMAQBtUMtWcxm1m8cGb50FL3uPXhRPwUDXa+vnS9iGi9EU471BAP/WWACXwkL4eOdFE6rhtKpfTF+vS+iOWsxvMiifHZiZZOAN2EYMAFBrNa54J28rxpYu7WHDthZYBVfhCNsdEO2OYBaCEL4zCOE7TDQJXUqrhisQTtvPu+661KruOlDt7jtv5yRvRRy3eFvZv3fXXgMAQI3VNnjL0nLvrInZVkwLKrWbo5lKDtvrQdheJWx3UxDEt/nG3zEww51mY8eEUl7/bDW2TluWzaNtrers2d0MBw8fDy83iuMP/V2L++6j4g0AqLVaB+/vPHFoZaxldCoNWGtaRanLyg7bo+FofcI2rKqr4XXesiytJrSqT2Or4EmvQQrpeo9hoFo19HjS4LsE60G1u9DBigAA5KG213jLYGB6l1xiYoO3QhzBu77swlxBWz+rEsJ2P7j7oSFsY4bRhPre6GYnoy+MJqNrroSCeWEhfHzLMgXA8RDetIBn//26jW+zZavidW1Vd/236LpuQnd1HHev6BsAABqg1sE7CN39pGM0cGfH9tsM6qPEsD0c3fdHYXtlNGQLcDZ6zKyMbuF8ibFquB3wWEgQ13NDr2F2cFhbquHTrm0fD+JRMK93qzp7dlfv5KkXHI4aMskcANAItW41l6XlngasLcQdw96q1bMB4tTpl8OFdRlh2zfe6sAMVgnbKMpYNfy+6L7YavgkhVddY2wHhbVNnVvVeV+pFm3mAIC2qXXFW0bbii3EHaPAR2WifBWG7QOjdmGgUFVWw6VpW5alVddWde3ZTeiuli7FSKKBmQYAgIaoffD2/fA6zKW4Y9TOTPAuh91TVd9zx+vv5kXYRu2M5gbodqEaHgTxHWUMaVMI1XPPbn81HsLbVg2vslVdJwPYs7t6eo9J4nnmMQMAQEPUvtVclpZ7L5qNRe1FtFBSW2AbKkB1RNgGkqka7hv/s1VtWda2ariLolrVtU0l7yfV0c/y4OGnkw47uX/vLvZ5AwA0RiOC93eeOPRYUFFajDvmK3dtDxad1xrko+SwrXC9Ntr6q0fYRtNVvWVZVDG+amrluAuytqrffeft5tZP3mBQDe2vbjs7ZvGH3p7FfTsZrAYAaIzat5qL54Xt5rHBW9caE7yz0SI1mrBM2AaymLJl2bagGr6jrGr4xrXhz12ohtsg3oVrl+Na1fV9SZqW3YS9yNvM5f1n4A2OGQAAGqQRFW9ZWu6dNdFE4anUFqj2QKQTXTf68qYhTgWxYTsIIsPvm2ifbcI2OqfqanhbtizL4g//6M9jK+A6OaHLl1A+nfx98uiJpMOC949dXzIAADRIIyreoumlwSJ196zPaxGl4NjVhWQaqvzYqnaJYVuV7TXCNrpuSjV8q4m2LPuGKaEabq+J1tRoO1XchvCuTPLW16sTjrPohKRuTDYvn8tQNX/orRgAABqmOcHbM/1gJbo77phXzrxJ8J4hCtlvhtfNaUFZoDBsBydKDnie0VYvhG0gRpVbltktAXWTrlTDoynwL8ceo9dMrvMul50tkmTgDdhGDADQOA1qNVd7pnc27hgtpr5+34JBpKqwPdpyCUBGY9Xw+6L78HKbUl63VQ3Xa+qtn7y+ddVwvR4+cfBI7DH6uu++k6HZZdJ7lQarJVjZv3fXXgMAQMM0puKtqunScq9vNloxL6L2SZ0x7/I2MArbatXTAqaIPW7HELaBglVdDR+/HKVNW5bpa9Et7oSkS8sz8uVS7faHfs8AANBAjQneMhgMV33fW4g7Rm/ct996s+kSwjbQDaPnnG6T1XCFcP26sGp4NIjxpQvhaDyER63bzaIp76dOzw7eei3lOu/yRBPn30w6bH1x3320mQMAGqlRwdv3w2FES3HHKIB2IXiXHLbXR8PR+oRtoB6mVcMHA7MQnJz8oil1y7JmVsP174wbsCa69r1rJ3Kr4jjos28AAGioxlzjbS0t9140G9vvXEQLPm0D07Z2c4VrO42csA0gTtVbltkQboe11ZFeQ7WtWBx9DV+56/MGxfve9/vhe1y84Zd4PwIANFWjKt4y2lZscdbnbUBtw0Re+7UoaCtwlxC2+8HdD004vCaspgFooClblm3zjb9jYIY7TUXVcLV212lIm07OJl3n7dD6jBzoZ5Acus06oRsA0GSNC96eFy4kF+OOUUhtavC22/vYVvICw/ZwdN8nbAPtFjy314I73R4vuxo+eW14nbYs07/h5KkXZn7eDphjm8p82Ovm7SDUaE/58067buikuwEAoMEa12ouS8s9bSu2ZdbnVcl46MF7TVPYsK3rDe2CpCAXwrZvvNWBGRxgj22g21QNN+FwNu8bpoRq+Di9Vo+H8LKr4XrdffLoidhjdmy/jeu8UxgP17qPPo7Cdbb3tuGNnBwGADRZ4yreMmo33z3r802oUujfaFvICdsAqjJWDV/Rr8veskzhVzcpuxru8nd0ZWBnGjZE24r1e++/n1O4nukkoRsA0HTNDN6e6QerwN1xx+javLoF7/Gw7TjBdV6EbQBzidmyLLgPO40Kq4ZHQe5tc/LU86VUw6O/46rYa7ntidG2DexMsrkl/PymXxc8b+Qi/tB73AAA0HCNDN5+NDBoOe6YKNjeYqpWcthWuF4jbAPIw7Qty6qqhhe1ZZmq7HHBu00DOydtbgl/d9Ov62TgDY4ZAAAarpHXeMvScu8ps3E94lS6zruKKkUVYXu09VePsA2gDGVXwyeNh3CF53npNfrg4adjj7lj26eCW/UnctOy1WkbpqOK9T/UMlzH6O/fu+tLBgCAhmtkxVsGg+Ex3/cW4o5R+C3r2rxocu/Lm7bRKYgN273RNHLCNoDSTauGDwZmIXhd/qKpaMuyearhLqG9Lh1U08yaFG7/f9P5Q2/FAADQAo0N3r4ftps/EndM0UNxKgrbqmyvEbYB1MnEteGVblmWphrucp23Xt+rvM67uEnhtTOc+PX6wBuwjRgAoBUa22ouS8u9F83Ggu4iWiTte+DLuS6WopD9ZrjAK7iaQNgG0Arassw3/o6BGe40JW9ZZqvhCtezhrT9eO3Z4PZc7J/zwD1fKPQ67womhVdlPFyfG93WhsPhLz3P/Mz+minmAIC2aWzFW0bbii3O+nxeQ3HKDtvB13UgWICsjipIANBoY1uWPV6Hariq4ONblkX38cFbHVRZ30vqNCm8YJPhet1E4frtUbjWY+Ec4RoA0CWNDt7BG7jazRfjjpl3saSwrd+ribqEbQDIx6hzpze6lV4Nt5cGjW9Zpmp4EgVkF02ZFJ7RZEv4hXA9GAxf8v3oY/0/OrUAAIg0vNVclRNP7eZbZh2jhZWmm7uwYVuVkYKrD4RtAJhitGXZ7qAa/llT8JZladn3khZMCndx0fXWZmPLyp8NzEBnIgjXAAA4anTwlqXl3qHgblfcMXHX5pUcttdH12v3CdsAEK/qLcsm6URu24eZmVEb+Chc/9JstIUTrgEAyKDxwfvb3z30sO97S3HHjO/BaisVhG0AaJZRNdxeG16raniNTQ3XGmZ2ieev23DN9dYAABSrBRXvsN38bNwxqnYreCtoK3CXELb7oz22CdsAUIC6VcMrxqRwAABqrhWLlKXl3lNmYyhP2eyCpz8K2yssbgCgXKqGDwZmwfe9L5qStywrCZPCAQBosFYsSr793UOPBoutR0x5LoRt33irAzNYZbEDAPUwqoZvK2vLspwwKRwAgBZrScX70ELwpTxlijUZtg+w+AGA+it7y7IYTAoHAKCjWtOGt7Tc03XeW0y+CNsA0CLRXBCzUGA1nEnhAADgIq0J3t954tBjwSJq0WRH2AaAjpizGs6kcAAAkEqLKt6Z2s21iArb/UZbf/UI2wDQPaMty3ZPVMOZFA4AADJpU/DWtmIvGvd2c8I2AGCmUVv6FsI1AADIqlV7njpsK2bDdm8UttcI2wAAAACAIl1qWmQwGK76vrcw8b8J2wAAAACAyrQqePu+WQnuvjP65bnhcHjA84z22O4bAAAAAACQ3be/e+jhaNAaAAAAAAAAAAAAAKDV/j+7XrzzT9fTyQAAAABJRU5ErkJggg=="/></defs></svg>
\ No newline at end of file
diff --git a/app/images/videos/recovery-onboarding/subtitles/de.vtt b/app/images/videos/recovery-onboarding/subtitles/de.vtt
index 9b5612285457..4f32049535bb 100644
--- a/app/images/videos/recovery-onboarding/subtitles/de.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/de.vtt
@@ -2,109 +2,91 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask ist eine neue Möglichkeit, sich mit
-Webseiten und Anwendungen zu verbinden.
+MetaMask ist eine neue Möglichkeit zur Verbindung mit Webseiten und Applikationen.
 
 2
-00:00:04.580 --> 00:00:08.860
-Auf traditionellen Webseiten ist eine
-zentrale Datenbank für die Steuerung und
+00:00:04.580 --> 00:00:08.860 
+Auf traditionellen Webseiten ist eine zentrale Datenbank verantwortlich für die Kontrolle und
 
 3
 00:00:08.860 --> 00:00:10.179
-Wiederherstellung der Konten zuständig.
+Wiederherstellung Ihrer Konten.
 
 4
 00:00:10.179 --> 00:00:15.050
-Bei MetaMask gehört all diese Macht dem
-Besitzer eines „Hauptschlüssels“.
+Auf MetaMask liegt diese Macht aber beim Inhaber des Generalschlüssels.
 
 5
 00:00:15.050 --> 00:00:18.460
-Wer den Schlüssel besitzt, kontrolliert
-das Wallet und damit die Konten.
+Wer den Generalschlüssel hat, kontrolliert die Konten.
 
 6
 00:00:18.460 --> 00:00:21.110
-Der geheime Satz zur Wiederherstellung
-Deines Wallets ist der „Hauptschlüssel“.
+Ihr geheime Wiederherstellungsphrase ist Ihr „Generalschlüssel“.
 
 7
 00:00:21.110 --> 00:00:26.070
-Es ist eine Reihe von 12 Wörtern, welche generiert werden,
-wenn MetaMask zum ersten Mal eingerichtet wird, diese erlauben dir
+Dies ist eine Serie von 12 Worten, die generiert werden, wenn Sie MetaMask zum ersten Mal einrichten, und erlaubt Ihnen
 
 8
 00:00:26.070 --> 00:00:30.120
-Deinen „Hauptschlüssel“ zu Deinem Wallet wieder herzustellen,
-solltest Du jemals den Zugriff darauf verlieren.
+Ihr Wallet und Ihr Guthaben wiederherzustellen, falls Sie jemals den Zugriff verlieren sollten.
 
 9
 00:00:30.120 --> 00:00:33.451
-Es ist wichtig, dass Du Dein Wallet sicherst,
-indem Du Deinen geheimen
+Es ist wichtig, dass Sie Ihr Wallet sichern, indem Sie
 
 10
 00:00:33.451 --> 00:00:37.510
-Wiederherstellungssatz sicher
-und geheim verwahrst.
+ihre geheime Wiederherstellungsphrase an einem sicheren und geheimen Ort aufbewahren.
 
 11
 00:00:37.510 --> 00:00:41.429
-Wenn jemand Zugriff darauf erhält, hat er
-den „Hauptschlüssel“ für Dein Wallet und kann
+Wenn jemand den Zugriff darauf erhält, hat diese Person den „Generalschlüssel“ zu Ihrem Wallet und kann
 
 12
 00:00:41.429 --> 00:00:45.190
-frei auf Deine Konten zugreifen und alle Gelder stehlen.
+frei auf Ihr Guthaben zugreifen und es Ihnen wegnehmen.
 
 13
 00:00:45.190 --> 00:00:50.109
-Um Dein MetaMask-Wallet zu sichern, musst Du Deinen
-geheimen Wiederherstellungssatz sicher speichern.
+Sie sollten Ihre geheime Wiederherstellungsphrase sicher aufbewahren, um Ihr MetaMask-Wallet zu schützen.
 
 14
 00:00:50.109 --> 00:00:54.930
-Du kannst ihn aufschreiben, irgendwo verstecken,
-in ein Schließfach legen
+Sie können sie aufschreiben, irgendwo verstecken, in einem Bankschließfach aufbewahren
 
 15
 00:00:54.930 --> 00:00:57.729
-oder in einen sicheren Passwort-Manager speichern.
+oder einen sicheren Passwortmanager verwenden.
 
 16
 00:00:57.729 --> 00:01:01.050
-Einige Benutzer gravieren ihren
-Satz sogar auf eine Metallplatte.
+Einige Benutzer gravieren Ihre Phrase sogar auf eine Metallplatte ein!
 
 17
 00:01:01.050 --> 00:01:04.440
-Niemand, nicht einmal das Team von MetaMask,
-kann Dir dabei helfen
+Niemand, nicht einmal das MetaMask-Team, kann Ihnen dabei helfen,
 
 18
 00:01:04.440 --> 00:01:07.820
-Dein Wallet wiederherzustellen, wenn Du Deinen
-geheimen Wiederherstellungssatz verlierst.
+ihr Wallet wiederherzustellen, falls Sie Ihre geheime Wiederherstellungsphrase verloren haben.
 
 19
 00:01:07.820 --> 00:01:12.072
-Wenn Du Deinen geheimen Wiederherstellungssatz noch nicht
-aufgeschrieben und an einem sicheren Ort aufbewahrt hast,
+Falls Sie sich Ihre geheime Wiederherstellungsphrase nicht aufgeschrieben und diese an einem sicheren Ort aufbewahren,
 
 20
 00:01:12.072 --> 00:01:15.492
-mach es jetzt. Wir warten solange.
+machen Sie es jetzt. Wir warten.
 
 21
 00:01:15.500 --> 00:01:20.780
-Und denk daran, teilen Deinen geheimen Wiederherstellungssatz
-niemals: nicht einmal mit uns.
+Und denken Sie daran: Teilen Sie Ihre geheime Wiederherstellungsphrase niemals mit anderen, nicht einmal mit uns.
 
 22
 00:01:20.780 --> 00:01:24.910
-Wenn dich jemals jemand danach fragt,
-versucht er dich zu betrügen.
+Sollte Sie jemand danach fragen, ist dies ein Betrugsversuch.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -112,5 +94,5 @@ Das ist alles!
 
 24
 00:01:26.250 --> 00:01:31.020
-Jetzt weist Du, was ein geheimer Wiederherstellungssatz ist
-und wie Du dafür sorgst, das Dein Wallete sicher bleibt.
+Jetzt wissen Sie, was eine geheime Wiederherstellungsphrase ist und wie Sie Ihr Wallet sicher halten und beschützen.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/el.vtt b/app/images/videos/recovery-onboarding/subtitles/el.vtt
new file mode 100644
index 000000000000..fc537aef807c
--- /dev/null
+++ b/app/images/videos/recovery-onboarding/subtitles/el.vtt
@@ -0,0 +1,98 @@
+WEBVTT
+
+1
+00:00:00.780 --> 00:00:04.580
+Το MetaMask είναι ένας νέος τρόπος για να συνδέεστε σε ισότοπους και εφαρμογές.
+
+2
+00:00:04.580 --> 00:00:08.860 
+Στους παραδοσιακούς ιστότοπους, μια κεντρική βάση δεδομένων ή τράπεζα είναι υπεύθυνη για τον έλεγχο και
+
+3
+00:00:08.860 --> 00:00:10.179
+την ανάκτηση των λογαριασμών σας.
+
+4
+00:00:10.179 --> 00:00:15.050
+Αλλά στο MetaMask, ο κάτοχος του κύριου κλειδιού έχει όλη τη δύναμη στα χέρια του.
+
+5
+00:00:15.050 --> 00:00:18.460
+Όποιος έχει το κλειδί, ελέγχει τους λογαριασμούς.
+
+6
+00:00:18.460 --> 00:00:21.110
+Η μυστική σας φράση ανάκτησης είναι το «κύριο κλειδί» σας.
+
+7
+00:00:21.110 --> 00:00:26.070
+Είναι μια σειρά από 12 λέξεις που παράγονται όταν ρυθμίσετε για πρώτη φορά το MetaMask, η οποία σας επιτρέπει
+
+8
+00:00:26.070 --> 00:00:30.120
+να ανακτήσετε το πορτοφόλι σας και τα χρήματά σας εάν κάποια στιγμή χάσετε την πρόσβαση.
+
+9
+00:00:30.120 --> 00:00:33.451
+Είναι σημαντικό να θωρακίσετε το πορτοφόλι σας με το να κρατήσετε τη
+
+10
+00:00:33.451 --> 00:00:37.510
+μυστική σας φράση ανάκτησης απόλυτα ασφαλή και μυστική.
+
+11
+00:00:37.510 --> 00:00:41.429
+Εάν κάποιος αποκτήσει πρόσβαση σε αυτήν, θα έχει το «κύριο κλειδί» για το πορτοφόλι σας και θα μπορεί
+
+12
+00:00:41.429 --> 00:00:45.190
+να έχει ελεύθερη πρόσβαση και να πάρει όλα σας τα χρήματα.
+
+13
+00:00:45.190 --> 00:00:50.109
+Για να θωρακίσετε το πορτοφόλι MetaMask θα πρέπει να αποθηκεύσετε με ασφάλεια την μυστική σας φράση ανάκτησης.
+
+14
+00:00:50.109 --> 00:00:54.930
+Μπορείτε να την γράψετε σε ένα χαρτί, να την κρύψετε κάπου, να την βάλετε σε μια ασφαλή θυρίδα
+
+15
+00:00:54.930 --> 00:00:57.729
+ή να χρησιμοποιήσετε έναν ασφαλή διαχειριστή κωδικών.
+
+16
+00:00:57.729 --> 00:01:01.050
+Μερικοί χρήστες έχουν χαράξει τη φράση τους ακόμα και σε μεταλλική πλάκα!
+
+17
+00:01:01.050 --> 00:01:04.440
+Κανένας, ούτε καν η ομάδα του MetaMask, δεν μπορεί να σας βοηθήσει να
+
+18
+00:01:04.440 --> 00:01:07.820
+ανακτήσετε το πορτοφόλι σας εάν χάσετε τη μυστική φράση ανάκτησης.
+
+19
+00:01:07.820 --> 00:01:12.072
+Αν δεν έχετε καταγράψει την μυστική σας φράση ανάκτησης και δεν την έχετε αποθηκεύσει κάπου με ασφάλεια,
+
+20
+00:01:12.072 --> 00:01:15.492
+κάντε το τώρα. Θα περιμένουμε.
+
+21
+00:01:15.500 --> 00:01:20.780
+Και να θυμάστε: μην μοιραστείτε ποτέ και με κανέναν τη μυστική σας φράση ανάκτησης. Ούτε καν με εμάς.
+
+22
+00:01:20.780 --> 00:01:24.910
+Εάν κάποιος σας την ζητήσει κάποια στιγμή, θα προσπαθεί να σας εξαπατήσει.
+
+23
+00:01:24.910 --> 00:01:26.250
+Αυτό ήταν!
+
+24
+00:01:26.250 --> 00:01:31.020
+Τώρα ξέρετε τι είναι η μυστική φράση ανάκτησης και πώς να κρατήσετε το πορτοφόλι σας σίγουρο και ασφαλές.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/es.vtt b/app/images/videos/recovery-onboarding/subtitles/es.vtt
index 2f56d35be5b3..aec4427ff72a 100644
--- a/app/images/videos/recovery-onboarding/subtitles/es.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/es.vtt
@@ -6,7 +6,7 @@ MetaMask es una nueva forma de conectarse
 a sitios y aplicaciones.
 
 2
-00:00:04.580 --> 00:00:08.860
+00:00:04.580 --> 00:00:08.860 
 En los sitios web tradicionales, una base de datos
 o un banco central es responsable de controlar y
 
@@ -113,3 +113,4 @@ será con intenciones de estafarlo.
 00:01:26.250 --> 00:01:31.020
 Ahora ya sabe qué es una frase secreta de recuperación
 y qué debe hacer para mantener protegida su cartera.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/fr.vtt b/app/images/videos/recovery-onboarding/subtitles/fr.vtt
new file mode 100644
index 000000000000..a80e4d6e479a
--- /dev/null
+++ b/app/images/videos/recovery-onboarding/subtitles/fr.vtt
@@ -0,0 +1,98 @@
+WEBVTT
+
+1
+00:00:00.780 --> 00:00:04.580
+MetaMask offre une nouvelle façon de se connecter aux sites et aux applications.
+
+2
+00:00:04.580 --> 00:00:08.860 
+Sur les sites traditionnels, une base de données centrale ou une banque est chargée du contrôle et de
+
+3
+00:00:08.860 --> 00:00:10.179
+la récupération des comptes.
+
+4
+00:00:10.179 --> 00:00:15.050
+Mais sur MetaMask, tout le pouvoir appartient au détenteur de la clé maîtresse.
+
+5
+00:00:15.050 --> 00:00:18.460
+Celui qui détient la clé, contrôle les comptes.
+
+6
+00:00:18.460 --> 00:00:21.110
+Votre phrase de récupération secrète est votre « clé maîtresse ».
+
+7
+00:00:21.110 --> 00:00:26.070
+Il s’agit d’une série de 12 mots générés lors de la première installation de MetaMask qui vous permet
+
+8
+00:00:26.070 --> 00:00:30.120
+de récupérer votre portefeuille et vos fonds, si vous en perdez l’accès.
+
+9
+00:00:30.120 --> 00:00:33.451
+Pour éviter tout accès non autorisé à votre portefeuille, veuillez garder votre
+
+10
+00:00:33.451 --> 00:00:37.510
+phrase de récupération secrète dans un lieu sûr et sécurisé.
+
+11
+00:00:37.510 --> 00:00:41.429
+Car toute personne ayant accès à votre phrase de récupération secrète, et donc à la « clé maîtresse » de votre portefeuille, pourra
+
+12
+00:00:41.429 --> 00:00:45.190
+accéder librement à vos fonds et les dérober.
+
+13
+00:00:45.190 --> 00:00:50.109
+Pour éviter tout accès non autorisé à votre portefeuille MetaMask, veuillez garder votre phrase de récupération secrète dans un lieu sûr et sécurisé.
+
+14
+00:00:50.109 --> 00:00:54.930
+Vous pouvez l’écrire sur un bout de papier et la cacher dans un lieu sûr comme dans un coffre-fort
+
+15
+00:00:54.930 --> 00:00:57.729
+ou utiliser un gestionnaire de mots de passe sécurisé.
+
+16
+00:00:57.729 --> 00:01:01.050
+Certains utilisateurs préfèrent même graver leur phrase de récupération secrète sur une plaque de métal !
+
+17
+00:01:01.050 --> 00:01:04.440
+Personne, pas même l’équipe de MetaMask, ne peut vous aider
+
+18
+00:01:04.440 --> 00:01:07.820
+à récupérer votre portefeuille si vous perdez votre phrase de récupération secrète.
+
+19
+00:01:07.820 --> 00:01:12.072
+Si vous n’avez pas encore écrit votre phrase de récupération secrète sur un bout de papier ou ne l’avez pas encore cachée dans un endroit sûr,
+
+20
+00:01:12.072 --> 00:01:15.492
+faites-le maintenant. Nous vous attendrons.
+
+21
+00:01:15.500 --> 00:01:20.780
+Et n’oubliez surtout pas que vous ne devriez jamais partager votre phrase de récupération secrète avec quiconque ; pas même avec nous.
+
+22
+00:01:20.780 --> 00:01:24.910
+Si quelqu’un vous la demande, c’est qu’il essaie de vous escroquer.
+
+23
+00:01:24.910 --> 00:01:26.250
+Voilà, c’est tout !
+
+24
+00:01:26.250 --> 00:01:31.020
+Maintenant vous savez ce qu’est une phrase de récupération secrète et ce que vous devez faire pour protéger votre portefeuille.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/hi.vtt b/app/images/videos/recovery-onboarding/subtitles/hi.vtt
index f82c695660f9..ec3d9ec37d11 100644
--- a/app/images/videos/recovery-onboarding/subtitles/hi.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/hi.vtt
@@ -2,108 +2,93 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask साइटों और एप्लिकेशन से
-जुड़ने का एक नया तरीका है।
+मेटामास्क साइटों और एप्लीकेशन से जुड़ने का एक नया तरीका है।
 
 2
-00:00:04.580 --> 00:00:08.860
-पारंपरिक वेबसाइटों पर, आपके खातों को नियंत्रित करने और
-पुनर्प्राप्त करने के लिए एक केंद्रीय डेटाबेस या
+00:00:04.580 --> 00:00:08.860 
+पारंपरिक वेबसाइटों पर, एक केंद्रीय डेटाबेस
+या बैंक नियंत्रित करने के लिए जिम्मेदार है और
 
 3
 00:00:08.860 --> 00:00:10.179
-बैंक ज़िम्मेदार होता है।
+अपने खाते पुनर्प्राप्त करना
 
 4
 00:00:10.179 --> 00:00:15.050
-लेकिन MetaMask पर, सारी शक्ति
-मास्टर कुंजी के धारक की होती है।
+लेकिन मेटामास्क पर, समस्त शक्ति मास्टर कुंजी के धारक के पास होती है।
 
 5
 00:00:15.050 --> 00:00:18.460
-जो भी कुंजी रखता है, वह खातों को नियंत्रित करता है।
+जिसके पास कुंजी होती है, वह खातों को नियंत्रित करता है।
 
 6
 00:00:18.460 --> 00:00:21.110
-आपका गुप्त रिकवरी फ्रेज़
-आपकी "मास्टर कुंजी" है।
+आपका गुप्त पुनर्प्राप्ति वाक्यांश आपकी "मास्टर कुंजी" है।
 
 7
 00:00:21.110 --> 00:00:26.070
-यह 12 शब्दों की एक सीरीज़ होती है, जो
-आपके द्वारा पहली बार MetaMask सेट करने पर जेनरेट होती है, जिससे
+यह उत्पन्न होने वाले 12 शब्दों की एक श्रृंखला है
+जब आप पहली बार मेटामास्क सेट करते हैं, जो अनुमति देता है
 
 8
 00:00:26.070 --> 00:00:30.120
-आप कभी भी एक्सेस खोने पर अपने वॉलेट और धन को
-पुनर्प्राप्त कर सकते हैं।
+एक्सेस खोने की स्थिति में अपने वॉलेट और धन को रिकवर करने की सुविधा प्रदान करती है।
 
 9
 00:00:30.120 --> 00:00:33.451
-यह महत्वपूर्ण है कि आप
-अपने गुप्त रिकवरी फ्रेज़ को
+यह महत्वपूर्ण है कि आप अपने वॉलेट को सुरक्षित रखे
 
 10
 00:00:33.451 --> 00:00:37.510
-बहुत सुरक्षित और बहुत गुप्त रखकर
-अपने वॉलेट को सुरक्षित रखें।
+गुप्त पुनर्प्राप्ति वाक्यांश बहुत सुरक्षित, और बहुत ही गुप्त।
 
 11
 00:00:37.510 --> 00:00:41.429
-अगर किसी को भी इसकी सुविधा का एक्सेस मिल जाता है, तो
-उनके पास आपके वॉलेट की "मास्टर कुंजी" होगी और
+यदि किसी को इसकी एक्सेस मिलती है, तो उनके पास आपके वॉलेट की "मास्टर कुंजी" होगी और वह कर सकता है
 
 12
 00:00:41.429 --> 00:00:45.190
-वे आपके सारे धन को आसानी से एक्सेस कर सकते हैं।
+वह बहुत आसानी से आपके पूरे फण्ड को एक्सेस करके उसे चुरा सकता है।
 
 13
 00:00:45.190 --> 00:00:50.109
-अपने MetaMask वॉलेट को सुरक्षित करने के लिए आप अपने
-गुप्त रिकवरी फ्रेज़ को सुरक्षित रूप से सहेजना चाहेंगे।
+अपने मेटामास्क वॉलेट को सुरक्षित रखने के लिए आपको अपने गुप्त पुनर्प्राप्ति वाक्यांश को सुरक्षित ढंग से सहेजना चाहिए।
 
 14
 00:00:50.109 --> 00:00:54.930
-आप इसे लिख सकते हैं, इसे कहीं छुपा सकते हैं,
-इसे सेफ़ डिपोज़िट बॉक्स में रख सकते हैं
+आप इसे लिख सकते हैं, इसे कहीं छुपा सकते हैं, इसे सुरक्षित जमा बॉक्स में रख सकते हैं
 
 15
 00:00:54.930 --> 00:00:57.729
-या सुरक्षित पासवर्ड मैनेजर का उपयोग कर सकते हैं।
+या एक सुरक्षित पासवर्ड मैनेजर का उपयोग करें।
 
 16
 00:00:57.729 --> 00:01:01.050
-कुछ उपयोगकर्ता अपने
-फ्रेज़ को धातु की प्लेट पर भी उकेर कर रखते हैं!
+कुछ उपयोगकर्ता अपने वाक्यांश को धातु की प्लेट पर भी उकेरते हैं!
 
 17
 00:01:01.050 --> 00:01:04.440
-यदि आप अपना गुप्त रिकवरी फ्रेज़ खो देते हैं, तो
-कोई भी, यहां तक कि MetaMask की टीम भी,
+कोई नहीं, यहां तक कि मेटामास्क की टीम भी आपकी मदद नहीं कर सकती
 
 18
 00:01:04.440 --> 00:01:07.820
-आपके वॉलेट को पुनर्प्राप्त करने में आपकी
-सहायता नहीं कर सकती है।
+यदि आप अपना गुप्त पुनर्प्राप्ति वाक्यांश खो देते हैं तो अपना वॉलेट पुनर्प्राप्त करें।
 
 19
 00:01:07.820 --> 00:01:12.072
-यदि आपने अपना गुप्त रिकवरी फ्रेज़
-लिखा नहीं है और इसे कहीं सुरक्षित संग्रहीत नहीं किया है,
+यदि आपने अपने गुप्त पुनर्प्राप्ति वाक्यांश को लिखकर किसी सुरक्षित स्थान पर स्टोर नहीं किया है
 
 20
 00:01:12.072 --> 00:01:15.492
-तो अभी करें। हम इंतजार करेंगे।
+अभी करें। हम प्रतीक्षा करेंगे।
 
 21
 00:01:15.500 --> 00:01:20.780
-और याद रखें, कभी भी अपना गुप्त रिकवरी फ्रेज़
-किसी के साथ साझा न करें: हमसे भी नहीं।
+और याद रखें, कभी भी अपने गुप्त पुनर्प्राप्ति वाक्यांश को किसी के भी साथ, यहां तक हमारे साथ भी, साझा नहीं करें।
 
 22
 00:01:20.780 --> 00:01:24.910
-यदि कोई आपसे कभी भी इसे मांगता है, तो
-वे आपके साथ धोखाधड़ी करने की कोशिश कर सकते हैं।
+अगर कभी कोई आपसे इसके लिए पूछे, वे आपको धोखा देने की कोशिश कर रहे हैं।
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -111,5 +96,5 @@ MetaMask साइटों और एप्लिकेशन से
 
 24
 00:01:26.250 --> 00:01:31.020
-अब आपको पता चल गया है कि गुप्त रिकवरी फ्रेज़ क्या है
-और अपने वॉलेट को कैसे सकुशल और सुरक्षित रखा जाए।
+अब आप जानते हैं कि गुप्त पुनर्प्राप्ति वाक्यांश क्या है और अपने वॉलेट को संरक्षित और सुरक्षित कैसे रखें।
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/id.vtt b/app/images/videos/recovery-onboarding/subtitles/id.vtt
index 94761496b213..12807086ebc8 100644
--- a/app/images/videos/recovery-onboarding/subtitles/id.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/id.vtt
@@ -2,13 +2,11 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask adalah cara baru untuk terhubung
-ke situs dan aplikasi.
+MetaMask adalah cara baru untuk terhubung ke situs dan aplikasi.
 
 2
-00:00:04.580 --> 00:00:08.860
-Di situs web tradisional, database sentral
-atau bank bertanggung jawab untuk mengontrol dan
+00:00:04.580 --> 00:00:08.860 
+Di situs web biasa, basis data pusat atau bank bertanggung jawab untuk mengendalikan dan
 
 3
 00:00:08.860 --> 00:00:10.179
@@ -16,56 +14,47 @@ memulihkan akun Anda.
 
 4
 00:00:10.179 --> 00:00:15.050
-Tetapi di MetaMask, semua kuasa milik
-pemegang kunci induk.
+Namun, di MetaMask, seluruh kuasa milik pemegang kunci utama.
 
 5
 00:00:15.050 --> 00:00:18.460
-Siapa pun yang memegang kunci tersebut, akan mengontrol akun.
+Siapa pun yang memegang kunci, ia mengendalikan akun.
 
 6
 00:00:18.460 --> 00:00:21.110
-Frasa pemulihan rahasia
-adalah "kunci induk" Anda.
+Frasa pemulihan rahasia Anda adalah "kunci rahasia" Anda.
 
 7
 00:00:21.110 --> 00:00:26.070
-Ini adalah rangkaian 12 kata yang dibuat
-saat Anda menyiapkan MetaMask pertama kali, yang memungkinkan
+Frasa pemulihan ini berupa 12 kata yang dihasilkan saat pertama kali Anda menyiapkan MetaMask, yang memungkinkan
 
 8
 00:00:26.070 --> 00:00:30.120
-Anda memulihkan dompet dan dana jika Anda
-kehilangan akses.
+Anda untuk memulihkan dompet dan dana Anda jika Anda kehilangan akses.
 
 9
 00:00:30.120 --> 00:00:33.451
-Penting agar Anda mengamankan
-dompet Anda dengan menjaga
+Anda perlu mengamankan dompet Anda dengan menjaga
 
 10
 00:00:33.451 --> 00:00:37.510
-frasa pemulihan rahasia
-Anda dengan sangat aman dan sangat rahasia.
+frasa pemulihan rahasia dengan sangat aman, dan sangat rahasia.
 
 11
 00:00:37.510 --> 00:00:41.429
-Jika seseorang mendapatkan aksesnya, mereka akan memiliki
-"kunci induk" ke dompet Anda dan dapat
+Jika seseorang mendapatkan akses ke frasa tersebut, ia akan memiliki "kunci utama" ke dompet Anda dan dapat
 
 12
 00:00:41.429 --> 00:00:45.190
-mengakses secara bebas dan mengambil semua dana Anda.
+dengan bebas mengakses serta mengambil seluruh dana Anda.
 
 13
 00:00:45.190 --> 00:00:50.109
-Untuk mengamankan dompet MetaMask, Anda pasti ingin
-menyimpan frasa pemulihan rahasia Anda secara aman.
+Untuk mengamankan dompet MetaMask Anda, Anda perlu menyimpan frasa pemulihan rahasia dengan aman.
 
 14
 00:00:50.109 --> 00:00:54.930
-Anda dapat menuliskannya, menyembunyikannya di suatu tempat,
-menempatkannya di kotak deposit yang aman
+Anda dapat menuliskannya, menyembunyikannya, menaruhnya di brankas,
 
 15
 00:00:54.930 --> 00:00:57.729
@@ -73,23 +62,19 @@ atau menggunakan pengelola kata sandi yang aman.
 
 16
 00:00:57.729 --> 00:01:01.050
-Beberapa pengguna bahkan mengukir frasa
-mereka pada pelat logam!
+Sebagian pengguna bahkan mengukir frasa yang mereka miliki di lempengan logam!
 
 17
 00:01:01.050 --> 00:01:04.440
-Tidak ada seorang pun, bahkan tidak juga tim
-di MetaMask, dapat membantu Anda
+Tidak seorang pun, bahkan tim di MetaMask sekalipun, dapat membantu Anda
 
 18
 00:01:04.440 --> 00:01:07.820
-memulihkan dompet Anda jika Anda menghilangkan
-frasa pemulihan rahasia Anda.
+untuk memulihkan dompet jika Anda kehilangan frasa pemulihan rahasia Anda.
 
 19
 00:01:07.820 --> 00:01:12.072
-Jika belum menuliskan frasa pemulihan rahasia Anda
-dan menyimpannya di suatu tempat yang aman,
+Jika Anda belum menuliskan frasa pemulihan rahasia dan menyimpannya di tempat yang aman,
 
 20
 00:01:12.072 --> 00:01:15.492
@@ -97,19 +82,17 @@ lakukan sekarang. Kami akan menunggu.
 
 21
 00:01:15.500 --> 00:01:20.780
-Dan ingat, jangan membagikan frasa pemulihan rahasia
-Anda kepada siapa pun: bahkan tidak kepada kami.
+Dan ingat, jangan pernah membagikan frasa pemulihan rahasia kepada siapa pun: bahkan kepada kami.
 
 22
 00:01:20.780 --> 00:01:24.910
-Jika ada yang menanyakannya,
-mereka akan mencoba menipu Anda.
+Jika ada orang yang menanyakannya kepada Anda, mereka mencoba menipu Anda.
 
 23
 00:01:24.910 --> 00:01:26.250
-Begitulah!
+Itu saja!
 
 24
 00:01:26.250 --> 00:01:31.020
-Sekarang, Anda tahu apa itu frasa pemulihan rahasia
-dan cara menjaga dompet Anda tetap aman.
+Sekarang, Anda mengetahui apa itu frasa pemulihan rahasia dan cara mempertahankan agar dompet Anda tetap aman dan terjaga.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/ja.vtt b/app/images/videos/recovery-onboarding/subtitles/ja.vtt
index e99b3b7a48d6..91849500b416 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ja.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ja.vtt
@@ -2,108 +2,91 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask は
-をサイトとアプリケーションにつなぐ新たな方法です。
+MetaMask はサイトやアプリケーションに接続する新たな手段となります。
 
 2
-00:00:04.580 --> 00:00:08.860
-従来のウェブサイト上では、中央データベース
-または銀行がアカウントの制御と
+00:00:04.580 --> 00:00:08.860 
+従来の Web サイトでは、中央データベースや銀行がアカウントの
 
 3
 00:00:08.860 --> 00:00:10.179
-回復の責任を負います。
+管理と復元を行います。
 
 4
 00:00:10.179 --> 00:00:15.050
-しかし、MetaMask 上では、全ての権限は
-マスターキーの保持者に属します。
+一方 MetaMask では、マスターキーの所有者がすべての権限を握っています。
 
 5
 00:00:15.050 --> 00:00:18.460
-当該のキーの保持者が、アカウントを制御します。
+キーを持っている人がアカウントを管理できるのです。
 
 6
 00:00:18.460 --> 00:00:21.110
-あなたのシークレット リカバリー フレーズ
-があなたの「マスターキー」です。
+秘密のリカバリーフレーズがその「マスターキー」となります。
 
 7
 00:00:21.110 --> 00:00:26.070
-これは一連の 12 の単語で
-あなたが最初に MetaMask を設定した際に自動生成され、これにより
+これは MetaMask のセットアップ時に生成される 12 単語からなるフレーズで、
 
 8
 00:00:26.070 --> 00:00:30.120
-あなたは万が一アクセス出来なくなった場合に
-ウォレットと資金を復元できます。
+万が一アクセスできなくなった際にウォレットと資金を復元できます。
 
 9
 00:00:30.120 --> 00:00:33.451
-ウォレットの安全性を確保することは非常に重要
-であり、あなたの
+ウォレットの安全を保つため、
 
 10
 00:00:33.451 --> 00:00:37.510
-シークレット リカバリー フレーズ
-を非常に安全かつ秘密に保つことで実現します。
+秘密のリカバリーフレーズは厳重に保管し、絶対に秘密にしてください。
 
 11
 00:00:37.510 --> 00:00:41.429
-誰かがそれにアクセスすれば、彼らは
-あなたのウォレットの「マスターキー」を得て、
+誰かの手に渡ると、ウォレットへの「マスターキー」として使用され、
 
 12
 00:00:41.429 --> 00:00:45.190
-あなたの資金に自由にアクセスして全てを奪えます。
+すべての資金にアクセスし盗むことが可能になります。
 
 13
 00:00:45.190 --> 00:00:50.109
-MetaMask ウォレットの安全性を確保するため
-あなたは シークレット リカバリー フレーズを安全に保存したくなるでしょう。
+MetaMask ウォレットを安全に保つため、秘密のリカバリーフレーズは大切に保管してください。
 
 14
 00:00:50.109 --> 00:00:54.930
-それを書き留めたり、どこかへ隠したり、
-セーフティボックスに入れたり
+書き留めて、どこかに隠したり、安全な金庫に保管したり、
 
 15
 00:00:54.930 --> 00:00:57.729
-または安全確保のためのパスワードマネジャーを使用できます。
+セキュアなパスワードマネージャーを使用することもできます。
 
 16
 00:00:57.729 --> 00:01:01.050
-自分たちの
-フレーズをメタルプレートに彫るユーザーさえいます！
+金属製のプレートにフレーズを彫るユーザーもいます！
 
 17
 00:01:01.050 --> 00:01:04.440
-何者も、
-MetaMask のチームのメンバーですら、あなたが
+秘密のリカバリーフレーズをなくした場合、MetaMask チームを含め、
 
 18
 00:01:04.440 --> 00:01:07.820
-シークレット リカバリー フレーズを無くしたら
-あなたのウォレットを復元する手助けはできません。
+誰にもウォレットの復元を行うことはできません。
 
 19
 00:01:07.820 --> 00:01:12.072
-あなたがシークレット リカバリー
-フレーズを書き留め安全な場所に保管していないのならば、
+秘密のリカバリーフレーズを書き留めて安全な場所に保管していない場合は、
 
 20
 00:01:12.072 --> 00:01:15.492
-ぜひ今それを実行してください。お待ちしております。
+今すぐ行ってください。その間お待ちします。
 
 21
 00:01:15.500 --> 00:01:20.780
-さらに、あなたのシークレット リカバリー
-フレーズを誰とも決して共有しないことを忘れないでください。私たちでさえも。
+繰り返しになりますが、秘密のリカバリーフレーズは MetaMask チームを含め、絶対に誰にも教えないでください。
 
 22
 00:01:20.780 --> 00:01:24.910
-それを尋ねる者がいたら、
-彼らはあなたを騙そうとしているのです。
+誰かに尋ねられたら、それは詐欺だと思ってください。
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -111,5 +94,5 @@ MetaMask のチームのメンバーですら、あなたが
 
 24
 00:01:26.250 --> 00:01:31.020
-これでシークレット リカバリ フレーズ
-が何であるか、あなたのウォレットと資金の安全を確保する方法が判りました。
+これで秘密のリカバリーフレーズとウォレットの安全を保つ方法の説明は終わりです。
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/ko.vtt b/app/images/videos/recovery-onboarding/subtitles/ko.vtt
index 68c04d1ae46d..60ff4e771e25 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ko.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ko.vtt
@@ -2,114 +2,97 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask는 사이트와 애플리케이션에
-연결할 수 있는 새로운 방법입니다.
+MetaMask는 사이트와 애플리케이션을 연결하는 새로운 방법입니다.
 
 2
-00:00:04.580 --> 00:00:08.860
-전통적인 웹사이트에서는 중앙 데이터베이스
-또는 은행에게 계정을 제어 및
+00:00:04.580 --> 00:00:08.860 
+기존의 웹사이트는 중앙 데이터베이스나 은행에 계정 복구의
 
 3
 00:00:08.860 --> 00:00:10.179
-복구할 책임이 있습니다.
+책임이 있습니다.
 
 4
 00:00:10.179 --> 00:00:15.050
-하지만 MetaMask에서는 모든 권한이
-마스터 키의 소유자에게 있습니다.
+MetaMask에서는 모든 권한이 마스터 키 소유자에게 있습니다.
 
 5
 00:00:15.050 --> 00:00:18.460
-키를 보유하고 있는 사람은 계정을 제어합니다.
+마스터 키를 소유한 사람이 해당 계정의 소유자가 됩니다.
 
 6
 00:00:18.460 --> 00:00:21.110
-계정 시드 구문은
-"마스터 키"입니다.
+여러분이 가지고 계시는 비밀 복구 구문이 바로 '마스터 키'입니다.
 
 7
 00:00:21.110 --> 00:00:26.070
-먼저 MetaMask를 설정하면, 일련의
-12단어가 생성되어,
+이는 처음 MetaMask 계정을 만들 때 생성된 12개의 단어로 이루어진 암호이며
 
 8
 00:00:26.070 --> 00:00:30.120
-접근 권한을 상실했을 때 지갑과
-자금을 복구할 수 있습니다.
+이를 사용하면 유사시에 지갑과 자금을 회복할 수 있습니다.
 
 9
 00:00:30.120 --> 00:00:33.451
-계정 시드 구문을
-안전하게 비밀을
+따라서 지갑을 안전하게 지키려면 이러한 비밀 복구 구문을
 
 10
 00:00:33.451 --> 00:00:37.510
-유지하여 지갑을 안전하게
-지키는 것이 중요합니다.
+매우 안전한 비밀장소에 보관하는 것이 중요합니다.
 
 11
 00:00:37.510 --> 00:00:41.429
-계정 시드 구문에 액세스하는 사람에게는
-지갑에 대한 "마스터 키"가 있어 자유롭게
+누구든지 비밀 복구 구문을 알게 되면 해당 지갑에 대한 '마스터 키'를 손에 넣게 되며
 
 12
 00:00:41.429 --> 00:00:45.190
-액세스하여 모든 자금을 가져갈 수 있습니다.
+해당 계정의 자금을 모두 인출할 수 있게 됩니다.
 
 13
 00:00:45.190 --> 00:00:50.109
-MetaMask 지갑을 안전하게 보호하려면, 계정 시드
-구문을 저장할 수 있습니다.
+MetaMask 지갑의 보안을 유지하려면 비밀 복구 구문을 안전하게 저장해야 합니다.
 
 14
 00:00:50.109 --> 00:00:54.930
-계정 시드 구문을 적어서 어딘가에 숨겨두거나
-대여 금고에 두거나
+이를 적어 별도의 장소나 안전 금고에 보관할 수도 있고
 
 15
 00:00:54.930 --> 00:00:57.729
-보안 암호 관리자를 사용할 수 있습니다.
+비밀번호 관리자를 이용하셔도 좋습니다.
 
 16
 00:00:57.729 --> 00:01:01.050
-일부 사용자는 자신의 구문을
-금속판에 새겨두기도 합니다!
+사용자에 따라 이를 금속판에 새겨 놓기도 합니다!
 
 17
 00:01:01.050 --> 00:01:04.440
-계정 시드 구문을 잊으면,
-MetaMask의 팀이라고
+이러한 비밀 복구 구문을 분실하면 아무도, 심지어 MetaMask도
 
 18
 00:01:04.440 --> 00:01:07.820
-해도 지갑을
-복구할 수 없습니다.
+계정 복구를 도와드릴 수 없습니다.
 
 19
 00:01:07.820 --> 00:01:12.072
-게정 시드 구문을 적어두지
-않으면, 안전한 장소에
+아직 비밀 복구 구문을 적어 안전한 곳에 보관하지 않으셨다면,
 
 20
 00:01:12.072 --> 00:01:15.492
-보관하십시오. 기다리겠습니다.
+지금 바로 하세요. 기다리겠습니다.
 
 21
 00:01:15.500 --> 00:01:20.780
-다른 사람과 계정 시드 구문을
-고유하면 안 됩니다. 당사하고도 공유하지 마십시오.
+절대로 본인의 비밀 복구 구문을 다른 사람에게 알려주지 마세요. MetaMask에도 알리면 안 됩니다.
 
 22
 00:01:20.780 --> 00:01:24.910
-계정 시드 구문을 요청하는 사람은
-사기를 치려고 하는 것입니다.
+이를 묻는 사람이 있다면 피싱 범죄자임에 틀림없습니다.
 
 23
 00:01:24.910 --> 00:01:26.250
-이제 다 됐습니다.
+그렇습니다!
 
 24
 00:01:26.250 --> 00:01:31.020
-이제 여러분은 계정 시드 구문이 무엇이고
-지갑을 안전하게 보관하는 방법을 알고 있습니다.
+이제 비밀 복구 구문과 지갑을 안전하게 보관하는 방법에 대하여 확인하였습니다.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/pt.vtt b/app/images/videos/recovery-onboarding/subtitles/pt.vtt
index bebef88e17b7..6a05682e922c 100644
--- a/app/images/videos/recovery-onboarding/subtitles/pt.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/pt.vtt
@@ -2,108 +2,108 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-O MetaMask é um novo jeito de se conectar
-a sites e aplicativos.
+A MetaMask é uma nova forma
+de se conectar a sites e aplicativos.
 
 2
-00:00:04.580 --> 00:00:08.860
-Em websites tradicionais, um banco ou base de dados central
-é responsável por controlar e
+00:00:04.580 --> 00:00:08.860 
+Em sites tradicionais, uma base de dados central
+ou um banco é responsável por controlar e
 
 3
 00:00:08.860 --> 00:00:10.179
-recuperar as suas contas.
+recuperar suas contas.
 
 4
 00:00:10.179 --> 00:00:15.050
-Mas, no MetaMask, todo o poder pertence
+Mas, na MetaMask, todo o poder pertence
 ao titular de uma chave-mestra.
 
 5
 00:00:15.050 --> 00:00:18.460
-Quem quer que detenha a chave controla as contas.
+Quem tiver a chave controla as contas.
 
 6
 00:00:18.460 --> 00:00:21.110
-A sua frase de recuperação secreta
-é a sua "chave-mestra".
+Sua frase de recuperação secreta
+é sua "chave-mestra".
 
 7
 00:00:21.110 --> 00:00:26.070
-É uma série de 12 palavras que são geradas
-quando você configura o MetaMask na primeira vez, o que permite que
+Ela é uma série de 12 palavras geradas quando você
+configura a MetaMask pela primeira vez, a qual permite
 
 8
 00:00:26.070 --> 00:00:30.120
-você recupere a sua carteira e recursos, caso você
-venha a perder o acesso.
+recuperar sua carteira e fundos
+caso você perca o acesso.
 
 9
 00:00:30.120 --> 00:00:33.451
-É importante que você mantenha protegida
-a sua carteira ao manter a sua
+É importante que você proteja
+sua carteira guardando sua
 
 10
 00:00:33.451 --> 00:00:37.510
 frase de recuperação secreta
-muito segura e muito secreta.
+de forma bem segura e sigilosa.
 
 11
 00:00:37.510 --> 00:00:41.429
-Caso alguém obtenha acesso a ela, essa pessoa terá
-a "chave-mestra" para a sua carteira e poderá
+Se alguém tiver acesso a ela, terá em mãos
+a "chave-mestra" da sua carteira e poderá
 
 12
 00:00:41.429 --> 00:00:45.190
-acessá-la livremente e tome todos os seus recursos.
+acessar e retirar livremente todos os seus fundos.
 
 13
 00:00:45.190 --> 00:00:50.109
-A fim de proteger a sua carteira MetaMask, você desejará
-manter em segurança a sua frase de recuperação secreta.
+Para proteger sua carteira MetaMask, recomenda-se
+salvar sua frase de recuperação secreta de modo seguro.
 
 14
 00:00:50.109 --> 00:00:54.930
-Você pode escrevê-la, escondê-la em algum lugar,
-colocá-la em um cofre
+Você pode anotá-la por escrito, escondê-la
+em algum lugar, colocá-la em um cofre
 
 15
 00:00:54.930 --> 00:00:57.729
-ou usar um gerenciador de senhas seguras.
+ou usar um gerenciador de senhas protegido.
 
 16
 00:00:57.729 --> 00:01:01.050
-Alguns usuários até mesmo gravam sua
-frase em uma placa de metal!
+Alguns usuários até mesmo gravam
+a frase em uma placa de metal!
 
 17
 00:01:01.050 --> 00:01:04.440
 Ninguém, nem mesmo a equipe
-na MetaMask, pode lhe ajudar
+da MetaMask, pode ajudar você
 
 18
 00:01:04.440 --> 00:01:07.820
-a recuperar a sua carteira, caso você perca
-a sua frase de recuperação secreta.
+a recuperar sua carteira caso perca
+sua frase de recuperação secreta.
 
 19
 00:01:07.820 --> 00:01:12.072
-Caso você não tenha escrito a sua frase de recuperação
-secreta e a tenha armazenado em algum lugar seguro,
+Se não tiver anotado por escrito sua frase de recuperação
+secreta e a armazenado em um lugar seguro,
 
 20
 00:01:12.072 --> 00:01:15.492
-faça isso agora. Iremos aguardar.
+faça isso agora. A gente espera.
 
 21
 00:01:15.500 --> 00:01:20.780
-E lembre-se de jamais compartilhar a sua frase de recuperação
-secreta com ninguém: nem mesmo conosco.
+E lembre-se: nunca compartilhe sua frase de recuperação
+secreta com ninguém, nem mesmo conosco.
 
 22
 00:01:20.780 --> 00:01:24.910
-Caso alguém venha a lhe pedir a sua frase de recuperação secreta,
-essa pessoa está tentando dar um golpe em você.
+Se alguém a pedir a você,
+é uma tentativa de fraude.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -111,5 +111,6 @@ essa pessoa está tentando dar um golpe em você.
 
 24
 00:01:26.250 --> 00:01:31.020
-Agora, você sabe o que é uma frase de recuperação secreta
-e como manter a sua carteira protegida e segura.
+Agora você sabe o que é uma frase de recuperação
+secreta e como manter sua carteira segura.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/ru.vtt b/app/images/videos/recovery-onboarding/subtitles/ru.vtt
index 46c165a6aa6d..221c48547546 100644
--- a/app/images/videos/recovery-onboarding/subtitles/ru.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/ru.vtt
@@ -6,9 +6,8 @@ MetaMask — это новый способ подключения
 к сайтам и приложениям.
 
 2
-00:00:04.580 --> 00:00:08.860
-На традиционных сайтах центральная база данных
-или банк несет ответственность за контроль и
+00:00:04.580 --> 00:00:08.860 
+На традиционных сайтах центральная база данных или банк отвечает за контроль и
 
 3
 00:00:08.860 --> 00:00:10.179
@@ -16,80 +15,72 @@ MetaMask — это новый способ подключения
 
 4
 00:00:10.179 --> 00:00:15.050
-На MetaMask все полномочия находятся
-в руках владельца мастер-ключа.
+Но в MetaMask все полномочия в руках
+обладателя главного ключа.
 
 5
 00:00:15.050 --> 00:00:18.460
-Тот, в чьих руках находится ключ, контролирует счета.
+Тот, кто имеет этот ключ, контролирует счета.
 
 6
 00:00:18.460 --> 00:00:21.110
-Ваша секретная фраза восстановления
-— это ваш «мастер-ключ».
+Ваша секретная фраза восстановления — это ваш главный ключ.
 
 7
 00:00:21.110 --> 00:00:26.070
-Это набор из 12 слов, которые генерируются
-при первой настройке MetaMask, он позволяет
+Это последовательность из 12 слов, которые генерируются при первой настройке MetaMask и позволяет
 
 8
 00:00:26.070 --> 00:00:30.120
-вам восстанавливать ваш кошелек и средства, если вы
-теряете к ним доступ.
+вам восстановить свой кошелек и средства, если вы
+когда-либо утратите доступ к ним.
 
 9
 00:00:30.120 --> 00:00:33.451
 Важно, чтобы вы обезопасили
-свой кошелек, храня вашу
+свой кошелек, сохранив
 
 10
 00:00:33.451 --> 00:00:37.510
-секретную фразу восстановления
-в очень надежном и тайном месте.
+секретную фразу для восстановления
+в очень надежном месте и в полной тайне.
 
 11
 00:00:37.510 --> 00:00:41.429
-Если кто-то получит доступ к ней, у этого человека окажется в руках
-«мастер-ключ» от вашего кошелька, и он сможет
+Если кто-то узнает ее, у этого человека будет
+главный ключ к вашему кошельку, и он сможет
 
 12
 00:00:41.429 --> 00:00:45.190
-распоряжаться им и завладеть всеми вашими средствами.
+получить свободный доступ ко всем вашим средствам и забрать их.
 
 13
 00:00:45.190 --> 00:00:50.109
-Чтобы обезопасить ваш кошелек MetaMask,
-сохраните секретную фразу восстановления в безопасном месте.
+Чтобы защитить кошелек MetaMask, вам необходимо безопасно сохранить секретную фразу восстановления.
 
 14
 00:00:50.109 --> 00:00:54.930
-Вы можете записать ее, спрятать ее где-то,
-положить ее в банковский сейф
+Вы можете записать ее и спрятать куда-нибудь, положить в сейф
 
 15
 00:00:54.930 --> 00:00:57.729
-или воспользоваться безопасным диспетчером паролей.
+или использовать безопасный менеджер паролей.
 
 16
 00:00:57.729 --> 00:01:01.050
-Некоторые пользователи даже гравируют свою
-фразу на металлической пластине!
+Некоторые пользователи даже гравируют свою фразу на металлической пластине!
 
 17
 00:01:01.050 --> 00:01:04.440
-Никто, даже команда
-MetaMask, не сможет помочь вам
+Никто, даже команда MetaMask, не сможет вам помочь
 
 18
 00:01:04.440 --> 00:01:07.820
-восстановить ваш кошелек, если вы потеряете
-вашу секретную фразу восстановления.
+восстановить кошелек, если вы потеряете секретную фразу для восстановления.
 
 19
 00:01:07.820 --> 00:01:12.072
-Если вы еще не записали секретную фразу
-восстановления и не поместили ее в надежное место,
+Если вы не записали свою секретную фразу для восстановления и не сохранили ее в безопасном месте,
 
 20
 00:01:12.072 --> 00:01:15.492
@@ -97,13 +88,11 @@ MetaMask, не сможет помочь вам
 
 21
 00:01:15.500 --> 00:01:20.780
-И помните, никогда не сообщайте свою секретную фразу
-восстановления никому: даже нам.
+И помните: никогда никому не сообщайте свою секретную фразу для восстановления, даже нам.
 
 22
 00:01:20.780 --> 00:01:24.910
-Если кто-нибудь когда-либо спросит у вас ее,
-этот человек пытается вас обмануть.
+Если кто-то когда-нибудь попросит вас предоставить ее, этот человек пытается вас обмануть.
 
 23
 00:01:24.910 --> 00:01:26.250
@@ -111,5 +100,5 @@ MetaMask, не сможет помочь вам
 
 24
 00:01:26.250 --> 00:01:31.020
-Теперь вы знаете, что такое секретная фраза восстановления
-и как обезопасить ваш кошелек.
+Теперь вы знаете, что такое секретная фраза для восстановления и как сохранить свой кошелек в целости и сохранности.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/tl.vtt b/app/images/videos/recovery-onboarding/subtitles/tl.vtt
index cfb3ebca76d3..b4fdbb7cd1ef 100644
--- a/app/images/videos/recovery-onboarding/subtitles/tl.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/tl.vtt
@@ -6,7 +6,7 @@ Ang MetaMask ay isang bagong paraan para kumonekta
 sa mga site at application.
 
 2
-00:00:04.580 --> 00:00:08.860
+00:00:04.580 --> 00:00:08.860 
 Sa mga tradisyonal na website, ang isang central database
 o bangko ang magiging responsable sa pagkontrol at
 
@@ -113,3 +113,4 @@ sinusubukan ka nilang i-scam.
 00:01:26.250 --> 00:01:31.020
 Ngayon ay alam mo na kung ano ang lihim na recovery phrase
 at kung paano mapapanatiling ligtas ang iyong wallet.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/tr.vtt b/app/images/videos/recovery-onboarding/subtitles/tr.vtt
new file mode 100644
index 000000000000..0e1fef01d754
--- /dev/null
+++ b/app/images/videos/recovery-onboarding/subtitles/tr.vtt
@@ -0,0 +1,116 @@
+WEBVTT
+
+1
+00:00:00.780 --> 00:00:04.580
+MetaMask site ve uygulamalara
+bağlanmanın yeni bir yoludur.
+
+2
+00:00:04.580 --> 00:00:08.860 
+Geleneksel web sitelerinde,
+merkezi bir veritabanı veya banka
+
+3
+00:00:08.860 --> 00:00:10.179
+hesaplarınızı korumaktan sorumludur.
+
+4
+00:00:10.179 --> 00:00:15.050
+Ama MetaMask'ta tüm güç
+ana anahtar sahibine aittir.
+
+5
+00:00:15.050 --> 00:00:18.460
+Anahtar kimdeyse hesapları o kontrol eder.
+
+6
+00:00:18.460 --> 00:00:21.110
+Gizli kurtarma ifadeniz
+sizin "ana anahtarınızdır".
+
+7
+00:00:21.110 --> 00:00:26.070
+MetaMask'ı ilk kurduğunuzda oluşturulan
+12 sözcükten oluşan bir dizi olup
+
+8
+00:00:26.070 --> 00:00:30.120
+erişiminizi kaybettiğiniz takdirde
+cüzdanınızı ve paralarınızı kurtarabilmenize olanak sağlar.
+
+9
+00:00:30.120 --> 00:00:33.451
+Gizli kurtarma ifadenizi
+çok güvenli ve çok gizli tutarak
+
+10
+00:00:33.451 --> 00:00:37.510
+cüzdanınızı korumanız
+önemlidir.
+
+11
+00:00:37.510 --> 00:00:41.429
+Gizli kurtarma ifadenize sahip olan kişi
+cüzdanınızın "ana anahtarı"na sahip olacak ve
+
+12
+00:00:41.429 --> 00:00:45.190
+serbestçe erişim sağlayıp tüm paranızı alabilecektir.
+
+13
+00:00:45.190 --> 00:00:50.109
+MetaMask cüzdanınızı korumak için gizli kurtarma
+ifadenizin güvenli bir şekilde saklamak isteyeceksiniz.
+
+14
+00:00:50.109 --> 00:00:54.930
+Yazıp bir yere saklayabilir,
+güvenli bir kasaya koyabilirsiniz
+
+15
+00:00:54.930 --> 00:00:57.729
+veya güvenli bir şifre yöneticisi kullanabilirsiniz.
+
+16
+00:00:57.729 --> 00:01:01.050
+İfadelerini metal bir levhaya kazıyan
+kullanıcılar bile görülmüştür!
+
+17
+00:01:01.050 --> 00:01:04.440
+Gizli kurtarma ifadenizi kaybettiğiniz takdirde
+MetaMask ekibi dahil olmak üzere hiç kimse
+
+18
+00:01:04.440 --> 00:01:07.820
+cüzdanınızı kurtarmanıza 
+yardımcı olamaz.
+
+19
+00:01:07.820 --> 00:01:12.072
+Gizli kurtarma ifadenizi yazmadıysanız veya
+güvenli bir yere saklamadıysanız
+
+20
+00:01:12.072 --> 00:01:15.492
+bunu şimdi yapın. Bekleyeceğiz.
+
+21
+00:01:15.500 --> 00:01:20.780
+Ayrıca gizli kurtarma ifadenizi asla
+biz dahil hiç kimse ile paylaşmamanız gerektiğini unutmayın.
+
+22
+00:01:20.780 --> 00:01:24.910
+Birisi gizli kurtarma ifadenizi sizden istiyorsa
+sizi dolandırmaya çalışıyordur.
+
+23
+00:01:24.910 --> 00:01:26.250
+Bu kadar!
+
+24
+00:01:26.250 --> 00:01:31.020
+Artık gizli kurtarma ifadesinin ne olduğunu ve
+cüzdanınızı nasıl güvende tutacağınızı biliyorsunuz.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/vi.vtt b/app/images/videos/recovery-onboarding/subtitles/vi.vtt
index a05e97d85562..69875b90a592 100644
--- a/app/images/videos/recovery-onboarding/subtitles/vi.vtt
+++ b/app/images/videos/recovery-onboarding/subtitles/vi.vtt
@@ -2,114 +2,114 @@ WEBVTT
 
 1
 00:00:00.780 --> 00:00:04.580
-MetaMask là cách thức mới để kết nối
-với các trang web và ứng dụng.
+MetaMask là một cách mới để kết nối
+đến các trang web và ứng dụng.
 
 2
-00:00:04.580 --> 00:00:08.860
-Trên các trang web truyền thống, một cơ sở dữ liệu trung tâm
-hay ngân hàng sẽ chịu trách nhiệm kiểm soát và
+00:00:04.580 --> 00:00:08.860 
+Trên các trang web truyền thống, cơ sở dữ liệu trung tâm
+hoặc ngân hàng sẽ chịu trách nhiệm kiểm soát và
 
 3
 00:00:08.860 --> 00:00:10.179
-khôi phục các tài khoản của bạn.
+khôi phục tài khoản của bạn.
 
 4
 00:00:10.179 --> 00:00:15.050
-Tuy nhiên, trên MetaMask, toàn bộ quyền sẽ thuộc về
-người nắm giữ khóa chính.
+Nhưng trên MetaMask, tất cả quyền lực thuộc về
+người nắm giữ chìa khóa chính.
 
 5
 00:00:15.050 --> 00:00:18.460
-Người có khóa chính sẽ kiểm soát được tài khoản.
+Ai nắm giữ chìa khóa, người đó kiểm soát tài khoản.
 
 6
 00:00:18.460 --> 00:00:21.110
-Cụm mật khẩu khôi phục bí mật
-là “khóa chính” của bạn.
+Cụm từ khôi phục bí mật
+là "chìa khóa chính" của bạn.
 
 7
 00:00:21.110 --> 00:00:26.070
-Đây là chuỗi gồm 12 từ được tạo
-vào lần đầu tiên bạn thiết lập MetaMask, chuỗi này cho phép
+Đó là một chuỗi 12 từ được tạo ra
+khi bạn thiết lập MetaMask lần đầu tiên, cho phép
 
 8
 00:00:26.070 --> 00:00:30.120
-bạn khôi phục ví và tiền của mình nếu
-bạn bị mất quyền truy cập.
+bạn khôi phục ví và tiền của mình nếu bị mất quyền truy cập.
 
 9
 00:00:30.120 --> 00:00:33.451
-Bạn cần phải bảo vệ an toàn cho
-ví của mình bằng cách lưu giữ
+Điều quan trọng là bạn phải bảo mật
+cho ví của mình bằng cách cất giữ
 
 10
 00:00:33.451 --> 00:00:37.510
-cụm mật khẩu khôi phục bí mật
-thật an toàn và bí mật.
+cụm từ khôi phục bí mật ở một nơi
+cực kỳ an toàn và bí mật.
 
 11
 00:00:37.510 --> 00:00:41.429
-Nếu ai đó có được cụm mật khẩu khôi phục bí mật của bạn thì người đó sẽ có
-“khóa chính” cho ví của bạn và có thể
+Nếu bất kỳ ai có quyền truy cập, họ sẽ biết
+"chìa khóa chính" để vào ví của bạn và có thể
 
 12
 00:00:41.429 --> 00:00:45.190
-tự do truy cập và lấy toàn bộ tiền của bạn.
+tự do truy cập và lấy hết tiền của bạn.
 
 13
 00:00:45.190 --> 00:00:50.109
-Để bảo vệ an toàn cho ví MetaMask, bạn cần
-lưu giữ cụm mật khẩu khôi phục bí mật một cách an toàn.
+Để bảo mật cho ví MetaMask của mình, bạn sẽ cần
+cất giữ cụm từ khôi phục bí mật ở một nơi an toàn.
 
 14
 00:00:50.109 --> 00:00:54.930
-Bạn có thể chép lại và giấu ở một nơi nào đó,
-cất trong hộp ký gửi an toàn
+Hãy viết ra giấy, giấu ở đâu đó,
+bỏ vào hộp ký gửi an toàn
 
 15
 00:00:54.930 --> 00:00:57.729
-hoặc dùng một trình quản lý mật khẩu an toàn.
+hoặc sử dụng trình quản lý mật khẩu an toàn.
 
 16
 00:00:57.729 --> 00:01:01.050
 Một số người dùng thậm chí còn khắc
-cụm mật khẩu của họ lên một tấm kim loại!
+cụm từ của họ lên một tấm kim loại!
 
 17
 00:01:01.050 --> 00:01:04.440
-Không một ai, kể cả đội ngũ
-tại MetaMask, có thể giúp bạn
+Sẽ không có ai, kể cả nhóm
+MetaMask, có thể giúp bạn
 
 18
 00:01:04.440 --> 00:01:07.820
-khôi phục lại ví nếu bạn đánh mất
-cụm mật khẩu khôi phục bí mật của mình.
+khôi phục ví nếu bạn làm mất
+cụm từ khôi phục bí mật.
 
 19
 00:01:07.820 --> 00:01:12.072
-Nếu chưa ghi lại cụm mật khẩu khôi phục bí mật
-của mình và lưu giữ ở nơi an toàn,
+Nếu bạn chưa viết cụm từ khôi phục bí mật
+ra giấy và cất giữ ở một nơi nào đó an toàn,
 
 20
 00:01:12.072 --> 00:01:15.492
-thì bạn hãy thực hiện ngay bây giờ. Chúng tôi sẽ chờ bạn.
+thì bạn cần thực hiện ngay. Chúng tôi sẽ đợi.
 
 21
 00:01:15.500 --> 00:01:20.780
-Và đừng bao giờ chia sẻ cụm mật khẩu khôi phục
-bí mật với bất kỳ ai: kể cả chúng tôi.
+Và hãy nhớ, không bao giờ chia sẻ cụm từ khôi phục
+bí mật của bạn với bất kỳ ai: ngay cả chúng tôi.
 
 22
 00:01:20.780 --> 00:01:24.910
-Nếu ai đó hỏi bạn cụm mật khẩu khôi phục bí mật,
-thì họ đang cố gắng lừa đảo bạn.
+Nếu bất kỳ ai hỏi bạn về cụm từ khôi phục
+bí mật, thì họ đang cố lừa bạn đó.
 
 23
 00:01:24.910 --> 00:01:26.250
-Xin hãy ghi nhớ!
+Đó là tất cả những gì bạn cần ghi nhớ!
 
 24
 00:01:26.250 --> 00:01:31.020
-Bây giờ bạn đã biết cụm mật khẩu khôi phục bí mật
-là gì và cách bảo vệ ví của bạn an toàn và bảo mật.
+Bây giờ bạn đã biết cụm từ khôi phục bí mật là gì
+và cách để đảm bảo an toàn và bảo mật cho ví của bạn.
+
diff --git a/app/images/videos/recovery-onboarding/subtitles/zh.vtt b/app/images/videos/recovery-onboarding/subtitles/zh.vtt
new file mode 100644
index 000000000000..8e1a572f276c
--- /dev/null
+++ b/app/images/videos/recovery-onboarding/subtitles/zh.vtt
@@ -0,0 +1,98 @@
+WEBVTT
+
+1
+00:00:00.780 --> 00:00:04.580
+MetaMask是连接站点和应用程序的一种新方法。
+
+2
+00:00:04.580 --> 00:00:08.860 
+在传统网站上，中央数据库或银行负责控制和
+
+3
+00:00:08.860 --> 00:00:10.179
+恢复您的账户。
+
+4
+00:00:10.179 --> 00:00:15.050
+但在MetaMask，所有的权限都属于主密钥的持有者。
+
+5
+00:00:15.050 --> 00:00:18.460
+谁拿着密钥，谁就控制着账户。
+
+6
+00:00:18.460 --> 00:00:21.110
+您的私钥助记词是您的“主密钥”。
+
+7
+00:00:21.110 --> 00:00:26.070
+这是在您第一次设置MetaMask时生成的12个单词的字串，
+
+8
+00:00:26.070 --> 00:00:30.120
+如果您一旦失去访问权限，可以使用该助记词恢复您的钱包和资金。
+
+9
+00:00:30.120 --> 00:00:33.451
+重要的是，您应通过非常保险而私密的方式保护您的
+
+10
+00:00:33.451 --> 00:00:37.510
+私钥助记词的安全，从而确保您的钱包安全。
+
+11
+00:00:37.510 --> 00:00:41.429
+如果有人可以获取您的私钥助记词，他们将拥有您钱包的“主密钥”，可以
+
+12
+00:00:41.429 --> 00:00:45.190
+自由访问并拿走您的所有资金。
+
+13
+00:00:45.190 --> 00:00:50.109
+为了保护MetaMask钱包的安全，您需要安全地保存您的私钥助记词。
+
+14
+00:00:50.109 --> 00:00:54.930
+您可以把它写下来，藏在某处，放在保险箱里，
+
+15
+00:00:54.930 --> 00:00:57.729
+或者使用安全的密码管理器保存。
+
+16
+00:00:57.729 --> 00:01:01.050
+一些用户甚至将他们的助记词刻在金属板上！
+
+17
+00:01:01.050 --> 00:01:04.440
+如果您丢失了私钥助记词，没有人能帮助您找回钱包，即使是MetaMask
+
+18
+00:01:04.440 --> 00:01:07.820
+的团队也毫无办法。
+
+19
+00:01:07.820 --> 00:01:12.072
+如果您尚未写下您的私钥助记词并将其存储在安全的地方，
+
+20
+00:01:12.072 --> 00:01:15.492
+请即刻着手做此事。我们会等待您的。
+
+21
+00:01:15.500 --> 00:01:20.780
+记住，永远不要与任何人分享您的私钥助记词：即便是我们也不可以。
+
+22
+00:01:20.780 --> 00:01:24.910
+如果有人向您索要私钥助记词，他们就是妄图欺诈您。
+
+23
+00:01:24.910 --> 00:01:26.250
+就是这样！
+
+24
+00:01:26.250 --> 00:01:31.020
+现在，您了解了什么是私钥助记词，以及如何确保您的钱包安全。
+
diff --git a/app/manifest/_base.json b/app/manifest/v2/_base.json
similarity index 95%
rename from app/manifest/_base.json
rename to app/manifest/v2/_base.json
index c2b20b4dbeac..d10900224f27 100644
--- a/app/manifest/_base.json
+++ b/app/manifest/v2/_base.json
@@ -66,12 +66,12 @@
     "clipboardWrite",
     "http://localhost:8545/",
     "https://*.infura.io/",
+    "https://chainid.network/chains.json",
     "https://lattice.gridplus.io/*",
     "activeTab",
     "webRequest",
     "*://*.eth/",
     "notifications"
   ],
-  "short_name": "__MSG_appName__",
-  "web_accessible_resources": ["inpage.js", "phishing.html"]
+  "short_name": "__MSG_appName__"
 }
diff --git a/app/manifest/brave.json b/app/manifest/v2/brave.json
similarity index 100%
rename from app/manifest/brave.json
rename to app/manifest/v2/brave.json
diff --git a/app/manifest/chrome.json b/app/manifest/v2/chrome.json
similarity index 100%
rename from app/manifest/chrome.json
rename to app/manifest/v2/chrome.json
diff --git a/app/manifest/firefox.json b/app/manifest/v2/firefox.json
similarity index 100%
rename from app/manifest/firefox.json
rename to app/manifest/v2/firefox.json
diff --git a/app/manifest/opera.json b/app/manifest/v2/opera.json
similarity index 100%
rename from app/manifest/opera.json
rename to app/manifest/v2/opera.json
diff --git a/app/manifest/v3/_base.json b/app/manifest/v3/_base.json
new file mode 100644
index 000000000000..38494de8fda9
--- /dev/null
+++ b/app/manifest/v3/_base.json
@@ -0,0 +1,76 @@
+{
+  "action": {
+    "default_icon": {
+      "16": "images/icon-16.png",
+      "19": "images/icon-19.png",
+      "32": "images/icon-32.png",
+      "38": "images/icon-38.png",
+      "64": "images/icon-64.png",
+      "128": "images/icon-128.png",
+      "512": "images/icon-512.png"
+    },
+    "default_title": "MetaMask",
+    "default_popup": "popup.html"
+  },
+  "author": "https://metamask.io",
+  "background": {
+    "service_worker": "app-init.js"
+  },
+  "commands": {
+    "_execute_browser_action": {
+      "suggested_key": {
+        "windows": "Alt+Shift+M",
+        "mac": "Alt+Shift+M",
+        "chromeos": "Alt+Shift+M",
+        "linux": "Alt+Shift+M"
+      }
+    }
+  },
+  "content_scripts": [
+    {
+      "matches": ["file://*/*", "http://*/*", "https://*/*"],
+      "js": [
+        "disable-console.js",
+        "globalthis.js",
+        "lockdown-install.js",
+        "lockdown-run.js",
+        "lockdown-more.js",
+        "contentscript.js"
+      ],
+      "run_at": "document_start",
+      "all_frames": true
+    },
+    {
+      "matches": ["*://connect.trezor.io/*/popup.html"],
+      "js": ["vendor/trezor/content-script.js"]
+    }
+  ],
+  "default_locale": "en",
+  "description": "__MSG_appDescription__",
+  "icons": {
+    "16": "images/icon-16.png",
+    "19": "images/icon-19.png",
+    "32": "images/icon-32.png",
+    "38": "images/icon-38.png",
+    "48": "images/icon-48.png",
+    "64": "images/icon-64.png",
+    "128": "images/icon-128.png",
+    "512": "images/icon-512.png"
+  },
+  "manifest_version": 3,
+  "name": "__MSG_appName__",
+  "permissions": [
+    "storage",
+    "unlimitedStorage",
+    "clipboardWrite",
+    "http://localhost:8545/",
+    "https://*.infura.io/",
+    "https://chainid.network/chains.json",
+    "https://lattice.gridplus.io/*",
+    "activeTab",
+    "webRequest",
+    "*://*.eth/",
+    "notifications"
+  ],
+  "short_name": "__MSG_appName__"
+}
diff --git a/app/manifest/v3/brave.json b/app/manifest/v3/brave.json
new file mode 100644
index 000000000000..0967ef424bce
--- /dev/null
+++ b/app/manifest/v3/brave.json
@@ -0,0 +1 @@
+{}
diff --git a/app/manifest/v3/chrome.json b/app/manifest/v3/chrome.json
new file mode 100644
index 000000000000..e4bb01cdd4b6
--- /dev/null
+++ b/app/manifest/v3/chrome.json
@@ -0,0 +1,7 @@
+{
+  "externally_connectable": {
+    "matches": ["https://metamask.io/*"],
+    "ids": ["*"]
+  },
+  "minimum_chrome_version": "66"
+}
diff --git a/app/manifest/v3/firefox.json b/app/manifest/v3/firefox.json
new file mode 100644
index 000000000000..918311d54b77
--- /dev/null
+++ b/app/manifest/v3/firefox.json
@@ -0,0 +1,26 @@
+{
+  "applications": {
+    "gecko": {
+      "id": "webextension@metamask.io",
+      "strict_min_version": "68.0"
+    }
+  },
+  "background": {
+    "page": "background.html",
+    "persistent": true
+  },
+  "browser_action": {
+    "default_icon": {
+      "16": "images/icon-16.png",
+      "19": "images/icon-19.png",
+      "32": "images/icon-32.png",
+      "38": "images/icon-38.png",
+      "64": "images/icon-64.png",
+      "128": "images/icon-128.png",
+      "512": "images/icon-512.png"
+    },
+    "default_title": "MetaMask",
+    "default_popup": "popup.html"
+  },
+  "manifest_version": 2
+}
diff --git a/app/manifest/v3/opera.json b/app/manifest/v3/opera.json
new file mode 100644
index 000000000000..6cfefd402510
--- /dev/null
+++ b/app/manifest/v3/opera.json
@@ -0,0 +1,9 @@
+{
+  "permissions": [
+    "storage",
+    "tabs",
+    "clipboardWrite",
+    "clipboardRead",
+    "http://localhost:8545/"
+  ]
+}
diff --git a/app/phishing.html b/app/phishing.html
deleted file mode 100644
index e854d79faa5d..000000000000
--- a/app/phishing.html
+++ /dev/null
@@ -1,150 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <title>MetaMask Phishing Detection</title>
-    <script
-      src="./globalthis.js"
-      type="text/javascript"
-      charset="utf-8"
-    ></script>
-    <script
-      src="./lockdown-install.js"
-      type="text/javascript"
-      charset="utf-8"
-    ></script>
-    <script
-      src="./lockdown-run.js"
-      type="text/javascript"
-      charset="utf-8"
-    ></script>
-    <script
-      src="./lockdown-more.js"
-      type="text/javascript"
-      charset="utf-8"
-    ></script>
-    <script src="./phishing-detect.js"></script>
-    <link rel="stylesheet" type="text/css" href="./index.css" title="ltr" />
-    <link
-      rel="stylesheet"
-      type="text/css"
-      href="./index-rtl.css"
-      title="rtl"
-      disabled
-    />
-    <style>
-      * {
-        margin: 0;
-        padding: 0;
-        box-sizing: border-box;
-      }
-      body,
-      html {
-        background-color: var(--color-error-default);
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-        font-family: Roboto, Arial, sans-serif;
-        width: 100vw;
-        min-height: 100vh;
-      }
-      .content {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        width: 80%;
-        background-color: var(--color-background-default);
-        box-shadow: 0 0 15px #737373;
-      }
-      .content__header {
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        color: var(--color-error-default);
-        border-bottom: 1px solid var(--color-border-default);
-        padding: 2em;
-      }
-      .content__header h1 {
-        font-size: 24px;
-        font-weight: normal;
-      }
-      .content__header h1 i {
-        margin-right: 0.25em;
-      }
-      .content__header img {
-        margin-bottom: 3em;
-        width: 130px;
-      }
-      .content__body {
-        background-color: var(--color-background-alternative);
-        font-size: 12pt;
-        color: var(--color-text-default);
-      }
-      .content__body p {
-        margin: 2em;
-      }
-      .content__body p a {
-        text-decoration: underline;
-        color: var(--color-primary-default);
-        cursor: pointer;
-      }
-    </style>
-  </head>
-  <body>
-    <div class="content">
-      <div class="content__header">
-        <img src="./images/logo/metamask-fox.svg" alt="MetaMask Logo" />
-        <h1>
-          <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-          MetaMask Phishing Detection
-        </h1>
-      </div>
-      <div class="content__body">
-        <p>
-          This domain is currently on the MetaMask domain warning list. This
-          means that based on information available to us, MetaMask believes
-          this domain could currently compromise your security and, as an added
-          safety feature, MetaMask has restricted access to the site. To
-          override this, please read the rest of this warning for instructions
-          on how to continue at your own risk.
-        </p>
-        <p>
-          There are many reasons sites can appear on our warning list, and our
-          warning list compiles from other widely used industry lists. Such
-          reasons can include known fraud or security risks, such as domains
-          that test positive on the
-          <a href="https://github.com/metamask/eth-phishing-detect"
-            >Ethereum Phishing Detector</a
-          >. Domains on these warning lists may include outright malicious
-          websites and legitimate websites that have been compromised by a
-          malicious actor.
-        </p>
-        <p>
-          To read more about this site
-          <a id="csdbLink" href="https://cryptoscamdb.org/search"
-            >please search for the domain on CryptoScamDB</a
-          >.
-        </p>
-        <p>
-          Note that this warning list is compiled on a voluntary basis. This
-          list may be inaccurate or incomplete. Just because a domain does not
-          appear on this list is not an implicit guarantee of that domain's
-          safety. As always, your transactions are your own responsibility. If
-          you wish to interact with any domain on our warning list, you can do
-          so by <a id="unsafe-continue">continuing at your own risk</a>.
-        </p>
-        <p>
-          If you think this domain is incorrectly flagged or if a blocked
-          legitimate website has resolved its security issues,
-          <a
-            id="new-issue-link"
-            href="https://github.com/metamask/eth-phishing-detect/issues/new"
-            >please file an issue</a
-          >.
-        </p>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/app/popup.html b/app/popup.html
index 90117fc7996e..831fe6122370 100644
--- a/app/popup.html
+++ b/app/popup.html
@@ -8,7 +8,10 @@
     <link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
   </head>
   <body style="width:357px; height:600px;">
-    <div id="app-content"></div>
+    <div id="app-content">
+      <img class="loading-logo" src="./images/logo/metamask-fox.svg" alt="" />
+      <img class="loading-spinner" src="./images/spinner.gif" alt="" />
+    </div>
     <div id="popover-content"></div>
     <script src="./globalthis.js" type="text/javascript" charset="utf-8"></script>
     <script src="./sentry-install.js" type="text/javascript" charset="utf-8"></script>
diff --git a/app/scripts/app-init.js b/app/scripts/app-init.js
new file mode 100644
index 000000000000..c333e248a3de
--- /dev/null
+++ b/app/scripts/app-init.js
@@ -0,0 +1,124 @@
+// This file is used only for manifest version 3
+
+// Represents if importAllScripts has been run
+// eslint-disable-next-line
+let scriptsLoaded = false;
+
+// Variable testMode is set to true when preparing test build.
+// This helps in changing service worker execution in test environment.
+const testMode = false;
+
+const loadTimeLogs = [];
+
+// eslint-disable-next-line import/unambiguous
+function tryImport(...fileNames) {
+  try {
+    const startTime = new Date().getTime();
+    // eslint-disable-next-line
+    importScripts(...fileNames);
+    const endTime = new Date().getTime();
+    loadTimeLogs.push({
+      name: fileNames[0],
+      value: endTime - startTime,
+      children: [],
+      startTime,
+      endTime,
+    });
+
+    return true;
+  } catch (e) {
+    console.error(e);
+  }
+
+  return false;
+}
+
+function importAllScripts() {
+  // Bail if we've already imported scripts
+  if (scriptsLoaded) {
+    return;
+  }
+
+  const files = [];
+
+  // In testMode individual files are imported, this is to help capture load time stats
+  const loadFile = (fileName) => {
+    if (testMode) {
+      tryImport(fileName);
+    } else {
+      files.push(fileName);
+    }
+  };
+
+  const startImportScriptsTime = Date.now();
+  // value of applyLavaMoat below is dynamically replaced at build time with actual value
+  const applyLavaMoat = true;
+
+  loadFile('./globalthis.js');
+  loadFile('./sentry-install.js');
+
+  if (applyLavaMoat) {
+    loadFile('./runtime-lavamoat.js');
+    loadFile('./lockdown-more.js');
+    loadFile('./policy-load.js');
+  } else {
+    loadFile('./init-globals.js');
+    loadFile('./lockdown-install.js');
+    loadFile('./lockdown-run.js');
+    loadFile('./lockdown-more.js');
+    loadFile('./runtime-cjs.js');
+  }
+
+  // Mark scripts as loaded
+  scriptsLoaded = true;
+
+  const fileList = [
+    // The list of files is injected at build time by replacing comment below with comma separated strings of file names
+    // https://github.com/MetaMask/metamask-extension/blob/496d9d81c3367931031edc11402552690c771acf/development/build/scripts.js#L406
+    /** FILE NAMES */
+  ];
+
+  fileList.forEach((fileName) => loadFile(fileName));
+
+  // Import all required resources
+  tryImport(...files);
+
+  const endImportScriptsTime = Date.now();
+
+  // for performance metrics/reference
+  console.log(
+    `SCRIPTS IMPORT COMPLETE in Seconds: ${
+      (Date.now() - startImportScriptsTime) / 1000
+    }`,
+  );
+
+  // In testMode load time logs are output to console
+  if (testMode) {
+    console.log(
+      `Time for each import: ${JSON.stringify(
+        {
+          name: 'Total',
+          children: loadTimeLogs,
+          startTime: startImportScriptsTime,
+          endTime: endImportScriptsTime,
+          value: endImportScriptsTime - startImportScriptsTime,
+          version: 1,
+        },
+        undefined,
+        '    ',
+      )}`,
+    );
+  }
+}
+
+// eslint-disable-next-line no-undef
+self.addEventListener('install', importAllScripts);
+
+/*
+ * Message event listener below loads script if they are no longer available.
+ * chrome below needs to be replaced by cross-browser object,
+ * but there is issue in importing webextension-polyfill into service worker.
+ * chrome does seems to work in at-least all chromium based browsers
+ */
+// eslint-disable-next-line no-undef
+chrome.runtime.onMessage.addListener(importAllScripts);
diff --git a/app/scripts/background.js b/app/scripts/background.js
index ae85d781bb24..0246c5d738d4 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -23,11 +23,15 @@ import {
   REJECT_NOTFICIATION_CLOSE,
   REJECT_NOTFICIATION_CLOSE_SIG,
 } from '../../shared/constants/metametrics';
+import { isManifestV3 } from '../../shared/modules/mv3.utils';
+import { maskObject } from '../../shared/modules/object.utils';
 import migrations from './migrations';
 import Migrator from './lib/migrator';
 import ExtensionPlatform from './platforms/extension';
 import LocalStore from './lib/local-store';
 import ReadOnlyNetworkStore from './lib/network-store';
+import { SENTRY_STATE } from './lib/setupSentry';
+
 import createStreamSink from './lib/createStreamSink';
 import NotificationManager, {
   NOTIFICATION_MANAGER_EVENTS,
@@ -45,6 +49,14 @@ import { getPlatform } from './lib/util';
 const { sentry } = global;
 const firstTimeState = { ...rawFirstTimeState };
 
+const metamaskInternalProcessHash = {
+  [ENVIRONMENT_TYPE_POPUP]: true,
+  [ENVIRONMENT_TYPE_NOTIFICATION]: true,
+  [ENVIRONMENT_TYPE_FULLSCREEN]: true,
+};
+
+const metamaskBlockedPorts = ['trezor-connect'];
+
 log.setDefaultLevel(process.env.METAMASK_DEBUG ? 'debug' : 'info');
 
 const platform = new ExtensionPlatform();
@@ -67,8 +79,29 @@ if (inTest || process.env.METAMASK_DEBUG) {
   global.metamaskGetState = localStore.get.bind(localStore);
 }
 
-// initialization flow
-initialize().catch(log.error);
+const phishingPageUrl = new URL(process.env.PHISHING_WARNING_PAGE_URL);
+
+const ONE_SECOND_IN_MILLISECONDS = 1_000;
+// Timeout for initializing phishing warning page.
+const PHISHING_WARNING_PAGE_TIMEOUT = ONE_SECOND_IN_MILLISECONDS;
+
+/**
+ * In case of MV3 we attach a "onConnect" event listener as soon as the application is initialised.
+ * Reason is that in case of MV3 a delay in doing this was resulting in missing first connect event after service worker is re-activated.
+ */
+
+const initApp = async (remotePort) => {
+  browser.runtime.onConnect.removeListener(initApp);
+  await initialize(remotePort);
+  log.info('MetaMask initialization complete.');
+};
+
+if (isManifestV3()) {
+  browser.runtime.onConnect.addListener(initApp);
+} else {
+  // initialization flow
+  initialize().catch(log.error);
+}
 
 /**
  * @typedef {import('../../shared/constants/transaction').TransactionMeta} TransactionMeta
@@ -128,15 +161,83 @@ initialize().catch(log.error);
 /**
  * Initializes the MetaMask controller, and sets up all platform configuration.
  *
+ * @param {string} remotePort - remote application port connecting to extension.
  * @returns {Promise} Setup complete.
  */
-async function initialize() {
+async function initialize(remotePort) {
   const initState = await loadStateFromPersistence();
   const initLangCode = await getFirstPreferredLangCode();
-  await setupController(initState, initLangCode);
+  await setupController(initState, initLangCode, remotePort);
+  await loadPhishingWarningPage();
   log.info('MetaMask initialization complete.');
 }
 
+/**
+ * An error thrown if the phishing warning page takes too long to load.
+ */
+class PhishingWarningPageTimeoutError extends Error {
+  constructor() {
+    super('Timeout failed');
+  }
+}
+
+/**
+ * Load the phishing warning page temporarily to ensure the service
+ * worker has been registered, so that the warning page works offline.
+ */
+async function loadPhishingWarningPage() {
+  let iframe;
+  try {
+    const extensionStartupPhishingPageUrl = new URL(
+      process.env.PHISHING_WARNING_PAGE_URL,
+    );
+    // The `extensionStartup` hash signals to the phishing warning page that it should not bother
+    // setting up streams for user interaction. Otherwise this page load would cause a console
+    // error.
+    extensionStartupPhishingPageUrl.hash = '#extensionStartup';
+
+    iframe = window.document.createElement('iframe');
+    iframe.setAttribute('src', extensionStartupPhishingPageUrl.href);
+    iframe.setAttribute('sandbox', 'allow-scripts allow-same-origin');
+
+    // Create "deferred Promise" to allow passing resolve/reject to event handlers
+    let deferredResolve;
+    let deferredReject;
+    const loadComplete = new Promise((resolve, reject) => {
+      deferredResolve = resolve;
+      deferredReject = reject;
+    });
+
+    // The load event is emitted once loading has completed, even if the loading failed.
+    // If loading failed we can't do anything about it, so we don't need to check.
+    iframe.addEventListener('load', deferredResolve);
+
+    // This step initiates the page loading.
+    window.document.body.appendChild(iframe);
+
+    // This timeout ensures that this iframe gets cleaned up in a reasonable
+    // timeframe, and ensures that the "initialization complete" message
+    // doesn't get delayed too long.
+    setTimeout(
+      () => deferredReject(new PhishingWarningPageTimeoutError()),
+      PHISHING_WARNING_PAGE_TIMEOUT,
+    );
+    await loadComplete;
+  } catch (error) {
+    if (error instanceof PhishingWarningPageTimeoutError) {
+      console.warn(
+        'Phishing warning page timeout; page not guaraneteed to work offline.',
+      );
+    } else {
+      console.error('Failed to initialize phishing warning page', error);
+    }
+  } finally {
+    if (iframe) {
+      iframe.remove();
+    }
+  }
+}
+
 //
 // State and Persistence
 //
@@ -205,9 +306,10 @@ async function loadStateFromPersistence() {
  *
  * @param {Object} initState - The initial state to start the controller with, matches the state that is emitted from the controller.
  * @param {string} initLangCode - The region code for the language preferred by the current user.
+ * @param {string} remoteSourcePort - remote application port connecting to extension.
  * @returns {Promise} After setup is complete.
  */
-function setupController(initState, initLangCode) {
+function setupController(initState, initLangCode, remoteSourcePort) {
   //
   // MetaMask Controller
   //
@@ -254,6 +356,8 @@ function setupController(initState, initLangCode) {
     },
   );
 
+  setupSentryGetStateGlobal(controller.store);
+
   /**
    * Assigns the given state to the versioned object (with metadata), and returns that.
    *
@@ -294,17 +398,13 @@ function setupController(initState, initLangCode) {
   //
   // connect to other contexts
   //
+  if (isManifestV3() && remoteSourcePort) {
+    connectRemote(remoteSourcePort);
+  }
+
   browser.runtime.onConnect.addListener(connectRemote);
   browser.runtime.onConnectExternal.addListener(connectExternal);
 
-  const metamaskInternalProcessHash = {
-    [ENVIRONMENT_TYPE_POPUP]: true,
-    [ENVIRONMENT_TYPE_NOTIFICATION]: true,
-    [ENVIRONMENT_TYPE_FULLSCREEN]: true,
-  };
-
-  const metamaskBlockedPorts = ['trezor-connect'];
-
   const isClientOpenStatus = () => {
     return (
       popupIsOpen ||
@@ -362,12 +462,23 @@ function setupController(initState, initLangCode) {
         remotePort.sender.origin === `chrome-extension://${browser.runtime.id}`;
     }
 
+    const senderUrl = remotePort.sender?.url
+      ? new URL(remotePort.sender.url)
+      : null;
+
     if (isMetaMaskInternalProcess) {
       const portStream = new PortStream(remotePort);
       // communication with popup
       controller.isClientOpen = true;
       controller.setupTrustedCommunication(portStream, remotePort.sender);
 
+      if (isManifestV3()) {
+        // Message below if captured by UI code in app/scripts/ui.js which will trigger UI initialisation
+        // This ensures that UI is initialised only after background is ready
+        // It fixes the issue of blank screen coming when extension is loaded, the issue is very frequent in MV3
+        remotePort.postMessage({ name: 'CONNECTION_READY' });
+      }
+
       if (processName === ENVIRONMENT_TYPE_POPUP) {
         popupIsOpen = true;
         endOfStream(portStream, () => {
@@ -406,6 +517,15 @@ function setupController(initState, initLangCode) {
           );
         });
       }
+    } else if (
+      senderUrl &&
+      senderUrl.origin === phishingPageUrl.origin &&
+      senderUrl.pathname === phishingPageUrl.pathname
+    ) {
+      const portStream = new PortStream(remotePort);
+      controller.setupPhishingCommunication({
+        connectionStream: portStream,
+      });
     } else {
       if (remotePort.sender && remotePort.sender.tab && remotePort.sender.url) {
         const tabId = remotePort.sender.tab.id;
@@ -480,8 +600,14 @@ function setupController(initState, initLangCode) {
     if (count) {
       label = String(count);
     }
-    browser.browserAction.setBadgeText({ text: label });
-    browser.browserAction.setBadgeBackgroundColor({ color: '#037DD6' });
+    // browserAction has been replaced by action in MV3
+    if (isManifestV3()) {
+      browser.action.setBadgeText({ text: label });
+      browser.action.setBadgeBackgroundColor({ color: '#037DD6' });
+    } else {
+      browser.browserAction.setBadgeText({ text: label });
+      browser.browserAction.setBadgeBackgroundColor({ color: '#037DD6' });
+    }
   }
 
   function getUnapprovedTransactionCount() {
@@ -634,3 +760,15 @@ browser.runtime.onInstalled.addListener(({ reason }) => {
     platform.openExtensionInBrowser();
   }
 });
+
+function setupSentryGetStateGlobal(store) {
+  global.getSentryState = function () {
+    const fullState = store.getState();
+    const debugState = maskObject(fullState, SENTRY_STATE);
+    return {
+      browser: window.navigator.userAgent,
+      store: debugState,
+      version: global.platform.getVersion(),
+    };
+  };
+}
diff --git a/app/scripts/constants/contracts.js b/app/scripts/constants/contracts.js
index 90df403c2b07..e822ccc7e5d7 100644
--- a/app/scripts/constants/contracts.js
+++ b/app/scripts/constants/contracts.js
@@ -6,3 +6,17 @@ export const SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN =
   '0xb8e671734ce5c8d7dfbbea5574fa4cf39f7a54a4';
 export const SINGLE_CALL_BALANCES_ADDRESS_KOVAN =
   '0xb1d3fbb2f83aecd196f474c16ca5d9cffa0d0ffc';
+export const SINGLE_CALL_BALANCES_ADDRESS_GOERLI =
+  '0x9788C4E93f9002a7ad8e72633b11E8d1ecd51f9b';
+export const SINGLE_CALL_BALANCES_ADDRESS_BSC =
+  '0x2352c63A83f9Fd126af8676146721Fa00924d7e4';
+export const SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM =
+  '0xB1c568e9C3E6bdaf755A60c7418C269eb11524FC';
+export const SINGLE_CALL_BALANCES_ADDRESS_POLYGON =
+  '0x2352c63A83f9Fd126af8676146721Fa00924d7e4';
+export const SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE =
+  '0xD023D153a0DFa485130ECFdE2FAA7e612EF94818';
+export const SINGLE_CALL_BALANCES_ADDRESS_FANTOM =
+  '0x07f697424ABe762bB808c109860c04eA488ff92B';
+export const SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM =
+  '0x151E24A486D7258dd7C33Fb67E4bB01919B7B32c';
diff --git a/app/scripts/constants/on-ramp.js b/app/scripts/constants/on-ramp.js
index bfce16f700b6..0d621f46e8be 100644
--- a/app/scripts/constants/on-ramp.js
+++ b/app/scripts/constants/on-ramp.js
@@ -1,2 +1,3 @@
 export const TRANSAK_API_KEY = '25ac1309-a49b-4411-b20e-5e56c61a5b1c'; // It's a public key, which will be included in a URL for Transak.
 export const MOONPAY_API_KEY = 'pk_live_WbCpe6PxSIcGPCSd6lKCbJNRht7uy'; // Publishable key.
+export const COINBASEPAY_API_KEY = 'ab4b8829-a59d-44d3-accc-de77e4f18df2'; // Publishable key.
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 037f3de14055..663cfa760d38 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -1,4 +1,3 @@
-import querystring from 'querystring';
 import pump from 'pump';
 import { WindowPostMessageStream } from '@metamask/post-message-stream';
 import ObjectMultiplex from 'obj-multiplex';
@@ -6,6 +5,8 @@ import browser from 'webextension-polyfill';
 import PortStream from 'extension-port-stream';
 import { obj as createThoughStream } from 'through2';
 
+import { isManifestV3 } from '../../shared/modules/mv3.utils';
+
 // These require calls need to use require to be statically recognized by browserify
 const fs = require('fs');
 const path = require('path');
@@ -17,8 +18,13 @@ const inpageContent = fs.readFileSync(
 const inpageSuffix = `//# sourceURL=${browser.runtime.getURL('inpage.js')}\n`;
 const inpageBundle = inpageContent + inpageSuffix;
 
+// contexts
 const CONTENT_SCRIPT = 'metamask-contentscript';
 const INPAGE = 'metamask-inpage';
+const PHISHING_WARNING_PAGE = 'metamask-phishing-warning-page';
+
+// stream channels
+const PHISHING_SAFELIST = 'metamask-phishing-safelist';
 const PROVIDER = 'metamask-provider';
 
 // TODO:LegacyProvider: Delete
@@ -27,7 +33,14 @@ const LEGACY_INPAGE = 'inpage';
 const LEGACY_PROVIDER = 'provider';
 const LEGACY_PUBLIC_CONFIG = 'publicConfig';
 
-if (shouldInjectProvider()) {
+const phishingPageUrl = new URL(process.env.PHISHING_WARNING_PAGE_URL);
+
+if (
+  window.location.origin === phishingPageUrl.origin &&
+  window.location.pathname === phishingPageUrl.pathname
+) {
+  setupPhishingStream();
+} else if (shouldInjectProvider()) {
   injectScript(inpageBundle);
   setupStreams();
 }
@@ -42,7 +55,12 @@ function injectScript(content) {
     const container = document.head || document.documentElement;
     const scriptTag = document.createElement('script');
     scriptTag.setAttribute('async', 'false');
-    scriptTag.textContent = content;
+    // Inline scripts do not work in MV3 due to more strict security policy
+    if (isManifestV3()) {
+      scriptTag.setAttribute('src', browser.runtime.getURL('inpage.js'));
+    } else {
+      scriptTag.textContent = content;
+    }
     container.insertBefore(scriptTag, container.children[0]);
     container.removeChild(scriptTag);
   } catch (error) {
@@ -50,6 +68,47 @@ function injectScript(content) {
   }
 }
 
+async function setupPhishingStream() {
+  // the transport-specific streams for communication between inpage and background
+  const pageStream = new WindowPostMessageStream({
+    name: CONTENT_SCRIPT,
+    target: PHISHING_WARNING_PAGE,
+  });
+  const extensionPort = browser.runtime.connect({ name: CONTENT_SCRIPT });
+  const extensionStream = new PortStream(extensionPort);
+
+  // create and connect channel muxers
+  // so we can handle the channels individually
+  const pageMux = new ObjectMultiplex();
+  pageMux.setMaxListeners(25);
+  const extensionMux = new ObjectMultiplex();
+  extensionMux.setMaxListeners(25);
+
+  pump(pageMux, pageStream, pageMux, (err) =>
+    logStreamDisconnectWarning('MetaMask Inpage Multiplex', err),
+  );
+  pump(extensionMux, extensionStream, extensionMux, (err) => {
+    logStreamDisconnectWarning('MetaMask Background Multiplex', err);
+    window.postMessage(
+      {
+        target: PHISHING_WARNING_PAGE, // the post-message-stream "target"
+        data: {
+          // this object gets passed to obj-multiplex
+          name: PHISHING_SAFELIST, // the obj-multiplex channel name
+          data: {
+            jsonrpc: '2.0',
+            method: 'METAMASK_STREAM_FAILURE',
+          },
+        },
+      },
+      window.location.origin,
+    );
+  });
+
+  // forward communication across inpage-background for these channels only
+  forwardTrafficBetweenMuxes(PHISHING_SAFELIST, pageMux, extensionMux);
+}
+
 /**
  * Sets up two-way communication streams between the
  * browser extension and local per-page browser context.
@@ -298,12 +357,15 @@ function blockedDomainCheck() {
 
 /**
  * Redirects the current page to a phishing information page
+ *
+ * @param data
  */
-function redirectToPhishingWarning() {
-  console.debug('MetaMask: Routing to Phishing Warning component.');
-  const extensionURL = browser.runtime.getURL('phishing.html');
-  window.location.href = `${extensionURL}#${querystring.stringify({
-    hostname: window.location.hostname,
-    href: window.location.href,
-  })}`;
+function redirectToPhishingWarning(data = {}) {
+  console.debug('MetaMask: Routing to Phishing Warning page.');
+  const { hostname, href } = window.location;
+  const { newIssueUrl } = data;
+  const baseUrl = process.env.PHISHING_WARNING_PAGE_URL;
+
+  const querystring = new URLSearchParams({ hostname, href, newIssueUrl });
+  window.location.href = `${baseUrl}#${querystring}`;
 }
diff --git a/app/scripts/controllers/detect-tokens.js b/app/scripts/controllers/detect-tokens.js
index d9cfe9b14ee6..b6261504d0ca 100644
--- a/app/scripts/controllers/detect-tokens.js
+++ b/app/scripts/controllers/detect-tokens.js
@@ -6,8 +6,10 @@ import { MINUTE } from '../../../shared/constants/time';
 import { MAINNET_CHAIN_ID } from '../../../shared/constants/network';
 import { isTokenDetectionEnabledForNetwork } from '../../../shared/modules/network.utils';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
-import { TOKEN_STANDARDS } from '../../../ui/helpers/constants/common';
-import { ASSET_TYPES } from '../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+} from '../../../shared/constants/transaction';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
 
 // By default, poll every 3 minutes
diff --git a/app/scripts/controllers/detect-tokens.test.js b/app/scripts/controllers/detect-tokens.test.js
index 4fd5605b0d51..5161cf44bd56 100644
--- a/app/scripts/controllers/detect-tokens.test.js
+++ b/app/scripts/controllers/detect-tokens.test.js
@@ -8,12 +8,19 @@ import {
   TokenListController,
   TokensController,
 } from '@metamask/controllers';
-import { MAINNET, ROPSTEN } from '../../../shared/constants/network';
+import {
+  MAINNET,
+  MAINNET_NETWORK_ID,
+  ROPSTEN,
+} from '../../../shared/constants/network';
 import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import DetectTokensController from './detect-tokens';
 import NetworkController from './network';
 import PreferencesController from './preferences';
 
+const tokenIconsApiBaseUrl =
+  'https://static.metaswap.codefi.network/api/v1/tokenIcons';
+
 describe('DetectTokensController', function () {
   let tokenListController;
   const sandbox = sinon.createSandbox();
@@ -127,7 +134,6 @@ describe('DetectTokensController', function () {
     });
     tokenListController = new TokenListController({
       chainId: '1',
-      useStaticTokenList: false,
       onNetworkStateChange: sinon.spy(),
       onPreferencesStateChange: sinon.spy(),
       messenger: tokenListMessenger,
@@ -179,7 +185,6 @@ describe('DetectTokensController', function () {
     });
     tokenListController = new TokenListController({
       chainId: '3',
-      useStaticTokenList: false,
       onNetworkStateChange: sinon.spy(),
       onPreferencesStateChange: sinon.spy(),
       messenger: tokenListMessengerRopsten,
@@ -241,7 +246,7 @@ describe('DetectTokensController', function () {
         ),
       );
 
-    await tokensController.removeAndIgnoreToken(tokenAddressToSkip);
+    await tokensController.ignoreTokens([tokenAddressToSkip]);
     await controller.detectNewTokens();
 
     assert.deepEqual(tokensController.state.tokens, [
@@ -249,7 +254,8 @@ describe('DetectTokensController', function () {
         address: toChecksumHexAddress(existingTokenAddress),
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
-        image: undefined,
+        aggregators: [],
+        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
         isERC721: false,
       },
     ]);
@@ -303,14 +309,16 @@ describe('DetectTokensController', function () {
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
         isERC721: false,
-        image: undefined,
+        aggregators: [],
+        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
       },
       {
         address: toChecksumHexAddress(tokenAddressToAdd),
         decimals: tokenToAdd.decimals,
         symbol: tokenToAdd.symbol,
-        image: undefined,
         isERC721: false,
+        aggregators: [],
+        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${tokenAddressToAdd}.png`,
       },
     ]);
   });
@@ -363,15 +371,17 @@ describe('DetectTokensController', function () {
         address: toChecksumHexAddress(existingTokenAddress),
         decimals: existingToken.decimals,
         symbol: existingToken.symbol,
-        image: undefined,
+        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${existingTokenAddress}.png`,
         isERC721: false,
+        aggregators: [],
       },
       {
         address: toChecksumHexAddress(tokenAddressToAdd),
         decimals: tokenToAdd.decimals,
         symbol: tokenToAdd.symbol,
-        image: undefined,
+        image: `${tokenIconsApiBaseUrl}/${MAINNET_NETWORK_ID}/${tokenAddressToAdd}.png`,
         isERC721: false,
+        aggregators: [],
       },
     ]);
   });
diff --git a/app/scripts/controllers/ens/ens.js b/app/scripts/controllers/ens/ens.js
index 0a629dd407b1..2242a2b8cd00 100644
--- a/app/scripts/controllers/ens/ens.js
+++ b/app/scripts/controllers/ens/ens.js
@@ -1,5 +1,6 @@
-import EthJsEns from 'ethjs-ens';
+import { ethers } from 'ethers';
 import ensNetworkMap from 'ethereum-ens-network-map';
+import { NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP } from '../../../../shared/constants/network';
 
 export default class Ens {
   static getNetworkEnsSupport(network) {
@@ -7,17 +8,21 @@ export default class Ens {
   }
 
   constructor({ network, provider } = {}) {
-    this._ethJsEns = new EthJsEns({
-      network,
-      provider,
+    const networkName = NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP[network];
+    const ensAddress = ensNetworkMap[network];
+    const ethProvider = new ethers.providers.Web3Provider(provider, {
+      chainId: parseInt(network, 10),
+      name: networkName,
+      ensAddress,
     });
+    this._ethProvider = ethProvider;
   }
 
   lookup(ensName) {
-    return this._ethJsEns.lookup(ensName);
+    return this._ethProvider.resolveName(ensName);
   }
 
   reverse(address) {
-    return this._ethJsEns.reverse(address);
+    return this._ethProvider.lookupAddress(address);
   }
 }
diff --git a/app/scripts/controllers/ens/index.test.js b/app/scripts/controllers/ens/index.test.js
index c94f73a5d9a6..d325e2885084 100644
--- a/app/scripts/controllers/ens/index.test.js
+++ b/app/scripts/controllers/ens/index.test.js
@@ -20,7 +20,7 @@ describe('EnsController', function () {
   describe('#constructor', function () {
     it('should construct the controller given a provider and a network', async function () {
       const ens = new EnsController({
-        provider: {},
+        provider: sinon.fake(),
         getCurrentChainId,
         onNetworkDidChange,
       });
diff --git a/app/scripts/controllers/incoming-transactions.js b/app/scripts/controllers/incoming-transactions.js
index c56509314a0e..9577632c5e76 100644
--- a/app/scripts/controllers/incoming-transactions.js
+++ b/app/scripts/controllers/incoming-transactions.js
@@ -18,9 +18,8 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
 } from '../../../shared/constants/network';
-import { SECOND } from '../../../shared/constants/time';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 /**
  * @typedef {import('../../../shared/constants/transaction').TransactionMeta} TransactionMeta
diff --git a/app/scripts/controllers/metametrics.js b/app/scripts/controllers/metametrics.js
index 8c1ecbca1bc8..7e1b6c6ec224 100644
--- a/app/scripts/controllers/metametrics.js
+++ b/app/scripts/controllers/metametrics.js
@@ -558,6 +558,15 @@ export default class MetaMetricsController {
       [TRAITS.NETWORKS_ADDED]: metamaskState.frequentRpcListDetail.map(
         (rpc) => rpc.chainId,
       ),
+      [TRAITS.NETWORKS_WITHOUT_TICKER]: metamaskState.frequentRpcListDetail.reduce(
+        (networkList, currentNetwork) => {
+          if (!currentNetwork.ticker) {
+            networkList.push(currentNetwork.chainId);
+          }
+          return networkList;
+        },
+        [],
+      ),
       [TRAITS.NFT_AUTODETECTION_ENABLED]: metamaskState.useCollectibleDetection,
       [TRAITS.NUMBER_OF_ACCOUNTS]: Object.values(metamaskState.identities)
         .length,
@@ -621,11 +630,9 @@ export default class MetaMetricsController {
    * @returns {[]}
    */
   _getAllNFTsFlattened = memoize((allCollectibles = {}) => {
-    return Object.values(allCollectibles)
-      .reduce((result, chainNFTs) => {
-        return result.concat(Object.values(chainNFTs));
-      }, [])
-      .flat();
+    return Object.values(allCollectibles).reduce((result, chainNFTs) => {
+      return result.concat(...Object.values(chainNFTs));
+    }, []);
   });
 
   /**
diff --git a/app/scripts/controllers/metametrics.test.js b/app/scripts/controllers/metametrics.test.js
index 76982e445356..804132295ab1 100644
--- a/app/scripts/controllers/metametrics.test.js
+++ b/app/scripts/controllers/metametrics.test.js
@@ -9,8 +9,10 @@ import {
 } from '../../../shared/constants/metametrics';
 import waitUntilCalled from '../../../test/lib/wait-until-called';
 import {
+  ETH_SYMBOL,
   MAINNET_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
+  TEST_ETH_SYMBOL,
 } from '../../../shared/constants/network';
 import MetaMetricsController from './metametrics';
 import { NETWORK_EVENTS } from './network';
@@ -673,8 +675,9 @@ describe('MetaMetricsController', function () {
         },
         allTokens: MOCK_ALL_TOKENS,
         frequentRpcListDetail: [
-          { chainId: MAINNET_CHAIN_ID },
-          { chainId: ROPSTEN_CHAIN_ID },
+          { chainId: MAINNET_CHAIN_ID, ticker: ETH_SYMBOL },
+          { chainId: ROPSTEN_CHAIN_ID, ticker: TEST_ETH_SYMBOL },
+          { chainId: '0xaf' },
         ],
         identities: [{}, {}],
         ledgerTransportType: 'web-hid',
@@ -688,7 +691,8 @@ describe('MetaMetricsController', function () {
       assert.deepEqual(traits, {
         [TRAITS.ADDRESS_BOOK_ENTRIES]: 3,
         [TRAITS.LEDGER_CONNECTION_TYPE]: 'web-hid',
-        [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, ROPSTEN_CHAIN_ID],
+        [TRAITS.NETWORKS_ADDED]: [MAINNET_CHAIN_ID, ROPSTEN_CHAIN_ID, '0xaf'],
+        [TRAITS.NETWORKS_WITHOUT_TICKER]: ['0xaf'],
         [TRAITS.NFT_AUTODETECTION_ENABLED]: false,
         [TRAITS.NUMBER_OF_ACCOUNTS]: 2,
         [TRAITS.NUMBER_OF_NFT_COLLECTIONS]: 3,
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index cb572773a387..2969041aabb1 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -20,7 +20,6 @@ import {
   INFURA_BLOCKED_KEY,
   TEST_NETWORK_TICKER_MAP,
 } from '../../../../shared/constants/network';
-import { SECOND } from '../../../../shared/constants/time';
 import {
   isPrefixedFormattedHexString,
   isSafeChainId,
@@ -31,7 +30,7 @@ import createInfuraClient from './createInfuraClient';
 import createJsonRpcClient from './createJsonRpcClient';
 
 const env = process.env.METAMASK_ENV;
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 let defaultProviderConfigOpts;
 if (process.env.IN_TEST) {
@@ -272,6 +271,11 @@ export default class NetworkController extends EventEmitter {
     return NETWORK_TYPE_TO_ID_MAP[type]?.chainId || configChainId;
   }
 
+  getCurrentRpcUrl() {
+    const { rpcUrl } = this.getProviderConfig();
+    return rpcUrl;
+  }
+
   setRpcTarget(rpcUrl, chainId, ticker = 'ETH', nickname = '', rpcPrefs) {
     assert.ok(
       isPrefixedFormattedHexString(chainId),
diff --git a/app/scripts/controllers/permissions/flask/snap-permissions.js b/app/scripts/controllers/permissions/flask/snap-permissions.js
index bde8c4c91623..07024c9ae19f 100644
--- a/app/scripts/controllers/permissions/flask/snap-permissions.js
+++ b/app/scripts/controllers/permissions/flask/snap-permissions.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/controllers';
+import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
 import {
   restrictedMethodPermissionBuilders,
   selectHooks,
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 706260b24340..9b9c16d1116f 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -69,6 +69,7 @@ export default class PreferencesController {
         ? LEDGER_TRANSPORT_TYPES.WEBHID
         : LEDGER_TRANSPORT_TYPES.U2F,
       theme: 'light',
+      customNetworkListEnabled: false,
       ...opts.initState,
     };
 
@@ -179,6 +180,17 @@ export default class PreferencesController {
     this.store.updateState({ theme: val });
   }
 
+  /**
+   * Setter for the `customNetworkListEnabled` property
+   *
+   * @param customNetworkListEnabled
+   */
+  setCustomNetworkListEnabled(customNetworkListEnabled) {
+    this.store.updateState({
+      customNetworkListEnabled,
+    });
+  }
+
   /**
    * Add new methodData to state, to avoid requesting this information again through Infura
    *
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 4e06c295100c..af968ab82d73 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -41,6 +41,7 @@ import {
   PRIORITY_LEVELS,
 } from '../../../../shared/constants/gas';
 import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
+import { isSwapsDefaultTokenAddress } from '../../../../shared/modules/swaps.utils';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import {
   HARDFORKS,
@@ -60,6 +61,7 @@ import PendingTransactionTracker from './pending-tx-tracker';
 import * as txUtils from './lib/util';
 
 const MAX_MEMSTORE_TX_LIST_SIZE = 100; // Number of transactions (by unique nonces) to keep in memory
+const UPDATE_POST_TX_BALANCE_TIMEOUT = 5000;
 
 const SWAP_TRANSACTION_TYPES = [
   TRANSACTION_TYPES.SWAP,
@@ -445,7 +447,7 @@ export default class TransactionController extends EventEmitter {
    * @param {string} editableParams.gasPrice
    * @returns {TransactionMeta} the txMeta of the updated transaction
    */
-  updateEditableParams(txId, { data, from, to, value, gas, gasPrice }) {
+  async updateEditableParams(txId, { data, from, to, value, gas, gasPrice }) {
     this._throwErrorIfNotUnapprovedTx(txId, 'updateEditableParams');
 
     const editableParams = {
@@ -460,8 +462,24 @@ export default class TransactionController extends EventEmitter {
     };
 
     // only update what is defined
-    editableParams.txParams = pickBy(editableParams.txParams);
+    editableParams.txParams = pickBy(
+      editableParams.txParams,
+      (prop) => prop !== undefined,
+    );
+
+    // update transaction type in case it has changes
+    const transactionBeforeEdit = this._getTransaction(txId);
+    const { type } = await determineTransactionType(
+      {
+        ...transactionBeforeEdit.txParams,
+        ...editableParams.txParams,
+      },
+      this.query,
+    );
+    editableParams.type = type;
+
     const note = `Update Editable Params for ${txId}`;
+
     this._updateTransaction(txId, editableParams, note);
     return this._getTransaction(txId);
   }
@@ -989,7 +1007,7 @@ export default class TransactionController extends EventEmitter {
    *
    * @param {Object} txMeta - The txMeta object
    * @param {string} getCodeResponse - The transaction category code response, used for debugging purposes
-   * @returns {Promise<Object>} Object containing the default gas limit, or the simulation failure object
+   * @returns {Promise<object>} Object containing the default gas limit, or the simulation failure object
    */
   async _getDefaultGasLimit(txMeta, getCodeResponse) {
     const chainId = this._getCurrentChainId();
@@ -1452,6 +1470,39 @@ export default class TransactionController extends EventEmitter {
     this._trackTransactionMetricsEvent(txMeta, TRANSACTION_EVENTS.SUBMITTED);
   }
 
+  async updatePostTxBalance({ txMeta, txId, numberOfAttempts = 6 }) {
+    const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
+    const latestTxMeta = this.txStateManager.getTransaction(txId);
+    const approvalTxMeta = latestTxMeta.approvalTxId
+      ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
+      : null;
+    latestTxMeta.postTxBalance = postTxBalance.toString(16);
+    const isDefaultTokenAddress = isSwapsDefaultTokenAddress(
+      txMeta.destinationTokenAddress,
+      txMeta.chainId,
+    );
+    if (
+      isDefaultTokenAddress &&
+      txMeta.preTxBalance === latestTxMeta.postTxBalance &&
+      numberOfAttempts > 0
+    ) {
+      setTimeout(() => {
+        // If postTxBalance is the same as preTxBalance, try it again.
+        this.updatePostTxBalance({
+          txMeta,
+          txId,
+          numberOfAttempts: numberOfAttempts - 1,
+        });
+      }, UPDATE_POST_TX_BALANCE_TIMEOUT);
+    } else {
+      this.txStateManager.updateTransaction(
+        latestTxMeta,
+        'transactions#confirmTransaction - add postTxBalance',
+      );
+      this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
+    }
+  }
+
   /**
    * Sets the status of the transaction to confirmed and sets the status of nonce duplicates as
    * dropped if the txParams have data it will fetch the txReceipt
@@ -1515,21 +1566,10 @@ export default class TransactionController extends EventEmitter {
       );
 
       if (txMeta.type === TRANSACTION_TYPES.SWAP) {
-        const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
-        const latestTxMeta = this.txStateManager.getTransaction(txId);
-
-        const approvalTxMeta = latestTxMeta.approvalTxId
-          ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
-          : null;
-
-        latestTxMeta.postTxBalance = postTxBalance.toString(16);
-
-        this.txStateManager.updateTransaction(
-          latestTxMeta,
-          'transactions#confirmTransaction - add postTxBalance',
-        );
-
-        this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
+        await this.updatePostTxBalance({
+          txMeta,
+          txId,
+        });
       }
     } catch (err) {
       log.error(err);
@@ -1587,21 +1627,10 @@ export default class TransactionController extends EventEmitter {
       );
 
       if (txMeta.type === TRANSACTION_TYPES.SWAP) {
-        const postTxBalance = await this.query.getBalance(txMeta.txParams.from);
-        const latestTxMeta = this.txStateManager.getTransaction(txId);
-
-        const approvalTxMeta = latestTxMeta.approvalTxId
-          ? this.txStateManager.getTransaction(latestTxMeta.approvalTxId)
-          : null;
-
-        latestTxMeta.postTxBalance = postTxBalance.toString(16);
-
-        this.txStateManager.updateTransaction(
-          latestTxMeta,
-          'transactions#confirmTransaction - add postTxBalance',
-        );
-
-        this._trackSwapsMetrics(latestTxMeta, approvalTxMeta);
+        await this.updatePostTxBalance({
+          txMeta,
+          txId,
+        });
       }
     } catch (err) {
       log.error(err);
@@ -1962,6 +1991,7 @@ export default class TransactionController extends EventEmitter {
 
   async _buildEventFragmentProperties(txMeta, extraParams) {
     const {
+      id,
       type,
       time,
       status,
@@ -1978,6 +2008,7 @@ export default class TransactionController extends EventEmitter {
       defaultGasEstimates,
       metamaskNetworkId: network,
     } = txMeta;
+    const { transactions } = this.store.getState();
     const source = referrer === ORIGIN_METAMASK ? 'user' : 'dapp';
 
     const { assetType, tokenStandard } = await determineTransactionAssetType(
@@ -2040,6 +2071,10 @@ export default class TransactionController extends EventEmitter {
       gasParams.estimate_used = estimateUsed;
     }
 
+    if (extraParams?.gas_used) {
+      gasParams.gas_used = extraParams.gas_used;
+    }
+
     const gasParamsInGwei = this._getGasValuesInGWEI(gasParams);
 
     let eip1559Version = '0';
@@ -2048,12 +2083,36 @@ export default class TransactionController extends EventEmitter {
       eip1559Version = eip1559V2Enabled ? '2' : '1';
     }
 
+    const contractInteractionTypes = [
+      TRANSACTION_TYPES.CONTRACT_INTERACTION,
+      TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+      TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
+      TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
+      TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+      TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
+      TRANSACTION_TYPES.SMART,
+      TRANSACTION_TYPES.SWAP,
+      TRANSACTION_TYPES.SWAP_APPROVAL,
+    ].includes(type);
+
+    let transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
+    let transactionContractMethod;
+    if (type === TRANSACTION_TYPES.CANCEL) {
+      transactionType = TRANSACTION_TYPES.CANCEL;
+    } else if (type === TRANSACTION_TYPES.RETRY) {
+      transactionType = TRANSACTION_TYPES.RETRY;
+    } else if (type === TRANSACTION_TYPES.DEPLOY_CONTRACT) {
+      transactionType = TRANSACTION_TYPES.DEPLOY_CONTRACT;
+    } else if (contractInteractionTypes) {
+      transactionType = TRANSACTION_TYPES.CONTRACT_INTERACTION;
+      transactionContractMethod = transactions[id]?.contractMethodName;
+    }
+
     const properties = {
       chain_id: chainId,
       referrer,
       source,
       network,
-      type,
       eip_1559_version: eip1559Version,
       gas_edit_type: 'none',
       gas_edit_attempted: 'none',
@@ -2061,6 +2120,7 @@ export default class TransactionController extends EventEmitter {
       device_model: await this.getDeviceModel(this.getSelectedAddress()),
       asset_type: assetType,
       token_standard: tokenStandard,
+      transaction_type: transactionType,
     };
 
     const sensitiveProperties = {
@@ -2070,8 +2130,9 @@ export default class TransactionController extends EventEmitter {
         : TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
       first_seen: time,
       gas_limit: gasLimit,
-      ...gasParamsInGwei,
+      transaction_contract_method: transactionContractMethod,
       ...extraParams,
+      ...gasParamsInGwei,
     };
 
     return { properties, sensitiveProperties };
diff --git a/app/scripts/controllers/transactions/index.test.js b/app/scripts/controllers/transactions/index.test.js
index a324c56fe9f1..52cface7aa2b 100644
--- a/app/scripts/controllers/transactions/index.test.js
+++ b/app/scripts/controllers/transactions/index.test.js
@@ -17,6 +17,7 @@ import {
   TRANSACTION_ENVELOPE_TYPES,
   TRANSACTION_EVENTS,
   ASSET_TYPES,
+  TOKEN_STANDARDS,
 } from '../../../../shared/constants/transaction';
 
 import { SECOND } from '../../../../shared/constants/time';
@@ -26,7 +27,6 @@ import {
 } from '../../../../shared/constants/gas';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../../ui/helpers/constants/transactions';
 import { METAMASK_CONTROLLER_EVENTS } from '../../metamask-controller';
-import { TOKEN_STANDARDS } from '../../../../ui/helpers/constants/common';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
 import TransactionController from '.';
 
@@ -1471,7 +1471,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: ORIGIN_METAMASK,
             source: EVENT.SOURCE.TRANSACTION.USER,
-            type: TRANSACTION_TYPES.SIMPLE_SEND,
+            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1482,6 +1482,7 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
+            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1550,7 +1551,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: ORIGIN_METAMASK,
             source: EVENT.SOURCE.TRANSACTION.USER,
-            type: TRANSACTION_TYPES.SIMPLE_SEND,
+            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1561,6 +1562,7 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
+            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1639,7 +1641,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: 'other',
             source: EVENT.SOURCE.TRANSACTION.DAPP,
-            type: TRANSACTION_TYPES.SIMPLE_SEND,
+            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1650,6 +1652,7 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
+            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1720,7 +1723,7 @@ describe('Transaction Controller', function () {
             network: '42',
             referrer: 'other',
             source: EVENT.SOURCE.TRANSACTION.DAPP,
-            type: TRANSACTION_TYPES.SIMPLE_SEND,
+            transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
             account_type: 'MetaMask',
             asset_type: ASSET_TYPES.NATIVE,
             token_standard: TOKEN_STANDARDS.NONE,
@@ -1731,6 +1734,7 @@ describe('Transaction Controller', function () {
             default_gas_price: '2',
             gas_price: '2',
             gas_limit: '0x7b0d',
+            transaction_contract_method: undefined,
             first_seen: 1624408066355,
             transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
             status: 'unapproved',
@@ -1801,7 +1805,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          type: TRANSACTION_TYPES.SIMPLE_SEND,
+          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
           account_type: 'MetaMask',
           asset_type: ASSET_TYPES.NATIVE,
           token_standard: TOKEN_STANDARDS.NONE,
@@ -1810,6 +1814,7 @@ describe('Transaction Controller', function () {
         sensitiveProperties: {
           gas_price: '2',
           gas_limit: '0x7b0d',
+          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
@@ -1860,7 +1865,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          type: TRANSACTION_TYPES.SIMPLE_SEND,
+          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
           chain_id: '0x2a',
           eip_1559_version: '0',
           gas_edit_attempted: 'none',
@@ -1875,6 +1880,7 @@ describe('Transaction Controller', function () {
           foo: 'bar',
           gas_price: '2',
           gas_limit: '0x7b0d',
+          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.LEGACY,
           status: 'unapproved',
@@ -1937,7 +1943,7 @@ describe('Transaction Controller', function () {
           network: '42',
           referrer: 'other',
           source: EVENT.SOURCE.TRANSACTION.DAPP,
-          type: TRANSACTION_TYPES.SIMPLE_SEND,
+          transaction_type: TRANSACTION_TYPES.SIMPLE_SEND,
           account_type: 'MetaMask',
           asset_type: ASSET_TYPES.NATIVE,
           token_standard: TOKEN_STANDARDS.NONE,
@@ -1949,6 +1955,7 @@ describe('Transaction Controller', function () {
           max_fee_per_gas: '2',
           max_priority_fee_per_gas: '2',
           gas_limit: '0x7b0d',
+          transaction_contract_method: undefined,
           first_seen: 1624408066355,
           transaction_envelope_type: TRANSACTION_ENVELOPE_TYPE_NAMES.FEE_MARKET,
           status: 'unapproved',
@@ -2245,4 +2252,126 @@ describe('Transaction Controller', function () {
       assert.equal(result.destinationTokenAddress, VALID_ADDRESS_TWO); // not updated even though it's passed in to update
     });
   });
+
+  describe('updateEditableParams', function () {
+    let txStateManager;
+
+    beforeEach(function () {
+      txStateManager = txController.txStateManager;
+      txStateManager.addTransaction({
+        id: '1',
+        status: TRANSACTION_STATUSES.UNAPPROVED,
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          gas: '0x001',
+          gasPrice: '0x002',
+          // max fees can not be mixed with gasPrice
+          // maxPriorityFeePerGas: '0x003',
+          // maxFeePerGas: '0x004',
+          to: VALID_ADDRESS,
+          from: VALID_ADDRESS,
+        },
+        estimateUsed: '0x005',
+        estimatedBaseFee: '0x006',
+        decEstimatedBaseFee: '6',
+        type: 'simpleSend',
+        userEditedGasLimit: '0x008',
+        userFeeLevel: 'medium',
+      });
+    });
+
+    it('updates editible params when type changes from simple send to token transfer', async function () {
+      providerResultStub.eth_getCode = '0xab';
+      // test update gasFees
+      await txController.updateEditableParams('1', {
+        data:
+          '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+      });
+      const result = txStateManager.getTransaction('1');
+      assert.equal(
+        result.txParams.data,
+        '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+      );
+      assert.equal(result.type, TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER);
+    });
+
+    it('updates editible params when type changes from token transfer to simple send', async function () {
+      // test update gasFees
+      txStateManager.addTransaction({
+        id: '2',
+        status: TRANSACTION_STATUSES.UNAPPROVED,
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          gas: '0x001',
+          gasPrice: '0x002',
+          // max fees can not be mixed with gasPrice
+          // maxPriorityFeePerGas: '0x003',
+          // maxFeePerGas: '0x004',
+          to: VALID_ADDRESS,
+          from: VALID_ADDRESS,
+          data:
+            '0xa9059cbb000000000000000000000000e18035bf8712672935fdb4e5e431b1a0183d2dfc0000000000000000000000000000000000000000000000000de0b6b3a7640000',
+        },
+        estimateUsed: '0x005',
+        estimatedBaseFee: '0x006',
+        decEstimatedBaseFee: '6',
+        type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+        userEditedGasLimit: '0x008',
+        userFeeLevel: 'medium',
+      });
+      await txController.updateEditableParams('2', {
+        data: '0x',
+      });
+      const result = txStateManager.getTransaction('2');
+      assert.equal(result.txParams.data, '0x');
+      assert.equal(result.type, TRANSACTION_TYPES.SIMPLE_SEND);
+    });
+
+    it('updates editible params when type changes from simpleSend to contract interaction', async function () {
+      // test update gasFees
+      txStateManager.addTransaction({
+        id: '3',
+        status: TRANSACTION_STATUSES.UNAPPROVED,
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          gas: '0x001',
+          gasPrice: '0x002',
+          // max fees can not be mixed with gasPrice
+          // maxPriorityFeePerGas: '0x003',
+          // maxFeePerGas: '0x004',
+          to: VALID_ADDRESS,
+          from: VALID_ADDRESS,
+        },
+        estimateUsed: '0x005',
+        estimatedBaseFee: '0x006',
+        decEstimatedBaseFee: '6',
+        type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+        userEditedGasLimit: '0x008',
+        userFeeLevel: 'medium',
+      });
+      providerResultStub.eth_getCode = '0x5';
+      await txController.updateEditableParams('3', {
+        data: '0x123',
+      });
+      const result = txStateManager.getTransaction('3');
+      assert.equal(result.txParams.data, '0x123');
+      assert.equal(result.type, TRANSACTION_TYPES.CONTRACT_INTERACTION);
+    });
+
+    it('updates editible params when type does not change', async function () {
+      // test update gasFees
+      await txController.updateEditableParams('1', {
+        data: '0x123',
+        gas: '0xabc',
+        from: VALID_ADDRESS_TWO,
+      });
+      const result = txStateManager.getTransaction('1');
+      assert.equal(result.txParams.data, '0x123');
+      assert.equal(result.txParams.gas, '0xabc');
+      assert.equal(result.txParams.from, VALID_ADDRESS_TWO);
+      assert.equal(result.txParams.to, VALID_ADDRESS);
+      assert.equal(result.txParams.gasPrice, '0x002');
+      assert.equal(result.type, TRANSACTION_TYPES.SIMPLE_SEND);
+    });
+  });
 });
diff --git a/app/scripts/controllers/transactions/pending-tx-tracker.js b/app/scripts/controllers/transactions/pending-tx-tracker.js
index 02b4cbeb4fec..2bd5471893e9 100644
--- a/app/scripts/controllers/transactions/pending-tx-tracker.js
+++ b/app/scripts/controllers/transactions/pending-tx-tracker.js
@@ -2,6 +2,7 @@ import EventEmitter from 'safe-event-emitter';
 import log from 'loglevel';
 import EthQuery from 'ethjs-query';
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction';
+import { ERROR_SUBMITTING } from './tx-state-manager';
 
 /**
  * Event emitter utility class for tracking the transactions as they
@@ -106,7 +107,7 @@ export default class PendingTransactionTracker extends EventEmitter {
         // encountered real error - transition to error state
         txMeta.warning = {
           error: errorMessage,
-          message: 'There was an error when resubmitting this transaction.',
+          message: ERROR_SUBMITTING,
         };
         this.emit('tx:warning', txMeta, err);
       }
diff --git a/app/scripts/controllers/transactions/tx-state-manager.js b/app/scripts/controllers/transactions/tx-state-manager.js
index 33e23bbf847a..c924c9b66641 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.js
@@ -18,6 +18,8 @@ import {
   validateConfirmedExternalTransaction,
 } from './lib/util';
 
+export const ERROR_SUBMITTING =
+  'There was an error when resubmitting this transaction.';
 /**
  * TransactionStatuses reimported from the shared transaction constants file
  *
@@ -304,9 +306,23 @@ export default class TransactionStateManager extends EventEmitter {
   updateTransaction(txMeta, note) {
     // normalize and validate txParams if present
     if (txMeta.txParams) {
-      txMeta.txParams = normalizeAndValidateTxParams(txMeta.txParams, false);
+      try {
+        txMeta.txParams = normalizeAndValidateTxParams(txMeta.txParams, false);
+      } catch (error) {
+        if (txMeta.warning.message === ERROR_SUBMITTING) {
+          this.setTxStatusFailed(txMeta.id, error);
+        } else {
+          throw error;
+        }
+
+        return;
+      }
     }
 
+    this._updateTransactionHistory(txMeta, note);
+  }
+
+  _updateTransactionHistory(txMeta, note) {
     // create txMeta snapshot for history
     const currentState = snapshotFromTxMeta(txMeta);
     // recover previous tx state obj
@@ -551,10 +567,11 @@ export default class TransactionStateManager extends EventEmitter {
       rpc: error.value,
       stack: error.stack,
     };
-    this.updateTransaction(
+    this._updateTransactionHistory(
       txMeta,
       'transactions:tx-state-manager#fail - add error',
     );
+
     this._setTransactionStatus(txId, TRANSACTION_STATUSES.FAILED);
   }
 
@@ -638,7 +655,7 @@ export default class TransactionStateManager extends EventEmitter {
 
     txMeta.status = status;
     try {
-      this.updateTransaction(
+      this._updateTransactionHistory(
         txMeta,
         `txStateManager: setting status to ${status}`,
       );
diff --git a/app/scripts/controllers/transactions/tx-state-manager.test.js b/app/scripts/controllers/transactions/tx-state-manager.test.js
index ba3dd6be221f..7fbe6ec1eae4 100644
--- a/app/scripts/controllers/transactions/tx-state-manager.test.js
+++ b/app/scripts/controllers/transactions/tx-state-manager.test.js
@@ -12,7 +12,7 @@ import {
 } from '../../../../shared/constants/network';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
 import { ORIGIN_METAMASK } from '../../../../shared/constants/app';
-import TxStateManager from './tx-state-manager';
+import TxStateManager, { ERROR_SUBMITTING } from './tx-state-manager';
 import { snapshotFromTxMeta } from './lib/tx-state-history-helpers';
 
 const VALID_ADDRESS = '0x0000000000000000000000000000000000000000';
@@ -918,6 +918,113 @@ describe('TransactionStateManager', function () {
       const { history } = txStateManager.getTransaction('1');
       assert.equal(history.length, 1, 'two history items (initial + diff)');
     });
+
+    it('should set tx status to failed if updating after error submitting', function () {
+      const txMeta = {
+        id: '1',
+        status: TRANSACTION_STATUSES.UNAPPROVED,
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          from: VALID_ADDRESS_TWO,
+          to: VALID_ADDRESS,
+          gasLimit: '0x5028',
+          maxFeePerGas: '0x2540be400',
+          maxPriorityFeePerGas: '0x3b9aca00',
+        },
+      };
+
+      txStateManager.addTransaction(txMeta);
+      const { history } = txStateManager.getTransaction('1');
+      assert.equal(history.length, 1);
+
+      txMeta.txParams.type = '0x0';
+      txMeta.warning = {
+        message: ERROR_SUBMITTING,
+        error: 'Testing tx status failed with arbitrary error',
+      };
+
+      // should result in additional 2 history entries
+      txStateManager.updateTransaction(txMeta);
+
+      const result = txStateManager.getTransaction('1');
+
+      assert.equal(result.history.length, 3);
+
+      // history[1] should contain 3 entries
+      assert.equal(result.history[1].length, 3);
+      assert.equal(
+        result.history[1][0].note,
+        'transactions:tx-state-manager#fail - add error',
+      );
+      assert.equal(result.history[1][0].op, 'add');
+      assert.equal(result.history[1][0].path, '/txParams/type');
+      assert.equal(result.history[1][0].value, '0x0');
+
+      assert.equal(result.history[1][1].op, 'add');
+      assert.equal(result.history[1][1].path, '/warning');
+      assert.equal(result.history[1][1].value.message, ERROR_SUBMITTING);
+
+      assert.equal(result.history[1][2].op, 'add');
+      assert.equal(result.history[1][2].path, '/err');
+      assert.equal(
+        result.history[1][2].value.message,
+        'Invalid transaction envelope type: specified type "0x0" but including maxFeePerGas and maxPriorityFeePerGas requires type: "0x2"',
+      );
+
+      assert.equal(result.history[2].length, 1);
+      assert.equal(
+        result.history[2][0].note,
+        'txStateManager: setting status to failed',
+      );
+      assert.equal(result.history[2][0].op, 'replace');
+      assert.equal(result.history[2][0].path, '/status');
+      assert.equal(result.history[2][0].value, 'failed');
+    });
+
+    it('should set transaction status to failed', function () {
+      const txMeta = {
+        id: '1',
+        status: TRANSACTION_STATUSES.UNAPPROVED,
+        metamaskNetworkId: currentNetworkId,
+        txParams: {
+          from: VALID_ADDRESS_TWO,
+          to: VALID_ADDRESS,
+          gasPrice: '0x01',
+        },
+      };
+
+      txStateManager.addTransaction(txMeta);
+      const { history } = txStateManager.getTransaction('1');
+      assert.equal(history.length, 1);
+
+      // should result in additional 2 history entries
+      txStateManager.setTxStatusFailed(
+        txMeta.id,
+        new Error('Testing tx status failed with arbitrary error'),
+      );
+
+      const result = txStateManager.getTransaction('1');
+      assert.equal(result.history.length, 3);
+
+      assert.equal(
+        result.history[1][0].note,
+        'transactions:tx-state-manager#fail - add error',
+      );
+      assert.equal(result.history[1][0].op, 'add');
+      assert.equal(result.history[1][0].path, '/err');
+      assert.equal(
+        result.history[1][0].value.message,
+        'Testing tx status failed with arbitrary error',
+      );
+      assert.equal(result.history[2].length, 1);
+      assert.equal(
+        result.history[2][0].note,
+        'txStateManager: setting status to failed',
+      );
+      assert.equal(result.history[2][0].op, 'replace');
+      assert.equal(result.history[2][0].path, '/status');
+      assert.equal(result.history[2][0].value, 'failed');
+    });
   });
 
   describe('#getUnapprovedTxList', function () {
diff --git a/app/scripts/init-globals.js b/app/scripts/init-globals.js
new file mode 100644
index 000000000000..a26c95266bd3
--- /dev/null
+++ b/app/scripts/init-globals.js
@@ -0,0 +1,18 @@
+/**
+ * This script add properties in globalThis and initialises them with undefined.
+ * This is workaround needed to avoid error in dependencies expecting to be run in a browser
+ * these dependencies are not available to service worker in MV3.
+ */
+
+// eslint-disable-next-line import/unambiguous
+const keys = ['XMLHttpRequest'];
+
+keys.forEach((key) => {
+  if (!Reflect.has(globalThis, key)) {
+    globalThis[key] = undefined;
+  }
+});
+
+if (!Reflect.has(globalThis, 'window')) {
+  globalThis.window = globalThis;
+}
diff --git a/app/scripts/lib/ComposableObservableStore.test.js b/app/scripts/lib/ComposableObservableStore.test.js
index 0beeacdfbebf..9d03eb98d078 100644
--- a/app/scripts/lib/ComposableObservableStore.test.js
+++ b/app/scripts/lib/ComposableObservableStore.test.js
@@ -165,7 +165,7 @@ describe('ComposableObservableStore', () => {
             Example: exampleController,
           },
         }),
-    ).toThrow(`Cannot read property 'subscribe' of undefined`);
+    ).toThrow(`Cannot read properties of undefined (reading 'subscribe')`);
   });
 
   it('should throw if the controller messenger is omitted and updateStructure called with a BaseControllerV2 controller', () => {
@@ -175,7 +175,7 @@ describe('ComposableObservableStore', () => {
     });
     const store = new ComposableObservableStore({});
     expect(() => store.updateStructure({ Example: exampleController })).toThrow(
-      `Cannot read property 'subscribe' of undefined`,
+      `Cannot read properties of undefined (reading 'subscribe')`,
     );
   });
 
diff --git a/app/scripts/lib/account-tracker.js b/app/scripts/lib/account-tracker.js
index 7abe349a35b2..e1c1bf185acc 100644
--- a/app/scripts/lib/account-tracker.js
+++ b/app/scripts/lib/account-tracker.js
@@ -19,6 +19,13 @@ import {
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
   KOVAN_CHAIN_ID,
+  GOERLI_CHAIN_ID,
+  BSC_CHAIN_ID,
+  OPTIMISM_CHAIN_ID,
+  POLYGON_CHAIN_ID,
+  AVALANCHE_CHAIN_ID,
+  FANTOM_CHAIN_ID,
+  ARBITRUM_CHAIN_ID,
 } from '../../../shared/constants/network';
 
 import {
@@ -26,6 +33,13 @@ import {
   SINGLE_CALL_BALANCES_ADDRESS_RINKEBY,
   SINGLE_CALL_BALANCES_ADDRESS_ROPSTEN,
   SINGLE_CALL_BALANCES_ADDRESS_KOVAN,
+  SINGLE_CALL_BALANCES_ADDRESS_GOERLI,
+  SINGLE_CALL_BALANCES_ADDRESS_BSC,
+  SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM,
+  SINGLE_CALL_BALANCES_ADDRESS_POLYGON,
+  SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE,
+  SINGLE_CALL_BALANCES_ADDRESS_FANTOM,
+  SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM,
 } from '../constants/contracts';
 import { bnToHex } from './util';
 
@@ -230,6 +244,55 @@ export default class AccountTracker {
         );
         break;
 
+      case GOERLI_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_GOERLI,
+        );
+        break;
+
+      case BSC_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_BSC,
+        );
+        break;
+
+      case OPTIMISM_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_OPTIMISM,
+        );
+        break;
+
+      case POLYGON_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_POLYGON,
+        );
+        break;
+
+      case AVALANCHE_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_AVALANCHE,
+        );
+        break;
+
+      case FANTOM_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_FANTOM,
+        );
+        break;
+
+      case ARBITRUM_CHAIN_ID:
+        await this._updateAccountsViaBalanceChecker(
+          addresses,
+          SINGLE_CALL_BALANCES_ADDRESS_ARBITRUM,
+        );
+        break;
+
       default:
         await Promise.all(addresses.map(this._updateAccount.bind(this)));
     }
@@ -243,8 +306,17 @@ export default class AccountTracker {
    * @returns {Promise} after the account balance is updated
    */
   async _updateAccount(address) {
+    let balance = '0x0';
+
     // query balance
-    const balance = await this._query.getBalance(address);
+    try {
+      balance = await this._query.getBalance(address);
+    } catch (error) {
+      if (error.data.request.method !== 'eth_getBalance') {
+        throw error;
+      }
+    }
+
     const result = { address, balance };
     // update accounts state
     const { accounts } = this.store.getState();
diff --git a/app/scripts/lib/buy-url.js b/app/scripts/lib/buy-url.js
index ba4a0d86f468..eb8e22cf4bf2 100644
--- a/app/scripts/lib/buy-url.js
+++ b/app/scripts/lib/buy-url.js
@@ -7,24 +7,31 @@ import {
   MAINNET_CHAIN_ID,
   RINKEBY_CHAIN_ID,
   ROPSTEN_CHAIN_ID,
-  MAINNET_NETWORK_ID,
   BUYABLE_CHAINS_MAP,
 } from '../../../shared/constants/network';
-import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
-import { TRANSAK_API_KEY, MOONPAY_API_KEY } from '../constants/on-ramp';
+import {
+  TRANSAK_API_KEY,
+  MOONPAY_API_KEY,
+  COINBASEPAY_API_KEY,
+} from '../constants/on-ramp';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 /**
  * Create a Wyre purchase URL.
  *
- * @param {string} address - Ethereum destination address
+ * @param {string} walletAddress - Ethereum destination address
+ * @param {string} chainId - Current chain ID
  * @returns String
  */
-const createWyrePurchaseUrl = async (address) => {
-  const fiatOnRampUrlApi = `${SWAPS_API_V2_BASE_URL}/networks/${MAINNET_NETWORK_ID}/fiatOnRampUrl?serviceName=wyre&destinationAddress=${address}`;
-  const wyrePurchaseUrlFallback = `https://pay.sendwyre.com/purchase?dest=ethereum:${address}&destCurrency=ETH&accountId=AC-7AG3W4XH4N2&paymentMethod=debit-card`;
+const createWyrePurchaseUrl = async (walletAddress, chainId) => {
+  const { wyre = {} } = BUYABLE_CHAINS_MAP[chainId];
+  const { srn, currencyCode } = wyre;
+
+  const networkId = parseInt(chainId, 16);
+  const fiatOnRampUrlApi = `${SWAPS_API_V2_BASE_URL}/networks/${networkId}/fiatOnRampUrl?serviceName=wyre&destinationAddress=${walletAddress}`;
+  const wyrePurchaseUrlFallback = `https://pay.sendwyre.com/purchase?dest=${srn}:${walletAddress}&destCurrency=${currencyCode}&accountId=AC-7AG3W4XH4N2&paymentMethod=debit-card`;
   try {
     const response = await fetchWithTimeout(fiatOnRampUrlApi, {
       method: 'GET',
@@ -108,6 +115,28 @@ const createMoonPayUrl = async (walletAddress, chainId) => {
   return '';
 };
 
+/**
+ * Create a Coinbase Pay Checkout URL.
+ *
+ * @param {string} walletAddress - Ethereum destination address
+ * @param {string} chainId - Current chain ID
+ * @returns String
+ */
+const createCoinbasePayUrl = (walletAddress, chainId) => {
+  const { coinbasePayCurrencies } = BUYABLE_CHAINS_MAP[chainId];
+  const queryParams = new URLSearchParams({
+    appId: COINBASEPAY_API_KEY,
+    attribution: 'extension',
+    destinationWallets: JSON.stringify([
+      {
+        address: walletAddress,
+        assets: coinbasePayCurrencies,
+      },
+    ]),
+  });
+  return `https://pay.coinbase.com/buy?${queryParams}`;
+};
+
 /**
  * Gives the caller a url at which the user can acquire eth, depending on the network they are in
  *
@@ -127,11 +156,13 @@ export default async function getBuyUrl({ chainId, address, service }) {
 
   switch (service) {
     case 'wyre':
-      return await createWyrePurchaseUrl(address);
+      return await createWyrePurchaseUrl(address, chainId);
     case 'transak':
       return createTransakUrl(address, chainId);
     case 'moonpay':
       return createMoonPayUrl(address, chainId);
+    case 'coinbase':
+      return createCoinbasePayUrl(address, chainId);
     case 'metamask-faucet':
       return 'https://faucet.metamask.io/';
     case 'rinkeby-faucet':
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
index 89141357f63a..3362e29ad3aa 100644
--- a/app/scripts/lib/createRPCMethodTrackingMiddleware.js
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.js
@@ -1,19 +1,91 @@
+import { MESSAGE_TYPE, ORIGIN_METAMASK } from '../../../shared/constants/app';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
 import { SECOND } from '../../../shared/constants/time';
 
-const USER_PROMPTED_EVENT_NAME_MAP = {
-  eth_signTypedData_v4: EVENT_NAMES.SIGNATURE_REQUESTED,
-  eth_signTypedData_v3: EVENT_NAMES.SIGNATURE_REQUESTED,
-  eth_signTypedData: EVENT_NAMES.SIGNATURE_REQUESTED,
-  eth_personal_sign: EVENT_NAMES.SIGNATURE_REQUESTED,
-  eth_sign: EVENT_NAMES.SIGNATURE_REQUESTED,
-  eth_getEncryptionPublicKey: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REQUESTED,
-  eth_decrypt: EVENT_NAMES.DECRYPTION_REQUESTED,
-  wallet_requestPermissions: EVENT_NAMES.PERMISSIONS_REQUESTED,
-  eth_requestAccounts: EVENT_NAMES.PERMISSIONS_REQUESTED,
+/**
+ * These types determine how the method tracking middleware handles incoming
+ * requests based on the method name. There are three options right now but
+ * the types could be expanded to cover other options in the future.
+ */
+const RATE_LIMIT_TYPES = {
+  RATE_LIMITED: 'rate_limited',
+  BLOCKED: 'blocked',
+  NON_RATE_LIMITED: 'non_rate_limited',
 };
 
-const samplingTimeouts = {};
+/**
+ * This object maps a method name to a RATE_LIMIT_TYPE. If not in this map the
+ * default is 'RATE_LIMITED'
+ */
+const RATE_LIMIT_MAP = {
+  [MESSAGE_TYPE.ETH_SIGN]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.PERSONAL_SIGN]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_DECRYPT]: RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]:
+    RATE_LIMIT_TYPES.NON_RATE_LIMITED,
+  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: RATE_LIMIT_TYPES.RATE_LIMITED,
+  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: RATE_LIMIT_TYPES.RATE_LIMITED,
+  [MESSAGE_TYPE.SEND_METADATA]: RATE_LIMIT_TYPES.BLOCKED,
+  [MESSAGE_TYPE.GET_PROVIDER_STATE]: RATE_LIMIT_TYPES.BLOCKED,
+};
+
+/**
+ * For events with user interaction (approve / reject | cancel) this map will
+ * return an object with APPROVED, REJECTED and REQUESTED keys that map to the
+ * appropriate event names.
+ */
+const EVENT_NAME_MAP = {
+  [MESSAGE_TYPE.ETH_SIGN]: {
+    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
+    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA]: {
+    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
+    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V3]: {
+    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
+    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4]: {
+    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
+    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+  },
+  [MESSAGE_TYPE.PERSONAL_SIGN]: {
+    APPROVED: EVENT_NAMES.SIGNATURE_APPROVED,
+    REJECTED: EVENT_NAMES.SIGNATURE_REJECTED,
+    REQUESTED: EVENT_NAMES.SIGNATURE_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_DECRYPT]: {
+    APPROVED: EVENT_NAMES.DECRYPTION_APPROVED,
+    REJECTED: EVENT_NAMES.DECRYPTION_REJECTED,
+    REQUESTED: EVENT_NAMES.DECRYPTION_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY]: {
+    APPROVED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_APPROVED,
+    REJECTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REJECTED,
+    REQUESTED: EVENT_NAMES.ENCRYPTION_PUBLIC_KEY_REQUESTED,
+  },
+  [MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS]: {
+    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
+    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
+    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
+  },
+  [MESSAGE_TYPE.WALLET_REQUEST_PERMISSIONS]: {
+    APPROVED: EVENT_NAMES.PERMISSIONS_APPROVED,
+    REJECTED: EVENT_NAMES.PERMISSIONS_REJECTED,
+    REQUESTED: EVENT_NAMES.PERMISSIONS_REQUESTED,
+  },
+};
+
+const rateLimitTimeouts = {};
 
 /**
  * Returns a middleware that tracks inpage_provider usage using sampling for
@@ -21,65 +93,113 @@ const samplingTimeouts = {};
  * signature requests
  *
  * @param {object} opts - options for the rpc method tracking middleware
- * @param {Function} opts.trackEvent - trackEvent method from MetaMetricsController
- * @param {Function} opts.getMetricsState - get the state of MetaMetricsController
+ * @param {Function} opts.trackEvent - trackEvent method from
+ *  MetaMetricsController
+ * @param {Function} opts.getMetricsState - get the state of
+ *  MetaMetricsController
+ * @param {number} [opts.rateLimitSeconds] - number of seconds to wait before
+ *  allowing another set of events to be tracked.
  * @returns {Function}
  */
 export default function createRPCMethodTrackingMiddleware({
   trackEvent,
   getMetricsState,
+  rateLimitSeconds = 60,
 }) {
   return function rpcMethodTrackingMiddleware(
     /** @type {any} */ req,
     /** @type {any} */ res,
     /** @type {Function} */ next,
   ) {
-    const startTime = Date.now();
-    const { origin } = req;
+    const { origin, method } = req;
+
+    // Determine what type of rate limit to apply based on method
+    const rateLimitType =
+      RATE_LIMIT_MAP[method] ?? RATE_LIMIT_TYPES.RATE_LIMITED;
+
+    // If the rateLimitType is RATE_LIMITED check the rateLimitTimeouts
+    const rateLimited =
+      rateLimitType === RATE_LIMIT_TYPES.RATE_LIMITED &&
+      typeof rateLimitTimeouts[method] !== 'undefined';
+
+    // Get the participateInMetaMetrics state to determine if we should track
+    // anything. This is extra redundancy because this value is checked in
+    // the metametrics controller's trackEvent method as well.
+    const userParticipatingInMetaMetrics =
+      getMetricsState().participateInMetaMetrics === true;
+
+    // Get the event type, each of which has APPROVED, REJECTED and REQUESTED
+    // keys for the various events in the flow.
+    const eventType = EVENT_NAME_MAP[method];
+
+    // Boolean variable that reduces code duplication and increases legibility
+    const shouldTrackEvent =
+      // Don't track if the request came from our own UI or background
+      origin !== ORIGIN_METAMASK &&
+      // Don't track if this is a blocked method
+      rateLimitType !== RATE_LIMIT_TYPES.BLOCKED &&
+      // Don't track if the rate limit has been hit
+      rateLimited === false &&
+      // Don't track if the user isn't participating in metametrics
+      userParticipatingInMetaMetrics === true;
+
+    if (shouldTrackEvent) {
+      // We track an initial "requested" event as soon as the dapp calls the
+      // provider method. For the events not special cased this is the only
+      // event that will be fired and the event name will be
+      // 'Provider Method Called'.
+      const event = eventType
+        ? eventType.REQUESTED
+        : EVENT_NAMES.PROVIDER_METHOD_CALLED;
+
+      const properties = {};
+
+      if (event === EVENT_NAMES.SIGNATURE_REQUESTED) {
+        properties.signature_type = method;
+      } else {
+        properties.method = method;
+      }
+
+      trackEvent({
+        event,
+        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+        referrer: {
+          url: origin,
+        },
+        properties,
+      });
+
+      rateLimitTimeouts[method] = setTimeout(() => {
+        delete rateLimitTimeouts[method];
+      }, SECOND * rateLimitSeconds);
+    }
 
     next((callback) => {
-      const endTime = Date.now();
-      if (!getMetricsState().participateInMetaMetrics) {
+      if (shouldTrackEvent === false || typeof eventType === 'undefined') {
         return callback();
       }
-      if (USER_PROMPTED_EVENT_NAME_MAP[req.method]) {
-        const userRejected = res.error?.code === 4001;
-        trackEvent({
-          event: USER_PROMPTED_EVENT_NAME_MAP[req.method],
-          category: EVENT.CATEGORIES.INPAGE_PROVIDER,
-          referrer: {
-            url: origin,
-          },
-          properties: {
-            method: req.method,
-            status: userRejected ? 'rejected' : 'approved',
-            error_code: res.error?.code,
-            error_message: res.error?.message,
-            has_result: typeof res.result !== 'undefined',
-            duration: endTime - startTime,
-          },
-        });
-      } else if (typeof samplingTimeouts[req.method] === 'undefined') {
-        trackEvent({
-          event: 'Provider Method Called',
-          category: EVENT.CATEGORIES.INPAGE_PROVIDER,
-          referrer: {
-            url: origin,
-          },
-          properties: {
-            method: req.method,
-            error_code: res.error?.code,
-            error_message: res.error?.message,
-            has_result: typeof res.result !== 'undefined',
-            duration: endTime - startTime,
-          },
-        });
-        // Only record one call to this method every ten seconds to avoid
-        // overloading network requests.
-        samplingTimeouts[req.method] = setTimeout(() => {
-          delete samplingTimeouts[req.method];
-        }, SECOND * 10);
+
+      // An error code of 4001 means the user rejected the request, which we
+      // can use here to determine which event to track.
+      const event =
+        res.error?.code === 4001 ? eventType.REJECTED : eventType.APPROVED;
+
+      const properties = {};
+
+      if (eventType.REQUESTED === EVENT_NAMES.SIGNATURE_REQUESTED) {
+        properties.signature_type = method;
+      } else {
+        properties.method = method;
       }
+
+      trackEvent({
+        event,
+        category: EVENT.CATEGORIES.INPAGE_PROVIDER,
+        referrer: {
+          url: origin,
+        },
+        properties,
+      });
       return callback();
     });
   };
diff --git a/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
new file mode 100644
index 000000000000..ffa953fa0f75
--- /dev/null
+++ b/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js
@@ -0,0 +1,217 @@
+import { MESSAGE_TYPE } from '../../../shared/constants/app';
+import { EVENT_NAMES } from '../../../shared/constants/metametrics';
+import { SECOND } from '../../../shared/constants/time';
+import createRPCMethodTrackingMiddleware from './createRPCMethodTrackingMiddleware';
+
+const trackEvent = jest.fn();
+const metricsState = { participateInMetaMetrics: null };
+const getMetricsState = () => metricsState;
+
+const handler = createRPCMethodTrackingMiddleware({
+  trackEvent,
+  getMetricsState,
+  rateLimitSeconds: 1,
+});
+
+function getNext(timeout = 500) {
+  let deferred;
+  const promise = new Promise((resolve) => {
+    deferred = {
+      resolve,
+    };
+  });
+  const cb = () => deferred.resolve();
+  let triggerNext;
+  setTimeout(() => {
+    deferred.resolve();
+  }, timeout);
+  return {
+    executeMiddlewareStack: async () => {
+      if (triggerNext) {
+        triggerNext(() => cb());
+      }
+      return await deferred.resolve();
+    },
+    promise,
+    next: (postReqHandler) => {
+      triggerNext = postReqHandler;
+    },
+  };
+}
+
+const waitForSeconds = async (seconds) =>
+  await new Promise((resolve) => setTimeout(resolve, SECOND * seconds));
+
+describe('createRPCMethodTrackingMiddleware', () => {
+  afterEach(() => {
+    jest.resetAllMocks();
+    metricsState.participateInMetaMetrics = null;
+  });
+
+  describe('before participateInMetaMetrics is set', () => {
+    it('should not track an event for a signature request', async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { executeMiddlewareStack, next } = getNext();
+      handler(req, res, next);
+      await executeMiddlewareStack();
+      expect(trackEvent).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('participateInMetaMetrics is set to false', () => {
+    beforeEach(() => {
+      metricsState.participateInMetaMetrics = false;
+    });
+
+    it('should not track an event for a signature request', async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { executeMiddlewareStack, next } = getNext();
+      handler(req, res, next);
+      await executeMiddlewareStack();
+      expect(trackEvent).not.toHaveBeenCalled();
+    });
+  });
+
+  describe('participateInMetaMetrics is set to true', () => {
+    beforeEach(() => {
+      metricsState.participateInMetaMetrics = true;
+    });
+
+    it(`should immediately track a ${EVENT_NAMES.SIGNATURE_REQUESTED} event`, () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next } = getNext();
+      handler(req, res, next);
+      expect(trackEvent).toHaveBeenCalledTimes(1);
+      expect(trackEvent.mock.calls[0][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_REQUESTED,
+        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
+    it(`should track a ${EVENT_NAMES.SIGNATURE_APPROVED} event if the user approves`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next, executeMiddlewareStack } = getNext();
+      handler(req, res, next);
+      await executeMiddlewareStack();
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_APPROVED,
+        properties: { signature_type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA_V4 },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
+    it(`should track a ${EVENT_NAMES.SIGNATURE_REJECTED} event if the user approves`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.PERSONAL_SIGN,
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: { code: 4001 },
+      };
+      const { next, executeMiddlewareStack } = getNext();
+      handler(req, res, next);
+      await executeMiddlewareStack();
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.SIGNATURE_REJECTED,
+        properties: { signature_type: MESSAGE_TYPE.PERSONAL_SIGN },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
+    it(`should track a ${EVENT_NAMES.PERMISSIONS_APPROVED} event if the user approves`, async () => {
+      const req = {
+        method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS,
+        origin: 'some.dapp',
+      };
+
+      const res = {};
+      const { next, executeMiddlewareStack } = getNext();
+      handler(req, res, next);
+      await executeMiddlewareStack();
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+      expect(trackEvent.mock.calls[1][0]).toMatchObject({
+        category: 'inpage_provider',
+        event: EVENT_NAMES.PERMISSIONS_APPROVED,
+        properties: { method: MESSAGE_TYPE.ETH_REQUEST_ACCOUNTS },
+        referrer: { url: 'some.dapp' },
+      });
+    });
+
+    it(`should never track blocked methods such as ${MESSAGE_TYPE.GET_PROVIDER_STATE}`, () => {
+      const req = {
+        method: MESSAGE_TYPE.GET_PROVIDER_STATE,
+        origin: 'www.notadapp.com',
+      };
+
+      const res = {
+        error: null,
+      };
+      const { next, executeMiddlewareStack } = getNext();
+      handler(req, res, next);
+      expect(trackEvent).not.toHaveBeenCalled();
+      executeMiddlewareStack();
+    });
+
+    it(`should only track events when not rate limited`, async () => {
+      const req = {
+        method: 'eth_chainId',
+        origin: 'some.dapp',
+      };
+
+      const res = {
+        error: null,
+      };
+
+      let callCount = 0;
+
+      while (callCount < 3) {
+        callCount += 1;
+        const { next, executeMiddlewareStack } = getNext();
+        handler(req, res, next);
+        await executeMiddlewareStack();
+        if (callCount !== 3) {
+          await waitForSeconds(0.6);
+        }
+      }
+
+      expect(trackEvent).toHaveBeenCalledTimes(2);
+      expect(trackEvent.mock.calls[0][0].properties.method).toBe('eth_chainId');
+      expect(trackEvent.mock.calls[1][0].properties.method).toBe('eth_chainId');
+    });
+  });
+});
diff --git a/app/scripts/lib/ens-ipfs/setup.js b/app/scripts/lib/ens-ipfs/setup.js
index 2d19811c3fa8..942b888ccd85 100644
--- a/app/scripts/lib/ens-ipfs/setup.js
+++ b/app/scripts/lib/ens-ipfs/setup.js
@@ -2,11 +2,10 @@ import base32Encode from 'base32-encode';
 import base64 from 'base64-js';
 import browser from 'webextension-polyfill';
 
-import { SECOND } from '../../../../shared/constants/time';
 import getFetchWithTimeout from '../../../../shared/modules/fetch-with-timeout';
 import resolveEnsToIpfsContentId from './resolver';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 const supportedTopLevelDomains = ['eth'];
 
diff --git a/app/scripts/lib/metaRPCClientFactory.js b/app/scripts/lib/metaRPCClientFactory.js
index 689774f914a7..1dfe572d2c02 100644
--- a/app/scripts/lib/metaRPCClientFactory.js
+++ b/app/scripts/lib/metaRPCClientFactory.js
@@ -1,6 +1,7 @@
 import { EthereumRpcError } from 'eth-rpc-errors';
 import SafeEventEmitter from 'safe-event-emitter';
 import createRandomId from '../../../shared/modules/random-id';
+import { TEN_SECONDS_IN_MILLISECONDS } from '../../../ui/helpers/constants/critical-error';
 
 class MetaRPCClient {
   constructor(connectionStream) {
@@ -10,6 +11,25 @@ class MetaRPCClient {
     this.requests = new Map();
     this.connectionStream.on('data', this.handleResponse.bind(this));
     this.connectionStream.on('end', this.close.bind(this));
+    this.responseHandled = {};
+  }
+
+  send(id, payload, cb) {
+    this.requests.set(id, cb);
+    this.connectionStream.write(payload);
+    this.responseHandled[id] = false;
+    if (payload.method === 'getState') {
+      setTimeout(() => {
+        if (!this.responseHandled[id] && cb) {
+          delete this.responseHandled[id];
+          return cb(new Error('No response from RPC'), null);
+        }
+
+        delete this.responseHandled[id];
+        // needed for linter to pass
+        return true;
+      }, TEN_SECONDS_IN_MILLISECONDS);
+    }
   }
 
   onNotification(handler) {
@@ -34,6 +54,8 @@ class MetaRPCClient {
     const isNotification = id === undefined && error === undefined;
     const cb = this.requests.get(id);
 
+    this.responseHandled[id] = true;
+
     if (method && params && !isNotification) {
       // dont handle server-side to client-side requests
       return;
@@ -79,14 +101,13 @@ const metaRPCClientFactory = (connectionStream) => {
         const cb = p[p.length - 1];
         const params = p.slice(0, -1);
         const id = createRandomId();
-
-        object.requests.set(id, cb);
-        object.connectionStream.write({
+        const payload = {
           jsonrpc: '2.0',
           method: property,
           params,
           id,
-        });
+        };
+        object.send(id, payload, cb);
       };
     },
   });
diff --git a/app/scripts/lib/metaRPCClientFactory.test.js b/app/scripts/lib/metaRPCClientFactory.test.js
index 8304cf4e98d6..d8fbf6fe3fbe 100644
--- a/app/scripts/lib/metaRPCClientFactory.test.js
+++ b/app/scripts/lib/metaRPCClientFactory.test.js
@@ -131,4 +131,21 @@ describe('metaRPCClientFactory', () => {
       },
     });
   });
+
+  it('should be able to handle no message within TIMEOUT secs', async () => {
+    jest.useFakeTimers();
+    const streamTest = createThoughStream();
+    const metaRPCClient = metaRPCClientFactory(streamTest);
+
+    const errorPromise = new Promise((_resolve, reject) =>
+      metaRPCClient.getState('bad', (error, _) => {
+        reject(error);
+      }),
+    );
+
+    jest.runOnlyPendingTimers();
+    await expect(errorPromise).rejects.toThrow('No response from RPC');
+
+    jest.useRealTimers();
+  });
 });
diff --git a/app/scripts/lib/network-store.js b/app/scripts/lib/network-store.js
index ca5f4c843d22..f4e5997bf279 100644
--- a/app/scripts/lib/network-store.js
+++ b/app/scripts/lib/network-store.js
@@ -1,8 +1,7 @@
 import log from 'loglevel';
-import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 const FIXTURE_SERVER_HOST = 'localhost';
 const FIXTURE_SERVER_PORT = 12345;
diff --git a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
index 82ac2cf846a9..d3130296601c 100644
--- a/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
+++ b/app/scripts/lib/rpc-method-middleware/handlers/add-ethereum-chain.js
@@ -1,7 +1,10 @@
 import { ethErrors, errorCodes } from 'eth-rpc-errors';
 import validUrl from 'valid-url';
 import { omit } from 'lodash';
-import { MESSAGE_TYPE } from '../../../../../shared/constants/app';
+import {
+  MESSAGE_TYPE,
+  UNKNOWN_TICKER_SYMBOL,
+} from '../../../../../shared/constants/app';
 import { EVENT } from '../../../../../shared/constants/metametrics';
 import {
   isPrefixedFormattedHexString,
@@ -16,6 +19,7 @@ const addEthereumChain = {
   hookNames: {
     addCustomRpc: true,
     getCurrentChainId: true,
+    getCurrentRpcUrl: true,
     findCustomRpcBy: true,
     updateRpcTarget: true,
     requestUserApproval: true,
@@ -32,6 +36,7 @@ async function addEthereumChainHandler(
   {
     addCustomRpc,
     getCurrentChainId,
+    getCurrentRpcUrl,
     findCustomRpcBy,
     updateRpcTarget,
     requestUserApproval,
@@ -77,14 +82,27 @@ async function addEthereumChainHandler(
     );
   }
 
+  const isLocalhost = (strUrl) => {
+    try {
+      const url = new URL(strUrl);
+      return url.hostname === 'localhost' || url.hostname === '127.0.0.1';
+    } catch (error) {
+      return false;
+    }
+  };
+
   const firstValidRPCUrl = Array.isArray(rpcUrls)
-    ? rpcUrls.find((rpcUrl) => validUrl.isHttpsUri(rpcUrl))
+    ? rpcUrls.find(
+        (rpcUrl) => isLocalhost(rpcUrl) || validUrl.isHttpsUri(rpcUrl),
+      )
     : null;
 
   const firstValidBlockExplorerUrl =
     blockExplorerUrls !== null && Array.isArray(blockExplorerUrls)
-      ? blockExplorerUrls.find((blockExplorerUrl) =>
-          validUrl.isHttpsUri(blockExplorerUrl),
+      ? blockExplorerUrls.find(
+          (blockExplorerUrl) =>
+            isLocalhost(blockExplorerUrl) ||
+            validUrl.isHttpsUri(blockExplorerUrl),
         )
       : null;
 
@@ -132,15 +150,21 @@ async function addEthereumChainHandler(
 
   const existingNetwork = findCustomRpcBy({ chainId: _chainId });
 
-  if (existingNetwork) {
+  // if the request is to add a network that is already added and configured
+  // with the same RPC gateway we shouldn't try to add it again.
+  if (existingNetwork && existingNetwork.rpcUrl === firstValidRPCUrl) {
     // If the network already exists, the request is considered successful
     res.result = null;
 
     const currentChainId = getCurrentChainId();
-    if (currentChainId === _chainId) {
+    const currentRpcUrl = getCurrentRpcUrl();
+
+    // If the current chainId and rpcUrl matches that of the incoming request
+    // We don't need to proceed further.
+    if (currentChainId === _chainId && currentRpcUrl === firstValidRPCUrl) {
       return end();
     }
-
+    // If this network is already added with but is not the currently selected network
     // Ask the user to switch the network
     try {
       await updateRpcTarget(
@@ -223,15 +247,32 @@ async function addEthereumChainHandler(
       );
     }
   }
-  const ticker = nativeCurrency?.symbol || 'ETH';
 
-  if (typeof ticker !== 'string' || ticker.length < 2 || ticker.length > 6) {
+  const ticker = nativeCurrency?.symbol || UNKNOWN_TICKER_SYMBOL;
+
+  if (
+    ticker !== UNKNOWN_TICKER_SYMBOL &&
+    (typeof ticker !== 'string' || ticker.length < 2 || ticker.length > 6)
+  ) {
     return end(
       ethErrors.rpc.invalidParams({
         message: `Expected 2-6 character string 'nativeCurrency.symbol'. Received:\n${ticker}`,
       }),
     );
   }
+  // if the chainId is the same as an existing network but the ticker is different we want to block this action
+  // as it is potentially malicious and confusing
+  if (
+    existingNetwork &&
+    existingNetwork.chainId === _chainId &&
+    existingNetwork.ticker !== ticker
+  ) {
+    return end(
+      ethErrors.rpc.invalidParams({
+        message: `nativeCurrency.symbol does not match currency symbol for a network the user already has added with the same chainId. Received:\n${ticker}`,
+      }),
+    );
+  }
 
   try {
     await addCustomRpc(
@@ -248,25 +289,34 @@ async function addEthereumChainHandler(
       }),
     );
 
+    let rpcUrlOrigin;
+    try {
+      rpcUrlOrigin = new URL(firstValidRPCUrl).origin;
+    } catch {
+      // ignore
+    }
+
     sendMetrics({
       event: 'Custom Network Added',
       category: EVENT.CATEGORIES.NETWORK,
       referrer: {
         url: origin,
       },
-      sensitiveProperties: {
+      properties: {
         chain_id: _chainId,
-        rpc_url: firstValidRPCUrl,
         network_name: _chainName,
         // Including network to override the default network
         // property included in all events. For RPC type networks
         // the MetaMetrics controller uses the rpcUrl for the network
         // property.
-        network: firstValidRPCUrl,
+        network: rpcUrlOrigin,
         symbol: ticker,
         block_explorer_url: firstValidBlockExplorerUrl,
         source: EVENT.SOURCE.TRANSACTION.DAPP,
       },
+      sensitiveProperties: {
+        rpc_url: rpcUrlOrigin,
+      },
     });
 
     // Once the network has been added, the requested is considered successful
diff --git a/app/scripts/lib/setupSentry.js b/app/scripts/lib/setupSentry.js
index 7332041bb5d0..196389439e61 100644
--- a/app/scripts/lib/setupSentry.js
+++ b/app/scripts/lib/setupSentry.js
@@ -103,7 +103,17 @@ export default function setupSentry({ release, getState }) {
     environment,
     integrations: [new Dedupe(), new ExtraErrorData()],
     release,
-    beforeSend: (report) => rewriteReport(report),
+    beforeSend: (report) => {
+      if (getState) {
+        const appState = getState();
+        if (!appState?.store?.metamask?.participateInMetaMetrics) {
+          return null;
+        }
+      } else {
+        return null;
+      }
+      return rewriteReport(report);
+    },
   });
 
   function rewriteReport(report) {
diff --git a/app/scripts/lib/util.js b/app/scripts/lib/util.js
index 9800666afd3b..b7fdf0521cee 100644
--- a/app/scripts/lib/util.js
+++ b/app/scripts/lib/util.js
@@ -27,7 +27,7 @@ const getEnvironmentTypeMemo = memoize((url) => {
   const parsedUrl = new URL(url);
   if (parsedUrl.pathname === '/popup.html') {
     return ENVIRONMENT_TYPE_POPUP;
-  } else if (['/home.html', '/phishing.html'].includes(parsedUrl.pathname)) {
+  } else if (['/home.html'].includes(parsedUrl.pathname)) {
     return ENVIRONMENT_TYPE_FULLSCREEN;
   } else if (parsedUrl.pathname === '/notification.html') {
     return ENVIRONMENT_TYPE_NOTIFICATION;
diff --git a/app/scripts/lib/util.test.js b/app/scripts/lib/util.test.js
index 62c33b5a537c..0892a4e3dea6 100644
--- a/app/scripts/lib/util.test.js
+++ b/app/scripts/lib/util.test.js
@@ -34,13 +34,6 @@ describe('app utils', () => {
       expect(environmentType).toStrictEqual(ENVIRONMENT_TYPE_FULLSCREEN);
     });
 
-    it('should return fullscreen type for phishing.html', () => {
-      const environmentType = getEnvironmentType(
-        'http://extension-id/phishing.html',
-      );
-      expect(environmentType).toStrictEqual(ENVIRONMENT_TYPE_FULLSCREEN);
-    });
-
     it('should return background type', () => {
       const environmentType = getEnvironmentType(
         'http://extension-id/_generated_background_page.html',
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 5f9139c13031..e7112e23965e 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -42,6 +42,7 @@ import {
   SubjectMetadataController,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   RateLimitController,
+  NotificationController,
   ///: END:ONLY_INCLUDE_IN
 } from '@metamask/controllers';
 import SmartTransactionsController from '@metamask/smart-transactions-controller';
@@ -50,12 +51,15 @@ import {
   SnapController,
   IframeExecutionService,
 } from '@metamask/snap-controllers';
+import { satisfies as satisfiesSemver } from 'semver';
 ///: END:ONLY_INCLUDE_IN
 
 import {
+  ASSET_TYPES,
   TRANSACTION_STATUSES,
   TRANSACTION_TYPES,
 } from '../../shared/constants/transaction';
+import { PHISHING_NEW_ISSUE_URLS } from '../../shared/constants/phishing';
 import {
   GAS_API_BASE_URL,
   GAS_DEV_API_BASE_URL,
@@ -84,10 +88,13 @@ import {
   POLLING_TOKEN_ENVIRONMENT_TYPES,
   SUBJECT_TYPES,
 } from '../../shared/constants/app';
-import { EVENT } from '../../shared/constants/metametrics';
+import { EVENT, EVENT_NAMES } from '../../shared/constants/metametrics';
 
 import { hexToDecimal } from '../../ui/helpers/utils/conversions.util';
-import { getTokenValueParam } from '../../ui/helpers/utils/token-util';
+import {
+  getTokenIdParam,
+  getTokenValueParam,
+} from '../../ui/helpers/utils/token-util';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../shared/modules/transaction.utils';
 import {
@@ -154,6 +161,9 @@ export const METAMASK_CONTROLLER_EVENTS = {
   APPROVAL_STATE_CHANGE: 'ApprovalController:stateChange',
 };
 
+// stream channels
+const PHISHING_SAFELIST = 'metamask-phishing-safelist';
+
 export default class MetamaskController extends EventEmitter {
   /**
    * @param {Object} opts
@@ -241,35 +251,28 @@ export default class MetamaskController extends EventEmitter {
       config: { provider: this.provider },
       state: initState.TokensController,
     });
-    process.env.TOKEN_DETECTION_V2
-      ? (this.assetsContractController = new AssetsContractController({
-          onPreferencesStateChange: (listener) =>
-            this.preferencesController.store.subscribe(listener),
-          onNetworkStateChange: (cb) =>
-            this.networkController.store.subscribe((networkState) => {
-              const modifiedNetworkState = {
-                ...networkState,
-                provider: {
-                  ...networkState.provider,
-                  chainId: hexToDecimal(networkState.provider.chainId),
-                },
-              };
-              return cb(modifiedNetworkState);
-            }),
-          config: {
-            provider: this.provider,
-          },
-          state: initState.AssetsContractController,
-        }))
-      : (this.assetsContractController = new AssetsContractController(
-          {
-            onPreferencesStateChange: (listener) =>
-              this.preferencesController.store.subscribe(listener),
-          },
-          {
-            provider: this.provider,
-          },
-        ));
+
+    this.assetsContractController = new AssetsContractController(
+      {
+        onPreferencesStateChange: (listener) =>
+          this.preferencesController.store.subscribe(listener),
+        onNetworkStateChange: (cb) =>
+          this.networkController.store.subscribe((networkState) => {
+            const modifiedNetworkState = {
+              ...networkState,
+              provider: {
+                ...networkState.provider,
+                chainId: hexToDecimal(networkState.provider.chainId),
+              },
+            };
+            return cb(modifiedNetworkState);
+          }),
+      },
+      {
+        provider: this.provider,
+      },
+      initState.AssetsContractController,
+    );
 
     this.collectiblesController = new CollectiblesController(
       {
@@ -297,6 +300,21 @@ export default class MetamaskController extends EventEmitter {
         getERC1155TokenURI: this.assetsContractController.getERC1155TokenURI.bind(
           this.assetsContractController,
         ),
+        onCollectibleAdded: ({ address, symbol, tokenId, standard, source }) =>
+          this.metaMetricsController.trackEvent({
+            event: EVENT_NAMES.NFT_ADDED,
+            category: EVENT.CATEGORIES.WALLET,
+            properties: {
+              token_contract_address: address,
+              token_symbol: symbol,
+              asset_type: ASSET_TYPES.COLLECTIBLE,
+              token_standard: standard,
+              source,
+            },
+            sensitiveProperties: {
+              tokenId,
+            },
+          }),
       },
       {},
       initState.CollectiblesController,
@@ -413,50 +431,23 @@ export default class MetamaskController extends EventEmitter {
     const tokenListMessenger = this.controllerMessenger.getRestricted({
       name: 'TokenListController',
     });
-    process.env.TOKEN_DETECTION_V2
-      ? (this.tokenListController = new TokenListController({
-          chainId: hexToDecimal(this.networkController.getCurrentChainId()),
-          onNetworkStateChange: (cb) =>
-            this.networkController.store.subscribe((networkState) => {
-              const modifiedNetworkState = {
-                ...networkState,
-                provider: {
-                  ...networkState.provider,
-                  chainId: hexToDecimal(networkState.provider.chainId),
-                },
-              };
-              return cb(modifiedNetworkState);
-            }),
-          messenger: tokenListMessenger,
-          state: initState.TokenListController,
-        }))
-      : (this.tokenListController = new TokenListController({
-          chainId: hexToDecimal(this.networkController.getCurrentChainId()),
-          useStaticTokenList: !this.preferencesController.store.getState()
-            .useTokenDetection,
-          onNetworkStateChange: (cb) =>
-            this.networkController.store.subscribe((networkState) => {
-              const modifiedNetworkState = {
-                ...networkState,
-                provider: {
-                  ...networkState.provider,
-                  chainId: hexToDecimal(networkState.provider.chainId),
-                },
-              };
-              return cb(modifiedNetworkState);
-            }),
-          onPreferencesStateChange: (cb) =>
-            this.preferencesController.store.subscribe((preferencesState) => {
-              const modifiedPreferencesState = {
-                ...preferencesState,
-                useStaticTokenList: !this.preferencesController.store.getState()
-                  .useTokenDetection,
-              };
-              return cb(modifiedPreferencesState);
-            }),
-          messenger: tokenListMessenger,
-          state: initState.TokenListController,
-        }));
+
+    this.tokenListController = new TokenListController({
+      chainId: hexToDecimal(this.networkController.getCurrentChainId()),
+      onNetworkStateChange: (cb) =>
+        this.networkController.store.subscribe((networkState) => {
+          const modifiedNetworkState = {
+            ...networkState,
+            provider: {
+              ...networkState.provider,
+              chainId: hexToDecimal(networkState.provider.chainId),
+            },
+          };
+          return cb(modifiedNetworkState);
+        }),
+      messenger: tokenListMessenger,
+      state: initState.TokenListController,
+    });
 
     this.phishingController = new PhishingController();
 
@@ -636,10 +627,9 @@ export default class MetamaskController extends EventEmitter {
     });
 
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    this.workerController = new IframeExecutionService({
-      onError: this.onExecutionEnvironmentError.bind(this),
+    this.snapExecutionService = new IframeExecutionService({
       iframeUrl: new URL(
-        'https://metamask.github.io/iframe-execution-environment/0.4.5',
+        'https://metamask.github.io/iframe-execution-environment/0.5.2',
       ),
       messenger: this.controllerMessenger.getRestricted({
         name: 'ExecutionService',
@@ -651,7 +641,8 @@ export default class MetamaskController extends EventEmitter {
       name: 'SnapController',
       allowedEvents: [
         'ExecutionService:unhandledError',
-        'ExecutionService:unresponsive',
+        'ExecutionService:outboundRequest',
+        'ExecutionService:outboundResponse',
       ],
       allowedActions: [
         `${this.permissionController.name}:getEndowments`,
@@ -661,28 +652,62 @@ export default class MetamaskController extends EventEmitter {
         `${this.permissionController.name}:requestPermissions`,
         `${this.permissionController.name}:revokeAllPermissions`,
         `${this.permissionController.name}:revokePermissionForAllSubjects`,
+        'ExecutionService:executeSnap',
+        'ExecutionService:getRpcRequestHandler',
+        'ExecutionService:terminateSnap',
+        'ExecutionService:terminateAllSnaps',
       ],
     });
 
+    const SNAP_BLOCKLIST = [
+      {
+        id: 'npm:@consensys/starknet-snap',
+        versionRange: '<0.1.11',
+      },
+    ];
+
     this.snapController = new SnapController({
-      endowmentPermissionNames: Object.values(EndowmentPermissions),
-      terminateAllSnaps: this.workerController.terminateAllSnaps.bind(
-        this.workerController,
-      ),
-      terminateSnap: this.workerController.terminateSnap.bind(
-        this.workerController,
-      ),
-      executeSnap: this.workerController.executeSnap.bind(
-        this.workerController,
-      ),
-      getRpcMessageHandler: this.workerController.getRpcMessageHandler.bind(
-        this.workerController,
-      ),
+      environmentEndowmentPermissions: Object.values(EndowmentPermissions),
       closeAllConnections: this.removeAllConnections.bind(this),
+      // Prefix subject with appKeyType to generate separate keys for separate uses
+      getAppKey: async (subject, appKeyType) => {
+        await this.appStateController.getUnlockPromise(true);
+        return this.getAppKeyForSubject(`${appKeyType}:${subject}`);
+      },
+      checkBlockList: async (snapsToCheck) => {
+        return Object.entries(snapsToCheck).reduce(
+          (acc, [snapId, snapVersion]) => {
+            const blockInfo = SNAP_BLOCKLIST.find(
+              (blocked) =>
+                blocked.id === snapId &&
+                satisfiesSemver(snapVersion, blocked.versionRange, {
+                  includePrerelease: true,
+                }),
+            );
+
+            const cur = blockInfo
+              ? {
+                  blocked: true,
+                  reason: blockInfo.reason,
+                  infoUrl: blockInfo.infoUrl,
+                }
+              : { blocked: false };
+            return { ...acc, [snapId]: cur };
+          },
+          {},
+        );
+      },
       state: initState.SnapController,
       messenger: snapControllerMessenger,
     });
 
+    this.notificationController = new NotificationController({
+      messenger: this.controllerMessenger.getRestricted({
+        name: 'NotificationController',
+      }),
+      state: initState.NotificationController,
+    });
+
     this.rateLimitController = new RateLimitController({
       messenger: this.controllerMessenger.getRestricted({
         name: 'RateLimitController',
@@ -701,6 +726,15 @@ export default class MetamaskController extends EventEmitter {
           );
           return null;
         },
+        showInAppNotification: (origin, message) => {
+          this.controllerMessenger.call(
+            'NotificationController:show',
+            origin,
+            message,
+          );
+
+          return null;
+        },
       },
     });
     ///: END:ONLY_INCLUDE_IN
@@ -835,7 +869,12 @@ export default class MetamaskController extends EventEmitter {
           } = txMeta.txParams;
           const { chainId } = txMeta;
           const transactionData = parseStandardTokenTransactionData(data);
-          const tokenAmountOrTokenId = getTokenValueParam(transactionData);
+          // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
+          // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
+          // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
+          const transactionDataTokenId =
+            getTokenIdParam(transactionData) ??
+            getTokenValueParam(transactionData);
           const { allCollectibles } = this.collectiblesController.state;
 
           // check if its a known collectible
@@ -844,7 +883,7 @@ export default class MetamaskController extends EventEmitter {
           ].find(
             ({ address, tokenId }) =>
               isEqualCaseInsensitive(address, contractAddress) &&
-              tokenId === tokenAmountOrTokenId,
+              tokenId === transactionDataTokenId,
           );
 
           // if it is we check and update ownership status.
@@ -1002,6 +1041,7 @@ export default class MetamaskController extends EventEmitter {
       CollectiblesController: this.collectiblesController,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
       SnapController: this.snapController,
+      NotificationController: this.notificationController,
       ///: END:ONLY_INCLUDE_IN
     });
 
@@ -1042,6 +1082,7 @@ export default class MetamaskController extends EventEmitter {
         CollectiblesController: this.collectiblesController,
         ///: BEGIN:ONLY_INCLUDE_IN(flask)
         SnapController: this.snapController,
+        NotificationController: this.notificationController,
         ///: END:ONLY_INCLUDE_IN
       },
       controllerMessenger: this.controllerMessenger,
@@ -1103,9 +1144,9 @@ export default class MetamaskController extends EventEmitter {
           this.controllerMessenger,
           'SnapController:get',
         ),
-        getSnapRpcHandler: this.controllerMessenger.call.bind(
+        handleSnapRpcRequest: this.controllerMessenger.call.bind(
           this.controllerMessenger,
-          'SnapController:getRpcMessageHandler',
+          'SnapController:handleRpcRequest',
         ),
         getSnapState: this.controllerMessenger.call.bind(
           this.controllerMessenger,
@@ -1117,7 +1158,7 @@ export default class MetamaskController extends EventEmitter {
             type: MESSAGE_TYPE.SNAP_CONFIRM,
             requestData: confirmationData,
           }),
-        showNotification: (origin, args) =>
+        showNativeNotification: (origin, args) =>
           this.controllerMessenger.call(
             'RateLimitController:call',
             origin,
@@ -1125,6 +1166,14 @@ export default class MetamaskController extends EventEmitter {
             origin,
             args.message,
           ),
+        showInAppNotification: (origin, args) =>
+          this.controllerMessenger.call(
+            'RateLimitController:call',
+            origin,
+            'showInAppNotification',
+            origin,
+            args.message,
+          ),
         updateSnapState: this.controllerMessenger.call.bind(
           this.controllerMessenger,
           'SnapController:updateSnapState',
@@ -1132,6 +1181,25 @@ export default class MetamaskController extends EventEmitter {
       }),
     };
   }
+
+  /**
+   * Deletes the specified notifications from state.
+   *
+   * @param {string[]} ids - The notifications ids to delete.
+   */
+  dismissNotifications(ids) {
+    this.notificationController.dismiss(ids);
+  }
+
+  /**
+   * Updates the readDate attribute of the specified notifications.
+   *
+   * @param {string[]} ids - The notifications ids to mark as read.
+   */
+  markNotificationsAsRead(ids) {
+    this.notificationController.markRead(ids);
+  }
+
   ///: END:ONLY_INCLUDE_IN
 
   /**
@@ -1202,7 +1270,7 @@ export default class MetamaskController extends EventEmitter {
     // Record Snap metadata whenever a Snap is added to state.
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapAdded`,
-      (snapId, snap, svgIcon = null) => {
+      (snap, svgIcon = null) => {
         const {
           manifest: { proposedName },
           version,
@@ -1210,7 +1278,7 @@ export default class MetamaskController extends EventEmitter {
         this.subjectMetadataController.addSubjectMetadata({
           subjectType: SUBJECT_TYPES.SNAP,
           name: proposedName,
-          origin: snapId,
+          origin: snap.id,
           version,
           svgIcon,
         });
@@ -1219,12 +1287,28 @@ export default class MetamaskController extends EventEmitter {
 
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapInstalled`,
-      (snapId) => {
+      (truncatedSnap) => {
         this.metaMetricsController.trackEvent({
           event: 'Snap Installed',
           category: EVENT.CATEGORIES.SNAPS,
           properties: {
-            snap_id: snapId,
+            snap_id: truncatedSnap.id,
+            version: truncatedSnap.version,
+          },
+        });
+      },
+    );
+
+    this.controllerMessenger.subscribe(
+      `${this.snapController.name}:snapUpdated`,
+      (newSnap, oldVersion) => {
+        this.metaMetricsController.trackEvent({
+          event: 'Snap Updated',
+          category: EVENT.CATEGORIES.SNAPS,
+          properties: {
+            snap_id: newSnap.id,
+            old_version: oldVersion,
+            new_version: newSnap.version,
           },
         });
       },
@@ -1232,12 +1316,12 @@ export default class MetamaskController extends EventEmitter {
 
     this.controllerMessenger.subscribe(
       `${this.snapController.name}:snapTerminated`,
-      (snapId) => {
+      (truncatedSnap) => {
         const approvals = Object.values(
           this.approvalController.state.pendingApprovals,
         ).filter(
           (approval) =>
-            approval.origin === snapId &&
+            approval.origin === truncatedSnap.id &&
             approval.type === MESSAGE_TYPE.SNAP_CONFIRM,
         );
         for (const approval of approvals) {
@@ -1458,7 +1542,6 @@ export default class MetamaskController extends EventEmitter {
       ),
       markPasswordForgotten: this.markPasswordForgotten.bind(this),
       unMarkPasswordForgotten: this.unMarkPasswordForgotten.bind(this),
-      safelistPhishingDomain: this.safelistPhishingDomain.bind(this),
       getRequestAccountTabIds: this.getRequestAccountTabIds,
       getOpenMetamaskTabsIds: this.getOpenMetamaskTabsIds,
       markNotificationPopupAsAutomaticallyClosed: () =>
@@ -1520,7 +1603,8 @@ export default class MetamaskController extends EventEmitter {
       setCustomRpc: this.setCustomRpc.bind(this),
       updateAndSetCustomRpc: this.updateAndSetCustomRpc.bind(this),
       delCustomRpc: this.delCustomRpc.bind(this),
-
+      addCustomNetwork: this.addCustomNetwork.bind(this),
+      requestUserApproval: this.requestUserApproval.bind(this),
       // PreferencesController
       setSelectedAddress: preferencesController.setSelectedAddress.bind(
         preferencesController,
@@ -1533,7 +1617,6 @@ export default class MetamaskController extends EventEmitter {
         tokensController,
       ),
       updateTokenType: tokensController.updateTokenType.bind(tokensController),
-      removeToken: tokensController.removeAndIgnoreToken.bind(tokensController),
       setAccountLabel: preferencesController.setAccountLabel.bind(
         preferencesController,
       ),
@@ -1557,7 +1640,9 @@ export default class MetamaskController extends EventEmitter {
         preferencesController,
       ),
       setTheme: preferencesController.setTheme.bind(preferencesController),
-
+      setCustomNetworkListEnabled: preferencesController.setCustomNetworkListEnabled.bind(
+        preferencesController,
+      ),
       // AssetsContractController
       getTokenStandardAndDetails: this.getTokenStandardAndDetails.bind(this),
 
@@ -1757,6 +1842,8 @@ export default class MetamaskController extends EventEmitter {
       disableSnap: this.snapController.disableSnap.bind(this.snapController),
       enableSnap: this.snapController.enableSnap.bind(this.snapController),
       removeSnap: this.snapController.removeSnap.bind(this.snapController),
+      dismissNotifications: this.dismissNotifications.bind(this),
+      markNotificationsAsRead: this.markNotificationsAsRead.bind(this),
       ///: END:ONLY_INCLUDE_IN
 
       // swaps
@@ -1820,9 +1907,6 @@ export default class MetamaskController extends EventEmitter {
       fetchSmartTransactionFees: smartTransactionsController.getFees.bind(
         smartTransactionsController,
       ),
-      estimateSmartTransactionsGas: smartTransactionsController.estimateGas.bind(
-        smartTransactionsController,
-      ),
       submitSignedTransactions: smartTransactionsController.submitSignedTransactions.bind(
         smartTransactionsController,
       ),
@@ -1906,20 +1990,14 @@ export default class MetamaskController extends EventEmitter {
         : null,
 
       /** Token Detection V2 */
-      addDetectedTokens: process.env.TOKEN_DETECTION_V2
-        ? tokensController.addDetectedTokens.bind(tokensController)
-        : null,
-      importTokens: process.env.TOKEN_DETECTION_V2
-        ? tokensController.importTokens.bind(tokensController)
-        : null,
-      ignoreTokens: process.env.TOKEN_DETECTION_V2
-        ? tokensController.ignoreTokens.bind(tokensController)
-        : null,
-      getBalancesInSingleCall: process.env.TOKEN_DETECTION_V2
-        ? assetsContractController.getBalancesInSingleCall.bind(
-            assetsContractController,
-          )
-        : null,
+      addDetectedTokens: tokensController.addDetectedTokens.bind(
+        tokensController,
+      ),
+      addImportedTokens: tokensController.addTokens.bind(tokensController),
+      ignoreTokens: tokensController.ignoreTokens.bind(tokensController),
+      getBalancesInSingleCall: assetsContractController.getBalancesInSingleCall.bind(
+        assetsContractController,
+      ),
     };
   }
 
@@ -1975,6 +2053,68 @@ export default class MetamaskController extends EventEmitter {
     }
   }
 
+  async requestUserApproval(customRpc, originIsMetaMask) {
+    try {
+      await this.approvalController.addAndShowApprovalRequest({
+        origin: 'metamask',
+        type: 'wallet_addEthereumChain',
+        requestData: {
+          chainId: customRpc.chainId,
+          blockExplorerUrl: customRpc.rpcPrefs.blockExplorerUrl,
+          chainName: customRpc.nickname,
+          rpcUrl: customRpc.rpcUrl,
+          ticker: customRpc.ticker,
+          imageUrl: customRpc.rpcPrefs.imageUrl,
+        },
+      });
+    } catch (error) {
+      if (
+        !(originIsMetaMask && error.message === 'User rejected the request.')
+      ) {
+        throw error;
+      }
+    }
+  }
+
+  async addCustomNetwork(customRpc) {
+    const { chainId, chainName, rpcUrl, ticker, blockExplorerUrl } = customRpc;
+
+    await this.preferencesController.addToFrequentRpcList(
+      rpcUrl,
+      chainId,
+      ticker,
+      chainName,
+      {
+        blockExplorerUrl,
+      },
+    );
+
+    let rpcUrlOrigin;
+    try {
+      rpcUrlOrigin = new URL(rpcUrl).origin;
+    } catch {
+      // ignore
+    }
+    this.metaMetricsController.trackEvent({
+      event: 'Custom Network Added',
+      category: EVENT.CATEGORIES.NETWORK,
+      referrer: {
+        url: rpcUrlOrigin,
+      },
+      properties: {
+        chain_id: chainId,
+        network_name: chainName,
+        network: rpcUrlOrigin,
+        symbol: ticker,
+        block_explorer_url: blockExplorerUrl,
+        source: EVENT.SOURCE.NETWORK.POPULAR_NETWORK_LIST,
+      },
+      sensitiveProperties: {
+        rpc_url: rpcUrlOrigin,
+      },
+    });
+  }
+
   /**
    * Create a new Vault and restore an existent keyring.
    *
@@ -2044,7 +2184,7 @@ export default class MetamaskController extends EventEmitter {
 
       // This must be set as soon as possible to communicate to the
       // keyring's iframe and have the setting initialized properly
-      // Optimistically called to not block Metamask login due to
+      // Optimistically called to not block MetaMask login due to
       // Ledger Keyring GitHub downtime
       const transportPreference = this.preferencesController.getLedgerTransportPreference();
       this.setLedgerTransportPreference(transportPreference);
@@ -2216,7 +2356,7 @@ export default class MetamaskController extends EventEmitter {
 
     // This must be set as soon as possible to communicate to the
     // keyring's iframe and have the setting initialized properly
-    // Optimistically called to not block Metamask login due to
+    // Optimistically called to not block MetaMask login due to
     // Ledger Keyring GitHub downtime
     const transportPreference = this.preferencesController.getLedgerTransportPreference();
 
@@ -2622,8 +2762,14 @@ export default class MetamaskController extends EventEmitter {
     // Remove account from the account tracker controller
     this.accountTracker.removeAccount([address]);
 
+    const keyring = await this.keyringController.getKeyringForAccount(address);
     // Remove account from the keyring
     await this.keyringController.removeAccount(address);
+    const updatedKeyringAccounts = keyring ? await keyring.getAccounts() : {};
+    if (updatedKeyringAccounts?.length === 0) {
+      keyring.destroy?.();
+    }
+
     return address;
   }
 
@@ -3220,9 +3366,13 @@ export default class MetamaskController extends EventEmitter {
     if (sender.url) {
       const { hostname } = new URL(sender.url);
       // Check if new connection is blocked if phishing detection is on
-      if (usePhishDetect && this.phishingController.test(hostname)) {
-        log.debug('MetaMask - sending phishing warning for', hostname);
-        this.sendPhishingWarning(connectionStream, hostname);
+      const phishingTestResponse = this.phishingController.test(hostname);
+      if (usePhishDetect && phishingTestResponse?.result) {
+        this.sendPhishingWarning(
+          connectionStream,
+          hostname,
+          phishingTestResponse,
+        );
         return;
       }
     }
@@ -3265,6 +3415,33 @@ export default class MetamaskController extends EventEmitter {
     );
   }
 
+  /**
+   * Used to create a multiplexed stream for connecting to the phishing warning page.
+   *
+   * @param options - Options bag.
+   * @param {ReadableStream} options.connectionStream - The Duplex stream to connect to.
+   */
+  setupPhishingCommunication({ connectionStream }) {
+    const { usePhishDetect } = this.preferencesController.store.getState();
+
+    if (!usePhishDetect) {
+      return;
+    }
+
+    // setup multiplexing
+    const mux = setupMultiplex(connectionStream);
+    const phishingStream = mux.createStream(PHISHING_SAFELIST);
+
+    // set up postStream transport
+    phishingStream.on(
+      'data',
+      createMetaRPCHandler(
+        { safelistPhishingDomain: this.safelistPhishingDomain.bind(this) },
+        phishingStream,
+      ),
+    );
+  }
+
   /**
    * Called when we detect a suspicious domain. Requests the browser redirects
    * to our anti-phishing page.
@@ -3273,11 +3450,15 @@ export default class MetamaskController extends EventEmitter {
    * @param {*} connectionStream - The duplex stream to the per-page script,
    * for sending the reload attempt to.
    * @param {string} hostname - The hostname that triggered the suspicion.
+   * @param {object} phishingTestResponse - Result of calling `phishingController.test`,
+   * which is the result of calling eth-phishing-detects detector.check method https://github.com/MetaMask/eth-phishing-detect/blob/master/src/detector.js#L55-L112
    */
-  sendPhishingWarning(connectionStream, hostname) {
+  sendPhishingWarning(connectionStream, hostname, phishingTestResponse) {
+    const newIssueUrl = PHISHING_NEW_ISSUE_URLS[phishingTestResponse?.name];
+
     const mux = setupMultiplex(connectionStream);
     const phishingStream = mux.createStream('phishing');
-    phishingStream.write({ hostname });
+    phishingStream.write({ hostname, newIssueUrl });
   }
 
   /**
@@ -3377,17 +3558,6 @@ export default class MetamaskController extends EventEmitter {
   }
 
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  /**
-   * For snaps running in workers.
-   *
-   * @param snapId
-   * @param error
-   */
-  onExecutionEnvironmentError(snapId, error) {
-    this.snapController.stopPlugin(snapId);
-    this.snapController.addSnapError(error);
-  }
-
   /**
    * For snaps running in workers.
    *
@@ -3529,6 +3699,9 @@ export default class MetamaskController extends EventEmitter {
         getCurrentChainId: this.networkController.getCurrentChainId.bind(
           this.networkController,
         ),
+        getCurrentRpcUrl: this.networkController.getCurrentRpcUrl.bind(
+          this.networkController,
+        ),
         setProviderType: this.networkController.setProviderType.bind(
           this.networkController,
         ),
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index 6baf1b113de9..c0e1a08b92b1 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -18,6 +18,8 @@ import { addHexPrefix } from './lib/util';
 
 const Ganache = require('../../test/e2e/ganache');
 
+const NOTIFICATION_ID = 'NHL8f2eSSTn9TKBamRLiU';
+
 const firstTimeState = {
   config: {},
   NetworkController: {
@@ -32,6 +34,17 @@ const firstTimeState = {
       },
     },
   },
+  NotificationController: {
+    notifications: {
+      [NOTIFICATION_ID]: {
+        id: NOTIFICATION_ID,
+        origin: 'local:http://localhost:8086/',
+        createdDate: 1652967897732,
+        readDate: null,
+        message: 'Hello, http://localhost:8086!',
+      },
+    },
+  },
 };
 
 const ganacheServer = new Ganache();
@@ -769,12 +782,20 @@ describe('MetaMaskController', function () {
   describe('#removeAccount', function () {
     let ret;
     const addressToRemove = '0x1';
+    let mockKeyring;
 
     beforeEach(async function () {
+      mockKeyring = {
+        getAccounts: sinon.stub().returns(Promise.resolve([])),
+        destroy: sinon.stub(),
+      };
       sinon.stub(metamaskController.preferencesController, 'removeAddress');
       sinon.stub(metamaskController.accountTracker, 'removeAccount');
       sinon.stub(metamaskController.keyringController, 'removeAccount');
       sinon.stub(metamaskController, 'removeAllAccountPermissions');
+      sinon
+        .stub(metamaskController.keyringController, 'getKeyringForAccount')
+        .returns(Promise.resolve(mockKeyring));
 
       ret = await metamaskController.removeAccount(addressToRemove);
     });
@@ -784,6 +805,9 @@ describe('MetaMaskController', function () {
       metamaskController.accountTracker.removeAccount.restore();
       metamaskController.preferencesController.removeAddress.restore();
       metamaskController.removeAllAccountPermissions.restore();
+
+      mockKeyring.getAccounts.resetHistory();
+      mockKeyring.destroy.resetHistory();
     });
 
     it('should call preferencesController.removeAddress', async function () {
@@ -817,6 +841,16 @@ describe('MetaMaskController', function () {
     it('should return address', async function () {
       assert.equal(ret, '0x1');
     });
+    it('should call keyringController.getKeyringForAccount', async function () {
+      assert(
+        metamaskController.keyringController.getKeyringForAccount.calledWith(
+          addressToRemove,
+        ),
+      );
+    });
+    it('should call keyring.destroy', async function () {
+      assert(mockKeyring.destroy.calledOnce);
+    });
   });
 
   describe('#newUnsignedMessage', function () {
@@ -1212,6 +1246,27 @@ describe('MetaMaskController', function () {
       assert.deepEqual(metamaskController.getState(), oldState);
     });
   });
+
+  describe('markNotificationsAsRead', function () {
+    it('marks the notification as read', function () {
+      metamaskController.markNotificationsAsRead([NOTIFICATION_ID]);
+      const readNotification = metamaskController.getState().notifications[
+        NOTIFICATION_ID
+      ];
+      assert.notEqual(readNotification.readDate, null);
+    });
+  });
+
+  describe('dismissNotifications', function () {
+    it('deletes the notification from state', function () {
+      metamaskController.dismissNotifications([NOTIFICATION_ID]);
+      const state = metamaskController.getState().notifications;
+      assert.ok(
+        !Object.values(state).includes(NOTIFICATION_ID),
+        'Object should not include the deleted notification',
+      );
+    });
+  });
 });
 
 function deferredPromise() {
diff --git a/app/scripts/migrations/072.js b/app/scripts/migrations/072.js
new file mode 100644
index 000000000000..4e5e8aebfb8c
--- /dev/null
+++ b/app/scripts/migrations/072.js
@@ -0,0 +1,30 @@
+import { cloneDeep } from 'lodash';
+
+const version = 72;
+
+/**
+ * Should empty the `knownMethodData` object in PreferencesController
+ */
+export default {
+  version,
+  async migrate(originalVersionedData) {
+    const versionedData = cloneDeep(originalVersionedData);
+    versionedData.meta.version = version;
+    const state = versionedData.data;
+    const newState = transformState(state);
+    versionedData.data = newState;
+    return versionedData;
+  },
+};
+
+function transformState(state) {
+  const PreferencesController = state?.PreferencesController || {};
+
+  return {
+    ...state,
+    PreferencesController: {
+      ...PreferencesController,
+      knownMethodData: {},
+    },
+  };
+}
diff --git a/app/scripts/migrations/072.test.js b/app/scripts/migrations/072.test.js
new file mode 100644
index 000000000000..70fedab84c82
--- /dev/null
+++ b/app/scripts/migrations/072.test.js
@@ -0,0 +1,427 @@
+import migration72 from './072';
+
+describe('migration #72', () => {
+  it('should update the version metadata', async () => {
+    const oldStorage = {
+      meta: {
+        version: 71,
+      },
+      data: {},
+    };
+
+    const newStorage = await migration72.migrate(oldStorage);
+    expect(newStorage.meta).toStrictEqual({
+      version: 72,
+    });
+  });
+
+  it('should empty knownMethodData object in PreferencesController', async () => {
+    const oldStorage = {
+      meta: {
+        version: 71,
+      },
+      data: {
+        PreferencesController: {
+          knownMethodData: {
+            '0x095ea7b3': {
+              name: 'Approve',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x1249c58b': {
+              name: 'Mint',
+              params: [],
+            },
+            '0x1688f0b9': {
+              name: 'Create Proxy With Nonce',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x18cbafe5': {
+              name: 'Swap Exact Tokens For E T H',
+              params: [
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'address[]',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x23b872dd': {
+              name: 'Transfer From',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x2e1a7d4d': {
+              name: 'Withdraw',
+              params: [
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x2e7ba6ef': {
+              name: 'Claim',
+              params: [
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'bytes32[]',
+                },
+              ],
+            },
+            '0x2eb2c2d6': {
+              name: 'Safe Batch Transfer From',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256[]',
+                },
+                {
+                  type: 'uint256[]',
+                },
+                {
+                  type: 'bytes',
+                },
+              ],
+            },
+            '0x3671f8cf': {},
+            '0x41441d3b': {
+              name: 'Enter Staking',
+              params: [
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x441a3e70': {
+              name: 'Withdraw',
+              params: [
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x6f652e1a': {
+              name: 'Create Order',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0x8dbdbe6d': {
+              name: 'Deposit',
+              params: [
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'address',
+                },
+              ],
+            },
+            '0x8ed955b9': {
+              name: 'Harvest All',
+              params: [],
+            },
+            '0xa22cb465': {
+              name: 'Set Approval For All',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'bool',
+                },
+              ],
+            },
+            '0xa9059cbb': {
+              name: 'Transfer',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0xab834bab': {
+              name: 'Atomic Match_',
+              params: [
+                {
+                  type: 'address[14]',
+                },
+                {
+                  type: 'uint256[18]',
+                },
+                {
+                  type: 'uint8[8]',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'bytes',
+                },
+                {
+                  type: 'uint8[2]',
+                },
+                {
+                  type: 'bytes32[5]',
+                },
+              ],
+            },
+            '0xd0e30db0': {
+              name: 'Deposit',
+              params: [],
+            },
+            '0xddd81f82': {
+              name: 'Register Proxy',
+              params: [],
+            },
+            '0xded9382a': {
+              name: 'Remove Liquidity E T H With Permit',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'bool',
+                },
+                {
+                  type: 'uint8',
+                },
+                {
+                  type: 'bytes32',
+                },
+                {
+                  type: 'bytes32',
+                },
+              ],
+            },
+            '0xe2bbb158': {
+              name: 'Deposit',
+              params: [
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+            '0xf305d719': {
+              name: 'Add Liquidity E T H',
+              params: [
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'uint256',
+                },
+                {
+                  type: 'address',
+                },
+                {
+                  type: 'uint256',
+                },
+              ],
+            },
+          },
+        },
+      },
+    };
+
+    const newStorage = await migration72.migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 72,
+      },
+      data: {
+        PreferencesController: {
+          knownMethodData: {},
+        },
+      },
+    });
+  });
+
+  it('should preserve other PreferencesController state', async () => {
+    const oldStorage = {
+      meta: {
+        version: 71,
+      },
+      data: {
+        PreferencesController: {
+          currentLocale: 'en',
+          dismissSeedBackUpReminder: false,
+          ipfsGateway: 'dweb.link',
+          knownMethodData: {
+            '0xd0e30db0': {
+              name: 'Deposit',
+              params: [],
+            },
+            '0xddd81f82': {
+              name: 'Register Proxy',
+              params: [],
+            },
+          },
+          openSeaEnabled: false,
+          useTokenDetection: false,
+        },
+      },
+    };
+
+    const newStorage = await migration72.migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 72,
+      },
+      data: {
+        PreferencesController: {
+          currentLocale: 'en',
+          dismissSeedBackUpReminder: false,
+          ipfsGateway: 'dweb.link',
+          knownMethodData: {},
+          openSeaEnabled: false,
+          useTokenDetection: false,
+        },
+      },
+    });
+  });
+
+  it('should not change state in controllers other than PreferencesController', async () => {
+    const oldStorage = {
+      meta: {
+        version: 71,
+      },
+      data: {
+        PreferencesController: {
+          knownMethodData: {
+            '0xd0e30db0': {
+              name: 'Deposit',
+              params: [],
+            },
+            '0xddd81f82': {
+              name: 'Register Proxy',
+              params: [],
+            },
+          },
+        },
+        data: {
+          FooController: { a: 'b' },
+        },
+      },
+    };
+
+    const newStorage = await migration72.migrate(oldStorage);
+    expect(newStorage).toStrictEqual({
+      meta: {
+        version: 72,
+      },
+      data: {
+        PreferencesController: {
+          knownMethodData: {},
+        },
+        data: {
+          FooController: { a: 'b' },
+        },
+      },
+    });
+  });
+});
diff --git a/app/scripts/migrations/index.js b/app/scripts/migrations/index.js
index 321b9131951f..b2a52040dfca 100644
--- a/app/scripts/migrations/index.js
+++ b/app/scripts/migrations/index.js
@@ -75,6 +75,7 @@ import m068 from './068';
 import m069 from './069';
 import m070 from './070';
 import m071 from './071';
+import m072 from './072';
 
 const migrations = [
   m002,
@@ -147,6 +148,7 @@ const migrations = [
   m069,
   m070,
   m071,
+  m072,
 ];
 
 export default migrations;
diff --git a/app/scripts/phishing-detect.js b/app/scripts/phishing-detect.js
deleted file mode 100644
index 68c30d50111e..000000000000
--- a/app/scripts/phishing-detect.js
+++ /dev/null
@@ -1,40 +0,0 @@
-import querystring from 'querystring';
-import PortStream from 'extension-port-stream';
-import browser from 'webextension-polyfill';
-import createRandomId from '../../shared/modules/random-id';
-import { setupMultiplex } from './lib/stream-utils';
-import { getEnvironmentType } from './lib/util';
-import ExtensionPlatform from './platforms/extension';
-
-document.addEventListener('DOMContentLoaded', start);
-
-function start() {
-  const hash = window.location.hash.substring(1);
-  const suspect = querystring.parse(hash);
-
-  const newIssueLink = document.getElementById('new-issue-link');
-  const newIssueUrl = `https://github.com/MetaMask/eth-phishing-detect/issues/new`;
-  const newIssueParams = `?title=[Legitimate%20Site%20Blocked]%20${encodeURIComponent(
-    suspect.hostname,
-  )}&body=${encodeURIComponent(suspect.href)}`;
-  newIssueLink.href = `${newIssueUrl}${newIssueParams}`;
-
-  global.platform = new ExtensionPlatform();
-
-  const extensionPort = browser.runtime.connect({
-    name: getEnvironmentType(),
-  });
-  const connectionStream = new PortStream(extensionPort);
-  const mx = setupMultiplex(connectionStream);
-  const backgroundConnection = mx.createStream('controller');
-  const continueLink = document.getElementById('unsafe-continue');
-  continueLink.addEventListener('click', () => {
-    backgroundConnection.write({
-      jsonrpc: '2.0',
-      method: 'safelistPhishingDomain',
-      params: [suspect.hostname],
-      id: createRandomId(),
-    });
-    window.location.href = suspect.href;
-  });
-}
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index 1c4a3fc1c311..93f06143d246 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -16,6 +16,9 @@ import {
   ENVIRONMENT_TYPE_FULLSCREEN,
   ENVIRONMENT_TYPE_POPUP,
 } from '../../shared/constants/app';
+import { isManifestV3 } from '../../shared/modules/mv3.utils';
+import { SUPPORT_LINK } from '../../ui/helpers/constants/common';
+import { getErrorHtml } from '../../ui/helpers/utils/error-utils';
 import ExtensionPlatform from './platforms/extension';
 import { setupMultiplex } from './lib/stream-utils';
 import { getEnvironmentType } from './lib/util';
@@ -24,6 +27,21 @@ import metaRPCClientFactory from './lib/metaRPCClientFactory';
 start().catch(log.error);
 
 async function start() {
+  async function displayCriticalError(container, err, metamaskState) {
+    const html = await getErrorHtml(SUPPORT_LINK, metamaskState);
+
+    container.innerHTML = html;
+
+    const button = document.getElementById('critical-error-button');
+
+    button.addEventListener('click', (_) => {
+      browser.runtime.reload();
+    });
+
+    log.error(err.stack);
+    throw err;
+  }
+
   // create platform global
   global.platform = new ExtensionPlatform();
 
@@ -32,24 +50,31 @@ async function start() {
 
   // setup stream to background
   const extensionPort = browser.runtime.connect({ name: windowType });
+
   const connectionStream = new PortStream(extensionPort);
 
   const activeTab = await queryCurrentActiveTab(windowType);
-  initializeUiWithTab(activeTab);
 
-  function displayCriticalError(container, err) {
-    container.innerHTML =
-      '<div class="critical-error">The MetaMask app failed to load: please open and close MetaMask again to restart.</div>';
-    container.style.height = '80px';
-    log.error(err.stack);
-    throw err;
+  /**
+   * In case of MV3 the issue of blank screen was very frequent, it is caused by UI initialising before background is ready to send state.
+   * Code below ensures that UI is rendered only after background is ready.
+   */
+  if (isManifestV3()) {
+    extensionPort.onMessage.addListener((message) => {
+      if (message?.name === 'CONNECTION_READY') {
+        initializeUiWithTab(activeTab);
+      }
+    });
+  } else {
+    initializeUiWithTab(activeTab);
   }
 
   function initializeUiWithTab(tab) {
     const container = document.getElementById('app-content');
     initializeUi(tab, container, connectionStream, (err, store) => {
       if (err) {
-        displayCriticalError(container, err);
+        // if there's an error, store will be = metamaskState
+        displayCriticalError(container, err, store);
         return;
       }
 
@@ -90,7 +115,7 @@ async function queryCurrentActiveTab(windowType) {
 function initializeUi(activeTab, container, connectionStream, cb) {
   connectToAccountManager(connectionStream, (err, backgroundConnection) => {
     if (err) {
-      cb(err);
+      cb(err, null);
       return;
     }
 
diff --git a/development/README.md b/development/README.md
index 16df8fb89342..d0c89081311c 100644
--- a/development/README.md
+++ b/development/README.md
@@ -54,3 +54,24 @@ To opt in to MetaMetrics;
 You can inspect the requests in the `Network` tab of your browser's Developer Tools (background.html)
 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 in Sentry
+
+To debug in a production Sentry environment:
+
+- 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`
+
+Errors reported whilst using the extension will be displayed in Sentry's `Issues` page.
diff --git a/development/build/README.md b/development/build/README.md
index 85823992b807..9d5df1e149fc 100644
--- a/development/build/README.md
+++ b/development/build/README.md
@@ -26,38 +26,4 @@ Source file bundling tasks are implemented in the [`./development/build/scripts.
 
 ## Usage
 
-```text
-Usage: yarn build <entry-task> [options]
-
-Commands:
-  yarn build prod       Create an optimized build for production environments.
-
-  yarn build dev        Create an unoptimized, live-reloaded build for local
-                        development.
-
-  yarn build test       Create an optimized build for running e2e tests.
-
-  yarn build testDev    Create an unoptimized, live-reloaded build for running
-                        e2e tests.
-
-Options:
-  --build-type        The "type" of build to create. One of: "beta", "flask",
-                      "main"
-                                                      [string] [default: "main"]
-  --lint-fence-files  Whether files with code fences should be linted after
-                      fences have been removed by the code fencing transform.
-                      The build will fail if linting fails.
-                      Defaults to `false` if the entry task is `dev` or
-                      `testDev`, and `true` otherwise.
-                                                   [boolean] [default: <varies>]
-  --lockdown          Whether to include SES lockdown files in the extension
-                      bundle. Setting this to `false` is useful e.g. when
-                      linking dependencies that are incompatible with lockdown.
-                                                       [boolean] [default: true]
-  --policy-only       Stops the build after generating the LavaMoat policy,
-                      skipping any writes to disk.
-                                                       [boolean] [deafult: false]
-  --skip-stats        Whether to refrain from logging build progress. Mostly
-                      used internally.
-                                                      [boolean] [default: false]
-```
+See `node ./development/build/index.js --help`
diff --git a/development/build/constants.js b/development/build/constants.js
new file mode 100644
index 000000000000..15b87e984029
--- /dev/null
+++ b/development/build/constants.js
@@ -0,0 +1,48 @@
+const TASKS = {
+  CLEAN: 'clean',
+  DEV: 'dev',
+  LINT_SCSS: 'lint-scss',
+  MANIFEST_DEV: 'manifest:dev',
+  MANIFEST_PROD: 'manifest:prod',
+  MANIFEST_TEST: 'manifest:test',
+  MANIFEST_TEST_DEV: 'manifest:testDev',
+  PROD: 'prod',
+  RELOAD: 'reload',
+  SCRIPTS_PROD: 'scripts:prod',
+  SCRIPTS_CORE_DEV_STANDARD_ENTRY_POINTS:
+    'scripts:core:dev:standardEntryPoints',
+  SCRIPTS_CORE_DEV_CONTENTSCRIPT: 'scripts:core:dev:contentscript',
+  SCRIPTS_CORE_DEV_DISABLE_CONSOLE: 'scripts:core:dev:disable-console',
+  SCRIPTS_CORE_DEV_SENTRY: 'scripts:core:dev:sentry',
+  SCRIPTS_CORE_DEV_PHISHING_DETECT: 'scripts:core:dev:phishing-detect',
+  SCRIPTS_CORE_PROD_STANDARD_ENTRY_POINTS:
+    'scripts:core:prod:standardEntryPoints',
+  SCRIPTS_CORE_PROD_CONTENTSCRIPT: 'scripts:core:prod:contentscript',
+  SCRIPTS_CORE_PROD_DISABLE_CONSOLE: 'scripts:core:prod:disable-console',
+  SCRIPTS_CORE_PROD_SENTRY: 'scripts:core:prod:sentry',
+  SCRIPTS_CORE_PROD_PHISHING_DETECT: 'scripts:core:prod:phishing-detect',
+  SCRIPTS_CORE_TEST_LIVE_STANDARD_ENTRY_POINTS:
+    'scripts:core:test-live:standardEntryPoints',
+  SCRIPTS_CORE_TEST_LIVE_CONTENTSCRIPT: 'scripts:core:test-live:contentscript',
+  SCRIPTS_CORE_TEST_LIVE_DISABLE_CONSOLE:
+    'scripts:core:test-live:disable-console',
+  SCRIPTS_CORE_TEST_LIVE_SENTRY: 'scripts:core:test-live:sentry',
+  SCRIPTS_CORE_TEST_LIVE_PHISHING_DETECT:
+    'scripts:core:test-live:phishing-detect',
+  SCRIPTS_CORE_TEST_STANDARD_ENTRY_POINTS:
+    'scripts:core:test:standardEntryPoints',
+  SCRIPTS_CORE_TEST_CONTENTSCRIPT: 'scripts:core:test:contentscript',
+  SCRIPTS_CORE_TEST_DISABLE_CONSOLE: 'scripts:core:test:disable-console',
+  SCRIPTS_CORE_TEST_SENTRY: 'scripts:core:test:sentry',
+  SCRIPTS_CORE_TEST_PHISHING_DETECT: 'scripts:core:test:phishing-detect',
+  STATIC_DEV: 'static:dev',
+  STATIC_PROD: 'static:prod',
+  STYLES: 'styles',
+  STYLES_DEV: 'styles:dev',
+  STYLES_PROD: 'styles:prod',
+  TEST: 'test',
+  TEST_DEV: 'testDev',
+  ZIP: 'zip',
+};
+
+module.exports = { TASKS };
diff --git a/development/build/etc.js b/development/build/etc.js
index e6d06c84d24c..3da86409f25b 100644
--- a/development/build/etc.js
+++ b/development/build/etc.js
@@ -7,12 +7,13 @@ const pify = require('pify');
 const pump = pify(require('pump'));
 
 const { BuildType } = require('../lib/build-type');
+const { TASKS } = require('./constants');
 const { createTask, composeParallel } = require('./task');
 
 module.exports = createEtcTasks;
 
 function createEtcTasks({ browserPlatforms, buildType, livereload, version }) {
-  const clean = createTask('clean', async function clean() {
+  const clean = createTask(TASKS.CLEAN, async function clean() {
     await del(['./dist/*']);
     await Promise.all(
       browserPlatforms.map(async (platform) => {
@@ -21,13 +22,13 @@ function createEtcTasks({ browserPlatforms, buildType, livereload, version }) {
     );
   });
 
-  const reload = createTask('reload', function devReload() {
+  const reload = createTask(TASKS.RELOAD, function devReload() {
     livereload.listen({ port: 35729 });
   });
 
   // zip tasks for distribution
   const zip = createTask(
-    'zip',
+    TASKS.ZIP,
     composeParallel(
       ...browserPlatforms.map((platform) =>
         createZipTask(platform, buildType, version),
@@ -48,7 +49,10 @@ function createZipTask(platform, buildType, version) {
       gulp.src(`dist/${platform}/**`),
       // sort files and set `mtime` to epoch to ensure zip build is deterministic
       sort(),
-      gulpZip(`${path}.zip`, { modifiedTime: new Date(0) }),
+      // Modified time set to an arbitrary static date to ensure build the is reproducible.
+      // The date chosen is MetaMask's birthday. Originally we chose the Unix epoch, but this
+      // resulted in invalid dates on certain timezones/operating systems.
+      gulpZip(`${path}.zip`, { modifiedTime: new Date('2016-07-14T00:00:00') }),
       gulp.dest('builds'),
     );
   };
diff --git a/development/build/index.js b/development/build/index.js
index fd6dd1b7662c..d9924f86bc47 100755
--- a/development/build/index.js
+++ b/development/build/index.js
@@ -5,10 +5,12 @@
 //
 const path = require('path');
 const livereload = require('gulp-livereload');
-const minimist = require('minimist');
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
 const { sync: globby } = require('globby');
 const { getVersion } = require('../lib/get-version');
 const { BuildType } = require('../lib/build-type');
+const { TASKS } = require('./constants');
 const {
   createTask,
   composeSeries,
@@ -110,7 +112,7 @@ function defineAndRunBuildTasks() {
 
   // build for development (livereload)
   createTask(
-    'dev',
+    TASKS.DEV,
     composeSeries(
       clean,
       styleTasks.dev,
@@ -125,7 +127,7 @@ function defineAndRunBuildTasks() {
 
   // build for test development (livereload)
   createTask(
-    'testDev',
+    TASKS.TEST_DEV,
     composeSeries(
       clean,
       styleTasks.dev,
@@ -140,7 +142,7 @@ function defineAndRunBuildTasks() {
 
   // build for prod release
   createTask(
-    'prod',
+    TASKS.PROD,
     composeSeries(
       clean,
       styleTasks.prod,
@@ -150,11 +152,11 @@ function defineAndRunBuildTasks() {
   );
 
   // build just production scripts, for LavaMoat policy generation purposes
-  createTask('scripts:prod', scriptTasks.prod);
+  createTask(TASKS.SCRIPTS_PROD, scriptTasks.prod);
 
   // build for CI testing
   createTask(
-    'test',
+    TASKS.TEST,
     composeSeries(
       clean,
       styleTasks.prod,
@@ -164,89 +166,108 @@ function defineAndRunBuildTasks() {
   );
 
   // special build for minimal CI testing
-  createTask('styles', styleTasks.prod);
+  createTask(TASKS.styles, styleTasks.prod);
 
   // Finally, start the build process by running the entry task.
   runTask(entryTask, { skipStats });
 }
 
 function parseArgv() {
-  const NamedArgs = {
-    ApplyLavaMoat: 'apply-lavamoat',
-    BuildType: 'build-type',
-    BuildVersion: 'build-version',
-    LintFenceFiles: 'lint-fence-files',
-    Lockdown: 'lockdown',
-    PolicyOnly: 'policy-only',
-    SkipStats: 'skip-stats',
-  };
+  const { argv } = yargs(hideBin(process.argv))
+    .usage('$0 <task> [options]', 'Build the MetaMask extension.', (_yargs) =>
+      _yargs
+        .positional('task', {
+          description: `The task to run. There are a number of main tasks, each of which calls other tasks internally. The main tasks are:
 
-  const argv = minimist(process.argv.slice(2), {
-    boolean: [
-      NamedArgs.ApplyLavaMoat,
-      NamedArgs.LintFenceFiles,
-      NamedArgs.Lockdown,
-      NamedArgs.PolicyOnly,
-      NamedArgs.SkipStats,
-    ],
-    string: [NamedArgs.BuildType, NamedArgs.BuildVersion],
-    default: {
-      [NamedArgs.ApplyLavaMoat]: true,
-      [NamedArgs.BuildType]: BuildType.main,
-      [NamedArgs.BuildVersion]: '0',
-      [NamedArgs.LintFenceFiles]: true,
-      [NamedArgs.Lockdown]: true,
-      [NamedArgs.PolicyOnly]: false,
-      [NamedArgs.SkipStats]: false,
-    },
-  });
+prod: Create an optimized build for a production environment.
 
-  if (argv._.length !== 1) {
-    throw new Error(
-      `Metamask build: Expected a single positional argument, but received "${argv._.length}" arguments.`,
-    );
-  }
+dev: Create an unoptimized, live-reloading build for local development.
 
-  const entryTask = argv._[0];
-  if (!entryTask) {
-    throw new Error('MetaMask build: No entry task specified.');
-  }
+test: Create an optimized build for running e2e tests.
 
-  const buildType = argv[NamedArgs.BuildType];
-  if (!(buildType in BuildType)) {
-    throw new Error(`MetaMask build: Invalid build type: "${buildType}"`);
-  }
+testDev: Create an unoptimized, live-reloading build for debugging e2e tests.`,
+          type: 'string',
+        })
+        .option('apply-lavamoat', {
+          default: true,
+          description:
+            'Whether to use LavaMoat. Setting this to `false` can be useful during development if you want to handle LavaMoat errors later.',
+          type: 'boolean',
+        })
+        .option('build-type', {
+          default: BuildType.main,
+          description: 'The type of build to create.',
+          choices: Object.keys(BuildType),
+        })
+        .option('build-version', {
+          default: 0,
+          description:
+            'The build version. This is set only for non-main build types. The build version is used in the "prerelease" segment of the extension version, e.g. `[major].[minor].[patch]-[build-type].[build-version]`',
+          type: 'number',
+        })
+        .option('lint-fence-files', {
+          description:
+            'Whether files with code fences should be linted after fences have been removed. The build will fail if linting fails. This defaults to `false` if the entry task is `dev` or `testDev`. Otherwise this defaults to `true`.',
+          type: 'boolean',
+        })
+        .option('lockdown', {
+          default: true,
+          description:
+            'Whether to include SES lockdown files in the extension bundle. Setting this to `false` can be useful during development if you want to handle lockdown errors later.',
+          type: 'boolean',
+        })
+        .option('policy-only', {
+          default: false,
+          description:
+            'Stop the build after generating the LavaMoat policy, skipping any writes to disk other than the LavaMoat policy itself.',
+          type: 'boolean',
+        })
+        .option('skip-stats', {
+          default: false,
+          description:
+            'Whether to skip logging the time to completion for each task to the console. This is meant primarily for internal use, to prevent duplicate logging.',
+          hidden: true,
+          type: 'boolean',
+        })
+        .check((args) => {
+          if (!Number.isInteger(args.buildVersion)) {
+            throw new Error(
+              `Expected integer for 'build-version', got '${args.buildVersion}'`,
+            );
+          } else if (!Object.values(TASKS).includes(args.task)) {
+            throw new Error(`Invalid task: '${args.task}'`);
+          }
+          return true;
+        }),
+    )
+    // TODO: Enable `.strict()` after this issue is resolved: https://github.com/LavaMoat/LavaMoat/issues/344
+    .help('help');
 
-  const rawBuildVersion = argv[NamedArgs.BuildVersion];
-  const buildVersion = Number.parseInt(rawBuildVersion, 10);
-  if (rawBuildVersion.match(/^\d+$/u) === null || Number.isNaN(buildVersion)) {
-    throw new Error(
-      `MetaMask build: Invalid build version: "${rawBuildVersion}"`,
-    );
-  }
+  const {
+    applyLavamoat: applyLavaMoat,
+    buildType,
+    buildVersion,
+    lintFenceFiles,
+    lockdown,
+    policyOnly,
+    skipStats,
+    task,
+  } = argv;
 
   // Manually default this to `false` for dev builds only.
-  const shouldLintFenceFiles = process.argv.includes(
-    `--${NamedArgs.LintFenceFiles}`,
-  )
-    ? argv[NamedArgs.LintFenceFiles]
-    : !/dev/iu.test(entryTask);
-
-  const policyOnly = argv[NamedArgs.PolicyOnly];
+  const shouldLintFenceFiles = lintFenceFiles ?? !/dev/iu.test(task);
 
   const version = getVersion(buildType, buildVersion);
 
   return {
-    // Should we apply LavaMoat to the build output?
-    applyLavaMoat: argv[NamedArgs.ApplyLavaMoat],
+    applyLavaMoat,
     buildType,
-    entryTask,
-    // Is this process running in lavamoat-node?
+    entryTask: task,
     isLavaMoat: process.argv[0].includes('lavamoat'),
     policyOnly,
-    shouldIncludeLockdown: argv[NamedArgs.Lockdown],
+    shouldIncludeLockdown: lockdown,
     shouldLintFenceFiles,
-    skipStats: argv[NamedArgs.SkipStats],
+    skipStats,
     version,
   };
 }
diff --git a/development/build/manifest.js b/development/build/manifest.js
index 498ab2785b6d..fb6a4092b14b 100644
--- a/development/build/manifest.js
+++ b/development/build/manifest.js
@@ -2,9 +2,12 @@ const { promises: fs } = require('fs');
 const path = require('path');
 const { mergeWith, cloneDeep } = require('lodash');
 
-const baseManifest = require('../../app/manifest/_base.json');
+const baseManifest = process.env.ENABLE_MV3
+  ? require('../../app/manifest/v3/_base.json')
+  : require('../../app/manifest/v2/_base.json');
 const { BuildType } = require('../lib/build-type');
 
+const { TASKS } = require('./constants');
 const { createTask, composeSeries } = require('./task');
 
 module.exports = createManifestTasks;
@@ -24,7 +27,7 @@ function createManifestTasks({
             '..',
             '..',
             'app',
-            'manifest',
+            process.env.ENABLE_MV3 ? 'manifest/v3' : 'manifest/v2',
             `${platform}.json`,
           ),
         );
@@ -66,19 +69,22 @@ function createManifestTasks({
   });
 
   // high level manifest tasks
-  const dev = createTask('manifest:dev', composeSeries(prepPlatforms, envDev));
+  const dev = createTask(
+    TASKS.MANIFEST_DEV,
+    composeSeries(prepPlatforms, envDev),
+  );
 
   const testDev = createTask(
-    'manifest:testDev',
+    TASKS.MANIFEST_TEST_DEV,
     composeSeries(prepPlatforms, envTestDev),
   );
 
   const test = createTask(
-    'manifest:test',
+    TASKS.MANIFEST_TEST,
     composeSeries(prepPlatforms, envTest),
   );
 
-  const prod = createTask('manifest:prod', prepPlatforms);
+  const prod = createTask(TASKS.MANIFEST_PROD, prepPlatforms);
 
   return { prod, dev, testDev, test };
 
diff --git a/development/build/scripts.js b/development/build/scripts.js
index 1447b3d79a61..85deff7d3f28 100644
--- a/development/build/scripts.js
+++ b/development/build/scripts.js
@@ -34,6 +34,7 @@ const metamaskrc = require('rc')('metamask', {
   INFURA_PROD_PROJECT_ID: process.env.INFURA_PROD_PROJECT_ID,
   ONBOARDING_V2: process.env.ONBOARDING_V2,
   COLLECTIBLES_V1: process.env.COLLECTIBLES_V1,
+  PHISHING_WARNING_PAGE_URL: process.env.PHISHING_WARNING_PAGE_URL,
   TOKEN_DETECTION_V2: process.env.TOKEN_DETECTION_V2,
   SEGMENT_HOST: process.env.SEGMENT_HOST,
   SEGMENT_WRITE_KEY: process.env.SEGMENT_WRITE_KEY,
@@ -133,6 +134,48 @@ function getSegmentWriteKey({ buildType, environment }) {
   throw new Error(`Invalid build type: '${buildType}'`);
 }
 
+/**
+ * Get the URL for the phishing warning page, if it has been set.
+ *
+ * @param {object} options - The phishing warning page options.
+ * @param {boolean} options.testing - Whether this is a test build or not.
+ * @returns {string} The URL for the phishing warning page, or `undefined` if no URL is set.
+ */
+function getPhishingWarningPageUrl({ testing }) {
+  let phishingWarningPageUrl = metamaskrc.PHISHING_WARNING_PAGE_URL;
+
+  if (!phishingWarningPageUrl) {
+    phishingWarningPageUrl = testing
+      ? 'http://localhost:9999/'
+      : 'https://metamask.github.io/phishing-warning/v1.1.0/';
+  }
+
+  // We add a hash/fragment to the URL dynamically, so we need to ensure it
+  // has a valid pathname to append a hash to.
+  const normalizedUrl = phishingWarningPageUrl.endsWith('/')
+    ? phishingWarningPageUrl
+    : `${phishingWarningPageUrl}/`;
+
+  let phishingWarningPageUrlObject;
+  try {
+    // eslint-disable-next-line no-new
+    phishingWarningPageUrlObject = new URL(normalizedUrl);
+  } catch (error) {
+    throw new Error(
+      `Invalid phishing warning page URL: '${normalizedUrl}'`,
+      error,
+    );
+  }
+  if (phishingWarningPageUrlObject.hash) {
+    // The URL fragment must be set dynamically
+    throw new Error(
+      `URL fragment not allowed in phishing warning page URL: '${normalizedUrl}'`,
+    );
+  }
+
+  return normalizedUrl;
+}
+
 const noopWriteStream = through.obj((_file, _fileEncoding, callback) =>
   callback(),
 );
@@ -153,22 +196,22 @@ function createScriptTasks({
   // internal tasks
   const core = {
     // dev tasks (live reload)
-    dev: createTasksForBuildJsExtension({
+    dev: createTasksForScriptBundles({
       taskPrefix: 'scripts:core:dev',
       devMode: true,
     }),
-    testDev: createTasksForBuildJsExtension({
+    testDev: createTasksForScriptBundles({
       taskPrefix: 'scripts:core:test-live',
       devMode: true,
       testing: true,
     }),
     // built for CI tests
-    test: createTasksForBuildJsExtension({
+    test: createTasksForScriptBundles({
       taskPrefix: 'scripts:core:test',
       testing: true,
     }),
     // production
-    prod: createTasksForBuildJsExtension({ taskPrefix: 'scripts:core:prod' }),
+    prod: createTasksForScriptBundles({ taskPrefix: 'scripts:core:prod' }),
   };
 
   // high level tasks
@@ -176,7 +219,11 @@ function createScriptTasks({
   const { dev, test, testDev, prod } = core;
   return { dev, test, testDev, prod };
 
-  function createTasksForBuildJsExtension({ taskPrefix, devMode, testing }) {
+  function createTasksForScriptBundles({
+    taskPrefix,
+    devMode = false,
+    testing = false,
+  }) {
     const standardEntryPoints = ['background', 'ui', 'content-script'];
     const standardSubtask = createTask(
       `${taskPrefix}:standardEntryPoints`,
@@ -203,24 +250,19 @@ function createScriptTasks({
     // because inpage bundle result is included inside contentscript
     const contentscriptSubtask = createTask(
       `${taskPrefix}:contentscript`,
-      createTaskForBundleContentscript({ devMode, testing }),
+      createContentscriptBundle({ devMode, testing }),
     );
 
     // this can run whenever
     const disableConsoleSubtask = createTask(
       `${taskPrefix}:disable-console`,
-      createTaskForBundleDisableConsole({ devMode, testing }),
+      createDisableConsoleBundle({ devMode, testing }),
     );
 
     // this can run whenever
     const installSentrySubtask = createTask(
       `${taskPrefix}:sentry`,
-      createTaskForBundleSentry({ devMode, testing }),
-    );
-
-    const phishingDetectSubtask = createTask(
-      `${taskPrefix}:phishing-detect`,
-      createTaskForBundlePhishingDetect({ devMode, testing }),
+      createSentryBundle({ devMode, testing }),
     );
 
     // task for initiating browser livereload
@@ -245,7 +287,6 @@ function createScriptTasks({
       contentscriptSubtask,
       disableConsoleSubtask,
       installSentrySubtask,
-      phishingDetectSubtask,
     ].map((subtask) =>
       runInChildProcess(subtask, {
         applyLavaMoat,
@@ -259,7 +300,7 @@ function createScriptTasks({
     return composeParallel(initiateLiveReload, ...allSubtasks);
   }
 
-  function createTaskForBundleDisableConsole({ devMode, testing }) {
+  function createDisableConsoleBundle({ devMode, testing }) {
     const label = 'disable-console';
     return createNormalBundle({
       browserPlatforms,
@@ -276,7 +317,7 @@ function createScriptTasks({
     });
   }
 
-  function createTaskForBundleSentry({ devMode, testing }) {
+  function createSentryBundle({ devMode, testing }) {
     const label = 'sentry-install';
     return createNormalBundle({
       browserPlatforms,
@@ -293,25 +334,8 @@ function createScriptTasks({
     });
   }
 
-  function createTaskForBundlePhishingDetect({ devMode, testing }) {
-    const label = 'phishing-detect';
-    return createNormalBundle({
-      buildType,
-      browserPlatforms,
-      destFilepath: `${label}.js`,
-      devMode,
-      entryFilepath: `./app/scripts/${label}.js`,
-      ignoredFiles,
-      label,
-      testing,
-      policyOnly,
-      shouldLintFenceFiles,
-      version,
-    });
-  }
-
   // the "contentscript" bundle contains the "inpage" bundle
-  function createTaskForBundleContentscript({ devMode, testing }) {
+  function createContentscriptBundle({ devMode, testing }) {
     const inpage = 'inpage';
     const contentscript = 'contentscript';
     return composeSeries(
@@ -345,6 +369,102 @@ function createScriptTasks({
   }
 }
 
+const postProcessServiceWorker = (
+  mv3BrowserPlatforms,
+  fileList,
+  applyLavaMoat,
+  testing,
+) => {
+  mv3BrowserPlatforms.forEach((browser) => {
+    const appInitFile = `./dist/${browser}/app-init.js`;
+    const fileContent = readFileSync('./app/scripts/app-init.js', 'utf8');
+    let fileOutput = fileContent.replace('/** FILE NAMES */', fileList);
+    if (testing) {
+      fileOutput = fileOutput.replace('testMode = false', 'testMode = true');
+    } else {
+      // Setting applyLavaMoat to true in testing mode
+      // This is to enable capturing initialisation time stats using e2e with lavamoat statsMode enabled
+      fileOutput = fileOutput.replace(
+        'const applyLavaMoat = true;',
+        `const applyLavaMoat = ${applyLavaMoat};`,
+      );
+    }
+    writeFileSync(appInitFile, fileOutput);
+  });
+};
+
+// Function generates app-init.js for browsers chrome, brave and opera.
+// It dynamically injects list of files generated in the build.
+async function createManifestV3AppInitializationBundle({
+  jsBundles,
+  browserPlatforms,
+  buildType,
+  devMode,
+  ignoredFiles,
+  testing,
+  policyOnly,
+  shouldLintFenceFiles,
+  applyLavaMoat,
+  version,
+}) {
+  const label = 'app-init';
+  // TODO: remove this filter for firefox once MV3 is supported in it
+  const mv3BrowserPlatforms = browserPlatforms.filter(
+    (platform) => platform !== 'firefox',
+  );
+  const fileList = jsBundles.reduce(
+    (result, file) => `${result}'${file}',\n    `,
+    '',
+  );
+
+  await createNormalBundle({
+    browserPlatforms: mv3BrowserPlatforms,
+    buildType,
+    destFilepath: 'app-init.js',
+    devMode,
+    entryFilepath: './app/scripts/app-init.js',
+    ignoredFiles,
+    label,
+    testing,
+    policyOnly,
+    shouldLintFenceFiles,
+    version,
+  })();
+
+  postProcessServiceWorker(
+    mv3BrowserPlatforms,
+    fileList,
+    applyLavaMoat,
+    testing,
+  );
+
+  // If the application is running in development mode, we watch service worker file to
+  // in case the file is changes we need to process it again to replace "/** FILE NAMES */", "testMode" etc.
+  if (devMode && !testing) {
+    let prevChromeFileContent;
+    watch('./dist/chrome/app-init.js', () => {
+      const chromeFileContent = readFileSync(
+        './dist/chrome/app-init.js',
+        'utf8',
+      );
+      if (chromeFileContent !== prevChromeFileContent) {
+        prevChromeFileContent = chromeFileContent;
+        postProcessServiceWorker(mv3BrowserPlatforms, fileList, applyLavaMoat);
+      }
+    });
+  }
+
+  // Code below is used to set statsMode to true when testing in MV3
+  // This is used to capture module initialisation stats using lavamoat.
+  if (testing) {
+    const content = readFileSync('./dist/chrome/runtime-lavamoat.js', 'utf8');
+    const fileOutput = content.replace('statsMode = false', 'statsMode = true');
+    writeFileSync('./dist/chrome/runtime-lavamoat.js', fileOutput);
+  }
+
+  console.log(`Bundle end: service worker app-init.js`);
+}
+
 function createFactoredBuild({
   applyLavaMoat,
   browserPlatforms,
@@ -457,7 +577,7 @@ function createFactoredBuild({
     });
 
     // wait for bundle completion for postprocessing
-    events.on('bundleDone', () => {
+    events.on('bundleDone', async () => {
       // Skip HTML generation if nothing is to be written to disk
       if (policyOnly) {
         return;
@@ -503,6 +623,24 @@ function createFactoredBuild({
               browserPlatforms,
               applyLavaMoat,
             });
+            if (process.env.ENABLE_MV3) {
+              const jsBundles = [
+                ...commonSet.values(),
+                ...groupSet.values(),
+              ].map((label) => `./${label}.js`);
+              await createManifestV3AppInitializationBundle({
+                jsBundles,
+                browserPlatforms,
+                buildType,
+                devMode,
+                ignoredFiles,
+                testing,
+                policyOnly,
+                shouldLintFenceFiles,
+                applyLavaMoat,
+                version,
+              });
+            }
             break;
           }
           case 'content-script': {
@@ -524,7 +662,7 @@ function createFactoredBuild({
       }
     });
 
-    await bundleIt(buildConfiguration, { reloadOnChange });
+    await createBundle(buildConfiguration, { reloadOnChange });
   };
 }
 
@@ -534,11 +672,9 @@ function createNormalBundle({
   destFilepath,
   devMode,
   entryFilepath,
-  extraEntries = [],
   ignoredFiles,
   label,
   policyOnly,
-  modulesToExpose,
   shouldLintFenceFiles,
   testing,
   version,
@@ -572,14 +708,7 @@ function createNormalBundle({
     });
 
     // set bundle entries
-    bundlerOpts.entries = [...extraEntries];
-    if (entryFilepath) {
-      bundlerOpts.entries.push(entryFilepath);
-    }
-
-    if (modulesToExpose) {
-      bundlerOpts.require = bundlerOpts.require.concat(modulesToExpose);
-    }
+    bundlerOpts.entries = [entryFilepath];
 
     // instrument pipeline
     events.on('configurePipeline', ({ pipeline }) => {
@@ -595,7 +724,7 @@ function createNormalBundle({
       });
     });
 
-    await bundleIt(buildConfiguration, { reloadOnChange });
+    await createBundle(buildConfiguration, { reloadOnChange });
   };
 }
 
@@ -648,7 +777,7 @@ function setupBundlerDefaults(
     // Look for TypeScript files when walking the dependency tree
     extensions,
     // Use entryFilepath for moduleIds, easier to determine origin file
-    fullPaths: devMode,
+    fullPaths: devMode || testing,
     // For sourcemaps
     debug: true,
   });
@@ -750,7 +879,7 @@ function setupSourcemaps(buildConfiguration, { devMode }) {
   });
 }
 
-async function bundleIt(buildConfiguration, { reloadOnChange }) {
+async function createBundle(buildConfiguration, { reloadOnChange }) {
   const { label, bundlerOpts, events } = buildConfiguration;
   const bundler = browserify(bundlerOpts);
 
@@ -822,6 +951,7 @@ function getEnvironmentVariables({ buildType, devMode, testing, version }) {
     METAMASK_BUILD_TYPE: buildType,
     NODE_ENV: devMode ? ENVIRONMENT.DEVELOPMENT : ENVIRONMENT.PRODUCTION,
     IN_TEST: testing,
+    PHISHING_WARNING_PAGE_URL: getPhishingWarningPageUrl({ testing }),
     PUBNUB_SUB_KEY: process.env.PUBNUB_SUB_KEY || '',
     PUBNUB_PUB_KEY: process.env.PUBNUB_PUB_KEY || '',
     CONF: devMode ? metamaskrc : {},
diff --git a/development/build/static.js b/development/build/static.js
index 7efde5a72c7a..7e3ccf02fadb 100644
--- a/development/build/static.js
+++ b/development/build/static.js
@@ -6,6 +6,7 @@ const glob = require('fast-glob');
 const locales = require('../../app/_locales/index.json');
 const { BuildType } = require('../lib/build-type');
 
+const { TASKS } = require('./constants');
 const { createTask, composeSeries } = require('./task');
 
 const EMPTY_JS_FILE = './development/empty.js';
@@ -41,7 +42,7 @@ module.exports = function createStaticAssetTasks({
   }
 
   const prod = createTask(
-    'static:prod',
+    TASKS.STATIC_PROD,
     composeSeries(
       ...copyTargetsProd.map((target) => {
         return async function copyStaticAssets() {
@@ -51,7 +52,7 @@ module.exports = function createStaticAssetTasks({
     ),
   );
   const dev = createTask(
-    'static:dev',
+    TASKS.STATIC_DEV,
     composeSeries(
       ...copyTargetsDev.map((target) => {
         return async function copyStaticAssets() {
@@ -152,6 +153,10 @@ function getCopyTargets(shouldIncludeLockdown) {
         : EMPTY_JS_FILE,
       dest: `lockdown-install.js`,
     },
+    {
+      src: './app/scripts/init-globals.js',
+      dest: 'init-globals.js',
+    },
     {
       src: shouldIncludeLockdown
         ? `./app/scripts/lockdown-run.js`
@@ -174,10 +179,6 @@ function getCopyTargets(shouldIncludeLockdown) {
       src: require.resolve('@lavamoat/lavapack/src/runtime.js'),
       dest: `runtime-lavamoat.js`,
     },
-    {
-      src: `./app/phishing.html`,
-      dest: `phishing.html`,
-    },
   ];
 
   const languageTags = new Set();
diff --git a/development/build/styles.js b/development/build/styles.js
index ecda4b661882..926609dff8fd 100644
--- a/development/build/styles.js
+++ b/development/build/styles.js
@@ -7,6 +7,7 @@ const sourcemaps = require('gulp-sourcemaps');
 const rtlcss = require('gulp-rtlcss');
 const rename = require('gulp-rename');
 const pump = pify(require('pump'));
+const { TASKS } = require('./constants');
 const { createTask } = require('./task');
 
 let sass;
@@ -16,7 +17,7 @@ module.exports = createStyleTasks;
 
 function createStyleTasks({ livereload }) {
   const prod = createTask(
-    'styles:prod',
+    TASKS.STYLES_PROD,
     createScssBuildTask({
       src: 'ui/css/index.scss',
       dest: 'ui/css/output',
@@ -25,7 +26,7 @@ function createStyleTasks({ livereload }) {
   );
 
   const dev = createTask(
-    'styles:dev',
+    TASKS.STYLES_DEV,
     createScssBuildTask({
       src: 'ui/css/index.scss',
       dest: 'ui/css/output',
@@ -34,7 +35,7 @@ function createStyleTasks({ livereload }) {
     }),
   );
 
-  const lint = createTask('lint-scss', function () {
+  const lint = createTask(TASKS.LINT_SCSS, function () {
     return gulp.src('ui/css/itcss/**/*.scss').pipe(
       gulpStylelint({
         reporters: [{ formatter: 'string', console: true }],
diff --git a/development/build/transforms/utils.test.js b/development/build/transforms/utils.test.js
index ba273a15bdac..303b954d3568 100644
--- a/development/build/transforms/utils.test.js
+++ b/development/build/transforms/utils.test.js
@@ -26,7 +26,7 @@ describe('transform utils', () => {
       // This error is an artifact of how we're mocking the ESLint singleton,
       // and won't actually occur in production.
       await expect(() => lintTransformedFile()).rejects.toThrow(
-        `Cannot read property '0' of undefined`,
+        `Cannot read properties of undefined (reading '0')`,
       );
       expect(mockESLint).toBeDefined();
     });
diff --git a/development/charts/flamegraph/chart/index.html b/development/charts/flamegraph/chart/index.html
new file mode 100644
index 000000000000..7afe9f9d0dcb
--- /dev/null
+++ b/development/charts/flamegraph/chart/index.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+
+    <link
+      rel="stylesheet"
+      href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+    />
+    <link rel="stylesheet" type="text/css" href="../lib/d3-flamegraph.css" />
+
+    <style>
+      /* Space out content a bit */
+      body {
+        padding-top: 20px;
+        padding-bottom: 20px;
+      }
+
+      /* Custom page header */
+      .header {
+        padding-bottom: 20px;
+        padding-right: 15px;
+        padding-left: 15px;
+        border-bottom: 1px solid #e5e5e5;
+      }
+
+      /* Make the masthead heading the same height as the navigation */
+      .header h3 {
+        margin-top: 0;
+        margin-bottom: 0;
+        line-height: 40px;
+      }
+
+      /* Customize container */
+      .container {
+        max-width: 990px;
+      }
+    </style>
+
+    <title>Performance Measurements</title>
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <div class="container">
+      <div class="header clearfix">
+        <nav>
+          <div class="pull-right">
+            <form class="form-inline" id="form">
+              <a class="btn" href="javascript: resetZoom();">Reset zoom</a>
+              <a class="btn" href="javascript: clear();">Clear</a>
+              <div class="form-group">
+                <input type="text" class="form-control" id="term" />
+              </div>
+              <a class="btn btn-primary" href="javascript: search();">Search</a>
+            </form>
+          </div>
+        </nav>
+        <h3 class="text-muted">d3-flame-graph</h3>
+      </div>
+      <div id="chart"></div>
+      <hr />
+      <div id="details"></div>
+    </div>
+
+    <!-- D3.js -->
+    <script src="https://d3js.org/d3.v7.js" charset="utf-8"></script>
+
+    <!-- d3-flamegraph -->
+    <script type="text/javascript" src="../lib/d3-flamegraph.js"></script>
+    <script
+      type="text/javascript"
+      src="../lib/d3-flamegraph-tooltip.js"
+    ></script>
+
+    <script type="text/javascript">
+      var chart = flamegraph()
+        .width(960)
+        .cellHeight(18)
+        .transitionDuration(750)
+        .minFrameSize(5)
+        .transitionEase(d3.easeCubic)
+        .sort(true)
+        //Example to sort in reverse order
+        //.sort(function(a,b){ return d3.descending(a.name, b.name);})
+        .title('')
+        .onClick(onClick)
+        .selfValue(false)
+        .setColorMapper((d, originalColor) =>
+          d.highlight ? '#6aff8f' : originalColor,
+        );
+
+      // Example on how to use custom a tooltip.
+      var tip = flamegraph.tooltip
+        .defaultFlamegraphTooltip()
+        .text((d) => 'name: ' + d.data.name + ', value: ' + d.data.value);
+      chart.tooltip(tip);
+
+      var details = document.getElementById('details');
+      chart.setDetailsElement(details);
+
+      // Example on how to use searchById() function in flamegraph.
+      // To invoke this function after loading the graph itself, this function should be registered in d3 datum(data).call()
+      // (See d3.json invocation in this file)
+      function invokeFind() {
+        var searchId = parseInt(location.hash.substring(1), 10);
+        if (searchId) {
+          find(searchId);
+        }
+      }
+
+      // Example on how to use custom labels
+      // var label = function(d) {
+      //  return "name: " + d.name + ", value: " + d.value;
+      // }
+      // chart.label(label);
+
+      // Example of how to set fixed chart height
+      // chart.height(540);
+
+      d3.json('stacks.json')
+        .then((data) => {
+          d3.select('#chart').datum(data).call(chart).call(invokeFind);
+        })
+        .catch((error) => {
+          return console.warn(error);
+        });
+
+      document
+        .getElementById('form')
+        .addEventListener('submit', function (event) {
+          event.preventDefault();
+          search();
+        });
+
+      function search() {
+        var term = document.getElementById('term').value;
+        chart.search(term);
+      }
+
+      function find(id) {
+        var elem = chart.findById(id);
+        if (elem) {
+          console.log(elem);
+          chart.zoomTo(elem);
+        }
+      }
+
+      function clear() {
+        document.getElementById('term').value = '';
+        chart.clear();
+      }
+
+      function resetZoom() {
+        chart.resetZoom();
+      }
+
+      function onClick(d) {
+        console.info(`Clicked on ${d.data.name}, id: "${d.id}"`);
+        history.pushState({ id: d.id }, d.data.name, `#${d.id}`);
+      }
+    </script>
+  </body>
+</html>
diff --git a/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js b/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
new file mode 100644
index 000000000000..cc042a0f281b
--- /dev/null
+++ b/development/charts/flamegraph/lib/d3-flamegraph-tooltip.js
@@ -0,0 +1,3117 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+	if(typeof exports === 'object' && typeof module === 'object')
+		module.exports = factory();
+	else if(typeof define === 'function' && define.amd)
+		define([], factory);
+	else if(typeof exports === 'object')
+		exports["flamegraph"] = factory();
+	else
+		root["flamegraph"] = root["flamegraph"] || {}, root["flamegraph"]["tooltip"] = factory();
+})(self, function() {
+return /******/ (() => { // webpackBootstrap
+/******/ 	"use strict";
+/******/ 	// The require scope
+/******/ 	var __webpack_require__ = {};
+/******/ 	
+/************************************************************************/
+/******/ 	/* webpack/runtime/define property getters */
+/******/ 	(() => {
+/******/ 		// define getter functions for harmony exports
+/******/ 		__webpack_require__.d = (exports, definition) => {
+/******/ 			for(var key in definition) {
+/******/ 				if(__webpack_require__.o(definition, key) && !__webpack_require__.o(exports, key)) {
+/******/ 					Object.defineProperty(exports, key, { enumerable: true, get: definition[key] });
+/******/ 				}
+/******/ 			}
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/hasOwnProperty shorthand */
+/******/ 	(() => {
+/******/ 		__webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
+/******/ 	})();
+/******/ 	
+/******/ 	/* webpack/runtime/make namespace object */
+/******/ 	(() => {
+/******/ 		// define __esModule on exports
+/******/ 		__webpack_require__.r = (exports) => {
+/******/ 			if(typeof Symbol !== 'undefined' && Symbol.toStringTag) {
+/******/ 				Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
+/******/ 			}
+/******/ 			Object.defineProperty(exports, '__esModule', { value: true });
+/******/ 		};
+/******/ 	})();
+/******/ 	
+/************************************************************************/
+var __webpack_exports__ = {};
+// ESM COMPAT FLAG
+__webpack_require__.r(__webpack_exports__);
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "defaultFlamegraphTooltip": () => (/* binding */ defaultFlamegraphTooltip)
+});
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selector.js
+function none() {}
+
+/* harmony default export */ function selector(selector) {
+  return selector == null ? none : function() {
+    return this.querySelector(selector);
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/select.js
+
+
+
+/* harmony default export */ function selection_select(select) {
+  if (typeof select !== "function") select = selector(select);
+
+  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group[i]) && (subnode = select.call(node, node.__data__, i, group))) {
+        if ("__data__" in node) subnode.__data__ = node.__data__;
+        subgroup[i] = subnode;
+      }
+    }
+  }
+
+  return new Selection(subgroups, this._parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/array.js
+// Given something array like (or null), returns something that is strictly an
+// array. This is used to ensure that array-like objects passed to d3.selectAll
+// or selection.selectAll are converted into proper arrays when creating a
+// selection; we don’t ever want to create a selection backed by a live
+// HTMLCollection or NodeList. However, note that selection.selectAll will use a
+// static NodeList as a group, since it safely derived from querySelectorAll.
+function array(x) {
+  return x == null ? [] : Array.isArray(x) ? x : Array.from(x);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selectorAll.js
+function empty() {
+  return [];
+}
+
+/* harmony default export */ function selectorAll(selector) {
+  return selector == null ? empty : function() {
+    return this.querySelectorAll(selector);
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectAll.js
+
+
+
+
+function arrayAll(select) {
+  return function() {
+    return array(select.apply(this, arguments));
+  };
+}
+
+/* harmony default export */ function selectAll(select) {
+  if (typeof select === "function") select = arrayAll(select);
+  else select = selectorAll(select);
+
+  for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+      if (node = group[i]) {
+        subgroups.push(select.call(node, node.__data__, i, group));
+        parents.push(node);
+      }
+    }
+  }
+
+  return new Selection(subgroups, parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/matcher.js
+/* harmony default export */ function matcher(selector) {
+  return function() {
+    return this.matches(selector);
+  };
+}
+
+function childMatcher(selector) {
+  return function(node) {
+    return node.matches(selector);
+  };
+}
+
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChild.js
+
+
+var find = Array.prototype.find;
+
+function childFind(match) {
+  return function() {
+    return find.call(this.children, match);
+  };
+}
+
+function childFirst() {
+  return this.firstElementChild;
+}
+
+/* harmony default export */ function selectChild(match) {
+  return this.select(match == null ? childFirst
+      : childFind(typeof match === "function" ? match : childMatcher(match)));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChildren.js
+
+
+var filter = Array.prototype.filter;
+
+function children() {
+  return Array.from(this.children);
+}
+
+function childrenFilter(match) {
+  return function() {
+    return filter.call(this.children, match);
+  };
+}
+
+/* harmony default export */ function selectChildren(match) {
+  return this.selectAll(match == null ? children
+      : childrenFilter(typeof match === "function" ? match : childMatcher(match)));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/filter.js
+
+
+
+/* harmony default export */ function selection_filter(match) {
+  if (typeof match !== "function") match = matcher(match);
+
+  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+        subgroup.push(node);
+      }
+    }
+  }
+
+  return new Selection(subgroups, this._parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sparse.js
+/* harmony default export */ function sparse(update) {
+  return new Array(update.length);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/enter.js
+
+
+
+/* harmony default export */ function enter() {
+  return new Selection(this._enter || this._groups.map(sparse), this._parents);
+}
+
+function EnterNode(parent, datum) {
+  this.ownerDocument = parent.ownerDocument;
+  this.namespaceURI = parent.namespaceURI;
+  this._next = null;
+  this._parent = parent;
+  this.__data__ = datum;
+}
+
+EnterNode.prototype = {
+  constructor: EnterNode,
+  appendChild: function(child) { return this._parent.insertBefore(child, this._next); },
+  insertBefore: function(child, next) { return this._parent.insertBefore(child, next); },
+  querySelector: function(selector) { return this._parent.querySelector(selector); },
+  querySelectorAll: function(selector) { return this._parent.querySelectorAll(selector); }
+};
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/constant.js
+/* harmony default export */ function src_constant(x) {
+  return function() {
+    return x;
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/data.js
+
+
+
+
+function bindIndex(parent, group, enter, update, exit, data) {
+  var i = 0,
+      node,
+      groupLength = group.length,
+      dataLength = data.length;
+
+  // Put any non-null nodes that fit into update.
+  // Put any null nodes into enter.
+  // Put any remaining data into enter.
+  for (; i < dataLength; ++i) {
+    if (node = group[i]) {
+      node.__data__ = data[i];
+      update[i] = node;
+    } else {
+      enter[i] = new EnterNode(parent, data[i]);
+    }
+  }
+
+  // Put any non-null nodes that don’t fit into exit.
+  for (; i < groupLength; ++i) {
+    if (node = group[i]) {
+      exit[i] = node;
+    }
+  }
+}
+
+function bindKey(parent, group, enter, update, exit, data, key) {
+  var i,
+      node,
+      nodeByKeyValue = new Map,
+      groupLength = group.length,
+      dataLength = data.length,
+      keyValues = new Array(groupLength),
+      keyValue;
+
+  // Compute the key for each node.
+  // If multiple nodes have the same key, the duplicates are added to exit.
+  for (i = 0; i < groupLength; ++i) {
+    if (node = group[i]) {
+      keyValues[i] = keyValue = key.call(node, node.__data__, i, group) + "";
+      if (nodeByKeyValue.has(keyValue)) {
+        exit[i] = node;
+      } else {
+        nodeByKeyValue.set(keyValue, node);
+      }
+    }
+  }
+
+  // Compute the key for each datum.
+  // If there a node associated with this key, join and add it to update.
+  // If there is not (or the key is a duplicate), add it to enter.
+  for (i = 0; i < dataLength; ++i) {
+    keyValue = key.call(parent, data[i], i, data) + "";
+    if (node = nodeByKeyValue.get(keyValue)) {
+      update[i] = node;
+      node.__data__ = data[i];
+      nodeByKeyValue.delete(keyValue);
+    } else {
+      enter[i] = new EnterNode(parent, data[i]);
+    }
+  }
+
+  // Add any remaining nodes that were not bound to data to exit.
+  for (i = 0; i < groupLength; ++i) {
+    if ((node = group[i]) && (nodeByKeyValue.get(keyValues[i]) === node)) {
+      exit[i] = node;
+    }
+  }
+}
+
+function datum(node) {
+  return node.__data__;
+}
+
+/* harmony default export */ function data(value, key) {
+  if (!arguments.length) return Array.from(this, datum);
+
+  var bind = key ? bindKey : bindIndex,
+      parents = this._parents,
+      groups = this._groups;
+
+  if (typeof value !== "function") value = src_constant(value);
+
+  for (var m = groups.length, update = new Array(m), enter = new Array(m), exit = new Array(m), j = 0; j < m; ++j) {
+    var parent = parents[j],
+        group = groups[j],
+        groupLength = group.length,
+        data = arraylike(value.call(parent, parent && parent.__data__, j, parents)),
+        dataLength = data.length,
+        enterGroup = enter[j] = new Array(dataLength),
+        updateGroup = update[j] = new Array(dataLength),
+        exitGroup = exit[j] = new Array(groupLength);
+
+    bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
+
+    // Now connect the enter nodes to their following update node, such that
+    // appendChild can insert the materialized enter node before this node,
+    // rather than at the end of the parent node.
+    for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
+      if (previous = enterGroup[i0]) {
+        if (i0 >= i1) i1 = i0 + 1;
+        while (!(next = updateGroup[i1]) && ++i1 < dataLength);
+        previous._next = next || null;
+      }
+    }
+  }
+
+  update = new Selection(update, parents);
+  update._enter = enter;
+  update._exit = exit;
+  return update;
+}
+
+// Given some data, this returns an array-like view of it: an object that
+// exposes a length property and allows numeric indexing. Note that unlike
+// selectAll, this isn’t worried about “live” collections because the resulting
+// array will only be used briefly while data is being bound. (It is possible to
+// cause the data to change while iterating by using a key function, but please
+// don’t; we’d rather avoid a gratuitous copy.)
+function arraylike(data) {
+  return typeof data === "object" && "length" in data
+    ? data // Array, TypedArray, NodeList, array-like
+    : Array.from(data); // Map, Set, iterable, string, or anything else
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/exit.js
+
+
+
+/* harmony default export */ function exit() {
+  return new Selection(this._exit || this._groups.map(sparse), this._parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/join.js
+/* harmony default export */ function join(onenter, onupdate, onexit) {
+  var enter = this.enter(), update = this, exit = this.exit();
+  if (typeof onenter === "function") {
+    enter = onenter(enter);
+    if (enter) enter = enter.selection();
+  } else {
+    enter = enter.append(onenter + "");
+  }
+  if (onupdate != null) {
+    update = onupdate(update);
+    if (update) update = update.selection();
+  }
+  if (onexit == null) exit.remove(); else onexit(exit);
+  return enter && update ? enter.merge(update).order() : update;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/merge.js
+
+
+/* harmony default export */ function merge(context) {
+  var selection = context.selection ? context.selection() : context;
+
+  for (var groups0 = this._groups, groups1 = selection._groups, m0 = groups0.length, m1 = groups1.length, m = Math.min(m0, m1), merges = new Array(m0), j = 0; j < m; ++j) {
+    for (var group0 = groups0[j], group1 = groups1[j], n = group0.length, merge = merges[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group0[i] || group1[i]) {
+        merge[i] = node;
+      }
+    }
+  }
+
+  for (; j < m0; ++j) {
+    merges[j] = groups0[j];
+  }
+
+  return new Selection(merges, this._parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/order.js
+/* harmony default export */ function order() {
+
+  for (var groups = this._groups, j = -1, m = groups.length; ++j < m;) {
+    for (var group = groups[j], i = group.length - 1, next = group[i], node; --i >= 0;) {
+      if (node = group[i]) {
+        if (next && node.compareDocumentPosition(next) ^ 4) next.parentNode.insertBefore(node, next);
+        next = node;
+      }
+    }
+  }
+
+  return this;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sort.js
+
+
+/* harmony default export */ function sort(compare) {
+  if (!compare) compare = ascending;
+
+  function compareNode(a, b) {
+    return a && b ? compare(a.__data__, b.__data__) : !a - !b;
+  }
+
+  for (var groups = this._groups, m = groups.length, sortgroups = new Array(m), j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, sortgroup = sortgroups[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group[i]) {
+        sortgroup[i] = node;
+      }
+    }
+    sortgroup.sort(compareNode);
+  }
+
+  return new Selection(sortgroups, this._parents).order();
+}
+
+function ascending(a, b) {
+  return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/call.js
+/* harmony default export */ function call() {
+  var callback = arguments[0];
+  arguments[0] = this;
+  callback.apply(null, arguments);
+  return this;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/nodes.js
+/* harmony default export */ function nodes() {
+  return Array.from(this);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/node.js
+/* harmony default export */ function node() {
+
+  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+    for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
+      var node = group[i];
+      if (node) return node;
+    }
+  }
+
+  return null;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/size.js
+/* harmony default export */ function size() {
+  let size = 0;
+  for (const node of this) ++size; // eslint-disable-line no-unused-vars
+  return size;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/empty.js
+/* harmony default export */ function selection_empty() {
+  return !this.node();
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/each.js
+/* harmony default export */ function each(callback) {
+
+  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
+      if (node = group[i]) callback.call(node, node.__data__, i, group);
+    }
+  }
+
+  return this;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/namespaces.js
+var xhtml = "http://www.w3.org/1999/xhtml";
+
+/* harmony default export */ const namespaces = ({
+  svg: "http://www.w3.org/2000/svg",
+  xhtml: xhtml,
+  xlink: "http://www.w3.org/1999/xlink",
+  xml: "http://www.w3.org/XML/1998/namespace",
+  xmlns: "http://www.w3.org/2000/xmlns/"
+});
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/namespace.js
+
+
+/* harmony default export */ function namespace(name) {
+  var prefix = name += "", i = prefix.indexOf(":");
+  if (i >= 0 && (prefix = name.slice(0, i)) !== "xmlns") name = name.slice(i + 1);
+  return namespaces.hasOwnProperty(prefix) ? {space: namespaces[prefix], local: name} : name; // eslint-disable-line no-prototype-builtins
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/attr.js
+
+
+function attrRemove(name) {
+  return function() {
+    this.removeAttribute(name);
+  };
+}
+
+function attrRemoveNS(fullname) {
+  return function() {
+    this.removeAttributeNS(fullname.space, fullname.local);
+  };
+}
+
+function attrConstant(name, value) {
+  return function() {
+    this.setAttribute(name, value);
+  };
+}
+
+function attrConstantNS(fullname, value) {
+  return function() {
+    this.setAttributeNS(fullname.space, fullname.local, value);
+  };
+}
+
+function attrFunction(name, value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    if (v == null) this.removeAttribute(name);
+    else this.setAttribute(name, v);
+  };
+}
+
+function attrFunctionNS(fullname, value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    if (v == null) this.removeAttributeNS(fullname.space, fullname.local);
+    else this.setAttributeNS(fullname.space, fullname.local, v);
+  };
+}
+
+/* harmony default export */ function attr(name, value) {
+  var fullname = namespace(name);
+
+  if (arguments.length < 2) {
+    var node = this.node();
+    return fullname.local
+        ? node.getAttributeNS(fullname.space, fullname.local)
+        : node.getAttribute(fullname);
+  }
+
+  return this.each((value == null
+      ? (fullname.local ? attrRemoveNS : attrRemove) : (typeof value === "function"
+      ? (fullname.local ? attrFunctionNS : attrFunction)
+      : (fullname.local ? attrConstantNS : attrConstant)))(fullname, value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/window.js
+/* harmony default export */ function src_window(node) {
+  return (node.ownerDocument && node.ownerDocument.defaultView) // node is a Node
+      || (node.document && node) // node is a Window
+      || node.defaultView; // node is a Document
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/style.js
+
+
+function styleRemove(name) {
+  return function() {
+    this.style.removeProperty(name);
+  };
+}
+
+function styleConstant(name, value, priority) {
+  return function() {
+    this.style.setProperty(name, value, priority);
+  };
+}
+
+function styleFunction(name, value, priority) {
+  return function() {
+    var v = value.apply(this, arguments);
+    if (v == null) this.style.removeProperty(name);
+    else this.style.setProperty(name, v, priority);
+  };
+}
+
+/* harmony default export */ function style(name, value, priority) {
+  return arguments.length > 1
+      ? this.each((value == null
+            ? styleRemove : typeof value === "function"
+            ? styleFunction
+            : styleConstant)(name, value, priority == null ? "" : priority))
+      : styleValue(this.node(), name);
+}
+
+function styleValue(node, name) {
+  return node.style.getPropertyValue(name)
+      || src_window(node).getComputedStyle(node, null).getPropertyValue(name);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/property.js
+function propertyRemove(name) {
+  return function() {
+    delete this[name];
+  };
+}
+
+function propertyConstant(name, value) {
+  return function() {
+    this[name] = value;
+  };
+}
+
+function propertyFunction(name, value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    if (v == null) delete this[name];
+    else this[name] = v;
+  };
+}
+
+/* harmony default export */ function property(name, value) {
+  return arguments.length > 1
+      ? this.each((value == null
+          ? propertyRemove : typeof value === "function"
+          ? propertyFunction
+          : propertyConstant)(name, value))
+      : this.node()[name];
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/classed.js
+function classArray(string) {
+  return string.trim().split(/^|\s+/);
+}
+
+function classList(node) {
+  return node.classList || new ClassList(node);
+}
+
+function ClassList(node) {
+  this._node = node;
+  this._names = classArray(node.getAttribute("class") || "");
+}
+
+ClassList.prototype = {
+  add: function(name) {
+    var i = this._names.indexOf(name);
+    if (i < 0) {
+      this._names.push(name);
+      this._node.setAttribute("class", this._names.join(" "));
+    }
+  },
+  remove: function(name) {
+    var i = this._names.indexOf(name);
+    if (i >= 0) {
+      this._names.splice(i, 1);
+      this._node.setAttribute("class", this._names.join(" "));
+    }
+  },
+  contains: function(name) {
+    return this._names.indexOf(name) >= 0;
+  }
+};
+
+function classedAdd(node, names) {
+  var list = classList(node), i = -1, n = names.length;
+  while (++i < n) list.add(names[i]);
+}
+
+function classedRemove(node, names) {
+  var list = classList(node), i = -1, n = names.length;
+  while (++i < n) list.remove(names[i]);
+}
+
+function classedTrue(names) {
+  return function() {
+    classedAdd(this, names);
+  };
+}
+
+function classedFalse(names) {
+  return function() {
+    classedRemove(this, names);
+  };
+}
+
+function classedFunction(names, value) {
+  return function() {
+    (value.apply(this, arguments) ? classedAdd : classedRemove)(this, names);
+  };
+}
+
+/* harmony default export */ function classed(name, value) {
+  var names = classArray(name + "");
+
+  if (arguments.length < 2) {
+    var list = classList(this.node()), i = -1, n = names.length;
+    while (++i < n) if (!list.contains(names[i])) return false;
+    return true;
+  }
+
+  return this.each((typeof value === "function"
+      ? classedFunction : value
+      ? classedTrue
+      : classedFalse)(names, value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/text.js
+function textRemove() {
+  this.textContent = "";
+}
+
+function textConstant(value) {
+  return function() {
+    this.textContent = value;
+  };
+}
+
+function textFunction(value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    this.textContent = v == null ? "" : v;
+  };
+}
+
+/* harmony default export */ function selection_text(value) {
+  return arguments.length
+      ? this.each(value == null
+          ? textRemove : (typeof value === "function"
+          ? textFunction
+          : textConstant)(value))
+      : this.node().textContent;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/html.js
+function htmlRemove() {
+  this.innerHTML = "";
+}
+
+function htmlConstant(value) {
+  return function() {
+    this.innerHTML = value;
+  };
+}
+
+function htmlFunction(value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    this.innerHTML = v == null ? "" : v;
+  };
+}
+
+/* harmony default export */ function html(value) {
+  return arguments.length
+      ? this.each(value == null
+          ? htmlRemove : (typeof value === "function"
+          ? htmlFunction
+          : htmlConstant)(value))
+      : this.node().innerHTML;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/raise.js
+function raise() {
+  if (this.nextSibling) this.parentNode.appendChild(this);
+}
+
+/* harmony default export */ function selection_raise() {
+  return this.each(raise);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/lower.js
+function lower() {
+  if (this.previousSibling) this.parentNode.insertBefore(this, this.parentNode.firstChild);
+}
+
+/* harmony default export */ function selection_lower() {
+  return this.each(lower);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/creator.js
+
+
+
+function creatorInherit(name) {
+  return function() {
+    var document = this.ownerDocument,
+        uri = this.namespaceURI;
+    return uri === xhtml && document.documentElement.namespaceURI === xhtml
+        ? document.createElement(name)
+        : document.createElementNS(uri, name);
+  };
+}
+
+function creatorFixed(fullname) {
+  return function() {
+    return this.ownerDocument.createElementNS(fullname.space, fullname.local);
+  };
+}
+
+/* harmony default export */ function creator(name) {
+  var fullname = namespace(name);
+  return (fullname.local
+      ? creatorFixed
+      : creatorInherit)(fullname);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/append.js
+
+
+/* harmony default export */ function append(name) {
+  var create = typeof name === "function" ? name : creator(name);
+  return this.select(function() {
+    return this.appendChild(create.apply(this, arguments));
+  });
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/insert.js
+
+
+
+function constantNull() {
+  return null;
+}
+
+/* harmony default export */ function insert(name, before) {
+  var create = typeof name === "function" ? name : creator(name),
+      select = before == null ? constantNull : typeof before === "function" ? before : selector(before);
+  return this.select(function() {
+    return this.insertBefore(create.apply(this, arguments), select.apply(this, arguments) || null);
+  });
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/remove.js
+function remove() {
+  var parent = this.parentNode;
+  if (parent) parent.removeChild(this);
+}
+
+/* harmony default export */ function selection_remove() {
+  return this.each(remove);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/clone.js
+function selection_cloneShallow() {
+  var clone = this.cloneNode(false), parent = this.parentNode;
+  return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
+}
+
+function selection_cloneDeep() {
+  var clone = this.cloneNode(true), parent = this.parentNode;
+  return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
+}
+
+/* harmony default export */ function clone(deep) {
+  return this.select(deep ? selection_cloneDeep : selection_cloneShallow);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/datum.js
+/* harmony default export */ function selection_datum(value) {
+  return arguments.length
+      ? this.property("__data__", value)
+      : this.node().__data__;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/on.js
+function contextListener(listener) {
+  return function(event) {
+    listener.call(this, event, this.__data__);
+  };
+}
+
+function parseTypenames(typenames) {
+  return typenames.trim().split(/^|\s+/).map(function(t) {
+    var name = "", i = t.indexOf(".");
+    if (i >= 0) name = t.slice(i + 1), t = t.slice(0, i);
+    return {type: t, name: name};
+  });
+}
+
+function onRemove(typename) {
+  return function() {
+    var on = this.__on;
+    if (!on) return;
+    for (var j = 0, i = -1, m = on.length, o; j < m; ++j) {
+      if (o = on[j], (!typename.type || o.type === typename.type) && o.name === typename.name) {
+        this.removeEventListener(o.type, o.listener, o.options);
+      } else {
+        on[++i] = o;
+      }
+    }
+    if (++i) on.length = i;
+    else delete this.__on;
+  };
+}
+
+function onAdd(typename, value, options) {
+  return function() {
+    var on = this.__on, o, listener = contextListener(value);
+    if (on) for (var j = 0, m = on.length; j < m; ++j) {
+      if ((o = on[j]).type === typename.type && o.name === typename.name) {
+        this.removeEventListener(o.type, o.listener, o.options);
+        this.addEventListener(o.type, o.listener = listener, o.options = options);
+        o.value = value;
+        return;
+      }
+    }
+    this.addEventListener(typename.type, listener, options);
+    o = {type: typename.type, name: typename.name, value: value, listener: listener, options: options};
+    if (!on) this.__on = [o];
+    else on.push(o);
+  };
+}
+
+/* harmony default export */ function on(typename, value, options) {
+  var typenames = parseTypenames(typename + ""), i, n = typenames.length, t;
+
+  if (arguments.length < 2) {
+    var on = this.node().__on;
+    if (on) for (var j = 0, m = on.length, o; j < m; ++j) {
+      for (i = 0, o = on[j]; i < n; ++i) {
+        if ((t = typenames[i]).type === o.type && t.name === o.name) {
+          return o.value;
+        }
+      }
+    }
+    return;
+  }
+
+  on = value ? onAdd : onRemove;
+  for (i = 0; i < n; ++i) this.each(on(typenames[i], value, options));
+  return this;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/dispatch.js
+
+
+function dispatchEvent(node, type, params) {
+  var window = src_window(node),
+      event = window.CustomEvent;
+
+  if (typeof event === "function") {
+    event = new event(type, params);
+  } else {
+    event = window.document.createEvent("Event");
+    if (params) event.initEvent(type, params.bubbles, params.cancelable), event.detail = params.detail;
+    else event.initEvent(type, false, false);
+  }
+
+  node.dispatchEvent(event);
+}
+
+function dispatchConstant(type, params) {
+  return function() {
+    return dispatchEvent(this, type, params);
+  };
+}
+
+function dispatchFunction(type, params) {
+  return function() {
+    return dispatchEvent(this, type, params.apply(this, arguments));
+  };
+}
+
+/* harmony default export */ function dispatch(type, params) {
+  return this.each((typeof params === "function"
+      ? dispatchFunction
+      : dispatchConstant)(type, params));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/iterator.js
+/* harmony default export */ function* iterator() {
+  for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+    for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
+      if (node = group[i]) yield node;
+    }
+  }
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/index.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var root = [null];
+
+function Selection(groups, parents) {
+  this._groups = groups;
+  this._parents = parents;
+}
+
+function selection() {
+  return new Selection([[document.documentElement]], root);
+}
+
+function selection_selection() {
+  return this;
+}
+
+Selection.prototype = selection.prototype = {
+  constructor: Selection,
+  select: selection_select,
+  selectAll: selectAll,
+  selectChild: selectChild,
+  selectChildren: selectChildren,
+  filter: selection_filter,
+  data: data,
+  enter: enter,
+  exit: exit,
+  join: join,
+  merge: merge,
+  selection: selection_selection,
+  order: order,
+  sort: sort,
+  call: call,
+  nodes: nodes,
+  node: node,
+  size: size,
+  empty: selection_empty,
+  each: each,
+  attr: attr,
+  style: style,
+  property: property,
+  classed: classed,
+  text: selection_text,
+  html: html,
+  raise: selection_raise,
+  lower: selection_lower,
+  append: append,
+  insert: insert,
+  remove: selection_remove,
+  clone: clone,
+  datum: selection_datum,
+  on: on,
+  dispatch: dispatch,
+  [Symbol.iterator]: iterator
+};
+
+/* harmony default export */ const src_selection = (selection);
+
+;// CONCATENATED MODULE: ../node_modules/d3-selection/src/select.js
+
+
+/* harmony default export */ function src_select(selector) {
+  return typeof selector === "string"
+      ? new Selection([[document.querySelector(selector)]], [document.documentElement])
+      : new Selection([[selector]], root);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-dispatch/src/dispatch.js
+var noop = {value: () => {}};
+
+function dispatch_dispatch() {
+  for (var i = 0, n = arguments.length, _ = {}, t; i < n; ++i) {
+    if (!(t = arguments[i] + "") || (t in _) || /[\s.]/.test(t)) throw new Error("illegal type: " + t);
+    _[t] = [];
+  }
+  return new Dispatch(_);
+}
+
+function Dispatch(_) {
+  this._ = _;
+}
+
+function dispatch_parseTypenames(typenames, types) {
+  return typenames.trim().split(/^|\s+/).map(function(t) {
+    var name = "", i = t.indexOf(".");
+    if (i >= 0) name = t.slice(i + 1), t = t.slice(0, i);
+    if (t && !types.hasOwnProperty(t)) throw new Error("unknown type: " + t);
+    return {type: t, name: name};
+  });
+}
+
+Dispatch.prototype = dispatch_dispatch.prototype = {
+  constructor: Dispatch,
+  on: function(typename, callback) {
+    var _ = this._,
+        T = dispatch_parseTypenames(typename + "", _),
+        t,
+        i = -1,
+        n = T.length;
+
+    // If no callback was specified, return the callback of the given type and name.
+    if (arguments.length < 2) {
+      while (++i < n) if ((t = (typename = T[i]).type) && (t = get(_[t], typename.name))) return t;
+      return;
+    }
+
+    // If a type was specified, set the callback for the given type and name.
+    // Otherwise, if a null callback was specified, remove callbacks of the given name.
+    if (callback != null && typeof callback !== "function") throw new Error("invalid callback: " + callback);
+    while (++i < n) {
+      if (t = (typename = T[i]).type) _[t] = set(_[t], typename.name, callback);
+      else if (callback == null) for (t in _) _[t] = set(_[t], typename.name, null);
+    }
+
+    return this;
+  },
+  copy: function() {
+    var copy = {}, _ = this._;
+    for (var t in _) copy[t] = _[t].slice();
+    return new Dispatch(copy);
+  },
+  call: function(type, that) {
+    if ((n = arguments.length - 2) > 0) for (var args = new Array(n), i = 0, n, t; i < n; ++i) args[i] = arguments[i + 2];
+    if (!this._.hasOwnProperty(type)) throw new Error("unknown type: " + type);
+    for (t = this._[type], i = 0, n = t.length; i < n; ++i) t[i].value.apply(that, args);
+  },
+  apply: function(type, that, args) {
+    if (!this._.hasOwnProperty(type)) throw new Error("unknown type: " + type);
+    for (var t = this._[type], i = 0, n = t.length; i < n; ++i) t[i].value.apply(that, args);
+  }
+};
+
+function get(type, name) {
+  for (var i = 0, n = type.length, c; i < n; ++i) {
+    if ((c = type[i]).name === name) {
+      return c.value;
+    }
+  }
+}
+
+function set(type, name, callback) {
+  for (var i = 0, n = type.length; i < n; ++i) {
+    if (type[i].name === name) {
+      type[i] = noop, type = type.slice(0, i).concat(type.slice(i + 1));
+      break;
+    }
+  }
+  if (callback != null) type.push({name: name, value: callback});
+  return type;
+}
+
+/* harmony default export */ const src_dispatch = (dispatch_dispatch);
+
+;// CONCATENATED MODULE: ../node_modules/d3-timer/src/timer.js
+var timer_frame = 0, // is an animation frame pending?
+    timeout = 0, // is a timeout pending?
+    interval = 0, // are any timers active?
+    pokeDelay = 1000, // how frequently we check for clock skew
+    taskHead,
+    taskTail,
+    clockLast = 0,
+    clockNow = 0,
+    clockSkew = 0,
+    clock = typeof performance === "object" && performance.now ? performance : Date,
+    setFrame = typeof window === "object" && window.requestAnimationFrame ? window.requestAnimationFrame.bind(window) : function(f) { setTimeout(f, 17); };
+
+function now() {
+  return clockNow || (setFrame(clearNow), clockNow = clock.now() + clockSkew);
+}
+
+function clearNow() {
+  clockNow = 0;
+}
+
+function Timer() {
+  this._call =
+  this._time =
+  this._next = null;
+}
+
+Timer.prototype = timer.prototype = {
+  constructor: Timer,
+  restart: function(callback, delay, time) {
+    if (typeof callback !== "function") throw new TypeError("callback is not a function");
+    time = (time == null ? now() : +time) + (delay == null ? 0 : +delay);
+    if (!this._next && taskTail !== this) {
+      if (taskTail) taskTail._next = this;
+      else taskHead = this;
+      taskTail = this;
+    }
+    this._call = callback;
+    this._time = time;
+    sleep();
+  },
+  stop: function() {
+    if (this._call) {
+      this._call = null;
+      this._time = Infinity;
+      sleep();
+    }
+  }
+};
+
+function timer(callback, delay, time) {
+  var t = new Timer;
+  t.restart(callback, delay, time);
+  return t;
+}
+
+function timerFlush() {
+  now(); // Get the current time, if not already set.
+  ++timer_frame; // Pretend we’ve set an alarm, if we haven’t already.
+  var t = taskHead, e;
+  while (t) {
+    if ((e = clockNow - t._time) >= 0) t._call.call(undefined, e);
+    t = t._next;
+  }
+  --timer_frame;
+}
+
+function wake() {
+  clockNow = (clockLast = clock.now()) + clockSkew;
+  timer_frame = timeout = 0;
+  try {
+    timerFlush();
+  } finally {
+    timer_frame = 0;
+    nap();
+    clockNow = 0;
+  }
+}
+
+function poke() {
+  var now = clock.now(), delay = now - clockLast;
+  if (delay > pokeDelay) clockSkew -= delay, clockLast = now;
+}
+
+function nap() {
+  var t0, t1 = taskHead, t2, time = Infinity;
+  while (t1) {
+    if (t1._call) {
+      if (time > t1._time) time = t1._time;
+      t0 = t1, t1 = t1._next;
+    } else {
+      t2 = t1._next, t1._next = null;
+      t1 = t0 ? t0._next = t2 : taskHead = t2;
+    }
+  }
+  taskTail = t0;
+  sleep(time);
+}
+
+function sleep(time) {
+  if (timer_frame) return; // Soonest alarm already set, or will be.
+  if (timeout) timeout = clearTimeout(timeout);
+  var delay = time - clockNow; // Strictly less than if we recomputed clockNow.
+  if (delay > 24) {
+    if (time < Infinity) timeout = setTimeout(wake, time - clock.now() - clockSkew);
+    if (interval) interval = clearInterval(interval);
+  } else {
+    if (!interval) clockLast = clock.now(), interval = setInterval(poke, pokeDelay);
+    timer_frame = 1, setFrame(wake);
+  }
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-timer/src/timeout.js
+
+
+/* harmony default export */ function src_timeout(callback, delay, time) {
+  var t = new Timer;
+  delay = delay == null ? 0 : +delay;
+  t.restart(elapsed => {
+    t.stop();
+    callback(elapsed + delay);
+  }, delay, time);
+  return t;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/schedule.js
+
+
+
+var emptyOn = src_dispatch("start", "end", "cancel", "interrupt");
+var emptyTween = [];
+
+var CREATED = 0;
+var SCHEDULED = 1;
+var STARTING = 2;
+var STARTED = 3;
+var RUNNING = 4;
+var ENDING = 5;
+var ENDED = 6;
+
+/* harmony default export */ function schedule(node, name, id, index, group, timing) {
+  var schedules = node.__transition;
+  if (!schedules) node.__transition = {};
+  else if (id in schedules) return;
+  create(node, id, {
+    name: name,
+    index: index, // For context during callback.
+    group: group, // For context during callback.
+    on: emptyOn,
+    tween: emptyTween,
+    time: timing.time,
+    delay: timing.delay,
+    duration: timing.duration,
+    ease: timing.ease,
+    timer: null,
+    state: CREATED
+  });
+}
+
+function init(node, id) {
+  var schedule = schedule_get(node, id);
+  if (schedule.state > CREATED) throw new Error("too late; already scheduled");
+  return schedule;
+}
+
+function schedule_set(node, id) {
+  var schedule = schedule_get(node, id);
+  if (schedule.state > STARTED) throw new Error("too late; already running");
+  return schedule;
+}
+
+function schedule_get(node, id) {
+  var schedule = node.__transition;
+  if (!schedule || !(schedule = schedule[id])) throw new Error("transition not found");
+  return schedule;
+}
+
+function create(node, id, self) {
+  var schedules = node.__transition,
+      tween;
+
+  // Initialize the self timer when the transition is created.
+  // Note the actual delay is not known until the first callback!
+  schedules[id] = self;
+  self.timer = timer(schedule, 0, self.time);
+
+  function schedule(elapsed) {
+    self.state = SCHEDULED;
+    self.timer.restart(start, self.delay, self.time);
+
+    // If the elapsed delay is less than our first sleep, start immediately.
+    if (self.delay <= elapsed) start(elapsed - self.delay);
+  }
+
+  function start(elapsed) {
+    var i, j, n, o;
+
+    // If the state is not SCHEDULED, then we previously errored on start.
+    if (self.state !== SCHEDULED) return stop();
+
+    for (i in schedules) {
+      o = schedules[i];
+      if (o.name !== self.name) continue;
+
+      // While this element already has a starting transition during this frame,
+      // defer starting an interrupting transition until that transition has a
+      // chance to tick (and possibly end); see d3/d3-transition#54!
+      if (o.state === STARTED) return src_timeout(start);
+
+      // Interrupt the active transition, if any.
+      if (o.state === RUNNING) {
+        o.state = ENDED;
+        o.timer.stop();
+        o.on.call("interrupt", node, node.__data__, o.index, o.group);
+        delete schedules[i];
+      }
+
+      // Cancel any pre-empted transitions.
+      else if (+i < id) {
+        o.state = ENDED;
+        o.timer.stop();
+        o.on.call("cancel", node, node.__data__, o.index, o.group);
+        delete schedules[i];
+      }
+    }
+
+    // Defer the first tick to end of the current frame; see d3/d3#1576.
+    // Note the transition may be canceled after start and before the first tick!
+    // Note this must be scheduled before the start event; see d3/d3-transition#16!
+    // Assuming this is successful, subsequent callbacks go straight to tick.
+    src_timeout(function() {
+      if (self.state === STARTED) {
+        self.state = RUNNING;
+        self.timer.restart(tick, self.delay, self.time);
+        tick(elapsed);
+      }
+    });
+
+    // Dispatch the start event.
+    // Note this must be done before the tween are initialized.
+    self.state = STARTING;
+    self.on.call("start", node, node.__data__, self.index, self.group);
+    if (self.state !== STARTING) return; // interrupted
+    self.state = STARTED;
+
+    // Initialize the tween, deleting null tween.
+    tween = new Array(n = self.tween.length);
+    for (i = 0, j = -1; i < n; ++i) {
+      if (o = self.tween[i].value.call(node, node.__data__, self.index, self.group)) {
+        tween[++j] = o;
+      }
+    }
+    tween.length = j + 1;
+  }
+
+  function tick(elapsed) {
+    var t = elapsed < self.duration ? self.ease.call(null, elapsed / self.duration) : (self.timer.restart(stop), self.state = ENDING, 1),
+        i = -1,
+        n = tween.length;
+
+    while (++i < n) {
+      tween[i].call(node, t);
+    }
+
+    // Dispatch the end event.
+    if (self.state === ENDING) {
+      self.on.call("end", node, node.__data__, self.index, self.group);
+      stop();
+    }
+  }
+
+  function stop() {
+    self.state = ENDED;
+    self.timer.stop();
+    delete schedules[id];
+    for (var i in schedules) return; // eslint-disable-line no-unused-vars
+    delete node.__transition;
+  }
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/interrupt.js
+
+
+/* harmony default export */ function interrupt(node, name) {
+  var schedules = node.__transition,
+      schedule,
+      active,
+      empty = true,
+      i;
+
+  if (!schedules) return;
+
+  name = name == null ? null : name + "";
+
+  for (i in schedules) {
+    if ((schedule = schedules[i]).name !== name) { empty = false; continue; }
+    active = schedule.state > STARTING && schedule.state < ENDING;
+    schedule.state = ENDED;
+    schedule.timer.stop();
+    schedule.on.call(active ? "interrupt" : "cancel", node, node.__data__, schedule.index, schedule.group);
+    delete schedules[i];
+  }
+
+  if (empty) delete node.__transition;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/interrupt.js
+
+
+/* harmony default export */ function selection_interrupt(name) {
+  return this.each(function() {
+    interrupt(this, name);
+  });
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/number.js
+/* harmony default export */ function number(a, b) {
+  return a = +a, b = +b, function(t) {
+    return a * (1 - t) + b * t;
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/decompose.js
+var degrees = 180 / Math.PI;
+
+var identity = {
+  translateX: 0,
+  translateY: 0,
+  rotate: 0,
+  skewX: 0,
+  scaleX: 1,
+  scaleY: 1
+};
+
+/* harmony default export */ function decompose(a, b, c, d, e, f) {
+  var scaleX, scaleY, skewX;
+  if (scaleX = Math.sqrt(a * a + b * b)) a /= scaleX, b /= scaleX;
+  if (skewX = a * c + b * d) c -= a * skewX, d -= b * skewX;
+  if (scaleY = Math.sqrt(c * c + d * d)) c /= scaleY, d /= scaleY, skewX /= scaleY;
+  if (a * d < b * c) a = -a, b = -b, skewX = -skewX, scaleX = -scaleX;
+  return {
+    translateX: e,
+    translateY: f,
+    rotate: Math.atan2(b, a) * degrees,
+    skewX: Math.atan(skewX) * degrees,
+    scaleX: scaleX,
+    scaleY: scaleY
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/parse.js
+
+
+var svgNode;
+
+/* eslint-disable no-undef */
+function parseCss(value) {
+  const m = new (typeof DOMMatrix === "function" ? DOMMatrix : WebKitCSSMatrix)(value + "");
+  return m.isIdentity ? identity : decompose(m.a, m.b, m.c, m.d, m.e, m.f);
+}
+
+function parseSvg(value) {
+  if (value == null) return identity;
+  if (!svgNode) svgNode = document.createElementNS("http://www.w3.org/2000/svg", "g");
+  svgNode.setAttribute("transform", value);
+  if (!(value = svgNode.transform.baseVal.consolidate())) return identity;
+  value = value.matrix;
+  return decompose(value.a, value.b, value.c, value.d, value.e, value.f);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/index.js
+
+
+
+function interpolateTransform(parse, pxComma, pxParen, degParen) {
+
+  function pop(s) {
+    return s.length ? s.pop() + " " : "";
+  }
+
+  function translate(xa, ya, xb, yb, s, q) {
+    if (xa !== xb || ya !== yb) {
+      var i = s.push("translate(", null, pxComma, null, pxParen);
+      q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
+    } else if (xb || yb) {
+      s.push("translate(" + xb + pxComma + yb + pxParen);
+    }
+  }
+
+  function rotate(a, b, s, q) {
+    if (a !== b) {
+      if (a - b > 180) b += 360; else if (b - a > 180) a += 360; // shortest path
+      q.push({i: s.push(pop(s) + "rotate(", null, degParen) - 2, x: number(a, b)});
+    } else if (b) {
+      s.push(pop(s) + "rotate(" + b + degParen);
+    }
+  }
+
+  function skewX(a, b, s, q) {
+    if (a !== b) {
+      q.push({i: s.push(pop(s) + "skewX(", null, degParen) - 2, x: number(a, b)});
+    } else if (b) {
+      s.push(pop(s) + "skewX(" + b + degParen);
+    }
+  }
+
+  function scale(xa, ya, xb, yb, s, q) {
+    if (xa !== xb || ya !== yb) {
+      var i = s.push(pop(s) + "scale(", null, ",", null, ")");
+      q.push({i: i - 4, x: number(xa, xb)}, {i: i - 2, x: number(ya, yb)});
+    } else if (xb !== 1 || yb !== 1) {
+      s.push(pop(s) + "scale(" + xb + "," + yb + ")");
+    }
+  }
+
+  return function(a, b) {
+    var s = [], // string constants and placeholders
+        q = []; // number interpolators
+    a = parse(a), b = parse(b);
+    translate(a.translateX, a.translateY, b.translateX, b.translateY, s, q);
+    rotate(a.rotate, b.rotate, s, q);
+    skewX(a.skewX, b.skewX, s, q);
+    scale(a.scaleX, a.scaleY, b.scaleX, b.scaleY, s, q);
+    a = b = null; // gc
+    return function(t) {
+      var i = -1, n = q.length, o;
+      while (++i < n) s[(o = q[i]).i] = o.x(t);
+      return s.join("");
+    };
+  };
+}
+
+var interpolateTransformCss = interpolateTransform(parseCss, "px, ", "px)", "deg)");
+var interpolateTransformSvg = interpolateTransform(parseSvg, ", ", ")", ")");
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/tween.js
+
+
+function tweenRemove(id, name) {
+  var tween0, tween1;
+  return function() {
+    var schedule = schedule_set(this, id),
+        tween = schedule.tween;
+
+    // If this node shared tween with the previous node,
+    // just assign the updated shared tween and we’re done!
+    // Otherwise, copy-on-write.
+    if (tween !== tween0) {
+      tween1 = tween0 = tween;
+      for (var i = 0, n = tween1.length; i < n; ++i) {
+        if (tween1[i].name === name) {
+          tween1 = tween1.slice();
+          tween1.splice(i, 1);
+          break;
+        }
+      }
+    }
+
+    schedule.tween = tween1;
+  };
+}
+
+function tweenFunction(id, name, value) {
+  var tween0, tween1;
+  if (typeof value !== "function") throw new Error;
+  return function() {
+    var schedule = schedule_set(this, id),
+        tween = schedule.tween;
+
+    // If this node shared tween with the previous node,
+    // just assign the updated shared tween and we’re done!
+    // Otherwise, copy-on-write.
+    if (tween !== tween0) {
+      tween1 = (tween0 = tween).slice();
+      for (var t = {name: name, value: value}, i = 0, n = tween1.length; i < n; ++i) {
+        if (tween1[i].name === name) {
+          tween1[i] = t;
+          break;
+        }
+      }
+      if (i === n) tween1.push(t);
+    }
+
+    schedule.tween = tween1;
+  };
+}
+
+/* harmony default export */ function tween(name, value) {
+  var id = this._id;
+
+  name += "";
+
+  if (arguments.length < 2) {
+    var tween = schedule_get(this.node(), id).tween;
+    for (var i = 0, n = tween.length, t; i < n; ++i) {
+      if ((t = tween[i]).name === name) {
+        return t.value;
+      }
+    }
+    return null;
+  }
+
+  return this.each((value == null ? tweenRemove : tweenFunction)(id, name, value));
+}
+
+function tweenValue(transition, name, value) {
+  var id = transition._id;
+
+  transition.each(function() {
+    var schedule = schedule_set(this, id);
+    (schedule.value || (schedule.value = {}))[name] = value.apply(this, arguments);
+  });
+
+  return function(node) {
+    return schedule_get(node, id).value[name];
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-color/src/define.js
+/* harmony default export */ function src_define(constructor, factory, prototype) {
+  constructor.prototype = factory.prototype = prototype;
+  prototype.constructor = constructor;
+}
+
+function extend(parent, definition) {
+  var prototype = Object.create(parent.prototype);
+  for (var key in definition) prototype[key] = definition[key];
+  return prototype;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-color/src/color.js
+
+
+function Color() {}
+
+var darker = 0.7;
+var brighter = 1 / darker;
+
+var reI = "\\s*([+-]?\\d+)\\s*",
+    reN = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*",
+    reP = "\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*",
+    reHex = /^#([0-9a-f]{3,8})$/,
+    reRgbInteger = new RegExp("^rgb\\(" + [reI, reI, reI] + "\\)$"),
+    reRgbPercent = new RegExp("^rgb\\(" + [reP, reP, reP] + "\\)$"),
+    reRgbaInteger = new RegExp("^rgba\\(" + [reI, reI, reI, reN] + "\\)$"),
+    reRgbaPercent = new RegExp("^rgba\\(" + [reP, reP, reP, reN] + "\\)$"),
+    reHslPercent = new RegExp("^hsl\\(" + [reN, reP, reP] + "\\)$"),
+    reHslaPercent = new RegExp("^hsla\\(" + [reN, reP, reP, reN] + "\\)$");
+
+var named = {
+  aliceblue: 0xf0f8ff,
+  antiquewhite: 0xfaebd7,
+  aqua: 0x00ffff,
+  aquamarine: 0x7fffd4,
+  azure: 0xf0ffff,
+  beige: 0xf5f5dc,
+  bisque: 0xffe4c4,
+  black: 0x000000,
+  blanchedalmond: 0xffebcd,
+  blue: 0x0000ff,
+  blueviolet: 0x8a2be2,
+  brown: 0xa52a2a,
+  burlywood: 0xdeb887,
+  cadetblue: 0x5f9ea0,
+  chartreuse: 0x7fff00,
+  chocolate: 0xd2691e,
+  coral: 0xff7f50,
+  cornflowerblue: 0x6495ed,
+  cornsilk: 0xfff8dc,
+  crimson: 0xdc143c,
+  cyan: 0x00ffff,
+  darkblue: 0x00008b,
+  darkcyan: 0x008b8b,
+  darkgoldenrod: 0xb8860b,
+  darkgray: 0xa9a9a9,
+  darkgreen: 0x006400,
+  darkgrey: 0xa9a9a9,
+  darkkhaki: 0xbdb76b,
+  darkmagenta: 0x8b008b,
+  darkolivegreen: 0x556b2f,
+  darkorange: 0xff8c00,
+  darkorchid: 0x9932cc,
+  darkred: 0x8b0000,
+  darksalmon: 0xe9967a,
+  darkseagreen: 0x8fbc8f,
+  darkslateblue: 0x483d8b,
+  darkslategray: 0x2f4f4f,
+  darkslategrey: 0x2f4f4f,
+  darkturquoise: 0x00ced1,
+  darkviolet: 0x9400d3,
+  deeppink: 0xff1493,
+  deepskyblue: 0x00bfff,
+  dimgray: 0x696969,
+  dimgrey: 0x696969,
+  dodgerblue: 0x1e90ff,
+  firebrick: 0xb22222,
+  floralwhite: 0xfffaf0,
+  forestgreen: 0x228b22,
+  fuchsia: 0xff00ff,
+  gainsboro: 0xdcdcdc,
+  ghostwhite: 0xf8f8ff,
+  gold: 0xffd700,
+  goldenrod: 0xdaa520,
+  gray: 0x808080,
+  green: 0x008000,
+  greenyellow: 0xadff2f,
+  grey: 0x808080,
+  honeydew: 0xf0fff0,
+  hotpink: 0xff69b4,
+  indianred: 0xcd5c5c,
+  indigo: 0x4b0082,
+  ivory: 0xfffff0,
+  khaki: 0xf0e68c,
+  lavender: 0xe6e6fa,
+  lavenderblush: 0xfff0f5,
+  lawngreen: 0x7cfc00,
+  lemonchiffon: 0xfffacd,
+  lightblue: 0xadd8e6,
+  lightcoral: 0xf08080,
+  lightcyan: 0xe0ffff,
+  lightgoldenrodyellow: 0xfafad2,
+  lightgray: 0xd3d3d3,
+  lightgreen: 0x90ee90,
+  lightgrey: 0xd3d3d3,
+  lightpink: 0xffb6c1,
+  lightsalmon: 0xffa07a,
+  lightseagreen: 0x20b2aa,
+  lightskyblue: 0x87cefa,
+  lightslategray: 0x778899,
+  lightslategrey: 0x778899,
+  lightsteelblue: 0xb0c4de,
+  lightyellow: 0xffffe0,
+  lime: 0x00ff00,
+  limegreen: 0x32cd32,
+  linen: 0xfaf0e6,
+  magenta: 0xff00ff,
+  maroon: 0x800000,
+  mediumaquamarine: 0x66cdaa,
+  mediumblue: 0x0000cd,
+  mediumorchid: 0xba55d3,
+  mediumpurple: 0x9370db,
+  mediumseagreen: 0x3cb371,
+  mediumslateblue: 0x7b68ee,
+  mediumspringgreen: 0x00fa9a,
+  mediumturquoise: 0x48d1cc,
+  mediumvioletred: 0xc71585,
+  midnightblue: 0x191970,
+  mintcream: 0xf5fffa,
+  mistyrose: 0xffe4e1,
+  moccasin: 0xffe4b5,
+  navajowhite: 0xffdead,
+  navy: 0x000080,
+  oldlace: 0xfdf5e6,
+  olive: 0x808000,
+  olivedrab: 0x6b8e23,
+  orange: 0xffa500,
+  orangered: 0xff4500,
+  orchid: 0xda70d6,
+  palegoldenrod: 0xeee8aa,
+  palegreen: 0x98fb98,
+  paleturquoise: 0xafeeee,
+  palevioletred: 0xdb7093,
+  papayawhip: 0xffefd5,
+  peachpuff: 0xffdab9,
+  peru: 0xcd853f,
+  pink: 0xffc0cb,
+  plum: 0xdda0dd,
+  powderblue: 0xb0e0e6,
+  purple: 0x800080,
+  rebeccapurple: 0x663399,
+  red: 0xff0000,
+  rosybrown: 0xbc8f8f,
+  royalblue: 0x4169e1,
+  saddlebrown: 0x8b4513,
+  salmon: 0xfa8072,
+  sandybrown: 0xf4a460,
+  seagreen: 0x2e8b57,
+  seashell: 0xfff5ee,
+  sienna: 0xa0522d,
+  silver: 0xc0c0c0,
+  skyblue: 0x87ceeb,
+  slateblue: 0x6a5acd,
+  slategray: 0x708090,
+  slategrey: 0x708090,
+  snow: 0xfffafa,
+  springgreen: 0x00ff7f,
+  steelblue: 0x4682b4,
+  tan: 0xd2b48c,
+  teal: 0x008080,
+  thistle: 0xd8bfd8,
+  tomato: 0xff6347,
+  turquoise: 0x40e0d0,
+  violet: 0xee82ee,
+  wheat: 0xf5deb3,
+  white: 0xffffff,
+  whitesmoke: 0xf5f5f5,
+  yellow: 0xffff00,
+  yellowgreen: 0x9acd32
+};
+
+src_define(Color, color, {
+  copy: function(channels) {
+    return Object.assign(new this.constructor, this, channels);
+  },
+  displayable: function() {
+    return this.rgb().displayable();
+  },
+  hex: color_formatHex, // Deprecated! Use color.formatHex.
+  formatHex: color_formatHex,
+  formatHsl: color_formatHsl,
+  formatRgb: color_formatRgb,
+  toString: color_formatRgb
+});
+
+function color_formatHex() {
+  return this.rgb().formatHex();
+}
+
+function color_formatHsl() {
+  return hslConvert(this).formatHsl();
+}
+
+function color_formatRgb() {
+  return this.rgb().formatRgb();
+}
+
+function color(format) {
+  var m, l;
+  format = (format + "").trim().toLowerCase();
+  return (m = reHex.exec(format)) ? (l = m[1].length, m = parseInt(m[1], 16), l === 6 ? rgbn(m) // #ff0000
+      : l === 3 ? new Rgb((m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), ((m & 0xf) << 4) | (m & 0xf), 1) // #f00
+      : l === 8 ? rgba(m >> 24 & 0xff, m >> 16 & 0xff, m >> 8 & 0xff, (m & 0xff) / 0xff) // #ff000000
+      : l === 4 ? rgba((m >> 12 & 0xf) | (m >> 8 & 0xf0), (m >> 8 & 0xf) | (m >> 4 & 0xf0), (m >> 4 & 0xf) | (m & 0xf0), (((m & 0xf) << 4) | (m & 0xf)) / 0xff) // #f000
+      : null) // invalid hex
+      : (m = reRgbInteger.exec(format)) ? new Rgb(m[1], m[2], m[3], 1) // rgb(255, 0, 0)
+      : (m = reRgbPercent.exec(format)) ? new Rgb(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, 1) // rgb(100%, 0%, 0%)
+      : (m = reRgbaInteger.exec(format)) ? rgba(m[1], m[2], m[3], m[4]) // rgba(255, 0, 0, 1)
+      : (m = reRgbaPercent.exec(format)) ? rgba(m[1] * 255 / 100, m[2] * 255 / 100, m[3] * 255 / 100, m[4]) // rgb(100%, 0%, 0%, 1)
+      : (m = reHslPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, 1) // hsl(120, 50%, 50%)
+      : (m = reHslaPercent.exec(format)) ? hsla(m[1], m[2] / 100, m[3] / 100, m[4]) // hsla(120, 50%, 50%, 1)
+      : named.hasOwnProperty(format) ? rgbn(named[format]) // eslint-disable-line no-prototype-builtins
+      : format === "transparent" ? new Rgb(NaN, NaN, NaN, 0)
+      : null;
+}
+
+function rgbn(n) {
+  return new Rgb(n >> 16 & 0xff, n >> 8 & 0xff, n & 0xff, 1);
+}
+
+function rgba(r, g, b, a) {
+  if (a <= 0) r = g = b = NaN;
+  return new Rgb(r, g, b, a);
+}
+
+function rgbConvert(o) {
+  if (!(o instanceof Color)) o = color(o);
+  if (!o) return new Rgb;
+  o = o.rgb();
+  return new Rgb(o.r, o.g, o.b, o.opacity);
+}
+
+function color_rgb(r, g, b, opacity) {
+  return arguments.length === 1 ? rgbConvert(r) : new Rgb(r, g, b, opacity == null ? 1 : opacity);
+}
+
+function Rgb(r, g, b, opacity) {
+  this.r = +r;
+  this.g = +g;
+  this.b = +b;
+  this.opacity = +opacity;
+}
+
+src_define(Rgb, color_rgb, extend(Color, {
+  brighter: function(k) {
+    k = k == null ? brighter : Math.pow(brighter, k);
+    return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+  },
+  darker: function(k) {
+    k = k == null ? darker : Math.pow(darker, k);
+    return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+  },
+  rgb: function() {
+    return this;
+  },
+  displayable: function() {
+    return (-0.5 <= this.r && this.r < 255.5)
+        && (-0.5 <= this.g && this.g < 255.5)
+        && (-0.5 <= this.b && this.b < 255.5)
+        && (0 <= this.opacity && this.opacity <= 1);
+  },
+  hex: rgb_formatHex, // Deprecated! Use color.formatHex.
+  formatHex: rgb_formatHex,
+  formatRgb: rgb_formatRgb,
+  toString: rgb_formatRgb
+}));
+
+function rgb_formatHex() {
+  return "#" + hex(this.r) + hex(this.g) + hex(this.b);
+}
+
+function rgb_formatRgb() {
+  var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+  return (a === 1 ? "rgb(" : "rgba(")
+      + Math.max(0, Math.min(255, Math.round(this.r) || 0)) + ", "
+      + Math.max(0, Math.min(255, Math.round(this.g) || 0)) + ", "
+      + Math.max(0, Math.min(255, Math.round(this.b) || 0))
+      + (a === 1 ? ")" : ", " + a + ")");
+}
+
+function hex(value) {
+  value = Math.max(0, Math.min(255, Math.round(value) || 0));
+  return (value < 16 ? "0" : "") + value.toString(16);
+}
+
+function hsla(h, s, l, a) {
+  if (a <= 0) h = s = l = NaN;
+  else if (l <= 0 || l >= 1) h = s = NaN;
+  else if (s <= 0) h = NaN;
+  return new Hsl(h, s, l, a);
+}
+
+function hslConvert(o) {
+  if (o instanceof Hsl) return new Hsl(o.h, o.s, o.l, o.opacity);
+  if (!(o instanceof Color)) o = color(o);
+  if (!o) return new Hsl;
+  if (o instanceof Hsl) return o;
+  o = o.rgb();
+  var r = o.r / 255,
+      g = o.g / 255,
+      b = o.b / 255,
+      min = Math.min(r, g, b),
+      max = Math.max(r, g, b),
+      h = NaN,
+      s = max - min,
+      l = (max + min) / 2;
+  if (s) {
+    if (r === max) h = (g - b) / s + (g < b) * 6;
+    else if (g === max) h = (b - r) / s + 2;
+    else h = (r - g) / s + 4;
+    s /= l < 0.5 ? max + min : 2 - max - min;
+    h *= 60;
+  } else {
+    s = l > 0 && l < 1 ? 0 : h;
+  }
+  return new Hsl(h, s, l, o.opacity);
+}
+
+function hsl(h, s, l, opacity) {
+  return arguments.length === 1 ? hslConvert(h) : new Hsl(h, s, l, opacity == null ? 1 : opacity);
+}
+
+function Hsl(h, s, l, opacity) {
+  this.h = +h;
+  this.s = +s;
+  this.l = +l;
+  this.opacity = +opacity;
+}
+
+src_define(Hsl, hsl, extend(Color, {
+  brighter: function(k) {
+    k = k == null ? brighter : Math.pow(brighter, k);
+    return new Hsl(this.h, this.s, this.l * k, this.opacity);
+  },
+  darker: function(k) {
+    k = k == null ? darker : Math.pow(darker, k);
+    return new Hsl(this.h, this.s, this.l * k, this.opacity);
+  },
+  rgb: function() {
+    var h = this.h % 360 + (this.h < 0) * 360,
+        s = isNaN(h) || isNaN(this.s) ? 0 : this.s,
+        l = this.l,
+        m2 = l + (l < 0.5 ? l : 1 - l) * s,
+        m1 = 2 * l - m2;
+    return new Rgb(
+      hsl2rgb(h >= 240 ? h - 240 : h + 120, m1, m2),
+      hsl2rgb(h, m1, m2),
+      hsl2rgb(h < 120 ? h + 240 : h - 120, m1, m2),
+      this.opacity
+    );
+  },
+  displayable: function() {
+    return (0 <= this.s && this.s <= 1 || isNaN(this.s))
+        && (0 <= this.l && this.l <= 1)
+        && (0 <= this.opacity && this.opacity <= 1);
+  },
+  formatHsl: function() {
+    var a = this.opacity; a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+    return (a === 1 ? "hsl(" : "hsla(")
+        + (this.h || 0) + ", "
+        + (this.s || 0) * 100 + "%, "
+        + (this.l || 0) * 100 + "%"
+        + (a === 1 ? ")" : ", " + a + ")");
+  }
+}));
+
+/* From FvD 13.37, CSS Color Module Level 3 */
+function hsl2rgb(h, m1, m2) {
+  return (h < 60 ? m1 + (m2 - m1) * h / 60
+      : h < 180 ? m2
+      : h < 240 ? m1 + (m2 - m1) * (240 - h) / 60
+      : m1) * 255;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basis.js
+function basis(t1, v0, v1, v2, v3) {
+  var t2 = t1 * t1, t3 = t2 * t1;
+  return ((1 - 3 * t1 + 3 * t2 - t3) * v0
+      + (4 - 6 * t2 + 3 * t3) * v1
+      + (1 + 3 * t1 + 3 * t2 - 3 * t3) * v2
+      + t3 * v3) / 6;
+}
+
+/* harmony default export */ function src_basis(values) {
+  var n = values.length - 1;
+  return function(t) {
+    var i = t <= 0 ? (t = 0) : t >= 1 ? (t = 1, n - 1) : Math.floor(t * n),
+        v1 = values[i],
+        v2 = values[i + 1],
+        v0 = i > 0 ? values[i - 1] : 2 * v1 - v2,
+        v3 = i < n - 1 ? values[i + 2] : 2 * v2 - v1;
+    return basis((t - i / n) * n, v0, v1, v2, v3);
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basisClosed.js
+
+
+/* harmony default export */ function basisClosed(values) {
+  var n = values.length;
+  return function(t) {
+    var i = Math.floor(((t %= 1) < 0 ? ++t : t) * n),
+        v0 = values[(i + n - 1) % n],
+        v1 = values[i % n],
+        v2 = values[(i + 1) % n],
+        v3 = values[(i + 2) % n];
+    return basis((t - i / n) * n, v0, v1, v2, v3);
+  };
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/constant.js
+/* harmony default export */ const d3_interpolate_src_constant = (x => () => x);
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/color.js
+
+
+function linear(a, d) {
+  return function(t) {
+    return a + t * d;
+  };
+}
+
+function exponential(a, b, y) {
+  return a = Math.pow(a, y), b = Math.pow(b, y) - a, y = 1 / y, function(t) {
+    return Math.pow(a + t * b, y);
+  };
+}
+
+function hue(a, b) {
+  var d = b - a;
+  return d ? linear(a, d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d) : constant(isNaN(a) ? b : a);
+}
+
+function gamma(y) {
+  return (y = +y) === 1 ? nogamma : function(a, b) {
+    return b - a ? exponential(a, b, y) : d3_interpolate_src_constant(isNaN(a) ? b : a);
+  };
+}
+
+function nogamma(a, b) {
+  var d = b - a;
+  return d ? linear(a, d) : d3_interpolate_src_constant(isNaN(a) ? b : a);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/rgb.js
+
+
+
+
+
+/* harmony default export */ const rgb = ((function rgbGamma(y) {
+  var color = gamma(y);
+
+  function rgb(start, end) {
+    var r = color((start = color_rgb(start)).r, (end = color_rgb(end)).r),
+        g = color(start.g, end.g),
+        b = color(start.b, end.b),
+        opacity = nogamma(start.opacity, end.opacity);
+    return function(t) {
+      start.r = r(t);
+      start.g = g(t);
+      start.b = b(t);
+      start.opacity = opacity(t);
+      return start + "";
+    };
+  }
+
+  rgb.gamma = rgbGamma;
+
+  return rgb;
+})(1));
+
+function rgbSpline(spline) {
+  return function(colors) {
+    var n = colors.length,
+        r = new Array(n),
+        g = new Array(n),
+        b = new Array(n),
+        i, color;
+    for (i = 0; i < n; ++i) {
+      color = color_rgb(colors[i]);
+      r[i] = color.r || 0;
+      g[i] = color.g || 0;
+      b[i] = color.b || 0;
+    }
+    r = spline(r);
+    g = spline(g);
+    b = spline(b);
+    color.opacity = 1;
+    return function(t) {
+      color.r = r(t);
+      color.g = g(t);
+      color.b = b(t);
+      return color + "";
+    };
+  };
+}
+
+var rgbBasis = rgbSpline(src_basis);
+var rgbBasisClosed = rgbSpline(basisClosed);
+
+;// CONCATENATED MODULE: ../node_modules/d3-interpolate/src/string.js
+
+
+var reA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+    reB = new RegExp(reA.source, "g");
+
+function zero(b) {
+  return function() {
+    return b;
+  };
+}
+
+function one(b) {
+  return function(t) {
+    return b(t) + "";
+  };
+}
+
+/* harmony default export */ function string(a, b) {
+  var bi = reA.lastIndex = reB.lastIndex = 0, // scan index for next number in b
+      am, // current match in a
+      bm, // current match in b
+      bs, // string preceding current number in b, if any
+      i = -1, // index in s
+      s = [], // string constants and placeholders
+      q = []; // number interpolators
+
+  // Coerce inputs to strings.
+  a = a + "", b = b + "";
+
+  // Interpolate pairs of numbers in a & b.
+  while ((am = reA.exec(a))
+      && (bm = reB.exec(b))) {
+    if ((bs = bm.index) > bi) { // a string precedes the next number in b
+      bs = b.slice(bi, bs);
+      if (s[i]) s[i] += bs; // coalesce with previous string
+      else s[++i] = bs;
+    }
+    if ((am = am[0]) === (bm = bm[0])) { // numbers in a & b match
+      if (s[i]) s[i] += bm; // coalesce with previous string
+      else s[++i] = bm;
+    } else { // interpolate non-matching numbers
+      s[++i] = null;
+      q.push({i: i, x: number(am, bm)});
+    }
+    bi = reB.lastIndex;
+  }
+
+  // Add remains of b.
+  if (bi < b.length) {
+    bs = b.slice(bi);
+    if (s[i]) s[i] += bs; // coalesce with previous string
+    else s[++i] = bs;
+  }
+
+  // Special optimization for only a single match.
+  // Otherwise, interpolate each of the numbers and rejoin the string.
+  return s.length < 2 ? (q[0]
+      ? one(q[0].x)
+      : zero(b))
+      : (b = q.length, function(t) {
+          for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+          return s.join("");
+        });
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/interpolate.js
+
+
+
+/* harmony default export */ function interpolate(a, b) {
+  var c;
+  return (typeof b === "number" ? number
+      : b instanceof color ? rgb
+      : (c = color(b)) ? (b = c, rgb)
+      : string)(a, b);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attr.js
+
+
+
+
+
+function attr_attrRemove(name) {
+  return function() {
+    this.removeAttribute(name);
+  };
+}
+
+function attr_attrRemoveNS(fullname) {
+  return function() {
+    this.removeAttributeNS(fullname.space, fullname.local);
+  };
+}
+
+function attr_attrConstant(name, interpolate, value1) {
+  var string00,
+      string1 = value1 + "",
+      interpolate0;
+  return function() {
+    var string0 = this.getAttribute(name);
+    return string0 === string1 ? null
+        : string0 === string00 ? interpolate0
+        : interpolate0 = interpolate(string00 = string0, value1);
+  };
+}
+
+function attr_attrConstantNS(fullname, interpolate, value1) {
+  var string00,
+      string1 = value1 + "",
+      interpolate0;
+  return function() {
+    var string0 = this.getAttributeNS(fullname.space, fullname.local);
+    return string0 === string1 ? null
+        : string0 === string00 ? interpolate0
+        : interpolate0 = interpolate(string00 = string0, value1);
+  };
+}
+
+function attr_attrFunction(name, interpolate, value) {
+  var string00,
+      string10,
+      interpolate0;
+  return function() {
+    var string0, value1 = value(this), string1;
+    if (value1 == null) return void this.removeAttribute(name);
+    string0 = this.getAttribute(name);
+    string1 = value1 + "";
+    return string0 === string1 ? null
+        : string0 === string00 && string1 === string10 ? interpolate0
+        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
+  };
+}
+
+function attr_attrFunctionNS(fullname, interpolate, value) {
+  var string00,
+      string10,
+      interpolate0;
+  return function() {
+    var string0, value1 = value(this), string1;
+    if (value1 == null) return void this.removeAttributeNS(fullname.space, fullname.local);
+    string0 = this.getAttributeNS(fullname.space, fullname.local);
+    string1 = value1 + "";
+    return string0 === string1 ? null
+        : string0 === string00 && string1 === string10 ? interpolate0
+        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
+  };
+}
+
+/* harmony default export */ function transition_attr(name, value) {
+  var fullname = namespace(name), i = fullname === "transform" ? interpolateTransformSvg : interpolate;
+  return this.attrTween(name, typeof value === "function"
+      ? (fullname.local ? attr_attrFunctionNS : attr_attrFunction)(fullname, i, tweenValue(this, "attr." + name, value))
+      : value == null ? (fullname.local ? attr_attrRemoveNS : attr_attrRemove)(fullname)
+      : (fullname.local ? attr_attrConstantNS : attr_attrConstant)(fullname, i, value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attrTween.js
+
+
+function attrInterpolate(name, i) {
+  return function(t) {
+    this.setAttribute(name, i.call(this, t));
+  };
+}
+
+function attrInterpolateNS(fullname, i) {
+  return function(t) {
+    this.setAttributeNS(fullname.space, fullname.local, i.call(this, t));
+  };
+}
+
+function attrTweenNS(fullname, value) {
+  var t0, i0;
+  function tween() {
+    var i = value.apply(this, arguments);
+    if (i !== i0) t0 = (i0 = i) && attrInterpolateNS(fullname, i);
+    return t0;
+  }
+  tween._value = value;
+  return tween;
+}
+
+function attrTween(name, value) {
+  var t0, i0;
+  function tween() {
+    var i = value.apply(this, arguments);
+    if (i !== i0) t0 = (i0 = i) && attrInterpolate(name, i);
+    return t0;
+  }
+  tween._value = value;
+  return tween;
+}
+
+/* harmony default export */ function transition_attrTween(name, value) {
+  var key = "attr." + name;
+  if (arguments.length < 2) return (key = this.tween(key)) && key._value;
+  if (value == null) return this.tween(key, null);
+  if (typeof value !== "function") throw new Error;
+  var fullname = namespace(name);
+  return this.tween(key, (fullname.local ? attrTweenNS : attrTween)(fullname, value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/delay.js
+
+
+function delayFunction(id, value) {
+  return function() {
+    init(this, id).delay = +value.apply(this, arguments);
+  };
+}
+
+function delayConstant(id, value) {
+  return value = +value, function() {
+    init(this, id).delay = value;
+  };
+}
+
+/* harmony default export */ function delay(value) {
+  var id = this._id;
+
+  return arguments.length
+      ? this.each((typeof value === "function"
+          ? delayFunction
+          : delayConstant)(id, value))
+      : schedule_get(this.node(), id).delay;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/duration.js
+
+
+function durationFunction(id, value) {
+  return function() {
+    schedule_set(this, id).duration = +value.apply(this, arguments);
+  };
+}
+
+function durationConstant(id, value) {
+  return value = +value, function() {
+    schedule_set(this, id).duration = value;
+  };
+}
+
+/* harmony default export */ function duration(value) {
+  var id = this._id;
+
+  return arguments.length
+      ? this.each((typeof value === "function"
+          ? durationFunction
+          : durationConstant)(id, value))
+      : schedule_get(this.node(), id).duration;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/ease.js
+
+
+function easeConstant(id, value) {
+  if (typeof value !== "function") throw new Error;
+  return function() {
+    schedule_set(this, id).ease = value;
+  };
+}
+
+/* harmony default export */ function ease(value) {
+  var id = this._id;
+
+  return arguments.length
+      ? this.each(easeConstant(id, value))
+      : schedule_get(this.node(), id).ease;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/easeVarying.js
+
+
+function easeVarying(id, value) {
+  return function() {
+    var v = value.apply(this, arguments);
+    if (typeof v !== "function") throw new Error;
+    schedule_set(this, id).ease = v;
+  };
+}
+
+/* harmony default export */ function transition_easeVarying(value) {
+  if (typeof value !== "function") throw new Error;
+  return this.each(easeVarying(this._id, value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/filter.js
+
+
+
+/* harmony default export */ function transition_filter(match) {
+  if (typeof match !== "function") match = matcher(match);
+
+  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = [], node, i = 0; i < n; ++i) {
+      if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+        subgroup.push(node);
+      }
+    }
+  }
+
+  return new Transition(subgroups, this._parents, this._name, this._id);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/merge.js
+
+
+/* harmony default export */ function transition_merge(transition) {
+  if (transition._id !== this._id) throw new Error;
+
+  for (var groups0 = this._groups, groups1 = transition._groups, m0 = groups0.length, m1 = groups1.length, m = Math.min(m0, m1), merges = new Array(m0), j = 0; j < m; ++j) {
+    for (var group0 = groups0[j], group1 = groups1[j], n = group0.length, merge = merges[j] = new Array(n), node, i = 0; i < n; ++i) {
+      if (node = group0[i] || group1[i]) {
+        merge[i] = node;
+      }
+    }
+  }
+
+  for (; j < m0; ++j) {
+    merges[j] = groups0[j];
+  }
+
+  return new Transition(merges, this._parents, this._name, this._id);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/on.js
+
+
+function start(name) {
+  return (name + "").trim().split(/^|\s+/).every(function(t) {
+    var i = t.indexOf(".");
+    if (i >= 0) t = t.slice(0, i);
+    return !t || t === "start";
+  });
+}
+
+function onFunction(id, name, listener) {
+  var on0, on1, sit = start(name) ? init : schedule_set;
+  return function() {
+    var schedule = sit(this, id),
+        on = schedule.on;
+
+    // If this node shared a dispatch with the previous node,
+    // just assign the updated shared dispatch and we’re done!
+    // Otherwise, copy-on-write.
+    if (on !== on0) (on1 = (on0 = on).copy()).on(name, listener);
+
+    schedule.on = on1;
+  };
+}
+
+/* harmony default export */ function transition_on(name, listener) {
+  var id = this._id;
+
+  return arguments.length < 2
+      ? schedule_get(this.node(), id).on.on(name)
+      : this.each(onFunction(id, name, listener));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/remove.js
+function removeFunction(id) {
+  return function() {
+    var parent = this.parentNode;
+    for (var i in this.__transition) if (+i !== id) return;
+    if (parent) parent.removeChild(this);
+  };
+}
+
+/* harmony default export */ function transition_remove() {
+  return this.on("end.remove", removeFunction(this._id));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/select.js
+
+
+
+
+/* harmony default export */ function transition_select(select) {
+  var name = this._name,
+      id = this._id;
+
+  if (typeof select !== "function") select = selector(select);
+
+  for (var groups = this._groups, m = groups.length, subgroups = new Array(m), j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, subgroup = subgroups[j] = new Array(n), node, subnode, i = 0; i < n; ++i) {
+      if ((node = group[i]) && (subnode = select.call(node, node.__data__, i, group))) {
+        if ("__data__" in node) subnode.__data__ = node.__data__;
+        subgroup[i] = subnode;
+        schedule(subgroup[i], name, id, i, subgroup, schedule_get(node, id));
+      }
+    }
+  }
+
+  return new Transition(subgroups, this._parents, name, id);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selectAll.js
+
+
+
+
+/* harmony default export */ function transition_selectAll(select) {
+  var name = this._name,
+      id = this._id;
+
+  if (typeof select !== "function") select = selectorAll(select);
+
+  for (var groups = this._groups, m = groups.length, subgroups = [], parents = [], j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+      if (node = group[i]) {
+        for (var children = select.call(node, node.__data__, i, group), child, inherit = schedule_get(node, id), k = 0, l = children.length; k < l; ++k) {
+          if (child = children[k]) {
+            schedule(child, name, id, k, children, inherit);
+          }
+        }
+        subgroups.push(children);
+        parents.push(node);
+      }
+    }
+  }
+
+  return new Transition(subgroups, parents, name, id);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selection.js
+
+
+var selection_Selection = src_selection.prototype.constructor;
+
+/* harmony default export */ function transition_selection() {
+  return new selection_Selection(this._groups, this._parents);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/style.js
+
+
+
+
+
+
+function styleNull(name, interpolate) {
+  var string00,
+      string10,
+      interpolate0;
+  return function() {
+    var string0 = styleValue(this, name),
+        string1 = (this.style.removeProperty(name), styleValue(this, name));
+    return string0 === string1 ? null
+        : string0 === string00 && string1 === string10 ? interpolate0
+        : interpolate0 = interpolate(string00 = string0, string10 = string1);
+  };
+}
+
+function style_styleRemove(name) {
+  return function() {
+    this.style.removeProperty(name);
+  };
+}
+
+function style_styleConstant(name, interpolate, value1) {
+  var string00,
+      string1 = value1 + "",
+      interpolate0;
+  return function() {
+    var string0 = styleValue(this, name);
+    return string0 === string1 ? null
+        : string0 === string00 ? interpolate0
+        : interpolate0 = interpolate(string00 = string0, value1);
+  };
+}
+
+function style_styleFunction(name, interpolate, value) {
+  var string00,
+      string10,
+      interpolate0;
+  return function() {
+    var string0 = styleValue(this, name),
+        value1 = value(this),
+        string1 = value1 + "";
+    if (value1 == null) string1 = value1 = (this.style.removeProperty(name), styleValue(this, name));
+    return string0 === string1 ? null
+        : string0 === string00 && string1 === string10 ? interpolate0
+        : (string10 = string1, interpolate0 = interpolate(string00 = string0, value1));
+  };
+}
+
+function styleMaybeRemove(id, name) {
+  var on0, on1, listener0, key = "style." + name, event = "end." + key, remove;
+  return function() {
+    var schedule = schedule_set(this, id),
+        on = schedule.on,
+        listener = schedule.value[key] == null ? remove || (remove = style_styleRemove(name)) : undefined;
+
+    // If this node shared a dispatch with the previous node,
+    // just assign the updated shared dispatch and we’re done!
+    // Otherwise, copy-on-write.
+    if (on !== on0 || listener0 !== listener) (on1 = (on0 = on).copy()).on(event, listener0 = listener);
+
+    schedule.on = on1;
+  };
+}
+
+/* harmony default export */ function transition_style(name, value, priority) {
+  var i = (name += "") === "transform" ? interpolateTransformCss : interpolate;
+  return value == null ? this
+      .styleTween(name, styleNull(name, i))
+      .on("end.style." + name, style_styleRemove(name))
+    : typeof value === "function" ? this
+      .styleTween(name, style_styleFunction(name, i, tweenValue(this, "style." + name, value)))
+      .each(styleMaybeRemove(this._id, name))
+    : this
+      .styleTween(name, style_styleConstant(name, i, value), priority)
+      .on("end.style." + name, null);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/styleTween.js
+function styleInterpolate(name, i, priority) {
+  return function(t) {
+    this.style.setProperty(name, i.call(this, t), priority);
+  };
+}
+
+function styleTween(name, value, priority) {
+  var t, i0;
+  function tween() {
+    var i = value.apply(this, arguments);
+    if (i !== i0) t = (i0 = i) && styleInterpolate(name, i, priority);
+    return t;
+  }
+  tween._value = value;
+  return tween;
+}
+
+/* harmony default export */ function transition_styleTween(name, value, priority) {
+  var key = "style." + (name += "");
+  if (arguments.length < 2) return (key = this.tween(key)) && key._value;
+  if (value == null) return this.tween(key, null);
+  if (typeof value !== "function") throw new Error;
+  return this.tween(key, styleTween(name, value, priority == null ? "" : priority));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/text.js
+
+
+function text_textConstant(value) {
+  return function() {
+    this.textContent = value;
+  };
+}
+
+function text_textFunction(value) {
+  return function() {
+    var value1 = value(this);
+    this.textContent = value1 == null ? "" : value1;
+  };
+}
+
+/* harmony default export */ function transition_text(value) {
+  return this.tween("text", typeof value === "function"
+      ? text_textFunction(tweenValue(this, "text", value))
+      : text_textConstant(value == null ? "" : value + ""));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/textTween.js
+function textInterpolate(i) {
+  return function(t) {
+    this.textContent = i.call(this, t);
+  };
+}
+
+function textTween(value) {
+  var t0, i0;
+  function tween() {
+    var i = value.apply(this, arguments);
+    if (i !== i0) t0 = (i0 = i) && textInterpolate(i);
+    return t0;
+  }
+  tween._value = value;
+  return tween;
+}
+
+/* harmony default export */ function transition_textTween(value) {
+  var key = "text";
+  if (arguments.length < 1) return (key = this.tween(key)) && key._value;
+  if (value == null) return this.tween(key, null);
+  if (typeof value !== "function") throw new Error;
+  return this.tween(key, textTween(value));
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/transition.js
+
+
+
+/* harmony default export */ function transition() {
+  var name = this._name,
+      id0 = this._id,
+      id1 = newId();
+
+  for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+      if (node = group[i]) {
+        var inherit = schedule_get(node, id0);
+        schedule(node, name, id1, i, group, {
+          time: inherit.time + inherit.delay + inherit.duration,
+          delay: 0,
+          duration: inherit.duration,
+          ease: inherit.ease
+        });
+      }
+    }
+  }
+
+  return new Transition(groups, this._parents, name, id1);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/end.js
+
+
+/* harmony default export */ function end() {
+  var on0, on1, that = this, id = that._id, size = that.size();
+  return new Promise(function(resolve, reject) {
+    var cancel = {value: reject},
+        end = {value: function() { if (--size === 0) resolve(); }};
+
+    that.each(function() {
+      var schedule = schedule_set(this, id),
+          on = schedule.on;
+
+      // If this node shared a dispatch with the previous node,
+      // just assign the updated shared dispatch and we’re done!
+      // Otherwise, copy-on-write.
+      if (on !== on0) {
+        on1 = (on0 = on).copy();
+        on1._.cancel.push(cancel);
+        on1._.interrupt.push(cancel);
+        on1._.end.push(end);
+      }
+
+      schedule.on = on1;
+    });
+
+    // The selection was empty, resolve end immediately
+    if (size === 0) resolve();
+  });
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/index.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var id = 0;
+
+function Transition(groups, parents, name, id) {
+  this._groups = groups;
+  this._parents = parents;
+  this._name = name;
+  this._id = id;
+}
+
+function transition_transition(name) {
+  return src_selection().transition(name);
+}
+
+function newId() {
+  return ++id;
+}
+
+var selection_prototype = src_selection.prototype;
+
+Transition.prototype = transition_transition.prototype = {
+  constructor: Transition,
+  select: transition_select,
+  selectAll: transition_selectAll,
+  selectChild: selection_prototype.selectChild,
+  selectChildren: selection_prototype.selectChildren,
+  filter: transition_filter,
+  merge: transition_merge,
+  selection: transition_selection,
+  transition: transition,
+  call: selection_prototype.call,
+  nodes: selection_prototype.nodes,
+  node: selection_prototype.node,
+  size: selection_prototype.size,
+  empty: selection_prototype.empty,
+  each: selection_prototype.each,
+  on: transition_on,
+  attr: transition_attr,
+  attrTween: transition_attrTween,
+  style: transition_style,
+  styleTween: transition_styleTween,
+  text: transition_text,
+  textTween: transition_textTween,
+  remove: transition_remove,
+  tween: tween,
+  delay: delay,
+  duration: duration,
+  ease: ease,
+  easeVarying: transition_easeVarying,
+  end: end,
+  [Symbol.iterator]: selection_prototype[Symbol.iterator]
+};
+
+;// CONCATENATED MODULE: ../node_modules/d3-ease/src/cubic.js
+function cubicIn(t) {
+  return t * t * t;
+}
+
+function cubicOut(t) {
+  return --t * t * t + 1;
+}
+
+function cubicInOut(t) {
+  return ((t *= 2) <= 1 ? t * t * t : (t -= 2) * t * t + 2) / 2;
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/transition.js
+
+
+
+
+
+var defaultTiming = {
+  time: null, // Set on use.
+  delay: 0,
+  duration: 250,
+  ease: cubicInOut
+};
+
+function inherit(node, id) {
+  var timing;
+  while (!(timing = node.__transition) || !(timing = timing[id])) {
+    if (!(node = node.parentNode)) {
+      throw new Error(`transition ${id} not found`);
+    }
+  }
+  return timing;
+}
+
+/* harmony default export */ function selection_transition(name) {
+  var id,
+      timing;
+
+  if (name instanceof Transition) {
+    id = name._id, name = name._name;
+  } else {
+    id = newId(), (timing = defaultTiming).time = now(), name = name == null ? null : name + "";
+  }
+
+  for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
+    for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+      if (node = group[i]) {
+        schedule(node, name, id, i, group, timing || inherit(node, id));
+      }
+    }
+  }
+
+  return new Transition(groups, this._parents, name, id);
+}
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/index.js
+
+
+
+
+src_selection.prototype.interrupt = selection_interrupt;
+src_selection.prototype.transition = selection_transition;
+
+;// CONCATENATED MODULE: ../node_modules/d3-transition/src/index.js
+
+
+
+
+
+;// CONCATENATED MODULE: ./tooltip.js
+/* global event */
+
+
+
+
+
+
+function defaultLabel (d) {
+    return d.data.name
+}
+
+function defaultFlamegraphTooltip () {
+    var rootElement = src_select('body')
+    var tooltip = null
+    // Function to get HTML content from data.
+    var html = defaultLabel
+    // Function to get text content from data.
+    var text = defaultLabel
+    // Whether to use d3's .html() to set content, otherwise use .text().
+    var contentIsHTML = false
+
+    function tip () {
+        tooltip = rootElement
+            .append('div')
+            .style('display', 'none')
+            .style('position', 'absolute')
+            .style('opacity', 0)
+            .style('pointer-events', 'none')
+            .attr('class', 'd3-flame-graph-tip')
+    }
+
+    tip.show = function (d) {
+        tooltip
+            .style('display', 'block')
+            .style('left', event.pageX + 5 + 'px')
+            .style('top', event.pageY + 5 + 'px')
+            .transition()
+            .duration(200)
+            .style('opacity', 1)
+            .style('pointer-events', 'all')
+
+        if (contentIsHTML) {
+            tooltip.html(html(d))
+        } else {
+            tooltip.text(text(d))
+        }
+
+        return tip
+    }
+
+    tip.hide = function () {
+        tooltip
+            .style('display', 'none')
+            .transition()
+            .duration(200)
+            .style('opacity', 0)
+            .style('pointer-events', 'none')
+
+        return tip
+    }
+
+    /**
+     * Gets/sets a function converting the d3 data into the tooltip's textContent.
+     *
+     * Cannot be combined with tip.html().
+     */
+    tip.text = function (_) {
+        if (!arguments.length) return text
+        text = _
+        contentIsHTML = false
+        return tip
+    }
+
+    /**
+     * Gets/sets a function converting the d3 data into the tooltip's innerHTML.
+     *
+     * Cannot be combined with tip.text().
+     *
+     * @deprecated prefer tip.text().
+     */
+    tip.html = function (_) {
+        if (!arguments.length) return html
+        html = _
+        contentIsHTML = true
+        return tip
+    }
+
+    tip.destroy = function () {
+        tooltip.remove()
+    }
+
+    return tip
+}
+
+/******/ 	return __webpack_exports__;
+/******/ })()
+;
+});
\ No newline at end of file
diff --git a/development/charts/flamegraph/lib/d3-flamegraph.css b/development/charts/flamegraph/lib/d3-flamegraph.css
new file mode 100644
index 000000000000..fa6f345ff7a9
--- /dev/null
+++ b/development/charts/flamegraph/lib/d3-flamegraph.css
@@ -0,0 +1,46 @@
+.d3-flame-graph rect {
+  stroke: #EEEEEE;
+  fill-opacity: .8;
+}
+
+.d3-flame-graph rect:hover {
+  stroke: #474747;
+  stroke-width: 0.5;
+  cursor: pointer;
+}
+
+.d3-flame-graph-label {
+  pointer-events: none;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  font-size: 12px;
+  font-family: Verdana;
+  margin-left: 4px;
+  margin-right: 4px;
+  line-height: 1.5;
+  padding: 0 0 0;
+  font-weight: 400;
+  color: black;
+  text-align: left;
+}
+
+.d3-flame-graph .fade {
+  opacity: 0.6 !important;
+}
+
+.d3-flame-graph .title {
+  font-size: 20px;
+  font-family: Verdana;
+}
+
+.d3-flame-graph-tip {
+    background-color: black;
+    border: none;
+    border-radius: 3px;
+    padding: 5px 10px 5px 10px;
+    min-width: 250px;
+    text-align: left;
+    color: white;
+    z-index: 10;
+}
\ No newline at end of file
diff --git a/development/charts/flamegraph/lib/d3-flamegraph.js b/development/charts/flamegraph/lib/d3-flamegraph.js
new file mode 100644
index 000000000000..eabb2c44972c
--- /dev/null
+++ b/development/charts/flamegraph/lib/d3-flamegraph.js
@@ -0,0 +1,5719 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+  if (typeof exports === 'object' && typeof module === 'object')
+    module.exports = factory();
+  else if (typeof define === 'function' && define.amd) define([], factory);
+  else if (typeof exports === 'object') exports['flamegraph'] = factory();
+  else root['flamegraph'] = factory();
+})(self, function () {
+  return /******/ (() => {
+    // webpackBootstrap
+    /******/ 'use strict'; // The require scope
+    /******/ /******/ var __webpack_require__ = {}; /* webpack/runtime/define property getters */
+    /******/
+    /************************************************************************/
+    /******/ /******/ (() => {
+      /******/ // define getter functions for harmony exports
+      /******/ __webpack_require__.d = (exports, definition) => {
+        /******/ for (var key in definition) {
+          /******/ if (
+            __webpack_require__.o(definition, key) &&
+            !__webpack_require__.o(exports, key)
+          ) {
+            /******/ Object.defineProperty(exports, key, {
+              enumerable: true,
+              get: definition[key],
+            });
+            /******/
+          }
+          /******/
+        }
+        /******/
+      };
+      /******/
+    })(); /* webpack/runtime/hasOwnProperty shorthand */
+    /******/
+    /******/ /******/ (() => {
+      /******/ __webpack_require__.o = (obj, prop) =>
+        Object.prototype.hasOwnProperty.call(obj, prop);
+      /******/
+    })();
+    /******/
+    /************************************************************************/
+    var __webpack_exports__ = {};
+
+    // EXPORTS
+    __webpack_require__.d(__webpack_exports__, {
+      default: () => /* binding */ flamegraph,
+    }); // CONCATENATED MODULE: ../node_modules/d3-selection/src/selector.js
+
+    function none() {}
+
+    /* harmony default export */ function selector(selector) {
+      return selector == null
+        ? none
+        : function () {
+            return this.querySelector(selector);
+          };
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/select.js
+
+    /* harmony default export */ function selection_select(select) {
+      if (typeof select !== 'function') select = selector(select);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group = groups[j],
+            n = group.length,
+            subgroup = (subgroups[j] = new Array(n)),
+            node,
+            subnode,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if (
+            (node = group[i]) &&
+            (subnode = select.call(node, node.__data__, i, group))
+          ) {
+            if ('__data__' in node) subnode.__data__ = node.__data__;
+            subgroup[i] = subnode;
+          }
+        }
+      }
+
+      return new Selection(subgroups, this._parents);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/array.js
+
+    // Given something array like (or null), returns something that is strictly an
+    // array. This is used to ensure that array-like objects passed to d3.selectAll
+    // or selection.selectAll are converted into proper arrays when creating a
+    // selection; we don’t ever want to create a selection backed by a live
+    // HTMLCollection or NodeList. However, note that selection.selectAll will use a
+    // static NodeList as a group, since it safely derived from querySelectorAll.
+    function array(x) {
+      return x == null ? [] : Array.isArray(x) ? x : Array.from(x);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selectorAll.js
+
+    function empty() {
+      return [];
+    }
+
+    /* harmony default export */ function selectorAll(selector) {
+      return selector == null
+        ? empty
+        : function () {
+            return this.querySelectorAll(selector);
+          };
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectAll.js
+
+    function arrayAll(select) {
+      return function () {
+        return array(select.apply(this, arguments));
+      };
+    }
+
+    /* harmony default export */ function selectAll(select) {
+      if (typeof select === 'function') select = arrayAll(select);
+      else select = selectorAll(select);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = [],
+          parents = [],
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+          if ((node = group[i])) {
+            subgroups.push(select.call(node, node.__data__, i, group));
+            parents.push(node);
+          }
+        }
+      }
+
+      return new Selection(subgroups, parents);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/matcher.js
+
+    /* harmony default export */ function matcher(selector) {
+      return function () {
+        return this.matches(selector);
+      };
+    }
+
+    function childMatcher(selector) {
+      return function (node) {
+        return node.matches(selector);
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChild.js
+
+    var find = Array.prototype.find;
+
+    function childFind(match) {
+      return function () {
+        return find.call(this.children, match);
+      };
+    }
+
+    function childFirst() {
+      return this.firstElementChild;
+    }
+
+    /* harmony default export */ function selectChild(match) {
+      return this.select(
+        match == null
+          ? childFirst
+          : childFind(
+              typeof match === 'function' ? match : childMatcher(match),
+            ),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/selectChildren.js
+
+    var filter = Array.prototype.filter;
+
+    function children() {
+      return Array.from(this.children);
+    }
+
+    function childrenFilter(match) {
+      return function () {
+        return filter.call(this.children, match);
+      };
+    }
+
+    /* harmony default export */ function selectChildren(match) {
+      return this.selectAll(
+        match == null
+          ? children
+          : childrenFilter(
+              typeof match === 'function' ? match : childMatcher(match),
+            ),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/filter.js
+
+    /* harmony default export */ function selection_filter(match) {
+      if (typeof match !== 'function') match = matcher(match);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group = groups[j],
+            n = group.length,
+            subgroup = (subgroups[j] = []),
+            node,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+            subgroup.push(node);
+          }
+        }
+      }
+
+      return new Selection(subgroups, this._parents);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sparse.js
+
+    /* harmony default export */ function sparse(update) {
+      return new Array(update.length);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/enter.js
+
+    /* harmony default export */ function enter() {
+      return new Selection(
+        this._enter || this._groups.map(sparse),
+        this._parents,
+      );
+    }
+
+    function EnterNode(parent, datum) {
+      this.ownerDocument = parent.ownerDocument;
+      this.namespaceURI = parent.namespaceURI;
+      this._next = null;
+      this._parent = parent;
+      this.__data__ = datum;
+    }
+
+    EnterNode.prototype = {
+      constructor: EnterNode,
+      appendChild: function (child) {
+        return this._parent.insertBefore(child, this._next);
+      },
+      insertBefore: function (child, next) {
+        return this._parent.insertBefore(child, next);
+      },
+      querySelector: function (selector) {
+        return this._parent.querySelector(selector);
+      },
+      querySelectorAll: function (selector) {
+        return this._parent.querySelectorAll(selector);
+      },
+    }; // CONCATENATED MODULE: ../node_modules/d3-selection/src/constant.js
+
+    /* harmony default export */ function src_constant(x) {
+      return function () {
+        return x;
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/data.js
+
+    function bindIndex(parent, group, enter, update, exit, data) {
+      var i = 0,
+        node,
+        groupLength = group.length,
+        dataLength = data.length;
+
+      // Put any non-null nodes that fit into update.
+      // Put any null nodes into enter.
+      // Put any remaining data into enter.
+      for (; i < dataLength; ++i) {
+        if ((node = group[i])) {
+          node.__data__ = data[i];
+          update[i] = node;
+        } else {
+          enter[i] = new EnterNode(parent, data[i]);
+        }
+      }
+
+      // Put any non-null nodes that don’t fit into exit.
+      for (; i < groupLength; ++i) {
+        if ((node = group[i])) {
+          exit[i] = node;
+        }
+      }
+    }
+
+    function bindKey(parent, group, enter, update, exit, data, key) {
+      var i,
+        node,
+        nodeByKeyValue = new Map(),
+        groupLength = group.length,
+        dataLength = data.length,
+        keyValues = new Array(groupLength),
+        keyValue;
+
+      // Compute the key for each node.
+      // If multiple nodes have the same key, the duplicates are added to exit.
+      for (i = 0; i < groupLength; ++i) {
+        if ((node = group[i])) {
+          keyValues[i] = keyValue =
+            key.call(node, node.__data__, i, group) + '';
+          if (nodeByKeyValue.has(keyValue)) {
+            exit[i] = node;
+          } else {
+            nodeByKeyValue.set(keyValue, node);
+          }
+        }
+      }
+
+      // Compute the key for each datum.
+      // If there a node associated with this key, join and add it to update.
+      // If there is not (or the key is a duplicate), add it to enter.
+      for (i = 0; i < dataLength; ++i) {
+        keyValue = key.call(parent, data[i], i, data) + '';
+        if ((node = nodeByKeyValue.get(keyValue))) {
+          update[i] = node;
+          node.__data__ = data[i];
+          nodeByKeyValue.delete(keyValue);
+        } else {
+          enter[i] = new EnterNode(parent, data[i]);
+        }
+      }
+
+      // Add any remaining nodes that were not bound to data to exit.
+      for (i = 0; i < groupLength; ++i) {
+        if ((node = group[i]) && nodeByKeyValue.get(keyValues[i]) === node) {
+          exit[i] = node;
+        }
+      }
+    }
+
+    function datum(node) {
+      return node.__data__;
+    }
+
+    /* harmony default export */ function data(value, key) {
+      if (!arguments.length) return Array.from(this, datum);
+
+      var bind = key ? bindKey : bindIndex,
+        parents = this._parents,
+        groups = this._groups;
+
+      if (typeof value !== 'function') value = src_constant(value);
+
+      for (
+        var m = groups.length,
+          update = new Array(m),
+          enter = new Array(m),
+          exit = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        var parent = parents[j],
+          group = groups[j],
+          groupLength = group.length,
+          data = arraylike(
+            value.call(parent, parent && parent.__data__, j, parents),
+          ),
+          dataLength = data.length,
+          enterGroup = (enter[j] = new Array(dataLength)),
+          updateGroup = (update[j] = new Array(dataLength)),
+          exitGroup = (exit[j] = new Array(groupLength));
+
+        bind(parent, group, enterGroup, updateGroup, exitGroup, data, key);
+
+        // Now connect the enter nodes to their following update node, such that
+        // appendChild can insert the materialized enter node before this node,
+        // rather than at the end of the parent node.
+        for (var i0 = 0, i1 = 0, previous, next; i0 < dataLength; ++i0) {
+          if ((previous = enterGroup[i0])) {
+            if (i0 >= i1) i1 = i0 + 1;
+            while (!(next = updateGroup[i1]) && ++i1 < dataLength);
+            previous._next = next || null;
+          }
+        }
+      }
+
+      update = new Selection(update, parents);
+      update._enter = enter;
+      update._exit = exit;
+      return update;
+    }
+
+    // Given some data, this returns an array-like view of it: an object that
+    // exposes a length property and allows numeric indexing. Note that unlike
+    // selectAll, this isn’t worried about “live” collections because the resulting
+    // array will only be used briefly while data is being bound. (It is possible to
+    // cause the data to change while iterating by using a key function, but please
+    // don’t; we’d rather avoid a gratuitous copy.)
+    function arraylike(data) {
+      return typeof data === 'object' && 'length' in data
+        ? data // Array, TypedArray, NodeList, array-like
+        : Array.from(data); // Map, Set, iterable, string, or anything else
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/exit.js
+
+    /* harmony default export */ function exit() {
+      return new Selection(
+        this._exit || this._groups.map(sparse),
+        this._parents,
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/join.js
+
+    /* harmony default export */ function join(onenter, onupdate, onexit) {
+      var enter = this.enter(),
+        update = this,
+        exit = this.exit();
+      if (typeof onenter === 'function') {
+        enter = onenter(enter);
+        if (enter) enter = enter.selection();
+      } else {
+        enter = enter.append(onenter + '');
+      }
+      if (onupdate != null) {
+        update = onupdate(update);
+        if (update) update = update.selection();
+      }
+      if (onexit == null) exit.remove();
+      else onexit(exit);
+      return enter && update ? enter.merge(update).order() : update;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/merge.js
+
+    /* harmony default export */ function merge(context) {
+      var selection = context.selection ? context.selection() : context;
+
+      for (
+        var groups0 = this._groups,
+          groups1 = selection._groups,
+          m0 = groups0.length,
+          m1 = groups1.length,
+          m = Math.min(m0, m1),
+          merges = new Array(m0),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group0 = groups0[j],
+            group1 = groups1[j],
+            n = group0.length,
+            merge = (merges[j] = new Array(n)),
+            node,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if ((node = group0[i] || group1[i])) {
+            merge[i] = node;
+          }
+        }
+      }
+
+      for (; j < m0; ++j) {
+        merges[j] = groups0[j];
+      }
+
+      return new Selection(merges, this._parents);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/order.js
+
+    /* harmony default export */ function order() {
+      for (var groups = this._groups, j = -1, m = groups.length; ++j < m; ) {
+        for (
+          var group = groups[j], i = group.length - 1, next = group[i], node;
+          --i >= 0;
+
+        ) {
+          if ((node = group[i])) {
+            if (next && node.compareDocumentPosition(next) ^ 4)
+              next.parentNode.insertBefore(node, next);
+            next = node;
+          }
+        }
+      }
+
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/sort.js
+
+    /* harmony default export */ function sort(compare) {
+      if (!compare) compare = ascending;
+
+      function compareNode(a, b) {
+        return a && b ? compare(a.__data__, b.__data__) : !a - !b;
+      }
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          sortgroups = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group = groups[j],
+            n = group.length,
+            sortgroup = (sortgroups[j] = new Array(n)),
+            node,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if ((node = group[i])) {
+            sortgroup[i] = node;
+          }
+        }
+        sortgroup.sort(compareNode);
+      }
+
+      return new Selection(sortgroups, this._parents).order();
+    }
+
+    function ascending(a, b) {
+      return a < b ? -1 : a > b ? 1 : a >= b ? 0 : NaN;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/call.js
+
+    /* harmony default export */ function call() {
+      var callback = arguments[0];
+      arguments[0] = this;
+      callback.apply(null, arguments);
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/nodes.js
+
+    /* harmony default export */ function nodes() {
+      return Array.from(this);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/node.js
+
+    /* harmony default export */ function node() {
+      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+        for (var group = groups[j], i = 0, n = group.length; i < n; ++i) {
+          var node = group[i];
+          if (node) return node;
+        }
+      }
+
+      return null;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/size.js
+
+    /* harmony default export */ function size() {
+      let size = 0;
+      for (const node of this) ++size; // eslint-disable-line no-unused-vars
+      return size;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/empty.js
+
+    /* harmony default export */ function selection_empty() {
+      return !this.node();
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/each.js
+
+    /* harmony default export */ function each(callback) {
+      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+        for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
+          if ((node = group[i])) callback.call(node, node.__data__, i, group);
+        }
+      }
+
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/namespaces.js
+
+    var xhtml = 'http://www.w3.org/1999/xhtml';
+
+    /* harmony default export */ const namespaces = {
+      svg: 'http://www.w3.org/2000/svg',
+      xhtml: xhtml,
+      xlink: 'http://www.w3.org/1999/xlink',
+      xml: 'http://www.w3.org/XML/1998/namespace',
+      xmlns: 'http://www.w3.org/2000/xmlns/',
+    }; // CONCATENATED MODULE: ../node_modules/d3-selection/src/namespace.js
+
+    /* harmony default export */ function namespace(name) {
+      var prefix = (name += ''),
+        i = prefix.indexOf(':');
+      if (i >= 0 && (prefix = name.slice(0, i)) !== 'xmlns')
+        name = name.slice(i + 1);
+      return namespaces.hasOwnProperty(prefix)
+        ? { space: namespaces[prefix], local: name }
+        : name; // eslint-disable-line no-prototype-builtins
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/attr.js
+
+    function attrRemove(name) {
+      return function () {
+        this.removeAttribute(name);
+      };
+    }
+
+    function attrRemoveNS(fullname) {
+      return function () {
+        this.removeAttributeNS(fullname.space, fullname.local);
+      };
+    }
+
+    function attrConstant(name, value) {
+      return function () {
+        this.setAttribute(name, value);
+      };
+    }
+
+    function attrConstantNS(fullname, value) {
+      return function () {
+        this.setAttributeNS(fullname.space, fullname.local, value);
+      };
+    }
+
+    function attrFunction(name, value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        if (v == null) this.removeAttribute(name);
+        else this.setAttribute(name, v);
+      };
+    }
+
+    function attrFunctionNS(fullname, value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        if (v == null) this.removeAttributeNS(fullname.space, fullname.local);
+        else this.setAttributeNS(fullname.space, fullname.local, v);
+      };
+    }
+
+    /* harmony default export */ function attr(name, value) {
+      var fullname = namespace(name);
+
+      if (arguments.length < 2) {
+        var node = this.node();
+        return fullname.local
+          ? node.getAttributeNS(fullname.space, fullname.local)
+          : node.getAttribute(fullname);
+      }
+
+      return this.each(
+        (value == null
+          ? fullname.local
+            ? attrRemoveNS
+            : attrRemove
+          : typeof value === 'function'
+          ? fullname.local
+            ? attrFunctionNS
+            : attrFunction
+          : fullname.local
+          ? attrConstantNS
+          : attrConstant)(fullname, value),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/window.js
+
+    /* harmony default export */ function src_window(node) {
+      return (
+        (node.ownerDocument && node.ownerDocument.defaultView) || // node is a Node
+        (node.document && node) || // node is a Window
+        node.defaultView
+      ); // node is a Document
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/style.js
+
+    function styleRemove(name) {
+      return function () {
+        this.style.removeProperty(name);
+      };
+    }
+
+    function styleConstant(name, value, priority) {
+      return function () {
+        this.style.setProperty(name, value, priority);
+      };
+    }
+
+    function styleFunction(name, value, priority) {
+      return function () {
+        var v = value.apply(this, arguments);
+        if (v == null) this.style.removeProperty(name);
+        else this.style.setProperty(name, v, priority);
+      };
+    }
+
+    /* harmony default export */ function style(name, value, priority) {
+      return arguments.length > 1
+        ? this.each(
+            (value == null
+              ? styleRemove
+              : typeof value === 'function'
+              ? styleFunction
+              : styleConstant)(name, value, priority == null ? '' : priority),
+          )
+        : styleValue(this.node(), name);
+    }
+
+    function styleValue(node, name) {
+      return (
+        node.style.getPropertyValue(name) ||
+        src_window(node).getComputedStyle(node, null).getPropertyValue(name)
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/property.js
+
+    function propertyRemove(name) {
+      return function () {
+        delete this[name];
+      };
+    }
+
+    function propertyConstant(name, value) {
+      return function () {
+        this[name] = value;
+      };
+    }
+
+    function propertyFunction(name, value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        if (v == null) delete this[name];
+        else this[name] = v;
+      };
+    }
+
+    /* harmony default export */ function property(name, value) {
+      return arguments.length > 1
+        ? this.each(
+            (value == null
+              ? propertyRemove
+              : typeof value === 'function'
+              ? propertyFunction
+              : propertyConstant)(name, value),
+          )
+        : this.node()[name];
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/classed.js
+
+    function classArray(string) {
+      return string.trim().split(/^|\s+/);
+    }
+
+    function classList(node) {
+      return node.classList || new ClassList(node);
+    }
+
+    function ClassList(node) {
+      this._node = node;
+      this._names = classArray(node.getAttribute('class') || '');
+    }
+
+    ClassList.prototype = {
+      add: function (name) {
+        var i = this._names.indexOf(name);
+        if (i < 0) {
+          this._names.push(name);
+          this._node.setAttribute('class', this._names.join(' '));
+        }
+      },
+      remove: function (name) {
+        var i = this._names.indexOf(name);
+        if (i >= 0) {
+          this._names.splice(i, 1);
+          this._node.setAttribute('class', this._names.join(' '));
+        }
+      },
+      contains: function (name) {
+        return this._names.indexOf(name) >= 0;
+      },
+    };
+
+    function classedAdd(node, names) {
+      var list = classList(node),
+        i = -1,
+        n = names.length;
+      while (++i < n) list.add(names[i]);
+    }
+
+    function classedRemove(node, names) {
+      var list = classList(node),
+        i = -1,
+        n = names.length;
+      while (++i < n) list.remove(names[i]);
+    }
+
+    function classedTrue(names) {
+      return function () {
+        classedAdd(this, names);
+      };
+    }
+
+    function classedFalse(names) {
+      return function () {
+        classedRemove(this, names);
+      };
+    }
+
+    function classedFunction(names, value) {
+      return function () {
+        (value.apply(this, arguments) ? classedAdd : classedRemove)(
+          this,
+          names,
+        );
+      };
+    }
+
+    /* harmony default export */ function classed(name, value) {
+      var names = classArray(name + '');
+
+      if (arguments.length < 2) {
+        var list = classList(this.node()),
+          i = -1,
+          n = names.length;
+        while (++i < n) if (!list.contains(names[i])) return false;
+        return true;
+      }
+
+      return this.each(
+        (typeof value === 'function'
+          ? classedFunction
+          : value
+          ? classedTrue
+          : classedFalse)(names, value),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/text.js
+
+    function textRemove() {
+      this.textContent = '';
+    }
+
+    function textConstant(value) {
+      return function () {
+        this.textContent = value;
+      };
+    }
+
+    function textFunction(value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        this.textContent = v == null ? '' : v;
+      };
+    }
+
+    /* harmony default export */ function selection_text(value) {
+      return arguments.length
+        ? this.each(
+            value == null
+              ? textRemove
+              : (typeof value === 'function' ? textFunction : textConstant)(
+                  value,
+                ),
+          )
+        : this.node().textContent;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/html.js
+
+    function htmlRemove() {
+      this.innerHTML = '';
+    }
+
+    function htmlConstant(value) {
+      return function () {
+        this.innerHTML = value;
+      };
+    }
+
+    function htmlFunction(value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        this.innerHTML = v == null ? '' : v;
+      };
+    }
+
+    /* harmony default export */ function html(value) {
+      return arguments.length
+        ? this.each(
+            value == null
+              ? htmlRemove
+              : (typeof value === 'function' ? htmlFunction : htmlConstant)(
+                  value,
+                ),
+          )
+        : this.node().innerHTML;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/raise.js
+
+    function raise() {
+      if (this.nextSibling) this.parentNode.appendChild(this);
+    }
+
+    /* harmony default export */ function selection_raise() {
+      return this.each(raise);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/lower.js
+
+    function lower() {
+      if (this.previousSibling)
+        this.parentNode.insertBefore(this, this.parentNode.firstChild);
+    }
+
+    /* harmony default export */ function selection_lower() {
+      return this.each(lower);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/creator.js
+
+    function creatorInherit(name) {
+      return function () {
+        var document = this.ownerDocument,
+          uri = this.namespaceURI;
+        return uri === xhtml && document.documentElement.namespaceURI === xhtml
+          ? document.createElement(name)
+          : document.createElementNS(uri, name);
+      };
+    }
+
+    function creatorFixed(fullname) {
+      return function () {
+        return this.ownerDocument.createElementNS(
+          fullname.space,
+          fullname.local,
+        );
+      };
+    }
+
+    /* harmony default export */ function creator(name) {
+      var fullname = namespace(name);
+      return (fullname.local ? creatorFixed : creatorInherit)(fullname);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/append.js
+
+    /* harmony default export */ function append(name) {
+      var create = typeof name === 'function' ? name : creator(name);
+      return this.select(function () {
+        return this.appendChild(create.apply(this, arguments));
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/insert.js
+
+    function constantNull() {
+      return null;
+    }
+
+    /* harmony default export */ function insert(name, before) {
+      var create = typeof name === 'function' ? name : creator(name),
+        select =
+          before == null
+            ? constantNull
+            : typeof before === 'function'
+            ? before
+            : selector(before);
+      return this.select(function () {
+        return this.insertBefore(
+          create.apply(this, arguments),
+          select.apply(this, arguments) || null,
+        );
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/remove.js
+
+    function remove() {
+      var parent = this.parentNode;
+      if (parent) parent.removeChild(this);
+    }
+
+    /* harmony default export */ function selection_remove() {
+      return this.each(remove);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/clone.js
+
+    function selection_cloneShallow() {
+      var clone = this.cloneNode(false),
+        parent = this.parentNode;
+      return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
+    }
+
+    function selection_cloneDeep() {
+      var clone = this.cloneNode(true),
+        parent = this.parentNode;
+      return parent ? parent.insertBefore(clone, this.nextSibling) : clone;
+    }
+
+    /* harmony default export */ function clone(deep) {
+      return this.select(deep ? selection_cloneDeep : selection_cloneShallow);
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/datum.js
+
+    /* harmony default export */ function selection_datum(value) {
+      return arguments.length
+        ? this.property('__data__', value)
+        : this.node().__data__;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/on.js
+
+    function contextListener(listener) {
+      return function (event) {
+        listener.call(this, event, this.__data__);
+      };
+    }
+
+    function parseTypenames(typenames) {
+      return typenames
+        .trim()
+        .split(/^|\s+/)
+        .map(function (t) {
+          var name = '',
+            i = t.indexOf('.');
+          if (i >= 0) (name = t.slice(i + 1)), (t = t.slice(0, i));
+          return { type: t, name: name };
+        });
+    }
+
+    function onRemove(typename) {
+      return function () {
+        var on = this.__on;
+        if (!on) return;
+        for (var j = 0, i = -1, m = on.length, o; j < m; ++j) {
+          if (
+            ((o = on[j]),
+            (!typename.type || o.type === typename.type) &&
+              o.name === typename.name)
+          ) {
+            this.removeEventListener(o.type, o.listener, o.options);
+          } else {
+            on[++i] = o;
+          }
+        }
+        if (++i) on.length = i;
+        else delete this.__on;
+      };
+    }
+
+    function onAdd(typename, value, options) {
+      return function () {
+        var on = this.__on,
+          o,
+          listener = contextListener(value);
+        if (on)
+          for (var j = 0, m = on.length; j < m; ++j) {
+            if (
+              (o = on[j]).type === typename.type &&
+              o.name === typename.name
+            ) {
+              this.removeEventListener(o.type, o.listener, o.options);
+              this.addEventListener(
+                o.type,
+                (o.listener = listener),
+                (o.options = options),
+              );
+              o.value = value;
+              return;
+            }
+          }
+        this.addEventListener(typename.type, listener, options);
+        o = {
+          type: typename.type,
+          name: typename.name,
+          value: value,
+          listener: listener,
+          options: options,
+        };
+        if (!on) this.__on = [o];
+        else on.push(o);
+      };
+    }
+
+    /* harmony default export */ function on(typename, value, options) {
+      var typenames = parseTypenames(typename + ''),
+        i,
+        n = typenames.length,
+        t;
+
+      if (arguments.length < 2) {
+        var on = this.node().__on;
+        if (on)
+          for (var j = 0, m = on.length, o; j < m; ++j) {
+            for (i = 0, o = on[j]; i < n; ++i) {
+              if ((t = typenames[i]).type === o.type && t.name === o.name) {
+                return o.value;
+              }
+            }
+          }
+        return;
+      }
+
+      on = value ? onAdd : onRemove;
+      for (i = 0; i < n; ++i) this.each(on(typenames[i], value, options));
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/dispatch.js
+
+    function dispatchEvent(node, type, params) {
+      var window = src_window(node),
+        event = window.CustomEvent;
+
+      if (typeof event === 'function') {
+        event = new event(type, params);
+      } else {
+        event = window.document.createEvent('Event');
+        if (params)
+          event.initEvent(type, params.bubbles, params.cancelable),
+            (event.detail = params.detail);
+        else event.initEvent(type, false, false);
+      }
+
+      node.dispatchEvent(event);
+    }
+
+    function dispatchConstant(type, params) {
+      return function () {
+        return dispatchEvent(this, type, params);
+      };
+    }
+
+    function dispatchFunction(type, params) {
+      return function () {
+        return dispatchEvent(this, type, params.apply(this, arguments));
+      };
+    }
+
+    /* harmony default export */ function dispatch(type, params) {
+      return this.each(
+        (typeof params === 'function' ? dispatchFunction : dispatchConstant)(
+          type,
+          params,
+        ),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/iterator.js
+
+    /* harmony default export */ function* iterator() {
+      for (var groups = this._groups, j = 0, m = groups.length; j < m; ++j) {
+        for (var group = groups[j], i = 0, n = group.length, node; i < n; ++i) {
+          if ((node = group[i])) yield node;
+        }
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-selection/src/selection/index.js
+
+    var root = [null];
+
+    function Selection(groups, parents) {
+      this._groups = groups;
+      this._parents = parents;
+    }
+
+    function selection() {
+      return new Selection([[document.documentElement]], root);
+    }
+
+    function selection_selection() {
+      return this;
+    }
+
+    Selection.prototype = selection.prototype = {
+      constructor: Selection,
+      select: selection_select,
+      selectAll: selectAll,
+      selectChild: selectChild,
+      selectChildren: selectChildren,
+      filter: selection_filter,
+      data: data,
+      enter: enter,
+      exit: exit,
+      join: join,
+      merge: merge,
+      selection: selection_selection,
+      order: order,
+      sort: sort,
+      call: call,
+      nodes: nodes,
+      node: node,
+      size: size,
+      empty: selection_empty,
+      each: each,
+      attr: attr,
+      style: style,
+      property: property,
+      classed: classed,
+      text: selection_text,
+      html: html,
+      raise: selection_raise,
+      lower: selection_lower,
+      append: append,
+      insert: insert,
+      remove: selection_remove,
+      clone: clone,
+      datum: selection_datum,
+      on: on,
+      dispatch: dispatch,
+      [Symbol.iterator]: iterator,
+    };
+
+    /* harmony default export */ const src_selection = selection; // CONCATENATED MODULE: ../node_modules/d3-selection/src/select.js
+
+    /* harmony default export */ function src_select(selector) {
+      return typeof selector === 'string'
+        ? new Selection(
+            [[document.querySelector(selector)]],
+            [document.documentElement],
+          )
+        : new Selection([[selector]], root);
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatDecimal.js
+
+    /* harmony default export */ function formatDecimal(x) {
+      return Math.abs((x = Math.round(x))) >= 1e21
+        ? x.toLocaleString('en').replace(/,/g, '')
+        : x.toString(10);
+    }
+
+    // Computes the decimal coefficient and exponent of the specified number x with
+    // significant digits p, where x is positive and p is in [1, 21] or undefined.
+    // For example, formatDecimalParts(1.23) returns ["123", 0].
+    function formatDecimalParts(x, p) {
+      if (
+        (i = (x = p ? x.toExponential(p - 1) : x.toExponential()).indexOf(
+          'e',
+        )) < 0
+      )
+        return null; // NaN, ±Infinity
+      var i,
+        coefficient = x.slice(0, i);
+
+      // The string returned by toExponential either has the form \d\.\d+e[-+]\d+
+      // (e.g., 1.2e+3) or the form \de[-+]\d+ (e.g., 1e+3).
+      return [
+        coefficient.length > 1
+          ? coefficient[0] + coefficient.slice(2)
+          : coefficient,
+        +x.slice(i + 1),
+      ];
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/exponent.js
+
+    /* harmony default export */ function exponent(x) {
+      return (x = formatDecimalParts(Math.abs(x))), x ? x[1] : NaN;
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatGroup.js
+
+    /* harmony default export */ function formatGroup(grouping, thousands) {
+      return function (value, width) {
+        var i = value.length,
+          t = [],
+          j = 0,
+          g = grouping[0],
+          length = 0;
+
+        while (i > 0 && g > 0) {
+          if (length + g + 1 > width) g = Math.max(1, width - length);
+          t.push(value.substring((i -= g), i + g));
+          if ((length += g + 1) > width) break;
+          g = grouping[(j = (j + 1) % grouping.length)];
+        }
+
+        return t.reverse().join(thousands);
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatNumerals.js
+
+    /* harmony default export */ function formatNumerals(numerals) {
+      return function (value) {
+        return value.replace(/[0-9]/g, function (i) {
+          return numerals[+i];
+        });
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatSpecifier.js
+
+    // [[fill]align][sign][symbol][0][width][,][.precision][~][type]
+    var re = /^(?:(.)?([<>=^]))?([+\-( ])?([$#])?(0)?(\d+)?(,)?(\.\d+)?(~)?([a-z%])?$/i;
+
+    function formatSpecifier(specifier) {
+      if (!(match = re.exec(specifier)))
+        throw new Error('invalid format: ' + specifier);
+      var match;
+      return new FormatSpecifier({
+        fill: match[1],
+        align: match[2],
+        sign: match[3],
+        symbol: match[4],
+        zero: match[5],
+        width: match[6],
+        comma: match[7],
+        precision: match[8] && match[8].slice(1),
+        trim: match[9],
+        type: match[10],
+      });
+    }
+
+    formatSpecifier.prototype = FormatSpecifier.prototype; // instanceof
+
+    function FormatSpecifier(specifier) {
+      this.fill = specifier.fill === undefined ? ' ' : specifier.fill + '';
+      this.align = specifier.align === undefined ? '>' : specifier.align + '';
+      this.sign = specifier.sign === undefined ? '-' : specifier.sign + '';
+      this.symbol = specifier.symbol === undefined ? '' : specifier.symbol + '';
+      this.zero = !!specifier.zero;
+      this.width = specifier.width === undefined ? undefined : +specifier.width;
+      this.comma = !!specifier.comma;
+      this.precision =
+        specifier.precision === undefined ? undefined : +specifier.precision;
+      this.trim = !!specifier.trim;
+      this.type = specifier.type === undefined ? '' : specifier.type + '';
+    }
+
+    FormatSpecifier.prototype.toString = function () {
+      return (
+        this.fill +
+        this.align +
+        this.sign +
+        this.symbol +
+        (this.zero ? '0' : '') +
+        (this.width === undefined ? '' : Math.max(1, this.width | 0)) +
+        (this.comma ? ',' : '') +
+        (this.precision === undefined
+          ? ''
+          : '.' + Math.max(0, this.precision | 0)) +
+        (this.trim ? '~' : '') +
+        this.type
+      );
+    }; // CONCATENATED MODULE: ../node_modules/d3-format/src/formatTrim.js
+
+    // Trims insignificant zeros, e.g., replaces 1.2000k with 1.2k.
+    /* harmony default export */ function formatTrim(s) {
+      out: for (var n = s.length, i = 1, i0 = -1, i1; i < n; ++i) {
+        switch (s[i]) {
+          case '.':
+            i0 = i1 = i;
+            break;
+          case '0':
+            if (i0 === 0) i0 = i;
+            i1 = i;
+            break;
+          default:
+            if (!+s[i]) break out;
+            if (i0 > 0) i0 = 0;
+            break;
+        }
+      }
+      return i0 > 0 ? s.slice(0, i0) + s.slice(i1 + 1) : s;
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatPrefixAuto.js
+
+    var prefixExponent;
+
+    /* harmony default export */ function formatPrefixAuto(x, p) {
+      var d = formatDecimalParts(x, p);
+      if (!d) return x + '';
+      var coefficient = d[0],
+        exponent = d[1],
+        i =
+          exponent -
+          (prefixExponent =
+            Math.max(-8, Math.min(8, Math.floor(exponent / 3))) * 3) +
+          1,
+        n = coefficient.length;
+      return i === n
+        ? coefficient
+        : i > n
+        ? coefficient + new Array(i - n + 1).join('0')
+        : i > 0
+        ? coefficient.slice(0, i) + '.' + coefficient.slice(i)
+        : '0.' +
+          new Array(1 - i).join('0') +
+          formatDecimalParts(x, Math.max(0, p + i - 1))[0]; // less than 1y!
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatRounded.js
+
+    /* harmony default export */ function formatRounded(x, p) {
+      var d = formatDecimalParts(x, p);
+      if (!d) return x + '';
+      var coefficient = d[0],
+        exponent = d[1];
+      return exponent < 0
+        ? '0.' + new Array(-exponent).join('0') + coefficient
+        : coefficient.length > exponent + 1
+        ? coefficient.slice(0, exponent + 1) +
+          '.' +
+          coefficient.slice(exponent + 1)
+        : coefficient + new Array(exponent - coefficient.length + 2).join('0');
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/formatTypes.js
+
+    /* harmony default export */ const formatTypes = {
+      '%': (x, p) => (x * 100).toFixed(p),
+      b: (x) => Math.round(x).toString(2),
+      c: (x) => x + '',
+      d: formatDecimal,
+      e: (x, p) => x.toExponential(p),
+      f: (x, p) => x.toFixed(p),
+      g: (x, p) => x.toPrecision(p),
+      o: (x) => Math.round(x).toString(8),
+      p: (x, p) => formatRounded(x * 100, p),
+      r: formatRounded,
+      s: formatPrefixAuto,
+      X: (x) => Math.round(x).toString(16).toUpperCase(),
+      x: (x) => Math.round(x).toString(16),
+    }; // CONCATENATED MODULE: ../node_modules/d3-format/src/identity.js
+
+    /* harmony default export */ function identity(x) {
+      return x;
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/locale.js
+
+    var map = Array.prototype.map,
+      prefixes = [
+        'y',
+        'z',
+        'a',
+        'f',
+        'p',
+        'n',
+        'µ',
+        'm',
+        '',
+        'k',
+        'M',
+        'G',
+        'T',
+        'P',
+        'E',
+        'Z',
+        'Y',
+      ];
+
+    /* harmony default export */ function locale(locale) {
+      var group =
+          locale.grouping === undefined || locale.thousands === undefined
+            ? identity
+            : formatGroup(
+                map.call(locale.grouping, Number),
+                locale.thousands + '',
+              ),
+        currencyPrefix =
+          locale.currency === undefined ? '' : locale.currency[0] + '',
+        currencySuffix =
+          locale.currency === undefined ? '' : locale.currency[1] + '',
+        decimal = locale.decimal === undefined ? '.' : locale.decimal + '',
+        numerals =
+          locale.numerals === undefined
+            ? identity
+            : formatNumerals(map.call(locale.numerals, String)),
+        percent = locale.percent === undefined ? '%' : locale.percent + '',
+        minus = locale.minus === undefined ? '−' : locale.minus + '',
+        nan = locale.nan === undefined ? 'NaN' : locale.nan + '';
+
+      function newFormat(specifier) {
+        specifier = formatSpecifier(specifier);
+
+        var fill = specifier.fill,
+          align = specifier.align,
+          sign = specifier.sign,
+          symbol = specifier.symbol,
+          zero = specifier.zero,
+          width = specifier.width,
+          comma = specifier.comma,
+          precision = specifier.precision,
+          trim = specifier.trim,
+          type = specifier.type;
+
+        // The "n" type is an alias for ",g".
+        if (type === 'n') (comma = true), (type = 'g');
+        // The "" type, and any invalid type, is an alias for ".12~g".
+        else if (!formatTypes[type])
+          precision === undefined && (precision = 12),
+            (trim = true),
+            (type = 'g');
+
+        // If zero fill is specified, padding goes after sign and before digits.
+        if (zero || (fill === '0' && align === '='))
+          (zero = true), (fill = '0'), (align = '=');
+
+        // Compute the prefix and suffix.
+        // For SI-prefix, the suffix is lazily computed.
+        var prefix =
+            symbol === '$'
+              ? currencyPrefix
+              : symbol === '#' && /[boxX]/.test(type)
+              ? '0' + type.toLowerCase()
+              : '',
+          suffix =
+            symbol === '$' ? currencySuffix : /[%p]/.test(type) ? percent : '';
+
+        // What format function should we use?
+        // Is this an integer type?
+        // Can this type generate exponential notation?
+        var formatType = formatTypes[type],
+          maybeSuffix = /[defgprs%]/.test(type);
+
+        // Set the default precision if not specified,
+        // or clamp the specified precision to the supported range.
+        // For significant precision, it must be in [1, 21].
+        // For fixed precision, it must be in [0, 20].
+        precision =
+          precision === undefined
+            ? 6
+            : /[gprs]/.test(type)
+            ? Math.max(1, Math.min(21, precision))
+            : Math.max(0, Math.min(20, precision));
+
+        function format(value) {
+          var valuePrefix = prefix,
+            valueSuffix = suffix,
+            i,
+            n,
+            c;
+
+          if (type === 'c') {
+            valueSuffix = formatType(value) + valueSuffix;
+            value = '';
+          } else {
+            value = +value;
+
+            // Determine the sign. -0 is not less than 0, but 1 / -0 is!
+            var valueNegative = value < 0 || 1 / value < 0;
+
+            // Perform the initial formatting.
+            value = isNaN(value) ? nan : formatType(Math.abs(value), precision);
+
+            // Trim insignificant zeros.
+            if (trim) value = formatTrim(value);
+
+            // If a negative value rounds to zero after formatting, and no explicit positive sign is requested, hide the sign.
+            if (valueNegative && +value === 0 && sign !== '+')
+              valueNegative = false;
+
+            // Compute the prefix and suffix.
+            valuePrefix =
+              (valueNegative
+                ? sign === '('
+                  ? sign
+                  : minus
+                : sign === '-' || sign === '('
+                ? ''
+                : sign) + valuePrefix;
+            valueSuffix =
+              (type === 's' ? prefixes[8 + prefixExponent / 3] : '') +
+              valueSuffix +
+              (valueNegative && sign === '(' ? ')' : '');
+
+            // Break the formatted value into the integer “value” part that can be
+            // grouped, and fractional or exponential “suffix” part that is not.
+            if (maybeSuffix) {
+              (i = -1), (n = value.length);
+              while (++i < n) {
+                if (((c = value.charCodeAt(i)), 48 > c || c > 57)) {
+                  valueSuffix =
+                    (c === 46 ? decimal + value.slice(i + 1) : value.slice(i)) +
+                    valueSuffix;
+                  value = value.slice(0, i);
+                  break;
+                }
+              }
+            }
+          }
+
+          // If the fill character is not "0", grouping is applied before padding.
+          if (comma && !zero) value = group(value, Infinity);
+
+          // Compute the padding.
+          var length = valuePrefix.length + value.length + valueSuffix.length,
+            padding =
+              length < width ? new Array(width - length + 1).join(fill) : '';
+
+          // If the fill character is "0", grouping is applied after padding.
+          if (comma && zero)
+            (value = group(
+              padding + value,
+              padding.length ? width - valueSuffix.length : Infinity,
+            )),
+              (padding = '');
+
+          // Reconstruct the final output based on the desired alignment.
+          switch (align) {
+            case '<':
+              value = valuePrefix + value + valueSuffix + padding;
+              break;
+            case '=':
+              value = valuePrefix + padding + value + valueSuffix;
+              break;
+            case '^':
+              value =
+                padding.slice(0, (length = padding.length >> 1)) +
+                valuePrefix +
+                value +
+                valueSuffix +
+                padding.slice(length);
+              break;
+            default:
+              value = padding + valuePrefix + value + valueSuffix;
+              break;
+          }
+
+          return numerals(value);
+        }
+
+        format.toString = function () {
+          return specifier + '';
+        };
+
+        return format;
+      }
+
+      function formatPrefix(specifier, value) {
+        var f = newFormat(
+            ((specifier = formatSpecifier(specifier)),
+            (specifier.type = 'f'),
+            specifier),
+          ),
+          e = Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3,
+          k = Math.pow(10, -e),
+          prefix = prefixes[8 + e / 3];
+        return function (value) {
+          return f(k * value) + prefix;
+        };
+      }
+
+      return {
+        format: newFormat,
+        formatPrefix: formatPrefix,
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/defaultLocale.js
+
+    var defaultLocale_locale;
+    var format;
+    var formatPrefix;
+
+    defaultLocale({
+      thousands: ',',
+      grouping: [3],
+      currency: ['$', ''],
+    });
+
+    function defaultLocale(definition) {
+      defaultLocale_locale = locale(definition);
+      format = defaultLocale_locale.format;
+      formatPrefix = defaultLocale_locale.formatPrefix;
+      return defaultLocale_locale;
+    } // CONCATENATED MODULE: ../node_modules/d3-array/src/ascending.js
+
+    function ascending_ascending(a, b) {
+      return a == null || b == null
+        ? NaN
+        : a < b
+        ? -1
+        : a > b
+        ? 1
+        : a >= b
+        ? 0
+        : NaN;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/treemap/round.js
+
+    /* harmony default export */ function treemap_round(node) {
+      node.x0 = Math.round(node.x0);
+      node.y0 = Math.round(node.y0);
+      node.x1 = Math.round(node.x1);
+      node.y1 = Math.round(node.y1);
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/treemap/dice.js
+
+    /* harmony default export */ function dice(parent, x0, y0, x1, y1) {
+      var nodes = parent.children,
+        node,
+        i = -1,
+        n = nodes.length,
+        k = parent.value && (x1 - x0) / parent.value;
+
+      while (++i < n) {
+        (node = nodes[i]), (node.y0 = y0), (node.y1 = y1);
+        (node.x0 = x0), (node.x1 = x0 += node.value * k);
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/partition.js
+
+    /* harmony default export */ function partition() {
+      var dx = 1,
+        dy = 1,
+        padding = 0,
+        round = false;
+
+      function partition(root) {
+        var n = root.height + 1;
+        root.x0 = root.y0 = padding;
+        root.x1 = dx;
+        root.y1 = dy / n;
+        root.eachBefore(positionNode(dy, n));
+        if (round) root.eachBefore(treemap_round);
+        return root;
+      }
+
+      function positionNode(dy, n) {
+        return function (node) {
+          if (node.children) {
+            dice(
+              node,
+              node.x0,
+              (dy * (node.depth + 1)) / n,
+              node.x1,
+              (dy * (node.depth + 2)) / n,
+            );
+          }
+          var x0 = node.x0,
+            y0 = node.y0,
+            x1 = node.x1 - padding,
+            y1 = node.y1 - padding;
+          if (x1 < x0) x0 = x1 = (x0 + x1) / 2;
+          if (y1 < y0) y0 = y1 = (y0 + y1) / 2;
+          node.x0 = x0;
+          node.y0 = y0;
+          node.x1 = x1;
+          node.y1 = y1;
+        };
+      }
+
+      partition.round = function (x) {
+        return arguments.length ? ((round = !!x), partition) : round;
+      };
+
+      partition.size = function (x) {
+        return arguments.length
+          ? ((dx = +x[0]), (dy = +x[1]), partition)
+          : [dx, dy];
+      };
+
+      partition.padding = function (x) {
+        return arguments.length ? ((padding = +x), partition) : padding;
+      };
+
+      return partition;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/count.js
+
+    function count(node) {
+      var sum = 0,
+        children = node.children,
+        i = children && children.length;
+      if (!i) sum = 1;
+      else while (--i >= 0) sum += children[i].value;
+      node.value = sum;
+    }
+
+    /* harmony default export */ function hierarchy_count() {
+      return this.eachAfter(count);
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/each.js
+
+    /* harmony default export */ function hierarchy_each(callback, that) {
+      let index = -1;
+      for (const node of this) {
+        callback.call(that, node, ++index, this);
+      }
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/eachBefore.js
+
+    /* harmony default export */ function eachBefore(callback, that) {
+      var node = this,
+        nodes = [node],
+        children,
+        i,
+        index = -1;
+      while ((node = nodes.pop())) {
+        callback.call(that, node, ++index, this);
+        if ((children = node.children)) {
+          for (i = children.length - 1; i >= 0; --i) {
+            nodes.push(children[i]);
+          }
+        }
+      }
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/eachAfter.js
+
+    /* harmony default export */ function eachAfter(callback, that) {
+      var node = this,
+        nodes = [node],
+        next = [],
+        children,
+        i,
+        n,
+        index = -1;
+      while ((node = nodes.pop())) {
+        next.push(node);
+        if ((children = node.children)) {
+          for (i = 0, n = children.length; i < n; ++i) {
+            nodes.push(children[i]);
+          }
+        }
+      }
+      while ((node = next.pop())) {
+        callback.call(that, node, ++index, this);
+      }
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/find.js
+
+    /* harmony default export */ function hierarchy_find(callback, that) {
+      let index = -1;
+      for (const node of this) {
+        if (callback.call(that, node, ++index, this)) {
+          return node;
+        }
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/sum.js
+
+    /* harmony default export */ function sum(value) {
+      return this.eachAfter(function (node) {
+        var sum = +value(node.data) || 0,
+          children = node.children,
+          i = children && children.length;
+        while (--i >= 0) sum += children[i].value;
+        node.value = sum;
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/sort.js
+
+    /* harmony default export */ function hierarchy_sort(compare) {
+      return this.eachBefore(function (node) {
+        if (node.children) {
+          node.children.sort(compare);
+        }
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/path.js
+
+    /* harmony default export */ function path(end) {
+      var start = this,
+        ancestor = leastCommonAncestor(start, end),
+        nodes = [start];
+      while (start !== ancestor) {
+        start = start.parent;
+        nodes.push(start);
+      }
+      var k = nodes.length;
+      while (end !== ancestor) {
+        nodes.splice(k, 0, end);
+        end = end.parent;
+      }
+      return nodes;
+    }
+
+    function leastCommonAncestor(a, b) {
+      if (a === b) return a;
+      var aNodes = a.ancestors(),
+        bNodes = b.ancestors(),
+        c = null;
+      a = aNodes.pop();
+      b = bNodes.pop();
+      while (a === b) {
+        c = a;
+        a = aNodes.pop();
+        b = bNodes.pop();
+      }
+      return c;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/ancestors.js
+
+    /* harmony default export */ function ancestors() {
+      var node = this,
+        nodes = [node];
+      while ((node = node.parent)) {
+        nodes.push(node);
+      }
+      return nodes;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/descendants.js
+
+    /* harmony default export */ function descendants() {
+      return Array.from(this);
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/leaves.js
+
+    /* harmony default export */ function leaves() {
+      var leaves = [];
+      this.eachBefore(function (node) {
+        if (!node.children) {
+          leaves.push(node);
+        }
+      });
+      return leaves;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/links.js
+
+    /* harmony default export */ function links() {
+      var root = this,
+        links = [];
+      root.each(function (node) {
+        if (node !== root) {
+          // Don’t include the root’s parent, if any.
+          links.push({ source: node.parent, target: node });
+        }
+      });
+      return links;
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/iterator.js
+
+    /* harmony default export */ function* hierarchy_iterator() {
+      var node = this,
+        current,
+        next = [node],
+        children,
+        i,
+        n;
+      do {
+        (current = next.reverse()), (next = []);
+        while ((node = current.pop())) {
+          yield node;
+          if ((children = node.children)) {
+            for (i = 0, n = children.length; i < n; ++i) {
+              next.push(children[i]);
+            }
+          }
+        }
+      } while (next.length);
+    } // CONCATENATED MODULE: ../node_modules/d3-hierarchy/src/hierarchy/index.js
+
+    function hierarchy(data, children) {
+      if (data instanceof Map) {
+        data = [undefined, data];
+        if (children === undefined) children = mapChildren;
+      } else if (children === undefined) {
+        children = objectChildren;
+      }
+
+      var root = new Node(data),
+        node,
+        nodes = [root],
+        child,
+        childs,
+        i,
+        n;
+
+      while ((node = nodes.pop())) {
+        if (
+          (childs = children(node.data)) &&
+          (n = (childs = Array.from(childs)).length)
+        ) {
+          node.children = childs;
+          for (i = n - 1; i >= 0; --i) {
+            nodes.push((child = childs[i] = new Node(childs[i])));
+            child.parent = node;
+            child.depth = node.depth + 1;
+          }
+        }
+      }
+
+      return root.eachBefore(computeHeight);
+    }
+
+    function node_copy() {
+      return hierarchy(this).eachBefore(copyData);
+    }
+
+    function objectChildren(d) {
+      return d.children;
+    }
+
+    function mapChildren(d) {
+      return Array.isArray(d) ? d[1] : null;
+    }
+
+    function copyData(node) {
+      if (node.data.value !== undefined) node.value = node.data.value;
+      node.data = node.data.data;
+    }
+
+    function computeHeight(node) {
+      var height = 0;
+      do node.height = height;
+      while ((node = node.parent) && node.height < ++height);
+    }
+
+    function Node(data) {
+      this.data = data;
+      this.depth = this.height = 0;
+      this.parent = null;
+    }
+
+    Node.prototype = hierarchy.prototype = {
+      constructor: Node,
+      count: hierarchy_count,
+      each: hierarchy_each,
+      eachAfter: eachAfter,
+      eachBefore: eachBefore,
+      find: hierarchy_find,
+      sum: sum,
+      sort: hierarchy_sort,
+      path: path,
+      ancestors: ancestors,
+      descendants: descendants,
+      leaves: leaves,
+      links: links,
+      copy: node_copy,
+      [Symbol.iterator]: hierarchy_iterator,
+    }; // CONCATENATED MODULE: ../node_modules/d3-array/src/ticks.js
+
+    var e10 = Math.sqrt(50),
+      e5 = Math.sqrt(10),
+      e2 = Math.sqrt(2);
+
+    function ticks(start, stop, count) {
+      var reverse,
+        i = -1,
+        n,
+        ticks,
+        step;
+
+      (stop = +stop), (start = +start), (count = +count);
+      if (start === stop && count > 0) return [start];
+      if ((reverse = stop < start)) (n = start), (start = stop), (stop = n);
+      if ((step = tickIncrement(start, stop, count)) === 0 || !isFinite(step))
+        return [];
+
+      if (step > 0) {
+        let r0 = Math.round(start / step),
+          r1 = Math.round(stop / step);
+        if (r0 * step < start) ++r0;
+        if (r1 * step > stop) --r1;
+        ticks = new Array((n = r1 - r0 + 1));
+        while (++i < n) ticks[i] = (r0 + i) * step;
+      } else {
+        step = -step;
+        let r0 = Math.round(start * step),
+          r1 = Math.round(stop * step);
+        if (r0 / step < start) ++r0;
+        if (r1 / step > stop) --r1;
+        ticks = new Array((n = r1 - r0 + 1));
+        while (++i < n) ticks[i] = (r0 + i) / step;
+      }
+
+      if (reverse) ticks.reverse();
+
+      return ticks;
+    }
+
+    function tickIncrement(start, stop, count) {
+      var step = (stop - start) / Math.max(0, count),
+        power = Math.floor(Math.log(step) / Math.LN10),
+        error = step / Math.pow(10, power);
+      return power >= 0
+        ? (error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1) *
+            Math.pow(10, power)
+        : -Math.pow(10, -power) /
+            (error >= e10 ? 10 : error >= e5 ? 5 : error >= e2 ? 2 : 1);
+    }
+
+    function tickStep(start, stop, count) {
+      var step0 = Math.abs(stop - start) / Math.max(0, count),
+        step1 = Math.pow(10, Math.floor(Math.log(step0) / Math.LN10)),
+        error = step0 / step1;
+      if (error >= e10) step1 *= 10;
+      else if (error >= e5) step1 *= 5;
+      else if (error >= e2) step1 *= 2;
+      return stop < start ? -step1 : step1;
+    } // CONCATENATED MODULE: ../node_modules/d3-array/src/bisector.js
+
+    function bisector(f) {
+      let delta = f;
+      let compare1 = f;
+      let compare2 = f;
+
+      if (f.length !== 2) {
+        delta = (d, x) => f(d) - x;
+        compare1 = ascending_ascending;
+        compare2 = (d, x) => ascending_ascending(f(d), x);
+      }
+
+      function left(a, x, lo = 0, hi = a.length) {
+        if (lo < hi) {
+          if (compare1(x, x) !== 0) return hi;
+          do {
+            const mid = (lo + hi) >>> 1;
+            if (compare2(a[mid], x) < 0) lo = mid + 1;
+            else hi = mid;
+          } while (lo < hi);
+        }
+        return lo;
+      }
+
+      function right(a, x, lo = 0, hi = a.length) {
+        if (lo < hi) {
+          if (compare1(x, x) !== 0) return hi;
+          do {
+            const mid = (lo + hi) >>> 1;
+            if (compare2(a[mid], x) <= 0) lo = mid + 1;
+            else hi = mid;
+          } while (lo < hi);
+        }
+        return lo;
+      }
+
+      function center(a, x, lo = 0, hi = a.length) {
+        const i = left(a, x, lo, hi - 1);
+        return i > lo && delta(a[i - 1], x) > -delta(a[i], x) ? i - 1 : i;
+      }
+
+      return { left, center, right };
+    } // CONCATENATED MODULE: ../node_modules/d3-array/src/number.js
+
+    function number(x) {
+      return x === null ? NaN : +x;
+    }
+
+    function* numbers(values, valueof) {
+      if (valueof === undefined) {
+        for (let value of values) {
+          if (value != null && (value = +value) >= value) {
+            yield value;
+          }
+        }
+      } else {
+        let index = -1;
+        for (let value of values) {
+          if (
+            (value = valueof(value, ++index, values)) != null &&
+            (value = +value) >= value
+          ) {
+            yield value;
+          }
+        }
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-array/src/bisect.js
+
+    const ascendingBisect = bisector(ascending_ascending);
+    const bisectRight = ascendingBisect.right;
+    const bisectLeft = ascendingBisect.left;
+    const bisectCenter = bisector(number).center;
+    /* harmony default export */ const bisect = bisectRight; // CONCATENATED MODULE: ../node_modules/d3-color/src/define.js
+
+    /* harmony default export */ function src_define(
+      constructor,
+      factory,
+      prototype,
+    ) {
+      constructor.prototype = factory.prototype = prototype;
+      prototype.constructor = constructor;
+    }
+
+    function extend(parent, definition) {
+      var prototype = Object.create(parent.prototype);
+      for (var key in definition) prototype[key] = definition[key];
+      return prototype;
+    } // CONCATENATED MODULE: ../node_modules/d3-color/src/color.js
+
+    function Color() {}
+
+    var darker = 0.7;
+    var brighter = 1 / darker;
+
+    var reI = '\\s*([+-]?\\d+)\\s*',
+      reN = '\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\s*',
+      reP = '\\s*([+-]?\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)%\\s*',
+      reHex = /^#([0-9a-f]{3,8})$/,
+      reRgbInteger = new RegExp('^rgb\\(' + [reI, reI, reI] + '\\)$'),
+      reRgbPercent = new RegExp('^rgb\\(' + [reP, reP, reP] + '\\)$'),
+      reRgbaInteger = new RegExp('^rgba\\(' + [reI, reI, reI, reN] + '\\)$'),
+      reRgbaPercent = new RegExp('^rgba\\(' + [reP, reP, reP, reN] + '\\)$'),
+      reHslPercent = new RegExp('^hsl\\(' + [reN, reP, reP] + '\\)$'),
+      reHslaPercent = new RegExp('^hsla\\(' + [reN, reP, reP, reN] + '\\)$');
+
+    var named = {
+      aliceblue: 0xf0f8ff,
+      antiquewhite: 0xfaebd7,
+      aqua: 0x00ffff,
+      aquamarine: 0x7fffd4,
+      azure: 0xf0ffff,
+      beige: 0xf5f5dc,
+      bisque: 0xffe4c4,
+      black: 0x000000,
+      blanchedalmond: 0xffebcd,
+      blue: 0x0000ff,
+      blueviolet: 0x8a2be2,
+      brown: 0xa52a2a,
+      burlywood: 0xdeb887,
+      cadetblue: 0x5f9ea0,
+      chartreuse: 0x7fff00,
+      chocolate: 0xd2691e,
+      coral: 0xff7f50,
+      cornflowerblue: 0x6495ed,
+      cornsilk: 0xfff8dc,
+      crimson: 0xdc143c,
+      cyan: 0x00ffff,
+      darkblue: 0x00008b,
+      darkcyan: 0x008b8b,
+      darkgoldenrod: 0xb8860b,
+      darkgray: 0xa9a9a9,
+      darkgreen: 0x006400,
+      darkgrey: 0xa9a9a9,
+      darkkhaki: 0xbdb76b,
+      darkmagenta: 0x8b008b,
+      darkolivegreen: 0x556b2f,
+      darkorange: 0xff8c00,
+      darkorchid: 0x9932cc,
+      darkred: 0x8b0000,
+      darksalmon: 0xe9967a,
+      darkseagreen: 0x8fbc8f,
+      darkslateblue: 0x483d8b,
+      darkslategray: 0x2f4f4f,
+      darkslategrey: 0x2f4f4f,
+      darkturquoise: 0x00ced1,
+      darkviolet: 0x9400d3,
+      deeppink: 0xff1493,
+      deepskyblue: 0x00bfff,
+      dimgray: 0x696969,
+      dimgrey: 0x696969,
+      dodgerblue: 0x1e90ff,
+      firebrick: 0xb22222,
+      floralwhite: 0xfffaf0,
+      forestgreen: 0x228b22,
+      fuchsia: 0xff00ff,
+      gainsboro: 0xdcdcdc,
+      ghostwhite: 0xf8f8ff,
+      gold: 0xffd700,
+      goldenrod: 0xdaa520,
+      gray: 0x808080,
+      green: 0x008000,
+      greenyellow: 0xadff2f,
+      grey: 0x808080,
+      honeydew: 0xf0fff0,
+      hotpink: 0xff69b4,
+      indianred: 0xcd5c5c,
+      indigo: 0x4b0082,
+      ivory: 0xfffff0,
+      khaki: 0xf0e68c,
+      lavender: 0xe6e6fa,
+      lavenderblush: 0xfff0f5,
+      lawngreen: 0x7cfc00,
+      lemonchiffon: 0xfffacd,
+      lightblue: 0xadd8e6,
+      lightcoral: 0xf08080,
+      lightcyan: 0xe0ffff,
+      lightgoldenrodyellow: 0xfafad2,
+      lightgray: 0xd3d3d3,
+      lightgreen: 0x90ee90,
+      lightgrey: 0xd3d3d3,
+      lightpink: 0xffb6c1,
+      lightsalmon: 0xffa07a,
+      lightseagreen: 0x20b2aa,
+      lightskyblue: 0x87cefa,
+      lightslategray: 0x778899,
+      lightslategrey: 0x778899,
+      lightsteelblue: 0xb0c4de,
+      lightyellow: 0xffffe0,
+      lime: 0x00ff00,
+      limegreen: 0x32cd32,
+      linen: 0xfaf0e6,
+      magenta: 0xff00ff,
+      maroon: 0x800000,
+      mediumaquamarine: 0x66cdaa,
+      mediumblue: 0x0000cd,
+      mediumorchid: 0xba55d3,
+      mediumpurple: 0x9370db,
+      mediumseagreen: 0x3cb371,
+      mediumslateblue: 0x7b68ee,
+      mediumspringgreen: 0x00fa9a,
+      mediumturquoise: 0x48d1cc,
+      mediumvioletred: 0xc71585,
+      midnightblue: 0x191970,
+      mintcream: 0xf5fffa,
+      mistyrose: 0xffe4e1,
+      moccasin: 0xffe4b5,
+      navajowhite: 0xffdead,
+      navy: 0x000080,
+      oldlace: 0xfdf5e6,
+      olive: 0x808000,
+      olivedrab: 0x6b8e23,
+      orange: 0xffa500,
+      orangered: 0xff4500,
+      orchid: 0xda70d6,
+      palegoldenrod: 0xeee8aa,
+      palegreen: 0x98fb98,
+      paleturquoise: 0xafeeee,
+      palevioletred: 0xdb7093,
+      papayawhip: 0xffefd5,
+      peachpuff: 0xffdab9,
+      peru: 0xcd853f,
+      pink: 0xffc0cb,
+      plum: 0xdda0dd,
+      powderblue: 0xb0e0e6,
+      purple: 0x800080,
+      rebeccapurple: 0x663399,
+      red: 0xff0000,
+      rosybrown: 0xbc8f8f,
+      royalblue: 0x4169e1,
+      saddlebrown: 0x8b4513,
+      salmon: 0xfa8072,
+      sandybrown: 0xf4a460,
+      seagreen: 0x2e8b57,
+      seashell: 0xfff5ee,
+      sienna: 0xa0522d,
+      silver: 0xc0c0c0,
+      skyblue: 0x87ceeb,
+      slateblue: 0x6a5acd,
+      slategray: 0x708090,
+      slategrey: 0x708090,
+      snow: 0xfffafa,
+      springgreen: 0x00ff7f,
+      steelblue: 0x4682b4,
+      tan: 0xd2b48c,
+      teal: 0x008080,
+      thistle: 0xd8bfd8,
+      tomato: 0xff6347,
+      turquoise: 0x40e0d0,
+      violet: 0xee82ee,
+      wheat: 0xf5deb3,
+      white: 0xffffff,
+      whitesmoke: 0xf5f5f5,
+      yellow: 0xffff00,
+      yellowgreen: 0x9acd32,
+    };
+
+    src_define(Color, color, {
+      copy: function (channels) {
+        return Object.assign(new this.constructor(), this, channels);
+      },
+      displayable: function () {
+        return this.rgb().displayable();
+      },
+      hex: color_formatHex, // Deprecated! Use color.formatHex.
+      formatHex: color_formatHex,
+      formatHsl: color_formatHsl,
+      formatRgb: color_formatRgb,
+      toString: color_formatRgb,
+    });
+
+    function color_formatHex() {
+      return this.rgb().formatHex();
+    }
+
+    function color_formatHsl() {
+      return hslConvert(this).formatHsl();
+    }
+
+    function color_formatRgb() {
+      return this.rgb().formatRgb();
+    }
+
+    function color(format) {
+      var m, l;
+      format = (format + '').trim().toLowerCase();
+      return (m = reHex.exec(format))
+        ? ((l = m[1].length),
+          (m = parseInt(m[1], 16)),
+          l === 6
+            ? rgbn(m) // #ff0000
+            : l === 3
+            ? new Rgb(
+                ((m >> 8) & 0xf) | ((m >> 4) & 0xf0),
+                ((m >> 4) & 0xf) | (m & 0xf0),
+                ((m & 0xf) << 4) | (m & 0xf),
+                1,
+              ) // #f00
+            : l === 8
+            ? rgba(
+                (m >> 24) & 0xff,
+                (m >> 16) & 0xff,
+                (m >> 8) & 0xff,
+                (m & 0xff) / 0xff,
+              ) // #ff000000
+            : l === 4
+            ? rgba(
+                ((m >> 12) & 0xf) | ((m >> 8) & 0xf0),
+                ((m >> 8) & 0xf) | ((m >> 4) & 0xf0),
+                ((m >> 4) & 0xf) | (m & 0xf0),
+                (((m & 0xf) << 4) | (m & 0xf)) / 0xff,
+              ) // #f000
+            : null) // invalid hex
+        : (m = reRgbInteger.exec(format))
+        ? new Rgb(m[1], m[2], m[3], 1) // rgb(255, 0, 0)
+        : (m = reRgbPercent.exec(format))
+        ? new Rgb((m[1] * 255) / 100, (m[2] * 255) / 100, (m[3] * 255) / 100, 1) // rgb(100%, 0%, 0%)
+        : (m = reRgbaInteger.exec(format))
+        ? rgba(m[1], m[2], m[3], m[4]) // rgba(255, 0, 0, 1)
+        : (m = reRgbaPercent.exec(format))
+        ? rgba((m[1] * 255) / 100, (m[2] * 255) / 100, (m[3] * 255) / 100, m[4]) // rgb(100%, 0%, 0%, 1)
+        : (m = reHslPercent.exec(format))
+        ? hsla(m[1], m[2] / 100, m[3] / 100, 1) // hsl(120, 50%, 50%)
+        : (m = reHslaPercent.exec(format))
+        ? hsla(m[1], m[2] / 100, m[3] / 100, m[4]) // hsla(120, 50%, 50%, 1)
+        : named.hasOwnProperty(format)
+        ? rgbn(named[format]) // eslint-disable-line no-prototype-builtins
+        : format === 'transparent'
+        ? new Rgb(NaN, NaN, NaN, 0)
+        : null;
+    }
+
+    function rgbn(n) {
+      return new Rgb((n >> 16) & 0xff, (n >> 8) & 0xff, n & 0xff, 1);
+    }
+
+    function rgba(r, g, b, a) {
+      if (a <= 0) r = g = b = NaN;
+      return new Rgb(r, g, b, a);
+    }
+
+    function rgbConvert(o) {
+      if (!(o instanceof Color)) o = color(o);
+      if (!o) return new Rgb();
+      o = o.rgb();
+      return new Rgb(o.r, o.g, o.b, o.opacity);
+    }
+
+    function color_rgb(r, g, b, opacity) {
+      return arguments.length === 1
+        ? rgbConvert(r)
+        : new Rgb(r, g, b, opacity == null ? 1 : opacity);
+    }
+
+    function Rgb(r, g, b, opacity) {
+      this.r = +r;
+      this.g = +g;
+      this.b = +b;
+      this.opacity = +opacity;
+    }
+
+    src_define(
+      Rgb,
+      color_rgb,
+      extend(Color, {
+        brighter: function (k) {
+          k = k == null ? brighter : Math.pow(brighter, k);
+          return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+        },
+        darker: function (k) {
+          k = k == null ? darker : Math.pow(darker, k);
+          return new Rgb(this.r * k, this.g * k, this.b * k, this.opacity);
+        },
+        rgb: function () {
+          return this;
+        },
+        displayable: function () {
+          return (
+            -0.5 <= this.r &&
+            this.r < 255.5 &&
+            -0.5 <= this.g &&
+            this.g < 255.5 &&
+            -0.5 <= this.b &&
+            this.b < 255.5 &&
+            0 <= this.opacity &&
+            this.opacity <= 1
+          );
+        },
+        hex: rgb_formatHex, // Deprecated! Use color.formatHex.
+        formatHex: rgb_formatHex,
+        formatRgb: rgb_formatRgb,
+        toString: rgb_formatRgb,
+      }),
+    );
+
+    function rgb_formatHex() {
+      return '#' + hex(this.r) + hex(this.g) + hex(this.b);
+    }
+
+    function rgb_formatRgb() {
+      var a = this.opacity;
+      a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+      return (
+        (a === 1 ? 'rgb(' : 'rgba(') +
+        Math.max(0, Math.min(255, Math.round(this.r) || 0)) +
+        ', ' +
+        Math.max(0, Math.min(255, Math.round(this.g) || 0)) +
+        ', ' +
+        Math.max(0, Math.min(255, Math.round(this.b) || 0)) +
+        (a === 1 ? ')' : ', ' + a + ')')
+      );
+    }
+
+    function hex(value) {
+      value = Math.max(0, Math.min(255, Math.round(value) || 0));
+      return (value < 16 ? '0' : '') + value.toString(16);
+    }
+
+    function hsla(h, s, l, a) {
+      if (a <= 0) h = s = l = NaN;
+      else if (l <= 0 || l >= 1) h = s = NaN;
+      else if (s <= 0) h = NaN;
+      return new Hsl(h, s, l, a);
+    }
+
+    function hslConvert(o) {
+      if (o instanceof Hsl) return new Hsl(o.h, o.s, o.l, o.opacity);
+      if (!(o instanceof Color)) o = color(o);
+      if (!o) return new Hsl();
+      if (o instanceof Hsl) return o;
+      o = o.rgb();
+      var r = o.r / 255,
+        g = o.g / 255,
+        b = o.b / 255,
+        min = Math.min(r, g, b),
+        max = Math.max(r, g, b),
+        h = NaN,
+        s = max - min,
+        l = (max + min) / 2;
+      if (s) {
+        if (r === max) h = (g - b) / s + (g < b) * 6;
+        else if (g === max) h = (b - r) / s + 2;
+        else h = (r - g) / s + 4;
+        s /= l < 0.5 ? max + min : 2 - max - min;
+        h *= 60;
+      } else {
+        s = l > 0 && l < 1 ? 0 : h;
+      }
+      return new Hsl(h, s, l, o.opacity);
+    }
+
+    function hsl(h, s, l, opacity) {
+      return arguments.length === 1
+        ? hslConvert(h)
+        : new Hsl(h, s, l, opacity == null ? 1 : opacity);
+    }
+
+    function Hsl(h, s, l, opacity) {
+      this.h = +h;
+      this.s = +s;
+      this.l = +l;
+      this.opacity = +opacity;
+    }
+
+    src_define(
+      Hsl,
+      hsl,
+      extend(Color, {
+        brighter: function (k) {
+          k = k == null ? brighter : Math.pow(brighter, k);
+          return new Hsl(this.h, this.s, this.l * k, this.opacity);
+        },
+        darker: function (k) {
+          k = k == null ? darker : Math.pow(darker, k);
+          return new Hsl(this.h, this.s, this.l * k, this.opacity);
+        },
+        rgb: function () {
+          var h = (this.h % 360) + (this.h < 0) * 360,
+            s = isNaN(h) || isNaN(this.s) ? 0 : this.s,
+            l = this.l,
+            m2 = l + (l < 0.5 ? l : 1 - l) * s,
+            m1 = 2 * l - m2;
+          return new Rgb(
+            hsl2rgb(h >= 240 ? h - 240 : h + 120, m1, m2),
+            hsl2rgb(h, m1, m2),
+            hsl2rgb(h < 120 ? h + 240 : h - 120, m1, m2),
+            this.opacity,
+          );
+        },
+        displayable: function () {
+          return (
+            ((0 <= this.s && this.s <= 1) || isNaN(this.s)) &&
+            0 <= this.l &&
+            this.l <= 1 &&
+            0 <= this.opacity &&
+            this.opacity <= 1
+          );
+        },
+        formatHsl: function () {
+          var a = this.opacity;
+          a = isNaN(a) ? 1 : Math.max(0, Math.min(1, a));
+          return (
+            (a === 1 ? 'hsl(' : 'hsla(') +
+            (this.h || 0) +
+            ', ' +
+            (this.s || 0) * 100 +
+            '%, ' +
+            (this.l || 0) * 100 +
+            '%' +
+            (a === 1 ? ')' : ', ' + a + ')')
+          );
+        },
+      }),
+    );
+
+    /* From FvD 13.37, CSS Color Module Level 3 */
+    function hsl2rgb(h, m1, m2) {
+      return (
+        (h < 60
+          ? m1 + ((m2 - m1) * h) / 60
+          : h < 180
+          ? m2
+          : h < 240
+          ? m1 + ((m2 - m1) * (240 - h)) / 60
+          : m1) * 255
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basis.js
+
+    function basis(t1, v0, v1, v2, v3) {
+      var t2 = t1 * t1,
+        t3 = t2 * t1;
+      return (
+        ((1 - 3 * t1 + 3 * t2 - t3) * v0 +
+          (4 - 6 * t2 + 3 * t3) * v1 +
+          (1 + 3 * t1 + 3 * t2 - 3 * t3) * v2 +
+          t3 * v3) /
+        6
+      );
+    }
+
+    /* harmony default export */ function src_basis(values) {
+      var n = values.length - 1;
+      return function (t) {
+        var i =
+            t <= 0 ? (t = 0) : t >= 1 ? ((t = 1), n - 1) : Math.floor(t * n),
+          v1 = values[i],
+          v2 = values[i + 1],
+          v0 = i > 0 ? values[i - 1] : 2 * v1 - v2,
+          v3 = i < n - 1 ? values[i + 2] : 2 * v2 - v1;
+        return basis((t - i / n) * n, v0, v1, v2, v3);
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/basisClosed.js
+
+    /* harmony default export */ function basisClosed(values) {
+      var n = values.length;
+      return function (t) {
+        var i = Math.floor(((t %= 1) < 0 ? ++t : t) * n),
+          v0 = values[(i + n - 1) % n],
+          v1 = values[i % n],
+          v2 = values[(i + 1) % n],
+          v3 = values[(i + 2) % n];
+        return basis((t - i / n) * n, v0, v1, v2, v3);
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/constant.js
+
+    /* harmony default export */ const d3_interpolate_src_constant = (
+      x,
+    ) => () => x; // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/color.js
+
+    function linear(a, d) {
+      return function (t) {
+        return a + t * d;
+      };
+    }
+
+    function exponential(a, b, y) {
+      return (
+        (a = Math.pow(a, y)),
+        (b = Math.pow(b, y) - a),
+        (y = 1 / y),
+        function (t) {
+          return Math.pow(a + t * b, y);
+        }
+      );
+    }
+
+    function hue(a, b) {
+      var d = b - a;
+      return d
+        ? linear(a, d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d)
+        : constant(isNaN(a) ? b : a);
+    }
+
+    function gamma(y) {
+      return (y = +y) === 1
+        ? nogamma
+        : function (a, b) {
+            return b - a
+              ? exponential(a, b, y)
+              : d3_interpolate_src_constant(isNaN(a) ? b : a);
+          };
+    }
+
+    function nogamma(a, b) {
+      var d = b - a;
+      return d ? linear(a, d) : d3_interpolate_src_constant(isNaN(a) ? b : a);
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/rgb.js
+
+    /* harmony default export */ const rgb = (function rgbGamma(y) {
+      var color = gamma(y);
+
+      function rgb(start, end) {
+        var r = color((start = color_rgb(start)).r, (end = color_rgb(end)).r),
+          g = color(start.g, end.g),
+          b = color(start.b, end.b),
+          opacity = nogamma(start.opacity, end.opacity);
+        return function (t) {
+          start.r = r(t);
+          start.g = g(t);
+          start.b = b(t);
+          start.opacity = opacity(t);
+          return start + '';
+        };
+      }
+
+      rgb.gamma = rgbGamma;
+
+      return rgb;
+    })(1);
+
+    function rgbSpline(spline) {
+      return function (colors) {
+        var n = colors.length,
+          r = new Array(n),
+          g = new Array(n),
+          b = new Array(n),
+          i,
+          color;
+        for (i = 0; i < n; ++i) {
+          color = color_rgb(colors[i]);
+          r[i] = color.r || 0;
+          g[i] = color.g || 0;
+          b[i] = color.b || 0;
+        }
+        r = spline(r);
+        g = spline(g);
+        b = spline(b);
+        color.opacity = 1;
+        return function (t) {
+          color.r = r(t);
+          color.g = g(t);
+          color.b = b(t);
+          return color + '';
+        };
+      };
+    }
+
+    var rgbBasis = rgbSpline(src_basis);
+    var rgbBasisClosed = rgbSpline(basisClosed); // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/array.js
+
+    /* harmony default export */ function src_array(a, b) {
+      return (isNumberArray(b) ? numberArray : genericArray)(a, b);
+    }
+
+    function genericArray(a, b) {
+      var nb = b ? b.length : 0,
+        na = a ? Math.min(nb, a.length) : 0,
+        x = new Array(na),
+        c = new Array(nb),
+        i;
+
+      for (i = 0; i < na; ++i) x[i] = value(a[i], b[i]);
+      for (; i < nb; ++i) c[i] = b[i];
+
+      return function (t) {
+        for (i = 0; i < na; ++i) c[i] = x[i](t);
+        return c;
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/date.js
+
+    /* harmony default export */ function date(a, b) {
+      var d = new Date();
+      return (
+        (a = +a),
+        (b = +b),
+        function (t) {
+          return d.setTime(a * (1 - t) + b * t), d;
+        }
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/number.js
+
+    /* harmony default export */ function src_number(a, b) {
+      return (
+        (a = +a),
+        (b = +b),
+        function (t) {
+          return a * (1 - t) + b * t;
+        }
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/object.js
+
+    /* harmony default export */ function object(a, b) {
+      var i = {},
+        c = {},
+        k;
+
+      if (a === null || typeof a !== 'object') a = {};
+      if (b === null || typeof b !== 'object') b = {};
+
+      for (k in b) {
+        if (k in a) {
+          i[k] = value(a[k], b[k]);
+        } else {
+          c[k] = b[k];
+        }
+      }
+
+      return function (t) {
+        for (k in i) c[k] = i[k](t);
+        return c;
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/string.js
+
+    var reA = /[-+]?(?:\d+\.?\d*|\.?\d+)(?:[eE][-+]?\d+)?/g,
+      reB = new RegExp(reA.source, 'g');
+
+    function zero(b) {
+      return function () {
+        return b;
+      };
+    }
+
+    function one(b) {
+      return function (t) {
+        return b(t) + '';
+      };
+    }
+
+    /* harmony default export */ function string(a, b) {
+      var bi = (reA.lastIndex = reB.lastIndex = 0), // scan index for next number in b
+        am, // current match in a
+        bm, // current match in b
+        bs, // string preceding current number in b, if any
+        i = -1, // index in s
+        s = [], // string constants and placeholders
+        q = []; // number interpolators
+
+      // Coerce inputs to strings.
+      (a = a + ''), (b = b + '');
+
+      // Interpolate pairs of numbers in a & b.
+      while ((am = reA.exec(a)) && (bm = reB.exec(b))) {
+        if ((bs = bm.index) > bi) {
+          // a string precedes the next number in b
+          bs = b.slice(bi, bs);
+          if (s[i]) s[i] += bs;
+          // coalesce with previous string
+          else s[++i] = bs;
+        }
+        if ((am = am[0]) === (bm = bm[0])) {
+          // numbers in a & b match
+          if (s[i]) s[i] += bm;
+          // coalesce with previous string
+          else s[++i] = bm;
+        } else {
+          // interpolate non-matching numbers
+          s[++i] = null;
+          q.push({ i: i, x: src_number(am, bm) });
+        }
+        bi = reB.lastIndex;
+      }
+
+      // Add remains of b.
+      if (bi < b.length) {
+        bs = b.slice(bi);
+        if (s[i]) s[i] += bs;
+        // coalesce with previous string
+        else s[++i] = bs;
+      }
+
+      // Special optimization for only a single match.
+      // Otherwise, interpolate each of the numbers and rejoin the string.
+      return s.length < 2
+        ? q[0]
+          ? one(q[0].x)
+          : zero(b)
+        : ((b = q.length),
+          function (t) {
+            for (var i = 0, o; i < b; ++i) s[(o = q[i]).i] = o.x(t);
+            return s.join('');
+          });
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/numberArray.js
+
+    /* harmony default export */ function src_numberArray(a, b) {
+      if (!b) b = [];
+      var n = a ? Math.min(b.length, a.length) : 0,
+        c = b.slice(),
+        i;
+      return function (t) {
+        for (i = 0; i < n; ++i) c[i] = a[i] * (1 - t) + b[i] * t;
+        return c;
+      };
+    }
+
+    function numberArray_isNumberArray(x) {
+      return ArrayBuffer.isView(x) && !(x instanceof DataView);
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/value.js
+
+    /* harmony default export */ function value(a, b) {
+      var t = typeof b,
+        c;
+      return b == null || t === 'boolean'
+        ? d3_interpolate_src_constant(b)
+        : (t === 'number'
+            ? src_number
+            : t === 'string'
+            ? (c = color(b))
+              ? ((b = c), rgb)
+              : string
+            : b instanceof color
+            ? rgb
+            : b instanceof Date
+            ? date
+            : numberArray_isNumberArray(b)
+            ? src_numberArray
+            : Array.isArray(b)
+            ? genericArray
+            : (typeof b.valueOf !== 'function' &&
+                typeof b.toString !== 'function') ||
+              isNaN(b)
+            ? object
+            : src_number)(a, b);
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/round.js
+
+    /* harmony default export */ function round(a, b) {
+      return (
+        (a = +a),
+        (b = +b),
+        function (t) {
+          return Math.round(a * (1 - t) + b * t);
+        }
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/constant.js
+
+    function constants(x) {
+      return function () {
+        return x;
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/number.js
+
+    function number_number(x) {
+      return +x;
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/continuous.js
+
+    var unit = [0, 1];
+
+    function continuous_identity(x) {
+      return x;
+    }
+
+    function normalize(a, b) {
+      return (b -= a = +a)
+        ? function (x) {
+            return (x - a) / b;
+          }
+        : constants(isNaN(b) ? NaN : 0.5);
+    }
+
+    function clamper(a, b) {
+      var t;
+      if (a > b) (t = a), (a = b), (b = t);
+      return function (x) {
+        return Math.max(a, Math.min(b, x));
+      };
+    }
+
+    // normalize(a, b)(x) takes a domain value x in [a,b] and returns the corresponding parameter t in [0,1].
+    // interpolate(a, b)(t) takes a parameter t in [0,1] and returns the corresponding range value x in [a,b].
+    function bimap(domain, range, interpolate) {
+      var d0 = domain[0],
+        d1 = domain[1],
+        r0 = range[0],
+        r1 = range[1];
+      if (d1 < d0) (d0 = normalize(d1, d0)), (r0 = interpolate(r1, r0));
+      else (d0 = normalize(d0, d1)), (r0 = interpolate(r0, r1));
+      return function (x) {
+        return r0(d0(x));
+      };
+    }
+
+    function polymap(domain, range, interpolate) {
+      var j = Math.min(domain.length, range.length) - 1,
+        d = new Array(j),
+        r = new Array(j),
+        i = -1;
+
+      // Reverse descending domains.
+      if (domain[j] < domain[0]) {
+        domain = domain.slice().reverse();
+        range = range.slice().reverse();
+      }
+
+      while (++i < j) {
+        d[i] = normalize(domain[i], domain[i + 1]);
+        r[i] = interpolate(range[i], range[i + 1]);
+      }
+
+      return function (x) {
+        var i = bisect(domain, x, 1, j) - 1;
+        return r[i](d[i](x));
+      };
+    }
+
+    function copy(source, target) {
+      return target
+        .domain(source.domain())
+        .range(source.range())
+        .interpolate(source.interpolate())
+        .clamp(source.clamp())
+        .unknown(source.unknown());
+    }
+
+    function transformer() {
+      var domain = unit,
+        range = unit,
+        interpolate = value,
+        transform,
+        untransform,
+        unknown,
+        clamp = continuous_identity,
+        piecewise,
+        output,
+        input;
+
+      function rescale() {
+        var n = Math.min(domain.length, range.length);
+        if (clamp !== continuous_identity)
+          clamp = clamper(domain[0], domain[n - 1]);
+        piecewise = n > 2 ? polymap : bimap;
+        output = input = null;
+        return scale;
+      }
+
+      function scale(x) {
+        return x == null || isNaN((x = +x))
+          ? unknown
+          : (
+              output ||
+              (output = piecewise(domain.map(transform), range, interpolate))
+            )(transform(clamp(x)));
+      }
+
+      scale.invert = function (y) {
+        return clamp(
+          untransform(
+            (
+              input ||
+              (input = piecewise(range, domain.map(transform), src_number))
+            )(y),
+          ),
+        );
+      };
+
+      scale.domain = function (_) {
+        return arguments.length
+          ? ((domain = Array.from(_, number_number)), rescale())
+          : domain.slice();
+      };
+
+      scale.range = function (_) {
+        return arguments.length
+          ? ((range = Array.from(_)), rescale())
+          : range.slice();
+      };
+
+      scale.rangeRound = function (_) {
+        return (range = Array.from(_)), (interpolate = round), rescale();
+      };
+
+      scale.clamp = function (_) {
+        return arguments.length
+          ? ((clamp = _ ? true : continuous_identity), rescale())
+          : clamp !== continuous_identity;
+      };
+
+      scale.interpolate = function (_) {
+        return arguments.length ? ((interpolate = _), rescale()) : interpolate;
+      };
+
+      scale.unknown = function (_) {
+        return arguments.length ? ((unknown = _), scale) : unknown;
+      };
+
+      return function (t, u) {
+        (transform = t), (untransform = u);
+        return rescale();
+      };
+    }
+
+    function continuous() {
+      return transformer()(continuous_identity, continuous_identity);
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/init.js
+
+    function initRange(domain, range) {
+      switch (arguments.length) {
+        case 0:
+          break;
+        case 1:
+          this.range(domain);
+          break;
+        default:
+          this.range(range).domain(domain);
+          break;
+      }
+      return this;
+    }
+
+    function initInterpolator(domain, interpolator) {
+      switch (arguments.length) {
+        case 0:
+          break;
+        case 1: {
+          if (typeof domain === 'function') this.interpolator(domain);
+          else this.range(domain);
+          break;
+        }
+        default: {
+          this.domain(domain);
+          if (typeof interpolator === 'function')
+            this.interpolator(interpolator);
+          else this.range(interpolator);
+          break;
+        }
+      }
+      return this;
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionPrefix.js
+
+    /* harmony default export */ function precisionPrefix(step, value) {
+      return Math.max(
+        0,
+        Math.max(-8, Math.min(8, Math.floor(exponent(value) / 3))) * 3 -
+          exponent(Math.abs(step)),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionRound.js
+
+    /* harmony default export */ function precisionRound(step, max) {
+      (step = Math.abs(step)), (max = Math.abs(max) - step);
+      return Math.max(0, exponent(max) - exponent(step)) + 1;
+    } // CONCATENATED MODULE: ../node_modules/d3-format/src/precisionFixed.js
+
+    /* harmony default export */ function precisionFixed(step) {
+      return Math.max(0, -exponent(Math.abs(step)));
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/tickFormat.js
+
+    function tickFormat(start, stop, count, specifier) {
+      var step = tickStep(start, stop, count),
+        precision;
+      specifier = formatSpecifier(specifier == null ? ',f' : specifier);
+      switch (specifier.type) {
+        case 's': {
+          var value = Math.max(Math.abs(start), Math.abs(stop));
+          if (
+            specifier.precision == null &&
+            !isNaN((precision = precisionPrefix(step, value)))
+          )
+            specifier.precision = precision;
+          return formatPrefix(specifier, value);
+        }
+        case '':
+        case 'e':
+        case 'g':
+        case 'p':
+        case 'r': {
+          if (
+            specifier.precision == null &&
+            !isNaN(
+              (precision = precisionRound(
+                step,
+                Math.max(Math.abs(start), Math.abs(stop)),
+              )),
+            )
+          )
+            specifier.precision = precision - (specifier.type === 'e');
+          break;
+        }
+        case 'f':
+        case '%': {
+          if (
+            specifier.precision == null &&
+            !isNaN((precision = precisionFixed(step)))
+          )
+            specifier.precision = precision - (specifier.type === '%') * 2;
+          break;
+        }
+      }
+      return format(specifier);
+    } // CONCATENATED MODULE: ../node_modules/d3-scale/src/linear.js
+
+    function linearish(scale) {
+      var domain = scale.domain;
+
+      scale.ticks = function (count) {
+        var d = domain();
+        return ticks(d[0], d[d.length - 1], count == null ? 10 : count);
+      };
+
+      scale.tickFormat = function (count, specifier) {
+        var d = domain();
+        return tickFormat(
+          d[0],
+          d[d.length - 1],
+          count == null ? 10 : count,
+          specifier,
+        );
+      };
+
+      scale.nice = function (count) {
+        if (count == null) count = 10;
+
+        var d = domain();
+        var i0 = 0;
+        var i1 = d.length - 1;
+        var start = d[i0];
+        var stop = d[i1];
+        var prestep;
+        var step;
+        var maxIter = 10;
+
+        if (stop < start) {
+          (step = start), (start = stop), (stop = step);
+          (step = i0), (i0 = i1), (i1 = step);
+        }
+
+        while (maxIter-- > 0) {
+          step = tickIncrement(start, stop, count);
+          if (step === prestep) {
+            d[i0] = start;
+            d[i1] = stop;
+            return domain(d);
+          } else if (step > 0) {
+            start = Math.floor(start / step) * step;
+            stop = Math.ceil(stop / step) * step;
+          } else if (step < 0) {
+            start = Math.ceil(start * step) / step;
+            stop = Math.floor(stop * step) / step;
+          } else {
+            break;
+          }
+          prestep = step;
+        }
+
+        return scale;
+      };
+
+      return scale;
+    }
+
+    function linear_linear() {
+      var scale = continuous();
+
+      scale.copy = function () {
+        return copy(scale, linear_linear());
+      };
+
+      initRange.apply(scale, arguments);
+
+      return linearish(scale);
+    } // CONCATENATED MODULE: ../node_modules/d3-ease/src/cubic.js
+
+    function cubicIn(t) {
+      return t * t * t;
+    }
+
+    function cubicOut(t) {
+      return --t * t * t + 1;
+    }
+
+    function cubicInOut(t) {
+      return ((t *= 2) <= 1 ? t * t * t : (t -= 2) * t * t + 2) / 2;
+    } // CONCATENATED MODULE: ../node_modules/d3-dispatch/src/dispatch.js
+
+    var noop = { value: () => {} };
+
+    function dispatch_dispatch() {
+      for (var i = 0, n = arguments.length, _ = {}, t; i < n; ++i) {
+        if (!(t = arguments[i] + '') || t in _ || /[\s.]/.test(t))
+          throw new Error('illegal type: ' + t);
+        _[t] = [];
+      }
+      return new Dispatch(_);
+    }
+
+    function Dispatch(_) {
+      this._ = _;
+    }
+
+    function dispatch_parseTypenames(typenames, types) {
+      return typenames
+        .trim()
+        .split(/^|\s+/)
+        .map(function (t) {
+          var name = '',
+            i = t.indexOf('.');
+          if (i >= 0) (name = t.slice(i + 1)), (t = t.slice(0, i));
+          if (t && !types.hasOwnProperty(t))
+            throw new Error('unknown type: ' + t);
+          return { type: t, name: name };
+        });
+    }
+
+    Dispatch.prototype = dispatch_dispatch.prototype = {
+      constructor: Dispatch,
+      on: function (typename, callback) {
+        var _ = this._,
+          T = dispatch_parseTypenames(typename + '', _),
+          t,
+          i = -1,
+          n = T.length;
+
+        // If no callback was specified, return the callback of the given type and name.
+        if (arguments.length < 2) {
+          while (++i < n)
+            if ((t = (typename = T[i]).type) && (t = get(_[t], typename.name)))
+              return t;
+          return;
+        }
+
+        // If a type was specified, set the callback for the given type and name.
+        // Otherwise, if a null callback was specified, remove callbacks of the given name.
+        if (callback != null && typeof callback !== 'function')
+          throw new Error('invalid callback: ' + callback);
+        while (++i < n) {
+          if ((t = (typename = T[i]).type))
+            _[t] = set(_[t], typename.name, callback);
+          else if (callback == null)
+            for (t in _) _[t] = set(_[t], typename.name, null);
+        }
+
+        return this;
+      },
+      copy: function () {
+        var copy = {},
+          _ = this._;
+        for (var t in _) copy[t] = _[t].slice();
+        return new Dispatch(copy);
+      },
+      call: function (type, that) {
+        if ((n = arguments.length - 2) > 0)
+          for (var args = new Array(n), i = 0, n, t; i < n; ++i)
+            args[i] = arguments[i + 2];
+        if (!this._.hasOwnProperty(type))
+          throw new Error('unknown type: ' + type);
+        for (t = this._[type], i = 0, n = t.length; i < n; ++i)
+          t[i].value.apply(that, args);
+      },
+      apply: function (type, that, args) {
+        if (!this._.hasOwnProperty(type))
+          throw new Error('unknown type: ' + type);
+        for (var t = this._[type], i = 0, n = t.length; i < n; ++i)
+          t[i].value.apply(that, args);
+      },
+    };
+
+    function get(type, name) {
+      for (var i = 0, n = type.length, c; i < n; ++i) {
+        if ((c = type[i]).name === name) {
+          return c.value;
+        }
+      }
+    }
+
+    function set(type, name, callback) {
+      for (var i = 0, n = type.length; i < n; ++i) {
+        if (type[i].name === name) {
+          (type[i] = noop), (type = type.slice(0, i).concat(type.slice(i + 1)));
+          break;
+        }
+      }
+      if (callback != null) type.push({ name: name, value: callback });
+      return type;
+    }
+
+    /* harmony default export */ const src_dispatch = dispatch_dispatch; // CONCATENATED MODULE: ../node_modules/d3-timer/src/timer.js
+
+    var timer_frame = 0, // is an animation frame pending?
+      timeout = 0, // is a timeout pending?
+      interval = 0, // are any timers active?
+      pokeDelay = 1000, // how frequently we check for clock skew
+      taskHead,
+      taskTail,
+      clockLast = 0,
+      clockNow = 0,
+      clockSkew = 0,
+      clock =
+        typeof performance === 'object' && performance.now ? performance : Date,
+      setFrame =
+        typeof window === 'object' && window.requestAnimationFrame
+          ? window.requestAnimationFrame.bind(window)
+          : function (f) {
+              setTimeout(f, 17);
+            };
+
+    function now() {
+      return (
+        clockNow || (setFrame(clearNow), (clockNow = clock.now() + clockSkew))
+      );
+    }
+
+    function clearNow() {
+      clockNow = 0;
+    }
+
+    function Timer() {
+      this._call = this._time = this._next = null;
+    }
+
+    Timer.prototype = timer.prototype = {
+      constructor: Timer,
+      restart: function (callback, delay, time) {
+        if (typeof callback !== 'function')
+          throw new TypeError('callback is not a function');
+        time = (time == null ? now() : +time) + (delay == null ? 0 : +delay);
+        if (!this._next && taskTail !== this) {
+          if (taskTail) taskTail._next = this;
+          else taskHead = this;
+          taskTail = this;
+        }
+        this._call = callback;
+        this._time = time;
+        sleep();
+      },
+      stop: function () {
+        if (this._call) {
+          this._call = null;
+          this._time = Infinity;
+          sleep();
+        }
+      },
+    };
+
+    function timer(callback, delay, time) {
+      var t = new Timer();
+      t.restart(callback, delay, time);
+      return t;
+    }
+
+    function timerFlush() {
+      now(); // Get the current time, if not already set.
+      ++timer_frame; // Pretend we’ve set an alarm, if we haven’t already.
+      var t = taskHead,
+        e;
+      while (t) {
+        if ((e = clockNow - t._time) >= 0) t._call.call(undefined, e);
+        t = t._next;
+      }
+      --timer_frame;
+    }
+
+    function wake() {
+      clockNow = (clockLast = clock.now()) + clockSkew;
+      timer_frame = timeout = 0;
+      try {
+        timerFlush();
+      } finally {
+        timer_frame = 0;
+        nap();
+        clockNow = 0;
+      }
+    }
+
+    function poke() {
+      var now = clock.now(),
+        delay = now - clockLast;
+      if (delay > pokeDelay) (clockSkew -= delay), (clockLast = now);
+    }
+
+    function nap() {
+      var t0,
+        t1 = taskHead,
+        t2,
+        time = Infinity;
+      while (t1) {
+        if (t1._call) {
+          if (time > t1._time) time = t1._time;
+          (t0 = t1), (t1 = t1._next);
+        } else {
+          (t2 = t1._next), (t1._next = null);
+          t1 = t0 ? (t0._next = t2) : (taskHead = t2);
+        }
+      }
+      taskTail = t0;
+      sleep(time);
+    }
+
+    function sleep(time) {
+      if (timer_frame) return; // Soonest alarm already set, or will be.
+      if (timeout) timeout = clearTimeout(timeout);
+      var delay = time - clockNow; // Strictly less than if we recomputed clockNow.
+      if (delay > 24) {
+        if (time < Infinity)
+          timeout = setTimeout(wake, time - clock.now() - clockSkew);
+        if (interval) interval = clearInterval(interval);
+      } else {
+        if (!interval)
+          (clockLast = clock.now()), (interval = setInterval(poke, pokeDelay));
+        (timer_frame = 1), setFrame(wake);
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-timer/src/timeout.js
+
+    /* harmony default export */ function src_timeout(callback, delay, time) {
+      var t = new Timer();
+      delay = delay == null ? 0 : +delay;
+      t.restart(
+        (elapsed) => {
+          t.stop();
+          callback(elapsed + delay);
+        },
+        delay,
+        time,
+      );
+      return t;
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/schedule.js
+
+    var emptyOn = src_dispatch('start', 'end', 'cancel', 'interrupt');
+    var emptyTween = [];
+
+    var CREATED = 0;
+    var SCHEDULED = 1;
+    var STARTING = 2;
+    var STARTED = 3;
+    var RUNNING = 4;
+    var ENDING = 5;
+    var ENDED = 6;
+
+    /* harmony default export */ function schedule(
+      node,
+      name,
+      id,
+      index,
+      group,
+      timing,
+    ) {
+      var schedules = node.__transition;
+      if (!schedules) node.__transition = {};
+      else if (id in schedules) return;
+      create(node, id, {
+        name: name,
+        index: index, // For context during callback.
+        group: group, // For context during callback.
+        on: emptyOn,
+        tween: emptyTween,
+        time: timing.time,
+        delay: timing.delay,
+        duration: timing.duration,
+        ease: timing.ease,
+        timer: null,
+        state: CREATED,
+      });
+    }
+
+    function init(node, id) {
+      var schedule = schedule_get(node, id);
+      if (schedule.state > CREATED)
+        throw new Error('too late; already scheduled');
+      return schedule;
+    }
+
+    function schedule_set(node, id) {
+      var schedule = schedule_get(node, id);
+      if (schedule.state > STARTED)
+        throw new Error('too late; already running');
+      return schedule;
+    }
+
+    function schedule_get(node, id) {
+      var schedule = node.__transition;
+      if (!schedule || !(schedule = schedule[id]))
+        throw new Error('transition not found');
+      return schedule;
+    }
+
+    function create(node, id, self) {
+      var schedules = node.__transition,
+        tween;
+
+      // Initialize the self timer when the transition is created.
+      // Note the actual delay is not known until the first callback!
+      schedules[id] = self;
+      self.timer = timer(schedule, 0, self.time);
+
+      function schedule(elapsed) {
+        self.state = SCHEDULED;
+        self.timer.restart(start, self.delay, self.time);
+
+        // If the elapsed delay is less than our first sleep, start immediately.
+        if (self.delay <= elapsed) start(elapsed - self.delay);
+      }
+
+      function start(elapsed) {
+        var i, j, n, o;
+
+        // If the state is not SCHEDULED, then we previously errored on start.
+        if (self.state !== SCHEDULED) return stop();
+
+        for (i in schedules) {
+          o = schedules[i];
+          if (o.name !== self.name) continue;
+
+          // While this element already has a starting transition during this frame,
+          // defer starting an interrupting transition until that transition has a
+          // chance to tick (and possibly end); see d3/d3-transition#54!
+          if (o.state === STARTED) return src_timeout(start);
+
+          // Interrupt the active transition, if any.
+          if (o.state === RUNNING) {
+            o.state = ENDED;
+            o.timer.stop();
+            o.on.call('interrupt', node, node.__data__, o.index, o.group);
+            delete schedules[i];
+          }
+
+          // Cancel any pre-empted transitions.
+          else if (+i < id) {
+            o.state = ENDED;
+            o.timer.stop();
+            o.on.call('cancel', node, node.__data__, o.index, o.group);
+            delete schedules[i];
+          }
+        }
+
+        // Defer the first tick to end of the current frame; see d3/d3#1576.
+        // Note the transition may be canceled after start and before the first tick!
+        // Note this must be scheduled before the start event; see d3/d3-transition#16!
+        // Assuming this is successful, subsequent callbacks go straight to tick.
+        src_timeout(function () {
+          if (self.state === STARTED) {
+            self.state = RUNNING;
+            self.timer.restart(tick, self.delay, self.time);
+            tick(elapsed);
+          }
+        });
+
+        // Dispatch the start event.
+        // Note this must be done before the tween are initialized.
+        self.state = STARTING;
+        self.on.call('start', node, node.__data__, self.index, self.group);
+        if (self.state !== STARTING) return; // interrupted
+        self.state = STARTED;
+
+        // Initialize the tween, deleting null tween.
+        tween = new Array((n = self.tween.length));
+        for (i = 0, j = -1; i < n; ++i) {
+          if (
+            (o = self.tween[i].value.call(
+              node,
+              node.__data__,
+              self.index,
+              self.group,
+            ))
+          ) {
+            tween[++j] = o;
+          }
+        }
+        tween.length = j + 1;
+      }
+
+      function tick(elapsed) {
+        var t =
+            elapsed < self.duration
+              ? self.ease.call(null, elapsed / self.duration)
+              : (self.timer.restart(stop), (self.state = ENDING), 1),
+          i = -1,
+          n = tween.length;
+
+        while (++i < n) {
+          tween[i].call(node, t);
+        }
+
+        // Dispatch the end event.
+        if (self.state === ENDING) {
+          self.on.call('end', node, node.__data__, self.index, self.group);
+          stop();
+        }
+      }
+
+      function stop() {
+        self.state = ENDED;
+        self.timer.stop();
+        delete schedules[id];
+        for (var i in schedules) return; // eslint-disable-line no-unused-vars
+        delete node.__transition;
+      }
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/interrupt.js
+
+    /* harmony default export */ function interrupt(node, name) {
+      var schedules = node.__transition,
+        schedule,
+        active,
+        empty = true,
+        i;
+
+      if (!schedules) return;
+
+      name = name == null ? null : name + '';
+
+      for (i in schedules) {
+        if ((schedule = schedules[i]).name !== name) {
+          empty = false;
+          continue;
+        }
+        active = schedule.state > STARTING && schedule.state < ENDING;
+        schedule.state = ENDED;
+        schedule.timer.stop();
+        schedule.on.call(
+          active ? 'interrupt' : 'cancel',
+          node,
+          node.__data__,
+          schedule.index,
+          schedule.group,
+        );
+        delete schedules[i];
+      }
+
+      if (empty) delete node.__transition;
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/interrupt.js
+
+    /* harmony default export */ function selection_interrupt(name) {
+      return this.each(function () {
+        interrupt(this, name);
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/decompose.js
+
+    var degrees = 180 / Math.PI;
+
+    var decompose_identity = {
+      translateX: 0,
+      translateY: 0,
+      rotate: 0,
+      skewX: 0,
+      scaleX: 1,
+      scaleY: 1,
+    };
+
+    /* harmony default export */ function decompose(a, b, c, d, e, f) {
+      var scaleX, scaleY, skewX;
+      if ((scaleX = Math.sqrt(a * a + b * b))) (a /= scaleX), (b /= scaleX);
+      if ((skewX = a * c + b * d)) (c -= a * skewX), (d -= b * skewX);
+      if ((scaleY = Math.sqrt(c * c + d * d)))
+        (c /= scaleY), (d /= scaleY), (skewX /= scaleY);
+      if (a * d < b * c)
+        (a = -a), (b = -b), (skewX = -skewX), (scaleX = -scaleX);
+      return {
+        translateX: e,
+        translateY: f,
+        rotate: Math.atan2(b, a) * degrees,
+        skewX: Math.atan(skewX) * degrees,
+        scaleX: scaleX,
+        scaleY: scaleY,
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/parse.js
+
+    var svgNode;
+
+    /* eslint-disable no-undef */
+    function parseCss(value) {
+      const m = new (typeof DOMMatrix === 'function'
+        ? DOMMatrix
+        : WebKitCSSMatrix)(value + '');
+      return m.isIdentity
+        ? decompose_identity
+        : decompose(m.a, m.b, m.c, m.d, m.e, m.f);
+    }
+
+    function parseSvg(value) {
+      if (value == null) return decompose_identity;
+      if (!svgNode)
+        svgNode = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+      svgNode.setAttribute('transform', value);
+      if (!(value = svgNode.transform.baseVal.consolidate()))
+        return decompose_identity;
+      value = value.matrix;
+      return decompose(value.a, value.b, value.c, value.d, value.e, value.f);
+    } // CONCATENATED MODULE: ../node_modules/d3-interpolate/src/transform/index.js
+
+    function interpolateTransform(parse, pxComma, pxParen, degParen) {
+      function pop(s) {
+        return s.length ? s.pop() + ' ' : '';
+      }
+
+      function translate(xa, ya, xb, yb, s, q) {
+        if (xa !== xb || ya !== yb) {
+          var i = s.push('translate(', null, pxComma, null, pxParen);
+          q.push(
+            { i: i - 4, x: src_number(xa, xb) },
+            { i: i - 2, x: src_number(ya, yb) },
+          );
+        } else if (xb || yb) {
+          s.push('translate(' + xb + pxComma + yb + pxParen);
+        }
+      }
+
+      function rotate(a, b, s, q) {
+        if (a !== b) {
+          if (a - b > 180) b += 360;
+          else if (b - a > 180) a += 360; // shortest path
+          q.push({
+            i: s.push(pop(s) + 'rotate(', null, degParen) - 2,
+            x: src_number(a, b),
+          });
+        } else if (b) {
+          s.push(pop(s) + 'rotate(' + b + degParen);
+        }
+      }
+
+      function skewX(a, b, s, q) {
+        if (a !== b) {
+          q.push({
+            i: s.push(pop(s) + 'skewX(', null, degParen) - 2,
+            x: src_number(a, b),
+          });
+        } else if (b) {
+          s.push(pop(s) + 'skewX(' + b + degParen);
+        }
+      }
+
+      function scale(xa, ya, xb, yb, s, q) {
+        if (xa !== xb || ya !== yb) {
+          var i = s.push(pop(s) + 'scale(', null, ',', null, ')');
+          q.push(
+            { i: i - 4, x: src_number(xa, xb) },
+            { i: i - 2, x: src_number(ya, yb) },
+          );
+        } else if (xb !== 1 || yb !== 1) {
+          s.push(pop(s) + 'scale(' + xb + ',' + yb + ')');
+        }
+      }
+
+      return function (a, b) {
+        var s = [], // string constants and placeholders
+          q = []; // number interpolators
+        (a = parse(a)), (b = parse(b));
+        translate(a.translateX, a.translateY, b.translateX, b.translateY, s, q);
+        rotate(a.rotate, b.rotate, s, q);
+        skewX(a.skewX, b.skewX, s, q);
+        scale(a.scaleX, a.scaleY, b.scaleX, b.scaleY, s, q);
+        a = b = null; // gc
+        return function (t) {
+          var i = -1,
+            n = q.length,
+            o;
+          while (++i < n) s[(o = q[i]).i] = o.x(t);
+          return s.join('');
+        };
+      };
+    }
+
+    var interpolateTransformCss = interpolateTransform(
+      parseCss,
+      'px, ',
+      'px)',
+      'deg)',
+    );
+    var interpolateTransformSvg = interpolateTransform(
+      parseSvg,
+      ', ',
+      ')',
+      ')',
+    ); // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/tween.js
+
+    function tweenRemove(id, name) {
+      var tween0, tween1;
+      return function () {
+        var schedule = schedule_set(this, id),
+          tween = schedule.tween;
+
+        // If this node shared tween with the previous node,
+        // just assign the updated shared tween and we’re done!
+        // Otherwise, copy-on-write.
+        if (tween !== tween0) {
+          tween1 = tween0 = tween;
+          for (var i = 0, n = tween1.length; i < n; ++i) {
+            if (tween1[i].name === name) {
+              tween1 = tween1.slice();
+              tween1.splice(i, 1);
+              break;
+            }
+          }
+        }
+
+        schedule.tween = tween1;
+      };
+    }
+
+    function tweenFunction(id, name, value) {
+      var tween0, tween1;
+      if (typeof value !== 'function') throw new Error();
+      return function () {
+        var schedule = schedule_set(this, id),
+          tween = schedule.tween;
+
+        // If this node shared tween with the previous node,
+        // just assign the updated shared tween and we’re done!
+        // Otherwise, copy-on-write.
+        if (tween !== tween0) {
+          tween1 = (tween0 = tween).slice();
+          for (
+            var t = { name: name, value: value }, i = 0, n = tween1.length;
+            i < n;
+            ++i
+          ) {
+            if (tween1[i].name === name) {
+              tween1[i] = t;
+              break;
+            }
+          }
+          if (i === n) tween1.push(t);
+        }
+
+        schedule.tween = tween1;
+      };
+    }
+
+    /* harmony default export */ function tween(name, value) {
+      var id = this._id;
+
+      name += '';
+
+      if (arguments.length < 2) {
+        var tween = schedule_get(this.node(), id).tween;
+        for (var i = 0, n = tween.length, t; i < n; ++i) {
+          if ((t = tween[i]).name === name) {
+            return t.value;
+          }
+        }
+        return null;
+      }
+
+      return this.each(
+        (value == null ? tweenRemove : tweenFunction)(id, name, value),
+      );
+    }
+
+    function tweenValue(transition, name, value) {
+      var id = transition._id;
+
+      transition.each(function () {
+        var schedule = schedule_set(this, id);
+        (schedule.value || (schedule.value = {}))[name] = value.apply(
+          this,
+          arguments,
+        );
+      });
+
+      return function (node) {
+        return schedule_get(node, id).value[name];
+      };
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/interpolate.js
+
+    /* harmony default export */ function interpolate(a, b) {
+      var c;
+      return (typeof b === 'number'
+        ? src_number
+        : b instanceof color
+        ? rgb
+        : (c = color(b))
+        ? ((b = c), rgb)
+        : string)(a, b);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attr.js
+
+    function attr_attrRemove(name) {
+      return function () {
+        this.removeAttribute(name);
+      };
+    }
+
+    function attr_attrRemoveNS(fullname) {
+      return function () {
+        this.removeAttributeNS(fullname.space, fullname.local);
+      };
+    }
+
+    function attr_attrConstant(name, interpolate, value1) {
+      var string00,
+        string1 = value1 + '',
+        interpolate0;
+      return function () {
+        var string0 = this.getAttribute(name);
+        return string0 === string1
+          ? null
+          : string0 === string00
+          ? interpolate0
+          : (interpolate0 = interpolate((string00 = string0), value1));
+      };
+    }
+
+    function attr_attrConstantNS(fullname, interpolate, value1) {
+      var string00,
+        string1 = value1 + '',
+        interpolate0;
+      return function () {
+        var string0 = this.getAttributeNS(fullname.space, fullname.local);
+        return string0 === string1
+          ? null
+          : string0 === string00
+          ? interpolate0
+          : (interpolate0 = interpolate((string00 = string0), value1));
+      };
+    }
+
+    function attr_attrFunction(name, interpolate, value) {
+      var string00, string10, interpolate0;
+      return function () {
+        var string0,
+          value1 = value(this),
+          string1;
+        if (value1 == null) return void this.removeAttribute(name);
+        string0 = this.getAttribute(name);
+        string1 = value1 + '';
+        return string0 === string1
+          ? null
+          : string0 === string00 && string1 === string10
+          ? interpolate0
+          : ((string10 = string1),
+            (interpolate0 = interpolate((string00 = string0), value1)));
+      };
+    }
+
+    function attr_attrFunctionNS(fullname, interpolate, value) {
+      var string00, string10, interpolate0;
+      return function () {
+        var string0,
+          value1 = value(this),
+          string1;
+        if (value1 == null)
+          return void this.removeAttributeNS(fullname.space, fullname.local);
+        string0 = this.getAttributeNS(fullname.space, fullname.local);
+        string1 = value1 + '';
+        return string0 === string1
+          ? null
+          : string0 === string00 && string1 === string10
+          ? interpolate0
+          : ((string10 = string1),
+            (interpolate0 = interpolate((string00 = string0), value1)));
+      };
+    }
+
+    /* harmony default export */ function transition_attr(name, value) {
+      var fullname = namespace(name),
+        i = fullname === 'transform' ? interpolateTransformSvg : interpolate;
+      return this.attrTween(
+        name,
+        typeof value === 'function'
+          ? (fullname.local ? attr_attrFunctionNS : attr_attrFunction)(
+              fullname,
+              i,
+              tweenValue(this, 'attr.' + name, value),
+            )
+          : value == null
+          ? (fullname.local ? attr_attrRemoveNS : attr_attrRemove)(fullname)
+          : (fullname.local ? attr_attrConstantNS : attr_attrConstant)(
+              fullname,
+              i,
+              value,
+            ),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/attrTween.js
+
+    function attrInterpolate(name, i) {
+      return function (t) {
+        this.setAttribute(name, i.call(this, t));
+      };
+    }
+
+    function attrInterpolateNS(fullname, i) {
+      return function (t) {
+        this.setAttributeNS(fullname.space, fullname.local, i.call(this, t));
+      };
+    }
+
+    function attrTweenNS(fullname, value) {
+      var t0, i0;
+      function tween() {
+        var i = value.apply(this, arguments);
+        if (i !== i0) t0 = (i0 = i) && attrInterpolateNS(fullname, i);
+        return t0;
+      }
+      tween._value = value;
+      return tween;
+    }
+
+    function attrTween(name, value) {
+      var t0, i0;
+      function tween() {
+        var i = value.apply(this, arguments);
+        if (i !== i0) t0 = (i0 = i) && attrInterpolate(name, i);
+        return t0;
+      }
+      tween._value = value;
+      return tween;
+    }
+
+    /* harmony default export */ function transition_attrTween(name, value) {
+      var key = 'attr.' + name;
+      if (arguments.length < 2) return (key = this.tween(key)) && key._value;
+      if (value == null) return this.tween(key, null);
+      if (typeof value !== 'function') throw new Error();
+      var fullname = namespace(name);
+      return this.tween(
+        key,
+        (fullname.local ? attrTweenNS : attrTween)(fullname, value),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/delay.js
+
+    function delayFunction(id, value) {
+      return function () {
+        init(this, id).delay = +value.apply(this, arguments);
+      };
+    }
+
+    function delayConstant(id, value) {
+      return (
+        (value = +value),
+        function () {
+          init(this, id).delay = value;
+        }
+      );
+    }
+
+    /* harmony default export */ function delay(value) {
+      var id = this._id;
+
+      return arguments.length
+        ? this.each(
+            (typeof value === 'function' ? delayFunction : delayConstant)(
+              id,
+              value,
+            ),
+          )
+        : schedule_get(this.node(), id).delay;
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/duration.js
+
+    function durationFunction(id, value) {
+      return function () {
+        schedule_set(this, id).duration = +value.apply(this, arguments);
+      };
+    }
+
+    function durationConstant(id, value) {
+      return (
+        (value = +value),
+        function () {
+          schedule_set(this, id).duration = value;
+        }
+      );
+    }
+
+    /* harmony default export */ function duration(value) {
+      var id = this._id;
+
+      return arguments.length
+        ? this.each(
+            (typeof value === 'function' ? durationFunction : durationConstant)(
+              id,
+              value,
+            ),
+          )
+        : schedule_get(this.node(), id).duration;
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/ease.js
+
+    function easeConstant(id, value) {
+      if (typeof value !== 'function') throw new Error();
+      return function () {
+        schedule_set(this, id).ease = value;
+      };
+    }
+
+    /* harmony default export */ function ease(value) {
+      var id = this._id;
+
+      return arguments.length
+        ? this.each(easeConstant(id, value))
+        : schedule_get(this.node(), id).ease;
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/easeVarying.js
+
+    function easeVarying(id, value) {
+      return function () {
+        var v = value.apply(this, arguments);
+        if (typeof v !== 'function') throw new Error();
+        schedule_set(this, id).ease = v;
+      };
+    }
+
+    /* harmony default export */ function transition_easeVarying(value) {
+      if (typeof value !== 'function') throw new Error();
+      return this.each(easeVarying(this._id, value));
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/filter.js
+
+    /* harmony default export */ function transition_filter(match) {
+      if (typeof match !== 'function') match = matcher(match);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group = groups[j],
+            n = group.length,
+            subgroup = (subgroups[j] = []),
+            node,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if ((node = group[i]) && match.call(node, node.__data__, i, group)) {
+            subgroup.push(node);
+          }
+        }
+      }
+
+      return new Transition(subgroups, this._parents, this._name, this._id);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/merge.js
+
+    /* harmony default export */ function transition_merge(transition) {
+      if (transition._id !== this._id) throw new Error();
+
+      for (
+        var groups0 = this._groups,
+          groups1 = transition._groups,
+          m0 = groups0.length,
+          m1 = groups1.length,
+          m = Math.min(m0, m1),
+          merges = new Array(m0),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group0 = groups0[j],
+            group1 = groups1[j],
+            n = group0.length,
+            merge = (merges[j] = new Array(n)),
+            node,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if ((node = group0[i] || group1[i])) {
+            merge[i] = node;
+          }
+        }
+      }
+
+      for (; j < m0; ++j) {
+        merges[j] = groups0[j];
+      }
+
+      return new Transition(merges, this._parents, this._name, this._id);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/on.js
+
+    function start(name) {
+      return (name + '')
+        .trim()
+        .split(/^|\s+/)
+        .every(function (t) {
+          var i = t.indexOf('.');
+          if (i >= 0) t = t.slice(0, i);
+          return !t || t === 'start';
+        });
+    }
+
+    function onFunction(id, name, listener) {
+      var on0,
+        on1,
+        sit = start(name) ? init : schedule_set;
+      return function () {
+        var schedule = sit(this, id),
+          on = schedule.on;
+
+        // If this node shared a dispatch with the previous node,
+        // just assign the updated shared dispatch and we’re done!
+        // Otherwise, copy-on-write.
+        if (on !== on0) (on1 = (on0 = on).copy()).on(name, listener);
+
+        schedule.on = on1;
+      };
+    }
+
+    /* harmony default export */ function transition_on(name, listener) {
+      var id = this._id;
+
+      return arguments.length < 2
+        ? schedule_get(this.node(), id).on.on(name)
+        : this.each(onFunction(id, name, listener));
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/remove.js
+
+    function removeFunction(id) {
+      return function () {
+        var parent = this.parentNode;
+        for (var i in this.__transition) if (+i !== id) return;
+        if (parent) parent.removeChild(this);
+      };
+    }
+
+    /* harmony default export */ function transition_remove() {
+      return this.on('end.remove', removeFunction(this._id));
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/select.js
+
+    /* harmony default export */ function transition_select(select) {
+      var name = this._name,
+        id = this._id;
+
+      if (typeof select !== 'function') select = selector(select);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = new Array(m),
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (
+          var group = groups[j],
+            n = group.length,
+            subgroup = (subgroups[j] = new Array(n)),
+            node,
+            subnode,
+            i = 0;
+          i < n;
+          ++i
+        ) {
+          if (
+            (node = group[i]) &&
+            (subnode = select.call(node, node.__data__, i, group))
+          ) {
+            if ('__data__' in node) subnode.__data__ = node.__data__;
+            subgroup[i] = subnode;
+            schedule(
+              subgroup[i],
+              name,
+              id,
+              i,
+              subgroup,
+              schedule_get(node, id),
+            );
+          }
+        }
+      }
+
+      return new Transition(subgroups, this._parents, name, id);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selectAll.js
+
+    /* harmony default export */ function transition_selectAll(select) {
+      var name = this._name,
+        id = this._id;
+
+      if (typeof select !== 'function') select = selectorAll(select);
+
+      for (
+        var groups = this._groups,
+          m = groups.length,
+          subgroups = [],
+          parents = [],
+          j = 0;
+        j < m;
+        ++j
+      ) {
+        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+          if ((node = group[i])) {
+            for (
+              var children = select.call(node, node.__data__, i, group),
+                child,
+                inherit = schedule_get(node, id),
+                k = 0,
+                l = children.length;
+              k < l;
+              ++k
+            ) {
+              if ((child = children[k])) {
+                schedule(child, name, id, k, children, inherit);
+              }
+            }
+            subgroups.push(children);
+            parents.push(node);
+          }
+        }
+      }
+
+      return new Transition(subgroups, parents, name, id);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/selection.js
+
+    var selection_Selection = src_selection.prototype.constructor;
+
+    /* harmony default export */ function transition_selection() {
+      return new selection_Selection(this._groups, this._parents);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/style.js
+
+    function styleNull(name, interpolate) {
+      var string00, string10, interpolate0;
+      return function () {
+        var string0 = styleValue(this, name),
+          string1 = (this.style.removeProperty(name), styleValue(this, name));
+        return string0 === string1
+          ? null
+          : string0 === string00 && string1 === string10
+          ? interpolate0
+          : (interpolate0 = interpolate(
+              (string00 = string0),
+              (string10 = string1),
+            ));
+      };
+    }
+
+    function style_styleRemove(name) {
+      return function () {
+        this.style.removeProperty(name);
+      };
+    }
+
+    function style_styleConstant(name, interpolate, value1) {
+      var string00,
+        string1 = value1 + '',
+        interpolate0;
+      return function () {
+        var string0 = styleValue(this, name);
+        return string0 === string1
+          ? null
+          : string0 === string00
+          ? interpolate0
+          : (interpolate0 = interpolate((string00 = string0), value1));
+      };
+    }
+
+    function style_styleFunction(name, interpolate, value) {
+      var string00, string10, interpolate0;
+      return function () {
+        var string0 = styleValue(this, name),
+          value1 = value(this),
+          string1 = value1 + '';
+        if (value1 == null)
+          string1 = value1 =
+            (this.style.removeProperty(name), styleValue(this, name));
+        return string0 === string1
+          ? null
+          : string0 === string00 && string1 === string10
+          ? interpolate0
+          : ((string10 = string1),
+            (interpolate0 = interpolate((string00 = string0), value1)));
+      };
+    }
+
+    function styleMaybeRemove(id, name) {
+      var on0,
+        on1,
+        listener0,
+        key = 'style.' + name,
+        event = 'end.' + key,
+        remove;
+      return function () {
+        var schedule = schedule_set(this, id),
+          on = schedule.on,
+          listener =
+            schedule.value[key] == null
+              ? remove || (remove = style_styleRemove(name))
+              : undefined;
+
+        // If this node shared a dispatch with the previous node,
+        // just assign the updated shared dispatch and we’re done!
+        // Otherwise, copy-on-write.
+        if (on !== on0 || listener0 !== listener)
+          (on1 = (on0 = on).copy()).on(event, (listener0 = listener));
+
+        schedule.on = on1;
+      };
+    }
+
+    /* harmony default export */ function transition_style(
+      name,
+      value,
+      priority,
+    ) {
+      var i =
+        (name += '') === 'transform' ? interpolateTransformCss : interpolate;
+      return value == null
+        ? this.styleTween(name, styleNull(name, i)).on(
+            'end.style.' + name,
+            style_styleRemove(name),
+          )
+        : typeof value === 'function'
+        ? this.styleTween(
+            name,
+            style_styleFunction(
+              name,
+              i,
+              tweenValue(this, 'style.' + name, value),
+            ),
+          ).each(styleMaybeRemove(this._id, name))
+        : this.styleTween(
+            name,
+            style_styleConstant(name, i, value),
+            priority,
+          ).on('end.style.' + name, null);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/styleTween.js
+
+    function styleInterpolate(name, i, priority) {
+      return function (t) {
+        this.style.setProperty(name, i.call(this, t), priority);
+      };
+    }
+
+    function styleTween(name, value, priority) {
+      var t, i0;
+      function tween() {
+        var i = value.apply(this, arguments);
+        if (i !== i0) t = (i0 = i) && styleInterpolate(name, i, priority);
+        return t;
+      }
+      tween._value = value;
+      return tween;
+    }
+
+    /* harmony default export */ function transition_styleTween(
+      name,
+      value,
+      priority,
+    ) {
+      var key = 'style.' + (name += '');
+      if (arguments.length < 2) return (key = this.tween(key)) && key._value;
+      if (value == null) return this.tween(key, null);
+      if (typeof value !== 'function') throw new Error();
+      return this.tween(
+        key,
+        styleTween(name, value, priority == null ? '' : priority),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/text.js
+
+    function text_textConstant(value) {
+      return function () {
+        this.textContent = value;
+      };
+    }
+
+    function text_textFunction(value) {
+      return function () {
+        var value1 = value(this);
+        this.textContent = value1 == null ? '' : value1;
+      };
+    }
+
+    /* harmony default export */ function transition_text(value) {
+      return this.tween(
+        'text',
+        typeof value === 'function'
+          ? text_textFunction(tweenValue(this, 'text', value))
+          : text_textConstant(value == null ? '' : value + ''),
+      );
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/textTween.js
+
+    function textInterpolate(i) {
+      return function (t) {
+        this.textContent = i.call(this, t);
+      };
+    }
+
+    function textTween(value) {
+      var t0, i0;
+      function tween() {
+        var i = value.apply(this, arguments);
+        if (i !== i0) t0 = (i0 = i) && textInterpolate(i);
+        return t0;
+      }
+      tween._value = value;
+      return tween;
+    }
+
+    /* harmony default export */ function transition_textTween(value) {
+      var key = 'text';
+      if (arguments.length < 1) return (key = this.tween(key)) && key._value;
+      if (value == null) return this.tween(key, null);
+      if (typeof value !== 'function') throw new Error();
+      return this.tween(key, textTween(value));
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/transition.js
+
+    /* harmony default export */ function transition() {
+      var name = this._name,
+        id0 = this._id,
+        id1 = newId();
+
+      for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
+        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+          if ((node = group[i])) {
+            var inherit = schedule_get(node, id0);
+            schedule(node, name, id1, i, group, {
+              time: inherit.time + inherit.delay + inherit.duration,
+              delay: 0,
+              duration: inherit.duration,
+              ease: inherit.ease,
+            });
+          }
+        }
+      }
+
+      return new Transition(groups, this._parents, name, id1);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/end.js
+
+    /* harmony default export */ function end() {
+      var on0,
+        on1,
+        that = this,
+        id = that._id,
+        size = that.size();
+      return new Promise(function (resolve, reject) {
+        var cancel = { value: reject },
+          end = {
+            value: function () {
+              if (--size === 0) resolve();
+            },
+          };
+
+        that.each(function () {
+          var schedule = schedule_set(this, id),
+            on = schedule.on;
+
+          // If this node shared a dispatch with the previous node,
+          // just assign the updated shared dispatch and we’re done!
+          // Otherwise, copy-on-write.
+          if (on !== on0) {
+            on1 = (on0 = on).copy();
+            on1._.cancel.push(cancel);
+            on1._.interrupt.push(cancel);
+            on1._.end.push(end);
+          }
+
+          schedule.on = on1;
+        });
+
+        // The selection was empty, resolve end immediately
+        if (size === 0) resolve();
+      });
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/transition/index.js
+
+    var id = 0;
+
+    function Transition(groups, parents, name, id) {
+      this._groups = groups;
+      this._parents = parents;
+      this._name = name;
+      this._id = id;
+    }
+
+    function transition_transition(name) {
+      return src_selection().transition(name);
+    }
+
+    function newId() {
+      return ++id;
+    }
+
+    var selection_prototype = src_selection.prototype;
+
+    Transition.prototype = transition_transition.prototype = {
+      constructor: Transition,
+      select: transition_select,
+      selectAll: transition_selectAll,
+      selectChild: selection_prototype.selectChild,
+      selectChildren: selection_prototype.selectChildren,
+      filter: transition_filter,
+      merge: transition_merge,
+      selection: transition_selection,
+      transition: transition,
+      call: selection_prototype.call,
+      nodes: selection_prototype.nodes,
+      node: selection_prototype.node,
+      size: selection_prototype.size,
+      empty: selection_prototype.empty,
+      each: selection_prototype.each,
+      on: transition_on,
+      attr: transition_attr,
+      attrTween: transition_attrTween,
+      style: transition_style,
+      styleTween: transition_styleTween,
+      text: transition_text,
+      textTween: transition_textTween,
+      remove: transition_remove,
+      tween: tween,
+      delay: delay,
+      duration: duration,
+      ease: ease,
+      easeVarying: transition_easeVarying,
+      end: end,
+      [Symbol.iterator]: selection_prototype[Symbol.iterator],
+    }; // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/transition.js
+
+    var defaultTiming = {
+      time: null, // Set on use.
+      delay: 0,
+      duration: 250,
+      ease: cubicInOut,
+    };
+
+    function inherit(node, id) {
+      var timing;
+      while (!(timing = node.__transition) || !(timing = timing[id])) {
+        if (!(node = node.parentNode)) {
+          throw new Error(`transition ${id} not found`);
+        }
+      }
+      return timing;
+    }
+
+    /* harmony default export */ function selection_transition(name) {
+      var id, timing;
+
+      if (name instanceof Transition) {
+        (id = name._id), (name = name._name);
+      } else {
+        (id = newId()),
+          ((timing = defaultTiming).time = now()),
+          (name = name == null ? null : name + '');
+      }
+
+      for (var groups = this._groups, m = groups.length, j = 0; j < m; ++j) {
+        for (var group = groups[j], n = group.length, node, i = 0; i < n; ++i) {
+          if ((node = group[i])) {
+            schedule(node, name, id, i, group, timing || inherit(node, id));
+          }
+        }
+      }
+
+      return new Transition(groups, this._parents, name, id);
+    } // CONCATENATED MODULE: ../node_modules/d3-transition/src/selection/index.js
+
+    src_selection.prototype.interrupt = selection_interrupt;
+    src_selection.prototype.transition = selection_transition; // CONCATENATED MODULE: ../node_modules/d3-transition/src/index.js // CONCATENATED MODULE: ./colorUtils.js
+
+    function generateHash(name) {
+      // Return a vector (0.0->1.0) that is a hash of the input string.
+      // The hash is computed to favor early characters over later ones, so
+      // that strings with similar starts have similar vectors. Only the first
+      // 6 characters are considered.
+      const MAX_CHAR = 6;
+
+      let hash = 0;
+      let maxHash = 0;
+      let weight = 1;
+      const mod = 10;
+
+      if (name) {
+        for (let i = 0; i < name.length; i++) {
+          if (i > MAX_CHAR) {
+            break;
+          }
+          hash += weight * (name.charCodeAt(i) % mod);
+          maxHash += weight * (mod - 1);
+          weight *= 0.7;
+        }
+        if (maxHash > 0) {
+          hash = hash / maxHash;
+        }
+      }
+      return hash;
+    }
+
+    function generateColorVector(name) {
+      let vector = 0;
+      if (name) {
+        const nameArr = name.split('`');
+        if (nameArr.length > 1) {
+          name = nameArr[nameArr.length - 1]; // drop module name if present
+        }
+        name = name.split('(')[0]; // drop extra info
+        vector = generateHash(name);
+      }
+      return vector;
+    } // CONCATENATED MODULE: ./colorScheme.js
+
+    function calculateColor(hue, vector) {
+      let r;
+      let g;
+      let b;
+
+      if (hue === 'red') {
+        r = 200 + Math.round(55 * vector);
+        g = 50 + Math.round(80 * vector);
+        b = g;
+      } else if (hue === 'orange') {
+        r = 190 + Math.round(65 * vector);
+        g = 90 + Math.round(65 * vector);
+        b = 0;
+      } else if (hue === 'yellow') {
+        r = 175 + Math.round(55 * vector);
+        g = r;
+        b = 50 + Math.round(20 * vector);
+      } else if (hue === 'green') {
+        r = 50 + Math.round(60 * vector);
+        g = 200 + Math.round(55 * vector);
+        b = r;
+      } else if (hue === 'pastelgreen') {
+        // rgb(163,195,72) - rgb(238,244,221)
+        r = 163 + Math.round(75 * vector);
+        g = 195 + Math.round(49 * vector);
+        b = 72 + Math.round(149 * vector);
+      } else if (hue === 'blue') {
+        // rgb(91,156,221) - rgb(217,232,247)
+        r = 91 + Math.round(126 * vector);
+        g = 156 + Math.round(76 * vector);
+        b = 221 + Math.round(26 * vector);
+      } else if (hue === 'aqua') {
+        r = 50 + Math.round(60 * vector);
+        g = 165 + Math.round(55 * vector);
+        b = g;
+      } else if (hue === 'cold') {
+        r = 0 + Math.round(55 * (1 - vector));
+        g = 0 + Math.round(230 * (1 - vector));
+        b = 200 + Math.round(55 * vector);
+      } else {
+        // original warm palette
+        r = 200 + Math.round(55 * vector);
+        g = 0 + Math.round(230 * (1 - vector));
+        b = 0 + Math.round(55 * (1 - vector));
+      }
+
+      return 'rgb(' + r + ',' + g + ',' + b + ')';
+    } // CONCATENATED MODULE: ./flamegraph.js
+
+    /* harmony default export */ function flamegraph() {
+      let w = 960; // graph width
+      let h = null; // graph height
+      let c = 18; // cell height
+      let selection = null; // selection
+      let tooltip = null; // tooltip
+      let title = ''; // graph title
+      let transitionDuration = 750;
+      let transitionEase = cubicInOut; // tooltip offset
+      let sort = false;
+      let inverted = false; // invert the graph direction
+      let clickHandler = null;
+      let hoverHandler = null;
+      let minFrameSize = 0;
+      let detailsElement = null;
+      let searchDetails = null;
+      let selfValue = false;
+      let resetHeightOnZoom = false;
+      let scrollOnZoom = false;
+      let minHeight = null;
+      let computeDelta = false;
+      let colorHue = null;
+
+      let getName = function (d) {
+        return d.data.n || d.data.name;
+      };
+
+      let getValue = function (d) {
+        if ('v' in d) {
+          return d.v;
+        } else {
+          return d.value;
+        }
+      };
+
+      let getChildren = function (d) {
+        return d.c || d.children;
+      };
+
+      let getLibtype = function (d) {
+        return d.data.l || d.data.libtype;
+      };
+
+      let getDelta = function (d) {
+        if ('d' in d.data) {
+          return d.data.d;
+        } else {
+          return d.data.delta;
+        }
+      };
+
+      let searchHandler = function (searchResults, searchSum, totalValue) {
+        searchDetails = () => {
+          if (detailsElement) {
+            detailsElement.textContent =
+              'search: ' +
+              searchSum +
+              ' of ' +
+              totalValue +
+              ' total time ( ' +
+              format('.3f')(100 * (searchSum / totalValue), 3) +
+              '%)';
+          }
+        };
+        searchDetails();
+      };
+      const originalSearchHandler = searchHandler;
+
+      let searchMatch = (d, term, ignoreCase = false) => {
+        if (!term) {
+          return false;
+        }
+        let label = getName(d);
+        if (ignoreCase) {
+          term = term.toLowerCase();
+          label = label.toLowerCase();
+        }
+        const re = new RegExp(term);
+        return typeof label !== 'undefined' && label && label.match(re);
+      };
+      const originalSearchMatch = searchMatch;
+
+      let detailsHandler = function (d) {
+        if (detailsElement) {
+          if (d) {
+            detailsElement.textContent = d;
+          } else {
+            if (typeof searchDetails === 'function') {
+              searchDetails();
+            } else {
+              detailsElement.textContent = '';
+            }
+          }
+        }
+      };
+      const originalDetailsHandler = detailsHandler;
+
+      let labelHandler = function (d) {
+        return (
+          getName(d) +
+          ' (' +
+          format('.3f')(100 * (d.x1 - d.x0), 3) +
+          '%, ' +
+          getValue(d) +
+          ' ms)'
+        );
+      };
+
+      let colorMapper = function (d) {
+        return d.highlight ? '#E600E6' : colorHash(getName(d), getLibtype(d));
+      };
+      const originalColorMapper = colorMapper;
+
+      function colorHash(name, libtype) {
+        // Return a color for the given name and library type. The library type
+        // selects the hue, and the name is hashed to a color in that hue.
+
+        // default when libtype is not in use
+        let hue = colorHue || 'warm';
+
+        if (!colorHue && !(typeof libtype === 'undefined' || libtype === '')) {
+          // Select hue. Order is important.
+          hue = 'red';
+          if (typeof name !== 'undefined' && name && name.match(/::/)) {
+            hue = 'yellow';
+          }
+          if (libtype === 'kernel') {
+            hue = 'orange';
+          } else if (libtype === 'jit') {
+            hue = 'green';
+          } else if (libtype === 'inlined') {
+            hue = 'aqua';
+          }
+        }
+
+        const vector = generateColorVector(name);
+        return calculateColor(hue, vector);
+      }
+
+      function show(d) {
+        d.data.fade = false;
+        d.data.hide = false;
+        if (d.children) {
+          d.children.forEach(show);
+        }
+      }
+
+      function hideSiblings(node) {
+        let child = node;
+        let parent = child.parent;
+        let children, i, sibling;
+        while (parent) {
+          children = parent.children;
+          i = children.length;
+          while (i--) {
+            sibling = children[i];
+            if (sibling !== child) {
+              sibling.data.hide = true;
+            }
+          }
+          child = parent;
+          parent = child.parent;
+        }
+      }
+
+      function fadeAncestors(d) {
+        if (d.parent) {
+          d.parent.data.fade = true;
+          fadeAncestors(d.parent);
+        }
+      }
+
+      function zoom(d) {
+        if (tooltip) tooltip.hide();
+        hideSiblings(d);
+        show(d);
+        fadeAncestors(d);
+        update();
+        if (scrollOnZoom) {
+          const chartOffset = src_select(this).select('svg')._groups[0][0]
+            .parentNode.offsetTop;
+          const maxFrames = (window.innerHeight - chartOffset) / c;
+          const frameOffset = (d.height - maxFrames + 10) * c;
+          window.scrollTo({
+            top: chartOffset + frameOffset,
+            left: 0,
+            behavior: 'smooth',
+          });
+        }
+        if (typeof clickHandler === 'function') {
+          clickHandler(d);
+        }
+      }
+
+      function searchTree(d, term) {
+        const results = [];
+        let sum = 0;
+
+        function searchInner(d, foundParent) {
+          let found = false;
+
+          if (searchMatch(d, term)) {
+            d.highlight = true;
+            found = true;
+            if (!foundParent) {
+              sum += getValue(d);
+            }
+            results.push(d);
+          } else {
+            d.highlight = false;
+          }
+
+          if (getChildren(d)) {
+            getChildren(d).forEach(function (child) {
+              searchInner(child, foundParent || found);
+            });
+          }
+        }
+        searchInner(d, false);
+
+        return [results, sum];
+      }
+
+      function findTree(d, id) {
+        if (d.id === id) {
+          return d;
+        } else {
+          const children = getChildren(d);
+          if (children) {
+            for (let i = 0; i < children.length; i++) {
+              const found = findTree(children[i], id);
+              if (found) {
+                return found;
+              }
+            }
+          }
+        }
+      }
+
+      function clear(d) {
+        d.highlight = false;
+        if (getChildren(d)) {
+          getChildren(d).forEach(function (child) {
+            clear(child);
+          });
+        }
+      }
+
+      function doSort(a, b) {
+        if (typeof sort === 'function') {
+          return sort(a, b);
+        } else if (sort) {
+          return ascending_ascending(getName(a), getName(b));
+        }
+      }
+
+      const p = partition();
+
+      function filterNodes(root) {
+        let nodeList = root.descendants();
+        if (minFrameSize > 0) {
+          const kx = w / (root.x1 - root.x0);
+          nodeList = nodeList.filter(function (el) {
+            return (el.x1 - el.x0) * kx > minFrameSize;
+          });
+        }
+        return nodeList;
+      }
+
+      function update() {
+        selection.each(function (root) {
+          const x = linear_linear().range([0, w]);
+          const y = linear_linear().range([0, c]);
+
+          reappraiseNode(root);
+
+          if (sort) root.sort(doSort);
+
+          p(root);
+
+          const kx = w / (root.x1 - root.x0);
+          function width(d) {
+            return (d.x1 - d.x0) * kx;
+          }
+
+          const descendants = filterNodes(root);
+          const svg = src_select(this).select('svg');
+          svg.attr('width', w);
+
+          let g = svg.selectAll('g').data(descendants, function (d) {
+            return d.id;
+          });
+
+          // if height is not set: set height on first update, after nodes were filtered by minFrameSize
+          if (!h || resetHeightOnZoom) {
+            const maxDepth = Math.max.apply(
+              null,
+              descendants.map(function (n) {
+                return n.depth;
+              }),
+            );
+
+            h = (maxDepth + 3) * c;
+            if (h < minHeight) h = minHeight;
+
+            svg.attr('height', h);
+          }
+
+          g.transition()
+            .duration(transitionDuration)
+            .ease(transitionEase)
+            .attr('transform', function (d) {
+              return (
+                'translate(' +
+                x(d.x0) +
+                ',' +
+                (inverted ? y(d.depth) : h - y(d.depth) - c) +
+                ')'
+              );
+            });
+
+          g.select('rect')
+            .transition()
+            .duration(transitionDuration)
+            .ease(transitionEase)
+            .attr('width', width);
+
+          const node = g
+            .enter()
+            .append('svg:g')
+            .attr('transform', function (d) {
+              return (
+                'translate(' +
+                x(d.x0) +
+                ',' +
+                (inverted ? y(d.depth) : h - y(d.depth) - c) +
+                ')'
+              );
+            });
+
+          node
+            .append('svg:rect')
+            .transition()
+            .delay(transitionDuration / 2)
+            .attr('width', width);
+
+          if (!tooltip) {
+            node.append('svg:title');
+          }
+
+          node.append('foreignObject').append('xhtml:div');
+
+          // Now we have to re-select to see the new elements (why?).
+          g = svg.selectAll('g').data(descendants, function (d) {
+            return d.id;
+          });
+
+          g.attr('width', width)
+            .attr('height', function (d) {
+              return c;
+            })
+            .attr('name', function (d) {
+              return getName(d);
+            })
+            .attr('class', function (d) {
+              return d.data.fade ? 'frame fade' : 'frame';
+            });
+
+          g.select('rect')
+            .attr('height', function (d) {
+              return c;
+            })
+            .attr('fill', function (d) {
+              return colorMapper(d);
+            });
+
+          if (!tooltip) {
+            g.select('title').text(labelHandler);
+          }
+
+          g.select('foreignObject')
+            .attr('width', width)
+            .attr('height', function (d) {
+              return c;
+            })
+            .select('div')
+            .attr('class', 'd3-flame-graph-label')
+            .style('display', function (d) {
+              return width(d) < 35 ? 'none' : 'block';
+            })
+            .transition()
+            .delay(transitionDuration)
+            .text(getName);
+
+          g.on('click', (_, d) => {
+            zoom(d);
+          });
+
+          g.exit().remove();
+
+          g.on('mouseover', function (_, d) {
+            if (tooltip) tooltip.show(d, this);
+            detailsHandler(labelHandler(d));
+            if (typeof hoverHandler === 'function') {
+              hoverHandler(d);
+            }
+          }).on('mouseout', function () {
+            if (tooltip) tooltip.hide();
+            detailsHandler(null);
+          });
+        });
+      }
+
+      function merge(data, samples) {
+        samples.forEach(function (sample) {
+          const node = data.find(function (element) {
+            return element.name === sample.name;
+          });
+
+          if (node) {
+            node.value += sample.value;
+            if (sample.children) {
+              if (!node.children) {
+                node.children = [];
+              }
+              merge(node.children, sample.children);
+            }
+          } else {
+            data.push(sample);
+          }
+        });
+      }
+
+      function forEachNode(node, f) {
+        f(node);
+        let children = node.children;
+        if (children) {
+          const stack = [children];
+          let count, child, grandChildren;
+          while (stack.length) {
+            children = stack.pop();
+            count = children.length;
+            while (count--) {
+              child = children[count];
+              f(child);
+              grandChildren = child.children;
+              if (grandChildren) {
+                stack.push(grandChildren);
+              }
+            }
+          }
+        }
+      }
+
+      function adoptNode(node) {
+        let id = 0;
+        forEachNode(node, function (n) {
+          n.id = id++;
+        });
+      }
+
+      function reappraiseNode(root) {
+        let node,
+          children,
+          grandChildren,
+          childrenValue,
+          i,
+          j,
+          child,
+          childValue;
+        const stack = [];
+        const included = [];
+        const excluded = [];
+        const compoundValue = !selfValue;
+        let item = root.data;
+        if (item.hide) {
+          root.value = 0;
+          children = root.children;
+          if (children) {
+            excluded.push(children);
+          }
+        } else {
+          root.value = item.fade ? 0 : getValue(item);
+          stack.push(root);
+        }
+        // First DFS pass:
+        // 1. Update node.value with node's self value
+        // 2. Populate excluded list with children under hidden nodes
+        // 3. Populate included list with children under visible nodes
+        while ((node = stack.pop())) {
+          children = node.children;
+          if (children && (i = children.length)) {
+            childrenValue = 0;
+            while (i--) {
+              child = children[i];
+              item = child.data;
+              if (item.hide) {
+                child.value = 0;
+                grandChildren = child.children;
+                if (grandChildren) {
+                  excluded.push(grandChildren);
+                }
+                continue;
+              }
+              if (item.fade) {
+                child.value = 0;
+              } else {
+                childValue = getValue(item);
+                child.value = childValue;
+                childrenValue += childValue;
+              }
+              stack.push(child);
+            }
+            // Here second part of `&&` is actually checking for `node.data.fade`. However,
+            // checking for node.value is faster and presents more oportunities for JS optimizer.
+            if (compoundValue && node.value) {
+              node.value -= childrenValue;
+            }
+            included.push(children);
+          }
+        }
+        // Postorder traversal to compute compound value of each visible node.
+        i = included.length;
+        while (i--) {
+          children = included[i];
+          childrenValue = 0;
+          j = children.length;
+          while (j--) {
+            childrenValue += children[j].value;
+          }
+          children[0].parent.value += childrenValue;
+        }
+        // Continue DFS to set value of all hidden nodes to 0.
+        while (excluded.length) {
+          children = excluded.pop();
+          j = children.length;
+          while (j--) {
+            child = children[j];
+            child.value = 0;
+            grandChildren = child.children;
+            if (grandChildren) {
+              excluded.push(grandChildren);
+            }
+          }
+        }
+      }
+
+      function processData() {
+        selection.datum((data) => {
+          if (data.constructor.name !== 'Node') {
+            // creating a root hierarchical structure
+            const root = hierarchy(data, getChildren);
+
+            // augumenting nodes with ids
+            adoptNode(root);
+
+            // calculate actual value
+            reappraiseNode(root);
+
+            // store value for later use
+            root.originalValue = root.value;
+
+            // computing deltas for differentials
+            if (computeDelta) {
+              root.eachAfter((node) => {
+                let sum = getDelta(node);
+                const children = node.children;
+                let i = children && children.length;
+                while (--i >= 0) sum += children[i].delta;
+                node.delta = sum;
+              });
+            }
+
+            // setting the bound data for the selection
+            return root;
+          }
+        });
+      }
+
+      function chart(s) {
+        if (!arguments.length) {
+          return chart;
+        }
+
+        // saving the selection on `.call`
+        selection = s;
+
+        // processing raw data to be used in the chart
+        processData();
+
+        // create chart svg
+        selection.each(function (data) {
+          if (src_select(this).select('svg').size() === 0) {
+            const svg = src_select(this)
+              .append('svg:svg')
+              .attr('width', w)
+              .attr('class', 'partition d3-flame-graph');
+
+            if (h) {
+              if (h < minHeight) h = minHeight;
+              svg.attr('height', h);
+            }
+
+            svg
+              .append('svg:text')
+              .attr('class', 'title')
+              .attr('text-anchor', 'middle')
+              .attr('y', '25')
+              .attr('x', w / 2)
+              .attr('fill', '#808080')
+              .text(title);
+
+            if (tooltip) svg.call(tooltip);
+          }
+        });
+
+        // first draw
+        update();
+      }
+
+      chart.height = function (_) {
+        if (!arguments.length) {
+          return h;
+        }
+        h = _;
+        return chart;
+      };
+
+      chart.minHeight = function (_) {
+        if (!arguments.length) {
+          return minHeight;
+        }
+        minHeight = _;
+        return chart;
+      };
+
+      chart.width = function (_) {
+        if (!arguments.length) {
+          return w;
+        }
+        w = _;
+        return chart;
+      };
+
+      chart.cellHeight = function (_) {
+        if (!arguments.length) {
+          return c;
+        }
+        c = _;
+        return chart;
+      };
+
+      chart.tooltip = function (_) {
+        if (!arguments.length) {
+          return tooltip;
+        }
+        if (typeof _ === 'function') {
+          tooltip = _;
+        }
+        return chart;
+      };
+
+      chart.title = function (_) {
+        if (!arguments.length) {
+          return title;
+        }
+        title = _;
+        return chart;
+      };
+
+      chart.transitionDuration = function (_) {
+        if (!arguments.length) {
+          return transitionDuration;
+        }
+        transitionDuration = _;
+        return chart;
+      };
+
+      chart.transitionEase = function (_) {
+        if (!arguments.length) {
+          return transitionEase;
+        }
+        transitionEase = _;
+        return chart;
+      };
+
+      chart.sort = function (_) {
+        if (!arguments.length) {
+          return sort;
+        }
+        sort = _;
+        return chart;
+      };
+
+      chart.inverted = function (_) {
+        if (!arguments.length) {
+          return inverted;
+        }
+        inverted = _;
+        return chart;
+      };
+
+      chart.computeDelta = function (_) {
+        if (!arguments.length) {
+          return computeDelta;
+        }
+        computeDelta = _;
+        return chart;
+      };
+
+      chart.setLabelHandler = function (_) {
+        if (!arguments.length) {
+          return labelHandler;
+        }
+        labelHandler = _;
+        return chart;
+      };
+      // Kept for backwards compatibility.
+      chart.label = chart.setLabelHandler;
+
+      chart.search = function (term) {
+        const searchResults = [];
+        let searchSum = 0;
+        let totalValue = 0;
+        selection.each(function (data) {
+          const res = searchTree(data, term);
+          searchResults.push(...res[0]);
+          searchSum += res[1];
+          totalValue += data.originalValue;
+        });
+        searchHandler(searchResults, searchSum, totalValue);
+        update();
+      };
+
+      chart.findById = function (id) {
+        if (typeof id === 'undefined' || id === null) {
+          return null;
+        }
+        let found = null;
+        selection.each(function (data) {
+          if (found === null) {
+            found = findTree(data, id);
+          }
+        });
+        return found;
+      };
+
+      chart.clear = function () {
+        detailsHandler(null);
+        selection.each(function (root) {
+          clear(root);
+          update();
+        });
+      };
+
+      chart.zoomTo = function (d) {
+        zoom(d);
+      };
+
+      chart.resetZoom = function () {
+        selection.each(function (root) {
+          zoom(root); // zoom to root
+        });
+      };
+
+      chart.onClick = function (_) {
+        if (!arguments.length) {
+          return clickHandler;
+        }
+        clickHandler = _;
+        return chart;
+      };
+
+      chart.onHover = function (_) {
+        if (!arguments.length) {
+          return hoverHandler;
+        }
+        hoverHandler = _;
+        return chart;
+      };
+
+      chart.merge = function (data) {
+        if (!selection) {
+          return chart;
+        }
+
+        // TODO: Fix merge with zoom
+        // Merging a zoomed chart doesn't work properly, so
+        //  clearing zoom before merge.
+        // To apply zoom on merge, we would need to set hide
+        //  and fade on new data according to current data.
+        // New ids are generated for the whole data structure,
+        //  so previous ids might not be the same. For merge to
+        //  work with zoom, previous ids should be maintained.
+        this.resetZoom();
+
+        // Clear search details
+        // Merge requires a new search, updating data and
+        //  the details handler with search results.
+        // Since we don't store the search term, can't
+        //  perform search again.
+        searchDetails = null;
+        detailsHandler(null);
+
+        selection.datum((root) => {
+          merge([root.data], [data]);
+          return root.data;
+        });
+        processData();
+        update();
+        return chart;
+      };
+
+      chart.update = function (data) {
+        if (!selection) {
+          return chart;
+        }
+        if (data) {
+          selection.datum(data);
+          processData();
+        }
+        update();
+        return chart;
+      };
+
+      chart.destroy = function () {
+        if (!selection) {
+          return chart;
+        }
+        if (tooltip) {
+          tooltip.hide();
+          if (typeof tooltip.destroy === 'function') {
+            tooltip.destroy();
+          }
+        }
+        selection.selectAll('svg').remove();
+        return chart;
+      };
+
+      chart.setColorMapper = function (_) {
+        if (!arguments.length) {
+          colorMapper = originalColorMapper;
+          return chart;
+        }
+        colorMapper = (d) => {
+          const originalColor = originalColorMapper(d);
+          return _(d, originalColor);
+        };
+        return chart;
+      };
+      // Kept for backwards compatibility.
+      chart.color = chart.setColorMapper;
+
+      chart.setColorHue = function (_) {
+        if (!arguments.length) {
+          colorHue = null;
+          return chart;
+        }
+        colorHue = _;
+        return chart;
+      };
+
+      chart.minFrameSize = function (_) {
+        if (!arguments.length) {
+          return minFrameSize;
+        }
+        minFrameSize = _;
+        return chart;
+      };
+
+      chart.setDetailsElement = function (_) {
+        if (!arguments.length) {
+          return detailsElement;
+        }
+        detailsElement = _;
+        return chart;
+      };
+      // Kept for backwards compatibility.
+      chart.details = chart.setDetailsElement;
+
+      chart.selfValue = function (_) {
+        if (!arguments.length) {
+          return selfValue;
+        }
+        selfValue = _;
+        return chart;
+      };
+
+      chart.resetHeightOnZoom = function (_) {
+        if (!arguments.length) {
+          return resetHeightOnZoom;
+        }
+        resetHeightOnZoom = _;
+        return chart;
+      };
+
+      chart.scrollOnZoom = function (_) {
+        if (!arguments.length) {
+          return scrollOnZoom;
+        }
+        scrollOnZoom = _;
+        return chart;
+      };
+
+      chart.getName = function (_) {
+        if (!arguments.length) {
+          return getName;
+        }
+        getName = _;
+        return chart;
+      };
+
+      chart.getValue = function (_) {
+        if (!arguments.length) {
+          return getValue;
+        }
+        getValue = _;
+        return chart;
+      };
+
+      chart.getChildren = function (_) {
+        if (!arguments.length) {
+          return getChildren;
+        }
+        getChildren = _;
+        return chart;
+      };
+
+      chart.getLibtype = function (_) {
+        if (!arguments.length) {
+          return getLibtype;
+        }
+        getLibtype = _;
+        return chart;
+      };
+
+      chart.getDelta = function (_) {
+        if (!arguments.length) {
+          return getDelta;
+        }
+        getDelta = _;
+        return chart;
+      };
+
+      chart.setSearchHandler = function (_) {
+        if (!arguments.length) {
+          searchHandler = originalSearchHandler;
+          return chart;
+        }
+        searchHandler = _;
+        return chart;
+      };
+
+      chart.setDetailsHandler = function (_) {
+        if (!arguments.length) {
+          detailsHandler = originalDetailsHandler;
+          return chart;
+        }
+        detailsHandler = _;
+        return chart;
+      };
+
+      chart.setSearchMatch = function (_) {
+        if (!arguments.length) {
+          searchMatch = originalSearchMatch;
+          return chart;
+        }
+        searchMatch = _;
+        return chart;
+      };
+
+      return chart;
+    }
+
+    __webpack_exports__ = __webpack_exports__['default'];
+    /******/ return __webpack_exports__;
+    /******/
+  })();
+});
diff --git a/development/charts/table/index.html b/development/charts/table/index.html
new file mode 100644
index 000000000000..ec11ecfde5c3
--- /dev/null
+++ b/development/charts/table/index.html
@@ -0,0 +1,67 @@
+<html>
+  <head>
+    <script type="text/javascript" src="./jquery.min.js"></script>
+    <style>
+      table {
+        border: 1px solid black;
+        border-collapse: collapse;
+      }
+      tr {
+        border: 1px solid black;
+      }
+    </style>
+    <script>
+      $(function () {
+        var loadTime = [];
+
+        $.getJSON('stats.json', function (data) {
+          $.each(data.children, function (index, datum) {
+            if (datum.name) {
+              var tblRow =
+                '<tr>' +
+                '<td>' +
+                index +
+                '</td>' +
+                '<td>' +
+                datum.name +
+                '</td>' +
+                '<td>' +
+                datum.value +
+                '</td>' +
+                '</tr>';
+              $(tblRow).appendTo('#loaddata tbody');
+            }
+          });
+          $(
+            '<tr>' +
+              '<td>' +
+              'Total' +
+              '</td>' +
+              '<td>' +
+              '--' +
+              '</td>' +
+              '<td>' +
+              data.value +
+              '</td>' +
+              '</tr>',
+          ).appendTo('#loaddata tbody');
+        });
+      });
+    </script>
+  </head>
+
+  <body>
+    <div class="wrapper">
+      <div class="profile">
+        <table id="loaddata">
+          <thead>
+            <th>S.No</th>
+            <th>Name</th>
+            <th>TotalTime</th>
+          </thead>
+          <tbody></tbody>
+        </table>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/development/charts/table/jquery.min.js b/development/charts/table/jquery.min.js
new file mode 100644
index 000000000000..8cdc80eb85d8
--- /dev/null
+++ b/development/charts/table/jquery.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
+shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
+)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index 9310a92d83ec..cc762602b4e6 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -94,6 +94,14 @@ async function start() {
   // links to bundle browser builds
   const depVizUrl = `${BUILD_LINK_BASE}/build-artifacts/build-viz/index.html`;
   const depVizLink = `<a href="${depVizUrl}">Build System</a>`;
+  const moduleInitStatsBackgroundUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/initialisation/background/index.html`;
+  const moduleInitStatsBackgroundLink = `<a href="${moduleInitStatsBackgroundUrl}">Background Module Init Stats</a>`;
+  const moduleInitStatsUIUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/initialisation/ui/index.html`;
+  const moduleInitStatsUILink = `<a href="${moduleInitStatsUIUrl}">UI Init Stats</a>`;
+  const moduleLoadStatsUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/load_time/index.html`;
+  const moduleLoadStatsLink = `<a href="${moduleLoadStatsUrl}">Module Load Stats</a>`;
+  const bundleSizeStatsUrl = `${BUILD_LINK_BASE}/test-artifacts/chrome/mv3/bundle_size.json`;
+  const bundleSizeStatsLink = `<a href="${bundleSizeStatsUrl}">Bundle Size Stats</a>`;
 
   // link to artifacts
   const allArtifactsUrl = `https://circleci.com/gh/MetaMask/metamask-extension/${CIRCLE_BUILD_NUM}#artifacts/containers/0`;
@@ -103,6 +111,10 @@ async function start() {
     `builds (beta): ${betaBuildLinks}`,
     `builds (flask): ${flaskBuildLinks}`,
     `build viz: ${depVizLink}`,
+    `mv3: ${moduleInitStatsBackgroundLink}`,
+    `mv3: ${moduleInitStatsUILink}`,
+    `mv3: ${moduleLoadStatsLink}`,
+    `mv3: ${bundleSizeStatsLink}`,
     `code coverage: ${coverageLink}`,
     `storybook: ${storybookLink}`,
     `<a href="${allArtifactsUrl}">all artifacts</a>`,
diff --git a/development/sourcemap-validator.js b/development/sourcemap-validator.js
index 01861e229a83..0531a03ced19 100644
--- a/development/sourcemap-validator.js
+++ b/development/sourcemap-validator.js
@@ -24,7 +24,6 @@ async function start() {
     `common-0.js`,
     `background-0.js`,
     `ui-0.js`,
-    'phishing-detect.js',
     // `contentscript.js`, skipped because the validator is erroneously sampling the inlined `inpage.js` script
     `inpage.js`,
   ];
diff --git a/docs/trezor-emulator.md b/docs/trezor-emulator.md
index bd77bb808c29..fd459b92b583 100644
--- a/docs/trezor-emulator.md
+++ b/docs/trezor-emulator.md
@@ -1,6 +1,6 @@
 # Using the TREZOR simulator
 
-You can install the TREZOR emulator and use it with Metamask.
+You can install the TREZOR emulator and use it with MetaMask.
 Here is how:
 
 ## 1 - Install the TREZOR Bridge
diff --git a/jest.config.js b/jest.config.js
index d64ca0864cfb..ad12bb85b657 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -1,6 +1,7 @@
 module.exports = {
   collectCoverageFrom: [
     '<rootDir>/app/scripts/controllers/permissions/**/*.js',
+    '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.js',
     '<rootDir>/shared/**/*.js',
     '<rootDir>/ui/**/*.js',
   ],
@@ -11,8 +12,8 @@ module.exports = {
     global: {
       branches: 44,
       functions: 42,
-      lines: 48,
-      statements: 48,
+      lines: 52,
+      statements: 52,
     },
     './app/scripts/controllers/permissions/**/*.js': {
       branches: 100,
@@ -20,6 +21,12 @@ module.exports = {
       lines: 100,
       statements: 100,
     },
+    './app/scripts/lib/createRPCMethodTrackingMiddleware.js': {
+      branches: 95.65,
+      functions: 100,
+      lines: 100,
+      statements: 100,
+    },
   },
   // TODO: enable resetMocks
   // resetMocks: true,
@@ -34,6 +41,7 @@ module.exports = {
     '<rootDir>/app/scripts/platforms/*.test.js',
     '<rootDir>app/scripts/controllers/network/**/*.test.js',
     '<rootDir>/app/scripts/controllers/permissions/**/*.test.js',
+    '<rootDir>/app/scripts/lib/createRPCMethodTrackingMiddleware.test.js',
   ],
   testTimeout: 2500,
   transform: {
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 6d45be3e37bb..e371f4fbad7c 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "addons-linter>regenerator-runtime": true
+        "@storybook/api>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,43 +3168,6 @@
         "watchify>xtend": true
       }
     },
-    "@metamask/post-message-stream": {
-      "globals": {
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
-        "@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3219,184 +3182,77 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
-        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>crypto-browserify>pbkdf2": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
-      "packages": {
-        "3box>ethers>elliptic": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
-        "setTimeout": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
       "globals": {
-        "Headers": true,
-        "URL": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
+        "TextEncoder": true,
+        "crypto": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controllers>abort-controller": true,
-        "@metamask/controllers>async-mutex": true,
-        "@metamask/controllers>eth-phishing-detect": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/controllers>multiformats": true,
-        "@metamask/controllers>web3-provider-engine": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
-        "@storybook/api>fast-deep-equal": true,
-        "browserify>buffer": true,
-        "browserify>events": true,
-        "deep-freeze-strict": true,
-        "eth-ens-namehash": true,
-        "eth-json-rpc-infura": true,
-        "eth-keyring-controller": true,
-        "eth-query": true,
-        "eth-rpc-errors": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "ethers": true,
-        "ethjs>ethjs-unit": true,
-        "immer": true,
-        "json-rpc-engine": true,
-        "jsonschema": true,
-        "punycode": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true,
-        "web3": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-provider-http": true,
-        "ethjs>ethjs-unit": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>number-to-bn": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "ethjs-query>babel-runtime": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-util": true,
-        "promise-to-callback": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
+    "@metamask/rpc-methods>@metamask/utils": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+        "@storybook/api>fast-deep-equal": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "console": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true
       },
       "packages": {
-        "ethjs-query>babel-runtime": true,
-        "ethjs-query>ethjs-format": true,
-        "ethjs-query>ethjs-rpc": true,
-        "promise-to-callback": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
-        "@truffle/codec>utf8": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-util": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-wallet>aes-js": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "@metamask/controllers": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3421,7 +3277,6 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
-        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3435,10 +3290,12 @@
       },
       "packages": {
         "@metamask/controllers": true,
-        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3456,6 +3313,19 @@
         "semver": true
       }
     },
+    "@metamask/snap-controllers>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3465,12 +3335,71 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
-        "readable-stream": true,
         "watchify>xtend": true
       }
     },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream": {
+      "globals": {
+        "WorkerGlobalScope": true,
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3577,8 +3506,38 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "readable-stream": true
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3644,7 +3603,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3666,12 +3625,6 @@
         "define": true
       }
     },
-    "@ngraveio/bc-ur>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3782,6 +3735,11 @@
         "localforage": true
       }
     },
+    "@storybook/api>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4101,9 +4059,10 @@
         "setTimeout": true
       }
     },
-    "addons-linter>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
+    "addons-linter>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
       }
     },
     "analytics-node": {
@@ -4294,7 +4253,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4325,7 +4284,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4777,63 +4736,37 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
         "eth-keyring-controller>browser-passworder": true,
-        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "loglevel": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>bip39": {
-      "globals": {
-        "console.log": true
-      },
+    "eth-keyring-controller>@metamask/bip39": {
       "packages": {
+        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
-        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "eth-keyring-controller>bip39>unorm": {
-      "globals": {
-        "define": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
+        "ethereumjs-wallet>randombytes": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>bip39": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-sig-util": true
+        "eth-trezor-keyring>@metamask/eth-sig-util": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4842,12 +4775,27 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5218,7 +5166,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5815,73 +5763,6 @@
         "browserify>process": true
       }
     },
-    "ethjs-ens": {
-      "packages": {
-        "ethereum-ens-network-map": true,
-        "ethjs-ens>eth-ens-namehash": true,
-        "ethjs-ens>ethjs-contract": true,
-        "ethjs-ens>ethjs-query": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
-        "ethjs-ens>eth-ens-namehash>js-sha3": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>idna-uts46": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "browserify>punycode": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-contract": {
-      "packages": {
-        "ethjs-contract>ethjs-abi": true,
-        "ethjs-ens>ethjs-contract>ethjs-filter": true,
-        "ethjs-ens>ethjs-contract>js-sha3": true,
-        "ethjs>ethjs-util": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>ethjs-filter": {
-      "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-query": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format": true,
-        "ethjs-ens>ethjs-query>ethjs-rpc": true
-      }
-    },
-    "ethjs-ens>ethjs-query>ethjs-format": {
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true,
-        "ethjs>number-to-bn": true
-      }
-    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5895,7 +5776,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "addons-linter>regenerator-runtime": true,
+        "@storybook/api>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6293,10 +6174,13 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
+        "addEventListener": true,
+        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
+        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 6d45be3e37bb..e371f4fbad7c 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "addons-linter>regenerator-runtime": true
+        "@storybook/api>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,43 +3168,6 @@
         "watchify>xtend": true
       }
     },
-    "@metamask/post-message-stream": {
-      "globals": {
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
-        "@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3219,184 +3182,77 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
-        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>crypto-browserify>pbkdf2": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
-      "packages": {
-        "3box>ethers>elliptic": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
-        "setTimeout": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
       "globals": {
-        "Headers": true,
-        "URL": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
+        "TextEncoder": true,
+        "crypto": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controllers>abort-controller": true,
-        "@metamask/controllers>async-mutex": true,
-        "@metamask/controllers>eth-phishing-detect": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/controllers>multiformats": true,
-        "@metamask/controllers>web3-provider-engine": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
-        "@storybook/api>fast-deep-equal": true,
-        "browserify>buffer": true,
-        "browserify>events": true,
-        "deep-freeze-strict": true,
-        "eth-ens-namehash": true,
-        "eth-json-rpc-infura": true,
-        "eth-keyring-controller": true,
-        "eth-query": true,
-        "eth-rpc-errors": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "ethers": true,
-        "ethjs>ethjs-unit": true,
-        "immer": true,
-        "json-rpc-engine": true,
-        "jsonschema": true,
-        "punycode": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true,
-        "web3": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-provider-http": true,
-        "ethjs>ethjs-unit": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>number-to-bn": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "ethjs-query>babel-runtime": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-util": true,
-        "promise-to-callback": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
+    "@metamask/rpc-methods>@metamask/utils": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+        "@storybook/api>fast-deep-equal": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "console": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true
       },
       "packages": {
-        "ethjs-query>babel-runtime": true,
-        "ethjs-query>ethjs-format": true,
-        "ethjs-query>ethjs-rpc": true,
-        "promise-to-callback": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
-        "@truffle/codec>utf8": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-util": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-wallet>aes-js": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "@metamask/controllers": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3421,7 +3277,6 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
-        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3435,10 +3290,12 @@
       },
       "packages": {
         "@metamask/controllers": true,
-        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3456,6 +3313,19 @@
         "semver": true
       }
     },
+    "@metamask/snap-controllers>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3465,12 +3335,71 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
-        "readable-stream": true,
         "watchify>xtend": true
       }
     },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream": {
+      "globals": {
+        "WorkerGlobalScope": true,
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3577,8 +3506,38 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "readable-stream": true
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3644,7 +3603,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3666,12 +3625,6 @@
         "define": true
       }
     },
-    "@ngraveio/bc-ur>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3782,6 +3735,11 @@
         "localforage": true
       }
     },
+    "@storybook/api>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4101,9 +4059,10 @@
         "setTimeout": true
       }
     },
-    "addons-linter>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
+    "addons-linter>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
       }
     },
     "analytics-node": {
@@ -4294,7 +4253,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4325,7 +4284,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4777,63 +4736,37 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
         "eth-keyring-controller>browser-passworder": true,
-        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "loglevel": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>bip39": {
-      "globals": {
-        "console.log": true
-      },
+    "eth-keyring-controller>@metamask/bip39": {
       "packages": {
+        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
-        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "eth-keyring-controller>bip39>unorm": {
-      "globals": {
-        "define": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
+        "ethereumjs-wallet>randombytes": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>bip39": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-sig-util": true
+        "eth-trezor-keyring>@metamask/eth-sig-util": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4842,12 +4775,27 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5218,7 +5166,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5815,73 +5763,6 @@
         "browserify>process": true
       }
     },
-    "ethjs-ens": {
-      "packages": {
-        "ethereum-ens-network-map": true,
-        "ethjs-ens>eth-ens-namehash": true,
-        "ethjs-ens>ethjs-contract": true,
-        "ethjs-ens>ethjs-query": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
-        "ethjs-ens>eth-ens-namehash>js-sha3": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>idna-uts46": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "browserify>punycode": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-contract": {
-      "packages": {
-        "ethjs-contract>ethjs-abi": true,
-        "ethjs-ens>ethjs-contract>ethjs-filter": true,
-        "ethjs-ens>ethjs-contract>js-sha3": true,
-        "ethjs>ethjs-util": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>ethjs-filter": {
-      "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-query": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format": true,
-        "ethjs-ens>ethjs-query>ethjs-rpc": true
-      }
-    },
-    "ethjs-ens>ethjs-query>ethjs-format": {
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true,
-        "ethjs>number-to-bn": true
-      }
-    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5895,7 +5776,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "addons-linter>regenerator-runtime": true,
+        "@storybook/api>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6293,10 +6174,13 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
+        "addEventListener": true,
+        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
+        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 6d45be3e37bb..e371f4fbad7c 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -2202,7 +2202,7 @@
     },
     "@babel/runtime": {
       "packages": {
-        "addons-linter>regenerator-runtime": true
+        "@storybook/api>regenerator-runtime": true
       }
     },
     "@download/blockies": {
@@ -3168,43 +3168,6 @@
         "watchify>xtend": true
       }
     },
-    "@metamask/post-message-stream": {
-      "globals": {
-        "addEventListener": true,
-        "location.origin": true,
-        "onmessage": "write",
-        "postMessage": true,
-        "removeEventListener": true
-      },
-      "packages": {
-        "@metamask/post-message-stream>readable-stream": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true,
-        "@metamask/post-message-stream>readable-stream>string_decoder": true,
-        "@storybook/api>util-deprecate": true,
-        "browserify>browser-resolve": true,
-        "browserify>events": true,
-        "browserify>process": true,
-        "browserify>timers-browserify": true,
-        "pumpify>inherits": true,
-        "readable-stream>core-util-is": true,
-        "readable-stream>isarray": true,
-        "vinyl>cloneable-readable>process-nextick-args": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>safe-buffer": {
-      "packages": {
-        "browserify>buffer": true
-      }
-    },
-    "@metamask/post-message-stream>readable-stream>string_decoder": {
-      "packages": {
-        "@metamask/post-message-stream>readable-stream>safe-buffer": true
-      }
-    },
     "@metamask/providers>@metamask/object-multiplex": {
       "globals": {
         "console.warn": true
@@ -3219,184 +3182,77 @@
       "packages": {
         "@metamask/controllers": true,
         "@metamask/rpc-methods>@metamask/key-tree": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
         "@metamask/snap-controllers": true,
         "eth-rpc-errors": true
       }
     },
     "@metamask/rpc-methods>@metamask/key-tree": {
       "packages": {
-        "@metamask/rpc-methods>@metamask/key-tree>bip39": true,
-        "@metamask/rpc-methods>@metamask/key-tree>secp256k1": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "browserify>insert-module-globals>is-buffer": true,
-        "ethereumjs-util>ethereum-cryptography>keccak": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>bip39": {
-      "packages": {
-        "browserify>buffer": true,
-        "browserify>crypto-browserify>pbkdf2": true,
-        "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true
-      }
-    },
-    "@metamask/rpc-methods>@metamask/key-tree>secp256k1": {
-      "packages": {
-        "3box>ethers>elliptic": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": true,
+        "browserify>buffer": true
       }
     },
-    "@metamask/smart-transactions-controller": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/ed25519": {
       "globals": {
-        "URLSearchParams": true,
-        "clearInterval": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
-        "setTimeout": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers": true,
-        "@metamask/smart-transactions-controller>bignumber.js": true,
-        "@metamask/smart-transactions-controller>fast-json-patch": true,
-        "ethers": true,
-        "lodash": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": {
       "globals": {
-        "Headers": true,
-        "URL": true,
-        "clearInterval": true,
-        "clearTimeout": true,
-        "console.error": true,
-        "console.log": true,
-        "fetch": true,
-        "setInterval": true,
+        "TextEncoder": true,
+        "crypto": true,
         "setTimeout": true
-      },
-      "packages": {
-        "@ethereumjs/common": true,
-        "@ethereumjs/tx": true,
-        "@metamask/contract-metadata": true,
-        "@metamask/controllers>abort-controller": true,
-        "@metamask/controllers>async-mutex": true,
-        "@metamask/controllers>eth-phishing-detect": true,
-        "@metamask/controllers>isomorphic-fetch": true,
-        "@metamask/controllers>multiformats": true,
-        "@metamask/controllers>web3-provider-engine": true,
-        "@metamask/metamask-eth-abis": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": true,
-        "@storybook/api>fast-deep-equal": true,
-        "browserify>buffer": true,
-        "browserify>events": true,
-        "deep-freeze-strict": true,
-        "eth-ens-namehash": true,
-        "eth-json-rpc-infura": true,
-        "eth-keyring-controller": true,
-        "eth-query": true,
-        "eth-rpc-errors": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "ethers": true,
-        "ethjs>ethjs-unit": true,
-        "immer": true,
-        "json-rpc-engine": true,
-        "jsonschema": true,
-        "punycode": true,
-        "single-call-balance-checker-abi": true,
-        "uuid": true,
-        "web3": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs": {
+    "@metamask/rpc-methods>@metamask/key-tree>@noble/secp256k1": {
       "globals": {
-        "clearInterval": true,
-        "setInterval": true
+        "crypto": true
       },
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-provider-http": true,
-        "ethjs>ethjs-unit": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>number-to-bn": true
+        "browserify>browser-resolve": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-abi": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/base": {
+      "globals": {
+        "TextDecoder": true,
+        "TextEncoder": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract": {
+    "@metamask/rpc-methods>@metamask/key-tree>@scure/bip39": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "ethjs-query>babel-runtime": true,
-        "ethjs>ethjs-filter": true,
-        "ethjs>ethjs-util": true,
-        "promise-to-callback": true
+        "@metamask/rpc-methods>@metamask/key-tree>@noble/hashes": true,
+        "@metamask/rpc-methods>@metamask/key-tree>@scure/base": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-contract>ethjs-abi": {
+    "@metamask/rpc-methods>@metamask/utils": {
       "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>bn.js": true,
-        "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": true,
-        "browserify>buffer": true,
-        "ethjs>number-to-bn": true
+        "@storybook/api>fast-deep-equal": true
       }
     },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>ethjs-query": {
+    "@metamask/smart-transactions-controller": {
       "globals": {
-        "console": true
+        "URLSearchParams": true,
+        "clearInterval": true,
+        "console.error": true,
+        "console.log": true,
+        "fetch": true,
+        "setInterval": true
       },
       "packages": {
-        "ethjs-query>babel-runtime": true,
-        "ethjs-query>ethjs-format": true,
-        "ethjs-query>ethjs-rpc": true,
-        "promise-to-callback": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>eth-method-registry>ethjs>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet": {
-      "packages": {
-        "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": true,
-        "@truffle/codec>utf8": true,
-        "browserify>buffer": true,
-        "browserify>crypto-browserify": true,
-        "ethereumjs-util": true,
-        "ethereumjs-util>ethereum-cryptography": true,
-        "ethereumjs-wallet>aes-js": true,
-        "ethereumjs-wallet>bs58check": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethers>@ethersproject/json-wallets>scrypt-js": true
-      }
-    },
-    "@metamask/smart-transactions-controller>@metamask/controllers>ethereumjs-wallet>uuid": {
-      "globals": {
-        "crypto": true,
-        "msCrypto": true
+        "@metamask/controllers": true,
+        "@metamask/controllers>isomorphic-fetch": true,
+        "@metamask/smart-transactions-controller>bignumber.js": true,
+        "@metamask/smart-transactions-controller>fast-json-patch": true,
+        "ethers": true,
+        "lodash": true
       }
     },
     "@metamask/smart-transactions-controller>@metamask/controllers>nanoid": {
@@ -3421,7 +3277,6 @@
     "@metamask/snap-controllers": {
       "globals": {
         "URL": true,
-        "Worker": true,
         "clearTimeout": true,
         "console.error": true,
         "console.info": true,
@@ -3435,10 +3290,12 @@
       },
       "packages": {
         "@metamask/controllers": true,
-        "@metamask/post-message-stream": true,
         "@metamask/providers>@metamask/object-multiplex": true,
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/browser-passworder": true,
         "@metamask/snap-controllers>@metamask/execution-environments": true,
         "@metamask/snap-controllers>@metamask/obs-store": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream": true,
         "@metamask/snap-controllers>ajv": true,
         "@metamask/snap-controllers>concat-stream": true,
         "@metamask/snap-controllers>gunzip-maybe": true,
@@ -3456,6 +3313,19 @@
         "semver": true
       }
     },
+    "@metamask/snap-controllers>@metamask/browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto.getRandomValues": true,
+        "crypto.subtle.decrypt": true,
+        "crypto.subtle.deriveKey": true,
+        "crypto.subtle.encrypt": true,
+        "crypto.subtle.importKey": true
+      },
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
     "@metamask/snap-controllers>@metamask/obs-store": {
       "packages": {
         "@metamask/snap-controllers>@metamask/obs-store>through2": true,
@@ -3465,12 +3335,71 @@
     },
     "@metamask/snap-controllers>@metamask/obs-store>through2": {
       "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": true,
         "browserify>process": true,
         "browserify>util": true,
-        "readable-stream": true,
         "watchify>xtend": true
       }
     },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/obs-store>through2>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream": {
+      "globals": {
+        "WorkerGlobalScope": true,
+        "addEventListener": true,
+        "location.origin": true,
+        "onmessage": "write",
+        "postMessage": true,
+        "removeEventListener": true
+      },
+      "packages": {
+        "@metamask/rpc-methods>@metamask/utils": true,
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true,
+        "vinyl>cloneable-readable>process-nextick-args": true
+      }
+    },
+    "@metamask/snap-controllers>@metamask/post-message-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
+      }
+    },
     "@metamask/snap-controllers>ajv": {
       "packages": {
         "@storybook/api>fast-deep-equal": true
@@ -3577,8 +3506,38 @@
         "setTimeout": true
       },
       "packages": {
-        "json-rpc-engine>@metamask/safe-event-emitter": true,
-        "readable-stream": true
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": true,
+        "json-rpc-engine>@metamask/safe-event-emitter": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true,
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": true,
+        "@storybook/api>util-deprecate": true,
+        "browserify>browser-resolve": true,
+        "browserify>events": true,
+        "browserify>process": true,
+        "browserify>timers-browserify": true,
+        "pumpify>inherits": true,
+        "readable-stream>core-util-is": true,
+        "readable-stream>isarray": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>process-nextick-args": {
+      "packages": {
+        "browserify>process": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": {
+      "packages": {
+        "browserify>buffer": true
+      }
+    },
+    "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>string_decoder": {
+      "packages": {
+        "@metamask/snap-controllers>json-rpc-middleware-stream>readable-stream>safe-buffer": true
       }
     },
     "@metamask/snap-controllers>nanoid": {
@@ -3644,7 +3603,7 @@
         "@ngraveio/bc-ur>bignumber.js": true,
         "@ngraveio/bc-ur>crc": true,
         "@ngraveio/bc-ur>jsbi": true,
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>assert": true,
         "browserify>buffer": true,
         "pubnub>cbor-sync": true
@@ -3666,12 +3625,6 @@
         "define": true
       }
     },
-    "@ngraveio/bc-ur>sha.js": {
-      "packages": {
-        "ethereumjs-wallet>safe-buffer": true,
-        "pumpify>inherits": true
-      }
-    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -3782,6 +3735,11 @@
         "localforage": true
       }
     },
+    "@storybook/api>regenerator-runtime": {
+      "globals": {
+        "regeneratorRuntime": "write"
+      }
+    },
     "@storybook/api>util-deprecate": {
       "globals": {
         "console.trace": true,
@@ -4101,9 +4059,10 @@
         "setTimeout": true
       }
     },
-    "addons-linter>regenerator-runtime": {
-      "globals": {
-        "regeneratorRuntime": "write"
+    "addons-linter>sha.js": {
+      "packages": {
+        "ethereumjs-wallet>safe-buffer": true,
+        "pumpify>inherits": true
       }
     },
     "analytics-node": {
@@ -4294,7 +4253,7 @@
     },
     "browserify>crypto-browserify>create-hmac": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4325,7 +4284,7 @@
         "setTimeout": true
       },
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "browserify>process": true,
         "ethereumjs-util>create-hash": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -4777,63 +4736,37 @@
       "packages": {
         "browserify>buffer": true,
         "browserify>events": true,
-        "eth-keyring-controller>bip39": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring": true,
         "eth-keyring-controller>browser-passworder": true,
-        "eth-keyring-controller>eth-hd-keyring": true,
         "eth-keyring-controller>eth-simple-keyring": true,
         "eth-keyring-controller>obs-store": true,
-        "eth-sig-util": true,
-        "ethereumjs-util": true,
-        "loglevel": true
+        "eth-sig-util": true
       }
     },
-    "eth-keyring-controller>bip39": {
-      "globals": {
-        "console.log": true
-      },
+    "eth-keyring-controller>@metamask/bip39": {
       "packages": {
+        "browserify>buffer": true,
         "browserify>crypto-browserify>pbkdf2": true,
-        "eth-keyring-controller>bip39>unorm": true,
         "ethereumjs-util>create-hash": true,
-        "ethereumjs-wallet>randombytes": true,
-        "ethereumjs-wallet>safe-buffer": true
-      }
-    },
-    "eth-keyring-controller>bip39>unorm": {
-      "globals": {
-        "define": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder": {
-      "globals": {
-        "btoa": true,
-        "crypto": true
-      },
-      "packages": {
-        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
-      }
-    },
-    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
-      "globals": {
-        "atob": true,
-        "btoa": true
+        "ethereumjs-wallet>randombytes": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring": {
       "packages": {
         "browserify>buffer": true,
-        "eth-keyring-controller>bip39": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": true,
+        "eth-keyring-controller>@metamask/bip39": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": true,
         "eth-keyring-controller>eth-simple-keyring": true,
-        "eth-sig-util": true
+        "eth-trezor-keyring>@metamask/eth-sig-util": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet": {
       "packages": {
         "@truffle/codec>utf8": true,
         "browserify>buffer": true,
         "browserify>crypto-browserify": true,
-        "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": true,
+        "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": true,
         "ethereumjs-util": true,
         "ethereumjs-util>ethereum-cryptography": true,
         "ethereumjs-wallet>aes-js": true,
@@ -4842,12 +4775,27 @@
         "ethers>@ethersproject/json-wallets>scrypt-js": true
       }
     },
-    "eth-keyring-controller>eth-hd-keyring>ethereumjs-wallet>uuid": {
+    "eth-keyring-controller>@metamask/eth-hd-keyring>ethereumjs-wallet>uuid": {
       "globals": {
         "crypto": true,
         "msCrypto": true
       }
     },
+    "eth-keyring-controller>browser-passworder": {
+      "globals": {
+        "btoa": true,
+        "crypto": true
+      },
+      "packages": {
+        "eth-keyring-controller>browser-passworder>browserify-unibabel": true
+      }
+    },
+    "eth-keyring-controller>browser-passworder>browserify-unibabel": {
+      "globals": {
+        "atob": true,
+        "btoa": true
+      }
+    },
     "eth-keyring-controller>eth-simple-keyring": {
       "packages": {
         "browserify>buffer": true,
@@ -5218,7 +5166,7 @@
     },
     "ethereumjs-util>create-hash": {
       "packages": {
-        "@ngraveio/bc-ur>sha.js": true,
+        "addons-linter>sha.js": true,
         "ethereumjs-util>create-hash>cipher-base": true,
         "ethereumjs-util>create-hash>md5.js": true,
         "ethereumjs-util>create-hash>ripemd160": true,
@@ -5815,73 +5763,6 @@
         "browserify>process": true
       }
     },
-    "ethjs-ens": {
-      "packages": {
-        "ethereum-ens-network-map": true,
-        "ethjs-ens>eth-ens-namehash": true,
-        "ethjs-ens>ethjs-contract": true,
-        "ethjs-ens>ethjs-query": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash": {
-      "globals": {
-        "name": "write"
-      },
-      "packages": {
-        "browserify>buffer": true,
-        "ethjs-ens>eth-ens-namehash>idna-uts46": true,
-        "ethjs-ens>eth-ens-namehash>js-sha3": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>idna-uts46": {
-      "globals": {
-        "define": true
-      },
-      "packages": {
-        "browserify>punycode": true
-      }
-    },
-    "ethjs-ens>eth-ens-namehash>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-contract": {
-      "packages": {
-        "ethjs-contract>ethjs-abi": true,
-        "ethjs-ens>ethjs-contract>ethjs-filter": true,
-        "ethjs-ens>ethjs-contract>js-sha3": true,
-        "ethjs>ethjs-util": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>ethjs-filter": {
-      "globals": {
-        "clearInterval": true,
-        "setInterval": true
-      }
-    },
-    "ethjs-ens>ethjs-contract>js-sha3": {
-      "packages": {
-        "browserify>process": true
-      }
-    },
-    "ethjs-ens>ethjs-query": {
-      "globals": {
-        "console": true
-      },
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format": true,
-        "ethjs-ens>ethjs-query>ethjs-rpc": true
-      }
-    },
-    "ethjs-ens>ethjs-query>ethjs-format": {
-      "packages": {
-        "ethjs-ens>ethjs-query>ethjs-format>ethjs-schema": true,
-        "ethjs>ethjs-util": true,
-        "ethjs>ethjs-util>strip-hex-prefix": true,
-        "ethjs>number-to-bn": true
-      }
-    },
     "ethjs-query": {
       "globals": {
         "console": true
@@ -5895,7 +5776,7 @@
     "ethjs-query>babel-runtime": {
       "packages": {
         "@babel/runtime": true,
-        "addons-linter>regenerator-runtime": true,
+        "@storybook/api>regenerator-runtime": true,
         "ethjs-query>babel-runtime>core-js": true
       }
     },
@@ -6293,10 +6174,13 @@
     "react-dnd-html5-backend": {
       "globals": {
         "Image": true,
+        "addEventListener": true,
+        "clearTimeout": true,
         "console.warn": true,
         "devicePixelRatio": true,
         "document": true,
         "navigator.userAgent": true,
+        "removeEventListener": true,
         "safari": true,
         "setTimeout": true
       }
diff --git a/lavamoat/browserify/policy-override.json b/lavamoat/browserify/policy-override.json
index 212074b38854..96504e814ac1 100644
--- a/lavamoat/browserify/policy-override.json
+++ b/lavamoat/browserify/policy-override.json
@@ -31,6 +31,13 @@
         "clearTimeout": true
       }
     },
+    "react-dnd-html5-backend": {
+      "globals": {
+        "clearTimeout": true,
+        "addEventListener": true,
+        "removeEventListener": true
+      }
+    },
     "ethers>@ethersproject/random": {
       "globals": {
         "crypto.getRandomValues": true
diff --git a/lavamoat/build-system/policy-override.json b/lavamoat/build-system/policy-override.json
index b0f3f75a7b89..8bdcb6a60973 100644
--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@@ -101,6 +101,36 @@
       "globals": {
         "globalThis": true
       }
+    },
+    "yargs": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path": true,
+        "util": true
+      },
+      "globals": {
+        "console": true,
+        "Error": true,
+        "process": true
+      }
+    },
+    "yargs>y18n": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "util": true
+      }
+    },
+    "yargs>yargs-parser": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "util": true
+      },
+      "globals": {
+        "process": true
+      }
     }
   }
 }
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index f35cc95e6a81..8096a980da7e 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -534,9 +534,9 @@
         "@babel/preset-env>@babel/helper-plugin-utils": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": true,
         "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-optimise-call-expression": true,
+        "@babel/preset-env>@babel/plugin-transform-classes>globals": true,
         "depcheck>@babel/traverse>@babel/helper-function-name": true,
-        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true,
-        "depcheck>@babel/traverse>globals": true
+        "depcheck>@babel/traverse>@babel/helper-split-export-declaration": true
       }
     },
     "@babel/preset-env>@babel/plugin-transform-classes>@babel/helper-annotate-as-pure": {
@@ -1134,21 +1134,6 @@
         "typescript": true
       }
     },
-    "addons-linter>probe-image-size>next-tick": {
-      "globals": {
-        "MutationObserver": true,
-        "WebKitMutationObserver": true,
-        "document": true,
-        "process": true,
-        "setImmediate": true,
-        "setTimeout": true
-      }
-    },
-    "addons-linter>upath": {
-      "builtin": {
-        "path": true
-      }
-    },
     "babelify": {
       "builtin": {
         "path.extname": true,
@@ -1993,57 +1978,6 @@
         "string.prototype.matchall>es-abstract": true
       }
     },
-    "enzyme>cheerio>dom-serializer": {
-      "packages": {
-        "enzyme>cheerio>entities": true,
-        "enzyme>cheerio>htmlparser2>domelementtype": true
-      }
-    },
-    "enzyme>cheerio>htmlparser2": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "string_decoder.StringDecoder": true
-      },
-      "packages": {
-        "enzyme>cheerio>entities": true,
-        "enzyme>cheerio>htmlparser2>domelementtype": true,
-        "enzyme>cheerio>htmlparser2>domhandler": true,
-        "enzyme>cheerio>htmlparser2>domutils": true,
-        "enzyme>cheerio>htmlparser2>readable-stream": true,
-        "pumpify>inherits": true
-      }
-    },
-    "enzyme>cheerio>htmlparser2>domhandler": {
-      "packages": {
-        "enzyme>cheerio>htmlparser2>domelementtype": true
-      }
-    },
-    "enzyme>cheerio>htmlparser2>domutils": {
-      "packages": {
-        "enzyme>cheerio>dom-serializer": true,
-        "enzyme>cheerio>htmlparser2>domelementtype": true
-      }
-    },
-    "enzyme>cheerio>htmlparser2>readable-stream": {
-      "builtin": {
-        "buffer.Buffer": true,
-        "events.EventEmitter": true,
-        "stream": true,
-        "util": true
-      },
-      "globals": {
-        "process.env.READABLE_STREAM": true,
-        "process.nextTick": true,
-        "process.stderr": true,
-        "process.stdout": true
-      },
-      "packages": {
-        "@storybook/api>util-deprecate": true,
-        "browserify>string_decoder": true,
-        "pumpify>inherits": true
-      }
-    },
     "enzyme>has": {
       "packages": {
         "mocha>object.assign>function-bind": true
@@ -2133,10 +2067,10 @@
         "eslint>is-glob": true,
         "eslint>json-stable-stringify-without-jsonify": true,
         "eslint>levn": true,
+        "eslint>minimatch": true,
         "eslint>natural-compare": true,
         "eslint>regexpp": true,
-        "lodash": true,
-        "mocha>minimatch": true
+        "lodash": true
       }
     },
     "eslint-config-prettier": {
@@ -2213,7 +2147,7 @@
         "eslint-plugin-import>read-pkg-up": true,
         "eslint-plugin-import>tsconfig-paths": true,
         "eslint-plugin-react>array-includes": true,
-        "mocha>minimatch": true,
+        "eslint>minimatch": true,
         "typescript": true
       }
     },
@@ -2430,7 +2364,7 @@
       "packages": {
         "eslint-plugin-import>tsconfig-paths>json5": true,
         "eslint-plugin-import>tsconfig-paths>strip-bom": true,
-        "minimist": true
+        "rc>minimist": true
       }
     },
     "eslint-plugin-import>tsconfig-paths>json5": {
@@ -2527,8 +2461,8 @@
         "eslint-plugin-node>eslint-plugin-es": true,
         "eslint-plugin-node>semver": true,
         "eslint>eslint-utils": true,
-        "globby>ignore": true,
-        "mocha>minimatch": true
+        "eslint>minimatch": true,
+        "globby>ignore": true
       }
     },
     "eslint-plugin-node>eslint-plugin-es": {
@@ -2575,8 +2509,8 @@
         "eslint-plugin-react>doctrine": true,
         "eslint-plugin-react>jsx-ast-utils": true,
         "eslint-plugin-react>resolve": true,
+        "eslint>minimatch": true,
         "lavamoat>object.fromentries": true,
-        "mocha>minimatch": true,
         "prop-types": true,
         "string.prototype.matchall": true
       }
@@ -2695,11 +2629,11 @@
         "eslint-plugin-react-hooks": true,
         "eslint>@eslint/eslintrc>globals": true,
         "eslint>@eslint/eslintrc>ignore": true,
-        "eslint>@eslint/eslintrc>strip-json-comments": true,
         "eslint>ajv": true,
         "eslint>debug": true,
         "eslint>espree": true,
-        "mocha>minimatch": true,
+        "eslint>minimatch": true,
+        "eslint>strip-json-comments": true,
         "nyc>js-yaml": true
       }
     },
@@ -2757,24 +2691,24 @@
       },
       "packages": {
         "eslint>eslint-scope>esrecurse": true,
-        "jsdom>escodegen>estraverse": true
+        "eslint>eslint-scope>estraverse": true
       }
     },
     "eslint>eslint-scope>esrecurse": {
       "packages": {
-        "eslint>eslint-scope>esrecurse>estraverse": true
+        "eslint>esquery>estraverse": true
       }
     },
     "eslint>eslint-utils": {
       "packages": {
-        "@babel/eslint-parser>eslint-visitor-keys": true
+        "eslint>eslint-utils>eslint-visitor-keys": true
       }
     },
     "eslint>espree": {
       "packages": {
-        "@babel/eslint-parser>eslint-visitor-keys": true,
         "eslint>espree>acorn": true,
-        "eslint>espree>acorn-jsx": true
+        "eslint>espree>acorn-jsx": true,
+        "eslint>espree>eslint-visitor-keys": true
       }
     },
     "eslint>espree>acorn": {
@@ -2819,21 +2753,7 @@
       },
       "packages": {
         "eslint>file-entry-cache>flat-cache>flatted": true,
-        "eslint>file-entry-cache>flat-cache>rimraf": true
-      }
-    },
-    "eslint>file-entry-cache>flat-cache>rimraf": {
-      "builtin": {
-        "assert": true,
-        "fs": true,
-        "path.join": true
-      },
-      "globals": {
-        "process.platform": true,
-        "setTimeout": true
-      },
-      "packages": {
-        "nyc>glob": true
+        "nyc>rimraf": true
       }
     },
     "eslint>glob-parent": {
@@ -2892,6 +2812,17 @@
         "eslint>levn>prelude-ls": true
       }
     },
+    "eslint>minimatch": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console": true
+      },
+      "packages": {
+        "mocha>minimatch>brace-expansion": true
+      }
+    },
     "eslint>strip-ansi": {
       "packages": {
         "eslint>strip-ansi>ansi-regex": true
@@ -3604,7 +3535,7 @@
       "packages": {
         "gulp-rtlcss>rtlcss>@choojs/findup": true,
         "gulp-rtlcss>rtlcss>postcss": true,
-        "rc>strip-json-comments": true
+        "gulp-rtlcss>rtlcss>strip-json-comments": true
       }
     },
     "gulp-rtlcss>rtlcss>@choojs/findup": {
@@ -3858,10 +3789,10 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>probe-image-size>next-tick": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>event-emitter": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>is-promise": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>lru-queue": true,
+        "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": true,
         "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": true,
         "resolve-url-loader>es6-iterator>d": true,
         "resolve-url-loader>es6-iterator>es5-ext": true
@@ -3878,6 +3809,16 @@
         "resolve-url-loader>es6-iterator>es5-ext": true
       }
     },
+    "gulp-sourcemaps>debug-fabulous>memoizee>next-tick": {
+      "globals": {
+        "MutationObserver": true,
+        "WebKitMutationObserver": true,
+        "document": true,
+        "process": true,
+        "setImmediate": true,
+        "setTimeout": true
+      }
+    },
     "gulp-sourcemaps>debug-fabulous>memoizee>timers-ext": {
       "packages": {
         "resolve-url-loader>es6-iterator>es5-ext": true
@@ -4146,7 +4087,6 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>upath": true,
         "gulp-watch>chokidar>anymatch": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>chokidar>braces": true,
@@ -4154,6 +4094,7 @@
         "gulp-watch>chokidar>is-glob": true,
         "gulp-watch>chokidar>normalize-path": true,
         "gulp-watch>chokidar>readdirp": true,
+        "gulp-watch>chokidar>upath": true,
         "gulp-watch>glob-parent": true,
         "gulp-watch>path-is-absolute": true,
         "pumpify>inherits": true
@@ -4451,6 +4392,11 @@
         "gulp-watch>chokidar>readdirp>micromatch>extglob>extend-shallow>is-extendable": true
       }
     },
+    "gulp-watch>chokidar>upath": {
+      "builtin": {
+        "path": true
+      }
+    },
     "gulp-watch>fancy-log": {
       "globals": {
         "console": true,
@@ -4787,7 +4733,6 @@
         "setTimeout": true
       },
       "packages": {
-        "addons-linter>upath": true,
         "eslint>is-glob": true,
         "gulp-watch>chokidar>async-each": true,
         "gulp-watch>path-is-absolute": true,
@@ -4797,6 +4742,7 @@
         "gulp>glob-watcher>chokidar>is-binary-path": true,
         "gulp>glob-watcher>chokidar>normalize-path": true,
         "gulp>glob-watcher>chokidar>readdirp": true,
+        "gulp>glob-watcher>chokidar>upath": true,
         "pumpify>inherits": true
       }
     },
@@ -4879,6 +4825,11 @@
         "readable-stream": true
       }
     },
+    "gulp>glob-watcher>chokidar>upath": {
+      "builtin": {
+        "path": true
+      }
+    },
     "gulp>glob-watcher>just-debounce": {
       "globals": {
         "clearTimeout": true,
@@ -5636,17 +5587,6 @@
         "fs.accessSync": true
       }
     },
-    "mocha>minimatch": {
-      "builtin": {
-        "path": true
-      },
-      "globals": {
-        "console.error": true
-      },
-      "packages": {
-        "mocha>minimatch>brace-expansion": true
-      }
-    },
     "mocha>minimatch>brace-expansion": {
       "packages": {
         "mocha>minimatch>brace-expansion>concat-map": true,
@@ -5730,8 +5670,8 @@
         "process.platform": true
       },
       "packages": {
+        "eslint>minimatch": true,
         "gulp-watch>path-is-absolute": true,
-        "mocha>minimatch": true,
         "nyc>glob>fs.realpath": true,
         "nyc>glob>inflight": true,
         "pump>once": true,
@@ -5786,6 +5726,20 @@
         "path.resolve": true
       }
     },
+    "nyc>rimraf": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path.join": true
+      },
+      "globals": {
+        "process.platform": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "nyc>glob": true
+      }
+    },
     "nyc>signal-exit": {
       "builtin": {
         "assert.equal": true,
@@ -5902,9 +5856,9 @@
         "process.platform": true
       },
       "packages": {
-        "minimist": true,
         "rc>deep-extend": true,
         "rc>ini": true,
+        "rc>minimist": true,
         "rc>strip-json-comments": true
       }
     },
@@ -6684,10 +6638,61 @@
         "__dirname": true
       },
       "packages": {
-        "enzyme>cheerio>htmlparser2": true,
+        "stylelint>postcss-html>htmlparser2": true,
         "stylelint>postcss-syntax": true
       }
     },
+    "stylelint>postcss-html>htmlparser2": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "string_decoder.StringDecoder": true
+      },
+      "packages": {
+        "pumpify>inherits": true,
+        "stylelint>postcss-html>htmlparser2>domelementtype": true,
+        "stylelint>postcss-html>htmlparser2>domhandler": true,
+        "stylelint>postcss-html>htmlparser2>domutils": true,
+        "stylelint>postcss-html>htmlparser2>entities": true,
+        "stylelint>postcss-html>htmlparser2>readable-stream": true
+      }
+    },
+    "stylelint>postcss-html>htmlparser2>domhandler": {
+      "packages": {
+        "stylelint>postcss-html>htmlparser2>domelementtype": true
+      }
+    },
+    "stylelint>postcss-html>htmlparser2>domutils": {
+      "packages": {
+        "stylelint>postcss-html>htmlparser2>domelementtype": true,
+        "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": true
+      }
+    },
+    "stylelint>postcss-html>htmlparser2>domutils>dom-serializer": {
+      "packages": {
+        "stylelint>postcss-html>htmlparser2>domelementtype": true,
+        "stylelint>postcss-html>htmlparser2>entities": true
+      }
+    },
+    "stylelint>postcss-html>htmlparser2>readable-stream": {
+      "builtin": {
+        "buffer.Buffer": true,
+        "events.EventEmitter": true,
+        "stream": true,
+        "util": true
+      },
+      "globals": {
+        "process.env.READABLE_STREAM": true,
+        "process.nextTick": true,
+        "process.stderr": true,
+        "process.stdout": true
+      },
+      "packages": {
+        "@storybook/api>util-deprecate": true,
+        "browserify>string_decoder": true,
+        "pumpify>inherits": true
+      }
+    },
     "stylelint>postcss-less": {
       "packages": {
         "stylelint>postcss": true
@@ -7613,12 +7618,82 @@
         "enzyme>rst-selector-parser>nearley>randexp>ret": true
       }
     },
+    "yargs": {
+      "builtin": {
+        "assert": true,
+        "fs": true,
+        "path": true,
+        "util": true
+      },
+      "globals": {
+        "Error": true,
+        "console": true,
+        "process": true
+      },
+      "packages": {
+        "yargs>cliui": true,
+        "yargs>escalade": true,
+        "yargs>get-caller-file": true,
+        "yargs>require-directory": true,
+        "yargs>string-width": true,
+        "yargs>y18n": true,
+        "yargs>yargs-parser": true
+      }
+    },
+    "yargs>cliui": {
+      "packages": {
+        "eslint>strip-ansi": true,
+        "yargs>cliui>wrap-ansi": true,
+        "yargs>string-width": true
+      }
+    },
+    "yargs>cliui>wrap-ansi": {
+      "packages": {
+        "chalk>ansi-styles": true,
+        "eslint>strip-ansi": true,
+        "yargs>string-width": true
+      }
+    },
+    "yargs>escalade": {
+      "builtin": {
+        "fs.readdirSync": true,
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.resolve": true
+      }
+    },
+    "yargs>require-directory": {
+      "builtin": {
+        "fs.readdirSync": true,
+        "fs.statSync": true,
+        "path.dirname": true,
+        "path.join": true,
+        "path.resolve": true
+      }
+    },
     "yargs>string-width": {
       "packages": {
         "eslint>strip-ansi": true,
         "yargs>string-width>emoji-regex": true,
         "yargs>string-width>is-fullwidth-code-point": true
       }
+    },
+    "yargs>y18n": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "util": true
+      }
+    },
+    "yargs>yargs-parser": {
+      "builtin": {
+        "fs": true,
+        "path": true,
+        "util": true
+      },
+      "globals": {
+        "process": true
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 123d50c377d2..2bce1be6329b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.14.0",
+  "version": "10.18.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -11,14 +11,17 @@
     "setup:postinstall": "yarn patch-package && yarn allow-scripts",
     "start": "yarn build:dev dev --apply-lavamoat=false",
     "start:lavamoat": "yarn build:dev dev --apply-lavamoat=true",
+    "start:mv3": "ENABLE_MV3=true yarn build:dev dev --apply-lavamoat=false",
     "dist": "yarn build prod",
     "build": "yarn lavamoat:build",
     "build:dev": "node development/build/index.js",
     "start:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build testDev",
     "benchmark:chrome": "SELENIUM_BROWSER=chrome node test/e2e/benchmark.js",
+    "mv3:stats:chrome": "SELENIUM_BROWSER=chrome ENABLE_MV3=true node test/e2e/mv3-perf-stats/index.js",
     "benchmark:firefox": "SELENIUM_BROWSER=firefox node test/e2e/benchmark.js",
     "build:test": "SEGMENT_HOST='https://api.segment.io' SEGMENT_WRITE_KEY='FAKE' yarn build test",
     "build:test:flask": "yarn build test --build-type flask",
+    "build:test:mv3": "ENABLE_MV3=true 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'",
@@ -78,9 +81,9 @@
     "**/cross-fetch": "^3.1.5",
     "**/configstore/dot-prop": "^5.1.1",
     "**/ethers/elliptic": "^6.5.4",
-    "**/knex/minimist": "^1.2.5",
-    "**/optimist/minimist": "^1.2.5",
-    "**/socketcluster/minimist": "^1.2.5",
+    "**/knex/minimist": "^1.2.6",
+    "**/optimist/minimist": "^1.2.6",
+    "**/socketcluster/minimist": "^1.2.6",
     "**/redux/symbol-observable": "^2.0.3",
     "**/redux-devtools-instrument/symbol-observable": "^2.0.3",
     "**/rxjs/symbol-observable": "^2.0.3",
@@ -115,9 +118,9 @@
     "@keystonehq/metamask-airgapped-keyring": "0.2.1",
     "@material-ui/core": "^4.11.0",
     "@metamask/contract-metadata": "^1.31.0",
-    "@metamask/controllers": "^28.0.0",
-    "@metamask/design-tokens": "^1.5.1",
-    "@metamask/eth-ledger-bridge-keyring": "^0.12.0",
+    "@metamask/controllers": "^30.0.2",
+    "@metamask/design-tokens": "^1.8.0",
+    "@metamask/eth-ledger-bridge-keyring": "^0.13.0",
     "@metamask/eth-token-tracker": "^4.0.0",
     "@metamask/etherscan-link": "^2.1.0",
     "@metamask/jazzicon": "^2.0.0",
@@ -125,11 +128,11 @@
     "@metamask/metamask-eth-abis": "^3.0.0",
     "@metamask/obs-store": "^5.0.0",
     "@metamask/post-message-stream": "^4.0.0",
-    "@metamask/providers": "^8.1.1",
-    "@metamask/rpc-methods": "^0.12.0",
+    "@metamask/providers": "^9.0.0",
+    "@metamask/rpc-methods": "^0.18.1",
     "@metamask/slip44": "^2.1.0",
-    "@metamask/smart-transactions-controller": "^1.10.0",
-    "@metamask/snap-controllers": "^0.12.0",
+    "@metamask/smart-transactions-controller": "^2.1.0",
+    "@metamask/snap-controllers": "^0.18.1",
     "@ngraveio/bc-ur": "^1.1.6",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
@@ -156,7 +159,7 @@
     "eth-json-rpc-filters": "^4.2.1",
     "eth-json-rpc-infura": "^5.1.0",
     "eth-json-rpc-middleware": "^8.0.0",
-    "eth-keyring-controller": "^6.2.0",
+    "eth-keyring-controller": "^7.0.2",
     "eth-lattice-keyring": "^0.7.3",
     "eth-method-registry": "^2.0.0",
     "eth-query": "^2.1.2",
@@ -167,10 +170,9 @@
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^7.0.10",
     "ethereumjs-wallet": "^0.6.4",
-    "ethers": "^5.0.8",
+    "ethers": "^5.6.4",
     "ethjs": "^0.4.0",
     "ethjs-contract": "^0.2.3",
-    "ethjs-ens": "^2.0.0",
     "ethjs-query": "^0.3.4",
     "extension-port-stream": "^2.0.0",
     "fast-json-patch": "^2.2.1",
@@ -250,7 +252,8 @@
     "@metamask/eslint-config-nodejs": "^9.0.0",
     "@metamask/eslint-config-typescript": "^9.0.1",
     "@metamask/forwarder": "^1.1.0",
-    "@metamask/test-dapp": "^5.0.0",
+    "@metamask/phishing-warning": "^1.2.1",
+    "@metamask/test-dapp": "^5.1.1",
     "@sentry/cli": "^1.58.0",
     "@storybook/addon-a11y": "^6.3.12",
     "@storybook/addon-actions": "^6.3.12",
@@ -273,14 +276,14 @@
     "@types/react": "^16.9.53",
     "@typescript-eslint/eslint-plugin": "^4.20.0",
     "@typescript-eslint/parser": "^4.20.0",
-    "addons-linter": "1.14.0",
+    "addons-linter": "^5.2.0",
     "babelify": "^10.0.0",
     "bify-module-groups": "^2.0.0",
     "brfs": "^2.0.2",
     "browser-util-inspect": "^0.2.0",
     "browserify": "^16.5.1",
     "chalk": "^3.0.0",
-    "chromedriver": "^101.0.0",
+    "chromedriver": "^103.0.0",
     "concurrently": "^5.2.0",
     "copy-webpack-plugin": "^6.0.3",
     "cross-spawn": "^7.0.3",
@@ -333,7 +336,6 @@
     "lavamoat-viz": "^6.0.9",
     "lockfile-lint": "^4.0.0",
     "loose-envify": "^1.4.0",
-    "minimist": "^1.2.5",
     "mocha": "^7.2.0",
     "mockttp": "^2.6.0",
     "nock": "^9.0.14",
@@ -354,7 +356,7 @@
     "resolve-url-loader": "^3.1.2",
     "sass": "^1.32.4",
     "sass-loader": "^10.1.1",
-    "selenium-webdriver": "^4.1.0",
+    "selenium-webdriver": "^4.3.1",
     "semver": "^7.3.5",
     "serve-handler": "^6.1.2",
     "sinon": "^9.0.0",
@@ -380,7 +382,7 @@
     "yarn-deduplicate": "^3.1.0"
   },
   "engines": {
-    "node": "^14.15.1",
+    "node": "^16.0.0",
     "yarn": "^1.16.0"
   },
   "lavamoat": {
diff --git a/patches/@lavamoat+lavapack+3.1.0.patch b/patches/@lavamoat+lavapack+3.1.0.patch
new file mode 100644
index 000000000000..bdce11c01ddb
--- /dev/null
+++ b/patches/@lavamoat+lavapack+3.1.0.patch
@@ -0,0 +1,15 @@
+diff --git a/node_modules/@lavamoat/lavapack/src/pack.js b/node_modules/@lavamoat/lavapack/src/pack.js
+index eb41a0a..3f891ea 100644
+--- a/node_modules/@lavamoat/lavapack/src/pack.js
++++ b/node_modules/@lavamoat/lavapack/src/pack.js
+@@ -203,7 +203,9 @@ function createPacker({
+     const jsonSerializeableData = {
+       // id,
+       package: packageName,
+-      file,
++      // Omit this absolute filename from bundle so that builds are reproducible between environments
++      // TODO: update lavapack with an option to omit this, and/or make this filepath relative to the current working directory
++      // file,
+       // deps,
+       // source: sourceMeta.code
+     }
diff --git a/patches/abort-controller+3.0.0.patch b/patches/abort-controller+3.0.0.patch
index 2210446d2100..c9a7f43aa470 100644
--- a/patches/abort-controller+3.0.0.patch
+++ b/patches/abort-controller+3.0.0.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/abort-controller/browser.js b/node_modules/abort-controller/browser.js
-index b0c5ec3..c8c8018 100644
+index b0c5ec3..b61071b 100644
 --- a/node_modules/abort-controller/browser.js
 +++ b/node_modules/abort-controller/browser.js
 @@ -2,12 +2,7 @@
@@ -13,6 +13,7 @@ index b0c5ec3..c8c8018 100644
 +const { AbortController } = globalThis;
  /*eslint-enable @mysticatea/prettier */
  
- module.exports = AbortController
+-module.exports = AbortController
 -module.exports.AbortSignal = AbortSignal
 -module.exports.default = AbortController
++module.exports = { AbortController }
diff --git a/patches/bip39+2.5.0.patch b/patches/bip39+2.5.0.patch
deleted file mode 100644
index 2976f3bb2711..000000000000
--- a/patches/bip39+2.5.0.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/node_modules/bip39/index.js b/node_modules/bip39/index.js
-index aa0f29f..bee8008 100644
---- a/node_modules/bip39/index.js
-+++ b/node_modules/bip39/index.js
-@@ -48,7 +48,9 @@ function salt (password) {
- }
- 
- function mnemonicToSeed (mnemonic, password) {
--  var mnemonicBuffer = Buffer.from(unorm.nfkd(mnemonic), 'utf8')
-+  var mnemonicBuffer = typeof mnemonic === 'string'
-+    ? Buffer.from(unorm.nfkd(mnemonic), 'utf8')
-+    : mnemonic
-   var saltBuffer = Buffer.from(salt(unorm.nfkd(password)), 'utf8')
- 
-   return pbkdf2(mnemonicBuffer, saltBuffer, 2048, 64, 'sha512')
-@@ -61,12 +63,28 @@ function mnemonicToSeedHex (mnemonic, password) {
- function mnemonicToEntropy (mnemonic, wordlist) {
-   wordlist = wordlist || DEFAULT_WORDLIST
- 
--  var words = unorm.nfkd(mnemonic).split(' ')
-+  var mnemonicAsBuffer = typeof mnemonic === 'string'
-+    ? Buffer.from(unorm.nfkd(mnemonic), 'utf8')
-+    : mnemonic
-+
-+  var words = [];
-+  var currentWord = [];
-+  for (const byte of mnemonicAsBuffer.values()) {
-+    // split at space or \u3000 (ideographic space, for Japanese wordlists)
-+    if (byte === 0x20 || byte === 0x3000) {
-+      words.push(Buffer.from(currentWord));
-+      currentWord = [];
-+    } else {
-+      currentWord.push(byte);
-+    }
-+  }
-+  words.push(Buffer.from(currentWord));
-+
-   if (words.length % 3 !== 0) throw new Error(INVALID_MNEMONIC)
- 
-   // convert word indices to 11 bit binary strings
-   var bits = words.map(function (word) {
--    var index = wordlist.indexOf(word)
-+    var index = wordlist.indexOf(word.toString('utf8'))
-     if (index === -1) throw new Error(INVALID_MNEMONIC)
- 
-     return lpad(index.toString(2), '0', 11)
-@@ -104,12 +122,41 @@ function entropyToMnemonic (entropy, wordlist) {
- 
-   var bits = entropyBits + checksumBits
-   var chunks = bits.match(/(.{1,11})/g)
--  var words = chunks.map(function (binary) {
-+  var wordsAsBuffers = chunks.map(function (binary) {
-     var index = binaryToByte(binary)
--    return wordlist[index]
-+    return Buffer.from(wordlist[index], 'utf8')
-   })
- 
--  return wordlist === JAPANESE_WORDLIST ? words.join('\u3000') : words.join(' ')
-+  var bufferSize = wordsAsBuffers.reduce(function (bufferSize, wordAsBuffer, i) {
-+    var shouldAddSeparator = i < wordsAsBuffers.length - 1
-+    return (
-+      bufferSize +
-+      wordAsBuffer.length +
-+      (shouldAddSeparator ? 1 : 0)
-+    )
-+  }, 0)
-+  var separator = wordlist === JAPANESE_WORDLIST ? '\u3000' : ' '
-+  var result = wordsAsBuffers.reduce(function (result, wordAsBuffer, i) {
-+    var shouldAddSeparator = i < wordsAsBuffers.length - 1
-+    result.workingBuffer.set(wordAsBuffer, result.offset)
-+    if (shouldAddSeparator) {
-+      result.workingBuffer.write(
-+        separator,
-+        result.offset + wordAsBuffer.length,
-+        separator.length,
-+        'utf8'
-+      )
-+    }
-+    return {
-+      workingBuffer: result.workingBuffer,
-+      offset: (
-+        result.offset +
-+        wordAsBuffer.length +
-+        (shouldAddSeparator ? 1 : 0)
-+      )
-+    }
-+  }, { workingBuffer: Buffer.alloc(bufferSize), offset: 0 })
-+  return result.workingBuffer;
- }
- 
- function generateMnemonic (strength, rng, wordlist) {
-@@ -124,6 +171,7 @@ function validateMnemonic (mnemonic, wordlist) {
-   try {
-     mnemonicToEntropy(mnemonic, wordlist)
-   } catch (e) {
-+    console.log('could not validate mnemonic', e)
-     return false
-   }
- 
diff --git a/patches/eth-hd-keyring+3.6.0.patch b/patches/eth-hd-keyring+3.6.0.patch
deleted file mode 100644
index 211cb89dd200..000000000000
--- a/patches/eth-hd-keyring+3.6.0.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff --git a/node_modules/eth-hd-keyring/index.js b/node_modules/eth-hd-keyring/index.js
-index 19d1d7f..350d6b8 100644
---- a/node_modules/eth-hd-keyring/index.js
-+++ b/node_modules/eth-hd-keyring/index.js
-@@ -17,8 +17,11 @@ class HdKeyring extends SimpleKeyring {
-   }
- 
-   serialize () {
-+    const mnemonicAsBuffer = typeof this.mnemonic === 'string'
-+      ? Buffer.from(this.mnemonic, 'utf8')
-+      : this.mnemonic
-     return Promise.resolve({
--      mnemonic: this.mnemonic,
-+      mnemonic: Array.from(mnemonicAsBuffer.values()),
-       numberOfAccounts: this.wallets.length,
-       hdPath: this.hdPath,
-     })
-@@ -69,9 +72,22 @@ class HdKeyring extends SimpleKeyring {
- 
-   /* PRIVATE METHODS */
- 
--  _initFromMnemonic (mnemonic) {
--    this.mnemonic = mnemonic
--    const seed = bip39.mnemonicToSeed(mnemonic)
-+  /**
-+   * Sets appropriate properties for the keyring based on the given
-+   * BIP39-compliant mnemonic.
-+   *
-+   * @param {string|Array<number>|Buffer} mnemonic - A seed phrase represented
-+   * as a string, an array of UTF-8 bytes, or a Buffer.
-+   */
-+  _initFromMnemonic(mnemonic) {
-+    if (typeof mnemonic === 'string') {
-+      this.mnemonic = Buffer.from(mnemonic, 'utf8')
-+    } else if (Array.isArray(mnemonic)) {
-+      this.mnemonic = Buffer.from(mnemonic)
-+    } else {
-+      this.mnemonic = mnemonic
-+    }
-+    const seed = bip39.mnemonicToSeed(this.mnemonic)
-     this.hdWallet = hdkey.fromMasterSeed(seed)
-     this.root = this.hdWallet.derivePath(this.hdPath)
-   }
diff --git a/patches/eth-keyring-controller+6.2.1.patch b/patches/eth-keyring-controller+6.2.1.patch
deleted file mode 100644
index aec0c716821d..000000000000
--- a/patches/eth-keyring-controller+6.2.1.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/node_modules/eth-keyring-controller/index.js b/node_modules/eth-keyring-controller/index.js
-index 250ab98..38615aa 100644
---- a/node_modules/eth-keyring-controller/index.js
-+++ b/node_modules/eth-keyring-controller/index.js
-@@ -84,15 +84,20 @@ class KeyringController extends EventEmitter {
-    *
-    * @emits KeyringController#unlock
-    * @param {string} password - The password to encrypt the vault with
--   * @param {string} seed - The BIP44-compliant seed phrase.
-+   * @param {string|Array<number>} seedPhrase - The BIP39-compliant seed phrase,
-+   * either as a string or an array of UTF-8 bytes that represent the string.
-    * @returns {Promise<Object>} A Promise that resolves to the state.
-    */
--  createNewVaultAndRestore (password, seed) {
-+  createNewVaultAndRestore(password, seedPhrase) {
-+    const seedPhraseAsBuffer = typeof seedPhrase === 'string'
-+      ? Buffer.from(seedPhrase, 'utf8')
-+      : Buffer.from(seedPhrase)
-+
-     if (typeof password !== 'string') {
-       return Promise.reject(new Error('Password must be text.'))
-     }
- 
--    if (!bip39.validateMnemonic(seed)) {
-+    if (!bip39.validateMnemonic(seedPhraseAsBuffer)) {
-       return Promise.reject(new Error('Seed phrase is invalid.'))
-     }
- 
-@@ -101,7 +106,7 @@ class KeyringController extends EventEmitter {
-     return this.persistAllKeyrings(password)
-       .then(() => {
-         return this.addNewKeyring('HD Key Tree', {
--          mnemonic: seed,
-+          mnemonic: seedPhraseAsBuffer,
-           numberOfAccounts: 1,
-         })
-       })
diff --git a/patches/yargs+17.4.1.patch b/patches/yargs+17.4.1.patch
new file mode 100644
index 000000000000..2daf3489c78e
--- /dev/null
+++ b/patches/yargs+17.4.1.patch
@@ -0,0 +1,11 @@
+diff --git a/node_modules/yargs/build/index.cjs b/node_modules/yargs/build/index.cjs
+index b36980a..8c50028 100644
+--- a/node_modules/yargs/build/index.cjs
++++ b/node_modules/yargs/build/index.cjs
+@@ -1 +1,5 @@
+-"use strict";var t=require("assert");class e extends Error{constructor(t){super(t||"yargs error"),this.name="YError",Error.captureStackTrace(this,e)}}let s,i=[];function n(t,o,a,h){s=h;let l={};if(Object.prototype.hasOwnProperty.call(t,"extends")){if("string"!=typeof t.extends)return l;const r=/\.json|\..*rc$/.test(t.extends);let h=null;if(r)h=function(t,e){return s.path.resolve(t,e)}(o,t.extends);else try{h=require.resolve(t.extends)}catch(e){return t}!function(t){if(i.indexOf(t)>-1)throw new e(`Circular extended configurations: '${t}'.`)}(h),i.push(h),l=r?JSON.parse(s.readFileSync(h,"utf8")):require(t.extends),delete t.extends,l=n(l,s.path.dirname(h),a,s)}return i=[],a?r(l,t):Object.assign({},l,t)}function r(t,e){const s={};function i(t){return t&&"object"==typeof t&&!Array.isArray(t)}Object.assign(s,t);for(const n of Object.keys(e))i(e[n])&&i(s[n])?s[n]=r(t[n],e[n]):s[n]=e[n];return s}function o(t){const e=t.replace(/\s{2,}/g," ").split(/\s+(?![^[]*]|[^<]*>)/),s=/\.*[\][<>]/g,i=e.shift();if(!i)throw new Error(`No command found in: ${t}`);const n={cmd:i.replace(s,""),demanded:[],optional:[]};return e.forEach(((t,i)=>{let r=!1;t=t.replace(/\s/g,""),/\.+[\]>]/.test(t)&&i===e.length-1&&(r=!0),/^\[/.test(t)?n.optional.push({cmd:t.replace(s,"").split("|"),variadic:r}):n.demanded.push({cmd:t.replace(s,"").split("|"),variadic:r})})),n}const a=["first","second","third","fourth","fifth","sixth"];function h(t,s,i){try{let n=0;const[r,a,h]="object"==typeof t?[{demanded:[],optional:[]},t,s]:[o(`cmd ${t}`),s,i],f=[].slice.call(a);for(;f.length&&void 0===f[f.length-1];)f.pop();const d=h||f.length;if(d<r.demanded.length)throw new e(`Not enough arguments provided. Expected ${r.demanded.length} but received ${f.length}.`);const u=r.demanded.length+r.optional.length;if(d>u)throw new e(`Too many arguments provided. Expected max ${u} but received ${d}.`);r.demanded.forEach((t=>{const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1})),r.optional.forEach((t=>{if(0===f.length)return;const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1}))}catch(t){console.warn(t.stack)}}function l(t){return Array.isArray(t)?"array":null===t?"null":typeof t}function c(t,s,i){throw new e(`Invalid ${a[i]||"manyith"} argument. Expected ${s.join(" or ")} but received ${t}.`)}function f(t){return!!t&&!!t.then&&"function"==typeof t.then}function d(t,e,s,i){s.assert.notStrictEqual(t,e,i)}function u(t,e){e.assert.strictEqual(typeof t,"string")}function p(t){return Object.keys(t)}function g(t={},e=(()=>!0)){const s={};return p(t).forEach((i=>{e(i,t[i])&&(s[i]=t[i])})),s}function m(){return process.versions.electron&&!process.defaultApp?0:1}function y(){return process.argv[m()]}var b=Object.freeze({__proto__:null,hideBin:function(t){return t.slice(m()+1)},getProcessArgvBin:y});function v(t,e,s,i){if("a"===s&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(t):i?i.value:e.get(t)}function O(t,e,s,i,n){if("m"===i)throw new TypeError("Private method is not writable");if("a"===i&&!n)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===i?n.call(t,s):n?n.value=s:e.set(t,s),s}class w{constructor(t){this.globalMiddleware=[],this.frozens=[],this.yargs=t}addMiddleware(t,e,s=!0,i=!1){if(h("<array|function> [boolean] [boolean] [boolean]",[t,e,s],arguments.length),Array.isArray(t)){for(let i=0;i<t.length;i++){if("function"!=typeof t[i])throw Error("middleware must be a function");const n=t[i];n.applyBeforeValidation=e,n.global=s}Array.prototype.push.apply(this.globalMiddleware,t)}else if("function"==typeof t){const n=t;n.applyBeforeValidation=e,n.global=s,n.mutates=i,this.globalMiddleware.push(t)}return this.yargs}addCoerceMiddleware(t,e){const s=this.yargs.getAliases();return this.globalMiddleware=this.globalMiddleware.filter((t=>{const i=[...s[e]||[],e];return!t.option||!i.includes(t.option)})),t.option=e,this.addMiddleware(t,!0,!0,!0)}getMiddleware(){return this.globalMiddleware}freeze(){this.frozens.push([...this.globalMiddleware])}unfreeze(){const t=this.frozens.pop();void 0!==t&&(this.globalMiddleware=t)}reset(){this.globalMiddleware=this.globalMiddleware.filter((t=>t.global))}}function C(t,e,s,i){return s.reduce(((t,s)=>{if(s.applyBeforeValidation!==i)return t;if(s.mutates){if(s.applied)return t;s.applied=!0}if(f(t))return t.then((t=>Promise.all([t,s(t,e)]))).then((([t,e])=>Object.assign(t,e)));{const i=s(t,e);return f(i)?i.then((e=>Object.assign(t,e))):Object.assign(t,i)}}),t)}function j(t,e,s=(t=>{throw t})){try{const s="function"==typeof t?t():t;return f(s)?s.then((t=>e(t))):e(s)}catch(t){return s(t)}}const _=/(^\*)|(^\$0)/;class M{constructor(t,e,s,i){this.requireCache=new Set,this.handlers={},this.aliasMap={},this.frozens=[],this.shim=i,this.usage=t,this.globalMiddleware=s,this.validation=e}addDirectory(t,e,s,i){"boolean"!=typeof(i=i||{}).recurse&&(i.recurse=!1),Array.isArray(i.extensions)||(i.extensions=["js"]);const n="function"==typeof i.visit?i.visit:t=>t;i.visit=(t,e,s)=>{const i=n(t,e,s);if(i){if(this.requireCache.has(e))return i;this.requireCache.add(e),this.addHandler(i)}return i},this.shim.requireDirectory({require:e,filename:s},t,i)}addHandler(t,e,s,i,n,r){let a=[];const h=function(t){return t?t.map((t=>(t.applyBeforeValidation=!1,t))):[]}(n);if(i=i||(()=>{}),Array.isArray(t))if(function(t){return t.every((t=>"string"==typeof t))}(t))[t,...a]=t;else for(const e of t)this.addHandler(e);else{if(function(t){return"object"==typeof t&&!Array.isArray(t)}(t)){let e=Array.isArray(t.command)||"string"==typeof t.command?t.command:this.moduleName(t);return t.aliases&&(e=[].concat(e).concat(t.aliases)),void this.addHandler(e,this.extractDesc(t),t.builder,t.handler,t.middlewares,t.deprecated)}if(k(s))return void this.addHandler([t].concat(a),e,s.builder,s.handler,s.middlewares,s.deprecated)}if("string"==typeof t){const n=o(t);a=a.map((t=>o(t).cmd));let l=!1;const c=[n.cmd].concat(a).filter((t=>!_.test(t)||(l=!0,!1)));0===c.length&&l&&c.push("$0"),l&&(n.cmd=c[0],a=c.slice(1),t=t.replace(_,n.cmd)),a.forEach((t=>{this.aliasMap[t]=n.cmd})),!1!==e&&this.usage.command(t,e,l,a,r),this.handlers[n.cmd]={original:t,description:e,handler:i,builder:s||{},middlewares:h,deprecated:r,demanded:n.demanded,optional:n.optional},l&&(this.defaultCommand=this.handlers[n.cmd])}}getCommandHandlers(){return this.handlers}getCommands(){return Object.keys(this.handlers).concat(Object.keys(this.aliasMap))}hasDefaultCommand(){return!!this.defaultCommand}runCommand(t,e,s,i,n,r){const o=this.handlers[t]||this.handlers[this.aliasMap[t]]||this.defaultCommand,a=e.getInternalMethods().getContext(),h=a.commands.slice(),l=!t;t&&(a.commands.push(t),a.fullCommands.push(o.original));const c=this.applyBuilderUpdateUsageAndParse(l,o,e,s.aliases,h,i,n,r);return f(c)?c.then((t=>this.applyMiddlewareAndGetResult(l,o,t.innerArgv,a,n,t.aliases,e))):this.applyMiddlewareAndGetResult(l,o,c.innerArgv,a,n,c.aliases,e)}applyBuilderUpdateUsageAndParse(t,e,s,i,n,r,o,a){const h=e.builder;let l=s;if(x(h)){const c=h(s.getInternalMethods().reset(i),a);if(f(c))return c.then((i=>{var a;return l=(a=i)&&"function"==typeof a.getInternalMethods?i:s,this.parseAndUpdateUsage(t,e,l,n,r,o)}))}else(function(t){return"object"==typeof t})(h)&&(l=s.getInternalMethods().reset(i),Object.keys(e.builder).forEach((t=>{l.option(t,h[t])})));return this.parseAndUpdateUsage(t,e,l,n,r,o)}parseAndUpdateUsage(t,e,s,i,n,r){t&&s.getInternalMethods().getUsageInstance().unfreeze(!0),this.shouldUpdateUsage(s)&&s.getInternalMethods().getUsageInstance().usage(this.usageFromParentCommandsCommandHandler(i,e),e.description);const o=s.getInternalMethods().runYargsParserAndExecuteCommands(null,void 0,!0,n,r);return f(o)?o.then((t=>({aliases:s.parsed.aliases,innerArgv:t}))):{aliases:s.parsed.aliases,innerArgv:o}}shouldUpdateUsage(t){return!t.getInternalMethods().getUsageInstance().getUsageDisabled()&&0===t.getInternalMethods().getUsageInstance().getUsage().length}usageFromParentCommandsCommandHandler(t,e){const s=_.test(e.original)?e.original.replace(_,"").trim():e.original,i=t.filter((t=>!_.test(t)));return i.push(s),`$0 ${i.join(" ")}`}applyMiddlewareAndGetResult(t,e,s,i,n,r,o){let a={};if(n)return s;o.getInternalMethods().getHasOutput()||(a=this.populatePositionals(e,s,i,o));const h=this.globalMiddleware.getMiddleware().slice(0).concat(e.middlewares);if(s=C(s,o,h,!0),!o.getInternalMethods().getHasOutput()){const e=o.getInternalMethods().runValidation(r,a,o.parsed.error,t);s=j(s,(t=>(e(t),t)))}if(e.handler&&!o.getInternalMethods().getHasOutput()){o.getInternalMethods().setHasOutput();const i=!!o.getOptions().configuration["populate--"];o.getInternalMethods().postProcess(s,i,!1,!1),s=j(s=C(s,o,h,!1),(t=>{const s=e.handler(t);return f(s)?s.then((()=>t)):t})),t||o.getInternalMethods().getUsageInstance().cacheHelpMessage(),f(s)&&!o.getInternalMethods().hasParseCallback()&&s.catch((t=>{try{o.getInternalMethods().getUsageInstance().fail(null,t)}catch(t){}}))}return t||(i.commands.pop(),i.fullCommands.pop()),s}populatePositionals(t,e,s,i){e._=e._.slice(s.commands.length);const n=t.demanded.slice(0),r=t.optional.slice(0),o={};for(this.validation.positionalCount(n.length,e._.length);n.length;){const t=n.shift();this.populatePositional(t,e,o)}for(;r.length;){const t=r.shift();this.populatePositional(t,e,o)}return e._=s.commands.concat(e._.map((t=>""+t))),this.postProcessPositionals(e,o,this.cmdToParseOptions(t.original),i),o}populatePositional(t,e,s){const i=t.cmd[0];t.variadic?s[i]=e._.splice(0).map(String):e._.length&&(s[i]=[String(e._.shift())])}cmdToParseOptions(t){const e={array:[],default:{},alias:{},demand:{}},s=o(t);return s.demanded.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i,e.demand[s]=!0})),s.optional.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i})),e}postProcessPositionals(t,e,s,i){const n=Object.assign({},i.getOptions());n.default=Object.assign(s.default,n.default);for(const t of Object.keys(s.alias))n.alias[t]=(n.alias[t]||[]).concat(s.alias[t]);n.array=n.array.concat(s.array),n.config={};const r=[];if(Object.keys(e).forEach((t=>{e[t].map((e=>{n.configuration["unknown-options-as-args"]&&(n.key[t]=!0),r.push(`--${t}`),r.push(e)}))})),!r.length)return;const o=Object.assign({},n.configuration,{"populate--":!1}),a=this.shim.Parser.detailed(r,Object.assign({},n,{configuration:o}));if(a.error)i.getInternalMethods().getUsageInstance().fail(a.error.message,a.error);else{const s=Object.keys(e);Object.keys(e).forEach((t=>{s.push(...a.aliases[t])}));const n=i.getOptions().default;Object.keys(a.argv).forEach((i=>{s.includes(i)&&(e[i]||(e[i]=a.argv[i]),!Object.hasOwnProperty.call(n,i)&&Object.hasOwnProperty.call(t,i)&&Object.hasOwnProperty.call(a.argv,i)&&(Array.isArray(t[i])||Array.isArray(a.argv[i]))?t[i]=[].concat(t[i],a.argv[i]):t[i]=a.argv[i])}))}}runDefaultBuilderOn(t){if(!this.defaultCommand)return;if(this.shouldUpdateUsage(t)){const e=_.test(this.defaultCommand.original)?this.defaultCommand.original:this.defaultCommand.original.replace(/^[^[\]<>]*/,"$0 ");t.getInternalMethods().getUsageInstance().usage(e,this.defaultCommand.description)}const e=this.defaultCommand.builder;if(x(e))return e(t,!0);k(e)||Object.keys(e).forEach((s=>{t.option(s,e[s])}))}moduleName(t){const e=function(t){if("undefined"==typeof require)return null;for(let e,s=0,i=Object.keys(require.cache);s<i.length;s++)if(e=require.cache[i[s]],e.exports===t)return e;return null}(t);if(!e)throw new Error(`No command name given for module: ${this.shim.inspect(t)}`);return this.commandFromFilename(e.filename)}commandFromFilename(t){return this.shim.path.basename(t,this.shim.path.extname(t))}extractDesc({describe:t,description:e,desc:s}){for(const i of[t,e,s]){if("string"==typeof i||!1===i)return i;d(i,!0,this.shim)}return!1}freeze(){this.frozens.push({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand})}unfreeze(){const t=this.frozens.pop();d(t,void 0,this.shim),({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand}=t)}reset(){return this.handlers={},this.aliasMap={},this.defaultCommand=void 0,this.requireCache=new Set,this}}function k(t){return"object"==typeof t&&!!t.builder&&"function"==typeof t.handler}function x(t){return"function"==typeof t}function E(t){"undefined"!=typeof process&&[process.stdout,process.stderr].forEach((e=>{const s=e;s._handle&&s.isTTY&&"function"==typeof s._handle.setBlocking&&s._handle.setBlocking(t)}))}function A(t){return"boolean"==typeof t}function P(t,s){const i=s.y18n.__,n={},r=[];n.failFn=function(t){r.push(t)};let o=null,a=null,h=!0;n.showHelpOnFail=function(e=!0,s){const[i,r]="string"==typeof e?[!0,e]:[e,s];return t.getInternalMethods().isGlobalContext()&&(a=r),o=r,h=i,n};let l=!1;n.fail=function(s,i){const c=t.getInternalMethods().getLoggerInstance();if(!r.length){if(t.getExitProcess()&&E(!0),!l){l=!0,h&&(t.showHelp("error"),c.error()),(s||i)&&c.error(s||i);const e=o||a;e&&((s||i)&&c.error(""),c.error(e))}if(i=i||new e(s),t.getExitProcess())return t.exit(1);if(t.getInternalMethods().hasParseCallback())return t.exit(1,i);throw i}for(let t=r.length-1;t>=0;--t){const e=r[t];if(A(e)){if(i)throw i;if(s)throw Error(s)}else e(s,i,n)}};let c=[],f=!1;n.usage=(t,e)=>null===t?(f=!0,c=[],n):(f=!1,c.push([t,e||""]),n),n.getUsage=()=>c,n.getUsageDisabled=()=>f,n.getPositionalGroupName=()=>i("Positionals:");let d=[];n.example=(t,e)=>{d.push([t,e||""])};let u=[];n.command=function(t,e,s,i,n=!1){s&&(u=u.map((t=>(t[2]=!1,t)))),u.push([t,e||"",s,i,n])},n.getCommands=()=>u;let p={};n.describe=function(t,e){Array.isArray(t)?t.forEach((t=>{n.describe(t,e)})):"object"==typeof t?Object.keys(t).forEach((e=>{n.describe(e,t[e])})):p[t]=e},n.getDescriptions=()=>p;let m=[];n.epilog=t=>{m.push(t)};let y,b=!1;function v(){return b||(y=function(){const t=80;return s.process.stdColumns?Math.min(t,s.process.stdColumns):t}(),b=!0),y}n.wrap=t=>{b=!0,y=t};const O="__yargsString__:";function w(t,e,i){let n=0;return Array.isArray(t)||(t=Object.values(t).map((t=>[t]))),t.forEach((t=>{n=Math.max(s.stringWidth(i?`${i} ${I(t[0])}`:I(t[0]))+$(t[0]),n)})),e&&(n=Math.min(n,parseInt((.5*e).toString(),10))),n}let C;function j(e){return t.getOptions().hiddenOptions.indexOf(e)<0||t.parsed.argv[t.getOptions().showHiddenOpt]}function _(t,e){let s=`[${i("default:")} `;if(void 0===t&&!e)return null;if(e)s+=e;else switch(typeof t){case"string":s+=`"${t}"`;break;case"object":s+=JSON.stringify(t);break;default:s+=t}return`${s}]`}n.deferY18nLookup=t=>O+t,n.help=function(){if(C)return C;!function(){const e=t.getDemandedOptions(),s=t.getOptions();(Object.keys(s.alias)||[]).forEach((i=>{s.alias[i].forEach((r=>{p[r]&&n.describe(i,p[r]),r in e&&t.demandOption(i,e[r]),s.boolean.includes(r)&&t.boolean(i),s.count.includes(r)&&t.count(i),s.string.includes(r)&&t.string(i),s.normalize.includes(r)&&t.normalize(i),s.array.includes(r)&&t.array(i),s.number.includes(r)&&t.number(i)}))}))}();const e=t.customScriptName?t.$0:s.path.basename(t.$0),r=t.getDemandedOptions(),o=t.getDemandedCommands(),a=t.getDeprecatedOptions(),h=t.getGroups(),l=t.getOptions();let g=[];g=g.concat(Object.keys(p)),g=g.concat(Object.keys(r)),g=g.concat(Object.keys(o)),g=g.concat(Object.keys(l.default)),g=g.filter(j),g=Object.keys(g.reduce(((t,e)=>("_"!==e&&(t[e]=!0),t)),{}));const y=v(),b=s.cliui({width:y,wrap:!!y});if(!f)if(c.length)c.forEach((t=>{b.div({text:`${t[0].replace(/\$0/g,e)}`}),t[1]&&b.div({text:`${t[1]}`,padding:[1,0,0,0]})})),b.div();else if(u.length){let t=null;t=o._?`${e} <${i("command")}>\n`:`${e} [${i("command")}]\n`,b.div(`${t}`)}if(u.length>1||1===u.length&&!u[0][2]){b.div(i("Commands:"));const s=t.getInternalMethods().getContext(),n=s.commands.length?`${s.commands.join(" ")} `:"";!0===t.getInternalMethods().getParserConfiguration()["sort-commands"]&&(u=u.sort(((t,e)=>t[0].localeCompare(e[0]))));const r=e?`${e} `:"";u.forEach((t=>{const s=`${r}${n}${t[0].replace(/^\$0 ?/,"")}`;b.span({text:s,padding:[0,2,0,2],width:w(u,y,`${e}${n}`)+4},{text:t[1]});const o=[];t[2]&&o.push(`[${i("default")}]`),t[3]&&t[3].length&&o.push(`[${i("aliases:")} ${t[3].join(", ")}]`),t[4]&&("string"==typeof t[4]?o.push(`[${i("deprecated: %s",t[4])}]`):o.push(`[${i("deprecated")}]`)),o.length?b.div({text:o.join(" "),padding:[0,0,0,2],align:"right"}):b.div()})),b.div()}const M=(Object.keys(l.alias)||[]).concat(Object.keys(t.parsed.newAliases)||[]);g=g.filter((e=>!t.parsed.newAliases[e]&&M.every((t=>-1===(l.alias[t]||[]).indexOf(e)))));const k=i("Options:");h[k]||(h[k]=[]),function(t,e,s,i){let n=[],r=null;Object.keys(s).forEach((t=>{n=n.concat(s[t])})),t.forEach((t=>{r=[t].concat(e[t]),r.some((t=>-1!==n.indexOf(t)))||s[i].push(t)}))}(g,l.alias,h,k);const x=t=>/^--/.test(I(t)),E=Object.keys(h).filter((t=>h[t].length>0)).map((t=>({groupName:t,normalizedKeys:h[t].filter(j).map((t=>{if(M.includes(t))return t;for(let e,s=0;void 0!==(e=M[s]);s++)if((l.alias[e]||[]).includes(t))return e;return t}))}))).filter((({normalizedKeys:t})=>t.length>0)).map((({groupName:t,normalizedKeys:e})=>{const s=e.reduce(((e,s)=>(e[s]=[s].concat(l.alias[s]||[]).map((e=>t===n.getPositionalGroupName()?e:(/^[0-9]$/.test(e)?l.boolean.includes(s)?"-":"--":e.length>1?"--":"-")+e)).sort(((t,e)=>x(t)===x(e)?0:x(t)?1:-1)).join(", "),e)),{});return{groupName:t,normalizedKeys:e,switches:s}}));if(E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).some((({normalizedKeys:t,switches:e})=>!t.every((t=>x(e[t])))))&&E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).forEach((({normalizedKeys:t,switches:e})=>{t.forEach((t=>{var s,i;x(e[t])&&(e[t]=(s=e[t],i="-x, ".length,S(s)?{text:s.text,indentation:s.indentation+i}:{text:s,indentation:i}))}))})),E.forEach((({groupName:t,normalizedKeys:e,switches:s})=>{b.div(t),e.forEach((t=>{const e=s[t];let o=p[t]||"",h=null;o.includes(O)&&(o=i(o.substring(O.length))),l.boolean.includes(t)&&(h=`[${i("boolean")}]`),l.count.includes(t)&&(h=`[${i("count")}]`),l.string.includes(t)&&(h=`[${i("string")}]`),l.normalize.includes(t)&&(h=`[${i("string")}]`),l.array.includes(t)&&(h=`[${i("array")}]`),l.number.includes(t)&&(h=`[${i("number")}]`);const c=[t in a?(f=a[t],"string"==typeof f?`[${i("deprecated: %s",f)}]`:`[${i("deprecated")}]`):null,h,t in r?`[${i("required")}]`:null,l.choices&&l.choices[t]?`[${i("choices:")} ${n.stringifiedValues(l.choices[t])}]`:null,_(l.default[t],l.defaultDescription[t])].filter(Boolean).join(" ");var f;b.span({text:I(e),padding:[0,2,0,2+$(e)],width:w(s,y)+4},o),c?b.div({text:c,padding:[0,0,0,2],align:"right"}):b.div()})),b.div()})),d.length&&(b.div(i("Examples:")),d.forEach((t=>{t[0]=t[0].replace(/\$0/g,e)})),d.forEach((t=>{""===t[1]?b.div({text:t[0],padding:[0,2,0,2]}):b.div({text:t[0],padding:[0,2,0,2],width:w(d,y)+4},{text:t[1]})})),b.div()),m.length>0){const t=m.map((t=>t.replace(/\$0/g,e))).join("\n");b.div(`${t}\n`)}return b.toString().replace(/\s*$/,"")},n.cacheHelpMessage=function(){C=this.help()},n.clearCachedHelpMessage=function(){C=void 0},n.hasCachedHelpMessage=function(){return!!C},n.showHelp=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(n.help())},n.functionDescription=t=>["(",t.name?s.Parser.decamelize(t.name,"-"):i("generated-value"),")"].join(""),n.stringifiedValues=function(t,e){let s="";const i=e||", ",n=[].concat(t);return t&&n.length?(n.forEach((t=>{s.length&&(s+=i),s+=JSON.stringify(t)})),s):s};let M=null;n.version=t=>{M=t},n.showVersion=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(M)},n.reset=function(t){return o=null,l=!1,c=[],f=!1,m=[],d=[],u=[],p=g(p,(e=>!t[e])),n};const k=[];return n.freeze=function(){k.push({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p})},n.unfreeze=function(t=!1){const e=k.pop();e&&(t?(p={...e.descriptions,...p},u=[...e.commands,...u],c=[...e.usages,...c],d=[...e.examples,...d],m=[...e.epilogs,...m]):({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p}=e))},n}function S(t){return"object"==typeof t}function $(t){return S(t)?t.indentation:0}function I(t){return S(t)?t.text:t}class N{constructor(t,e,s,i){var n,r,o;this.yargs=t,this.usage=e,this.command=s,this.shim=i,this.completionKey="get-yargs-completions",this.aliases=null,this.customCompletionFunction=null,this.indexAfterLastReset=0,this.zshShell=null!==(o=(null===(n=this.shim.getEnv("SHELL"))||void 0===n?void 0:n.includes("zsh"))||(null===(r=this.shim.getEnv("ZSH_NAME"))||void 0===r?void 0:r.includes("zsh")))&&void 0!==o&&o}defaultCompletion(t,e,s,i){const n=this.command.getCommandHandlers();for(let e=0,s=t.length;e<s;++e)if(n[t[e]]&&n[t[e]].builder){const s=n[t[e]].builder;if(x(s)){this.indexAfterLastReset=e+1;const t=this.yargs.getInternalMethods().reset();return s(t,!0),t.argv}}const r=[];this.commandCompletions(r,t,s),this.optionCompletions(r,t,e,s),this.choicesFromOptionsCompletions(r,t,e,s),this.choicesFromPositionalsCompletions(r,t,e,s),i(null,r)}commandCompletions(t,e,s){const i=this.yargs.getInternalMethods().getContext().commands;s.match(/^-/)||i[i.length-1]===s||this.previousArgHasChoices(e)||this.usage.getCommands().forEach((s=>{const i=o(s[0]).cmd;if(-1===e.indexOf(i))if(this.zshShell){const e=s[1]||"";t.push(i.replace(/:/g,"\\:")+":"+e)}else t.push(i)}))}optionCompletions(t,e,s,i){if((i.match(/^-/)||""===i&&0===t.length)&&!this.previousArgHasChoices(e)){const n=this.yargs.getOptions(),r=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[];Object.keys(n.key).forEach((o=>{const a=!!n.configuration["boolean-negation"]&&n.boolean.includes(o);r.includes(o)||n.hiddenOptions.includes(o)||this.argsContainKey(e,s,o,a)||(this.completeOptionKey(o,t,i),a&&n.default[o]&&this.completeOptionKey(`no-${o}`,t,i))}))}}choicesFromOptionsCompletions(t,e,s,i){if(this.previousArgHasChoices(e)){const s=this.getPreviousArgChoices(e);s&&s.length>0&&t.push(...s.map((t=>t.replace(/:/g,"\\:"))))}}choicesFromPositionalsCompletions(t,e,s,i){if(""===i&&t.length>0&&this.previousArgHasChoices(e))return;const n=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[],r=Math.max(this.indexAfterLastReset,this.yargs.getInternalMethods().getContext().commands.length+1),o=n[s._.length-r-1];if(!o)return;const a=this.yargs.getOptions().choices[o]||[];for(const e of a)e.startsWith(i)&&t.push(e.replace(/:/g,"\\:"))}getPreviousArgChoices(t){if(t.length<1)return;let e=t[t.length-1],s="";if(!e.startsWith("-")&&t.length>1&&(s=e,e=t[t.length-2]),!e.startsWith("-"))return;const i=e.replace(/^-+/,""),n=this.yargs.getOptions(),r=[i,...this.yargs.getAliases()[i]||[]];let o;for(const t of r)if(Object.prototype.hasOwnProperty.call(n.key,t)&&Array.isArray(n.choices[t])){o=n.choices[t];break}return o?o.filter((t=>!s||t.startsWith(s))):void 0}previousArgHasChoices(t){const e=this.getPreviousArgChoices(t);return void 0!==e&&e.length>0}argsContainKey(t,e,s,i){if(-1!==t.indexOf(`--${s}`))return!0;if(i&&-1!==t.indexOf(`--no-${s}`))return!0;if(this.aliases)for(const t of this.aliases[s])if(void 0!==e[t])return!0;return!1}completeOptionKey(t,e,s){const i=this.usage.getDescriptions(),n=!/^--/.test(s)&&(t=>/^[^0-9]$/.test(t))(t)?"-":"--";if(this.zshShell){const s=i[t]||"";e.push(n+`${t.replace(/:/g,"\\:")}:${s.replace("__yargsString__:","")}`)}else e.push(n+t)}customCompletion(t,e,s,i){if(d(this.customCompletionFunction,null,this.shim),this.customCompletionFunction.length<3){const t=this.customCompletionFunction(s,e);return f(t)?t.then((t=>{this.shim.process.nextTick((()=>{i(null,t)}))})).catch((t=>{this.shim.process.nextTick((()=>{i(t,void 0)}))})):i(null,t)}return function(t){return t.length>3}(this.customCompletionFunction)?this.customCompletionFunction(s,e,((n=i)=>this.defaultCompletion(t,e,s,n)),(t=>{i(null,t)})):this.customCompletionFunction(s,e,(t=>{i(null,t)}))}getCompletion(t,e){const s=t.length?t[t.length-1]:"",i=this.yargs.parse(t,!0),n=this.customCompletionFunction?i=>this.customCompletion(t,i,s,e):i=>this.defaultCompletion(t,i,s,e);return f(i)?i.then(n):n(i)}generateCompletionScript(t,e){let s=this.zshShell?'#compdef {{app_name}}\n###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.zshrc\n#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n  local reply\n  local si=$IFS\n  IFS=$\'\n\' reply=($(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" {{app_path}} --get-yargs-completions "${words[@]}"))\n  IFS=$si\n  _describe \'values\' reply\n}\ncompdef _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n':'###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.bashrc\n#    or {{app_path}} {{completion_command}} >> ~/.bash_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n    local cur_word args type_list\n\n    cur_word="${COMP_WORDS[COMP_CWORD]}"\n    args=("${COMP_WORDS[@]}")\n\n    # ask yargs to generate completions.\n    type_list=$({{app_path}} --get-yargs-completions "${args[@]}")\n\n    COMPREPLY=( $(compgen -W "${type_list}" -- ${cur_word}) )\n\n    # if no match was found, fall back to filename completion\n    if [ ${#COMPREPLY[@]} -eq 0 ]; then\n      COMPREPLY=()\n    fi\n\n    return 0\n}\ncomplete -o bashdefault -o default -F _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n';const i=this.shim.path.basename(t);return t.match(/\.js$/)&&(t=`./${t}`),s=s.replace(/{{app_name}}/g,i),s=s.replace(/{{completion_command}}/g,e),s.replace(/{{app_path}}/g,t)}registerFunction(t){this.customCompletionFunction=t}setParsed(t){this.aliases=t.aliases}}function D(t,e){if(0===t.length)return e.length;if(0===e.length)return t.length;const s=[];let i,n;for(i=0;i<=e.length;i++)s[i]=[i];for(n=0;n<=t.length;n++)s[0][n]=n;for(i=1;i<=e.length;i++)for(n=1;n<=t.length;n++)e.charAt(i-1)===t.charAt(n-1)?s[i][n]=s[i-1][n-1]:i>1&&n>1&&e.charAt(i-2)===t.charAt(n-1)&&e.charAt(i-1)===t.charAt(n-2)?s[i][n]=s[i-2][n-2]+1:s[i][n]=Math.min(s[i-1][n-1]+1,Math.min(s[i][n-1]+1,s[i-1][n]+1));return s[e.length][t.length]}const H=["$0","--","_"];var z,q,W,F,U,L,V,G,R,T,K,B,Y,J,Z,X,Q,tt,et,st,it,nt,rt,ot,at,ht,lt,ct,ft,dt,ut,pt,gt,mt;const yt=Symbol("copyDoubleDash"),bt=Symbol("copyDoubleDash"),vt=Symbol("deleteFromParserHintObject"),Ot=Symbol("emitWarning"),wt=Symbol("freeze"),Ct=Symbol("getDollarZero"),jt=Symbol("getParserConfiguration"),_t=Symbol("guessLocale"),Mt=Symbol("guessVersion"),kt=Symbol("parsePositionalNumbers"),xt=Symbol("pkgUp"),Et=Symbol("populateParserHintArray"),At=Symbol("populateParserHintSingleValueDictionary"),Pt=Symbol("populateParserHintArrayDictionary"),St=Symbol("populateParserHintDictionary"),$t=Symbol("sanitizeKey"),It=Symbol("setKey"),Nt=Symbol("unfreeze"),Dt=Symbol("validateAsync"),Ht=Symbol("getCommandInstance"),zt=Symbol("getContext"),qt=Symbol("getHasOutput"),Wt=Symbol("getLoggerInstance"),Ft=Symbol("getParseContext"),Ut=Symbol("getUsageInstance"),Lt=Symbol("getValidationInstance"),Vt=Symbol("hasParseCallback"),Gt=Symbol("isGlobalContext"),Rt=Symbol("postProcess"),Tt=Symbol("rebase"),Kt=Symbol("reset"),Bt=Symbol("runYargsParserAndExecuteCommands"),Yt=Symbol("runValidation"),Jt=Symbol("setHasOutput"),Zt=Symbol("kTrackManuallySetKeys");class Xt{constructor(t=[],e,s,i){this.customScriptName=!1,this.parsed=!1,z.set(this,void 0),q.set(this,void 0),W.set(this,{commands:[],fullCommands:[]}),F.set(this,null),U.set(this,null),L.set(this,"show-hidden"),V.set(this,null),G.set(this,!0),R.set(this,{}),T.set(this,!0),K.set(this,[]),B.set(this,void 0),Y.set(this,{}),J.set(this,!1),Z.set(this,null),X.set(this,!0),Q.set(this,void 0),tt.set(this,""),et.set(this,void 0),st.set(this,void 0),it.set(this,{}),nt.set(this,null),rt.set(this,null),ot.set(this,{}),at.set(this,{}),ht.set(this,void 0),lt.set(this,!1),ct.set(this,void 0),ft.set(this,!1),dt.set(this,!1),ut.set(this,!1),pt.set(this,void 0),gt.set(this,null),mt.set(this,void 0),O(this,ct,i,"f"),O(this,ht,t,"f"),O(this,q,e,"f"),O(this,st,s,"f"),O(this,B,new w(this),"f"),this.$0=this[Ct](),this[Kt](),O(this,z,v(this,z,"f"),"f"),O(this,pt,v(this,pt,"f"),"f"),O(this,mt,v(this,mt,"f"),"f"),O(this,et,v(this,et,"f"),"f"),v(this,et,"f").showHiddenOpt=v(this,L,"f"),O(this,Q,this[bt](),"f")}addHelpOpt(t,e){return h("[string|boolean] [string]",[t,e],arguments.length),v(this,Z,"f")&&(this[vt](v(this,Z,"f")),O(this,Z,null,"f")),!1===t&&void 0===e||(O(this,Z,"string"==typeof t?t:"help","f"),this.boolean(v(this,Z,"f")),this.describe(v(this,Z,"f"),e||v(this,pt,"f").deferY18nLookup("Show help"))),this}help(t,e){return this.addHelpOpt(t,e)}addShowHiddenOpt(t,e){if(h("[string|boolean] [string]",[t,e],arguments.length),!1===t&&void 0===e)return this;const s="string"==typeof t?t:v(this,L,"f");return this.boolean(s),this.describe(s,e||v(this,pt,"f").deferY18nLookup("Show hidden options")),v(this,et,"f").showHiddenOpt=s,this}showHidden(t,e){return this.addShowHiddenOpt(t,e)}alias(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.alias.bind(this),"alias",t,e),this}array(t){return h("<array|string>",[t],arguments.length),this[Et]("array",t),this[Zt](t),this}boolean(t){return h("<array|string>",[t],arguments.length),this[Et]("boolean",t),this[Zt](t),this}check(t,e){return h("<function> [boolean]",[t,e],arguments.length),this.middleware(((e,s)=>j((()=>t(e,s.getOptions())),(s=>(s?("string"==typeof s||s instanceof Error)&&v(this,pt,"f").fail(s.toString(),s):v(this,pt,"f").fail(v(this,ct,"f").y18n.__("Argument check failed: %s",t.toString())),e)),(t=>(v(this,pt,"f").fail(t.message?t.message:t.toString(),t),e)))),!1,e),this}choices(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.choices.bind(this),"choices",t,e),this}coerce(t,s){if(h("<object|string|array> [function]",[t,s],arguments.length),Array.isArray(t)){if(!s)throw new e("coerce callback must be provided");for(const e of t)this.coerce(e,s);return this}if("object"==typeof t){for(const e of Object.keys(t))this.coerce(e,t[e]);return this}if(!s)throw new e("coerce callback must be provided");return v(this,et,"f").key[t]=!0,v(this,B,"f").addCoerceMiddleware(((i,n)=>{let r;return Object.hasOwnProperty.call(i,t)?j((()=>(r=n.getAliases(),s(i[t]))),(e=>{i[t]=e;const s=n.getInternalMethods().getParserConfiguration()["strip-aliased"];if(r[t]&&!0!==s)for(const s of r[t])i[s]=e;return i}),(t=>{throw new e(t.message)})):i}),t),this}conflicts(t,e){return h("<string|object> [string|array]",[t,e],arguments.length),v(this,mt,"f").conflicts(t,e),this}config(t="config",e,s){return h("[object|string] [string|function] [function]",[t,e,s],arguments.length),"object"!=typeof t||Array.isArray(t)?("function"==typeof e&&(s=e,e=void 0),this.describe(t,e||v(this,pt,"f").deferY18nLookup("Path to JSON config file")),(Array.isArray(t)?t:[t]).forEach((t=>{v(this,et,"f").config[t]=s||!0})),this):(t=n(t,v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(t),this)}completion(t,e,s){return h("[string] [string|boolean|function] [function]",[t,e,s],arguments.length),"function"==typeof e&&(s=e,e=void 0),O(this,U,t||v(this,U,"f")||"completion","f"),e||!1===e||(e="generate completion script"),this.command(v(this,U,"f"),e),s&&v(this,F,"f").registerFunction(s),this}command(t,e,s,i,n,r){return h("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]",[t,e,s,i,n,r],arguments.length),v(this,z,"f").addHandler(t,e,s,i,n,r),this}commands(t,e,s,i,n,r){return this.command(t,e,s,i,n,r)}commandDir(t,e){h("<string> [object]",[t,e],arguments.length);const s=v(this,st,"f")||v(this,ct,"f").require;return v(this,z,"f").addDirectory(t,s,v(this,ct,"f").getCallerFile(),e),this}count(t){return h("<array|string>",[t],arguments.length),this[Et]("count",t),this[Zt](t),this}default(t,e,s){return h("<object|string|array> [*] [string]",[t,e,s],arguments.length),s&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]=s),"function"==typeof e&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]||(v(this,et,"f").defaultDescription[t]=v(this,pt,"f").functionDescription(e)),e=e.call()),this[At](this.default.bind(this),"default",t,e),this}defaults(t,e,s){return this.default(t,e,s)}demandCommand(t=1,e,s,i){return h("[number] [number|string] [string|null|undefined] [string|null|undefined]",[t,e,s,i],arguments.length),"number"!=typeof e&&(s=e,e=1/0),this.global("_",!1),v(this,et,"f").demandedCommands._={min:t,max:e,minMsg:s,maxMsg:i},this}demand(t,e,s){return Array.isArray(e)?(e.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})),e=1/0):"number"!=typeof e&&(s=e,e=1/0),"number"==typeof t?(d(s,!0,v(this,ct,"f")),this.demandCommand(t,e,s,s)):Array.isArray(t)?t.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})):"string"==typeof s?this.demandOption(t,s):!0!==s&&void 0!==s||this.demandOption(t),this}demandOption(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[At](this.demandOption.bind(this),"demandedOptions",t,e),this}deprecateOption(t,e){return h("<string> [string|boolean]",[t,e],arguments.length),v(this,et,"f").deprecatedOptions[t]=e,this}describe(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[It](t,!0),v(this,pt,"f").describe(t,e),this}detectLocale(t){return h("<boolean>",[t],arguments.length),O(this,G,t,"f"),this}env(t){return h("[string|boolean]",[t],arguments.length),!1===t?delete v(this,et,"f").envPrefix:v(this,et,"f").envPrefix=t||"",this}epilogue(t){return h("<string>",[t],arguments.length),v(this,pt,"f").epilog(t),this}epilog(t){return this.epilogue(t)}example(t,e){return h("<string|array> [string]",[t,e],arguments.length),Array.isArray(t)?t.forEach((t=>this.example(...t))):v(this,pt,"f").example(t,e),this}exit(t,e){O(this,J,!0,"f"),O(this,V,e,"f"),v(this,T,"f")&&v(this,ct,"f").process.exit(t)}exitProcess(t=!0){return h("[boolean]",[t],arguments.length),O(this,T,t,"f"),this}fail(t){if(h("<function|boolean>",[t],arguments.length),"boolean"==typeof t&&!1!==t)throw new e("Invalid first argument. Expected function or boolean 'false'");return v(this,pt,"f").failFn(t),this}getAliases(){return this.parsed?this.parsed.aliases:{}}async getCompletion(t,e){return h("<array> [function]",[t,e],arguments.length),e?v(this,F,"f").getCompletion(t,e):new Promise(((e,s)=>{v(this,F,"f").getCompletion(t,((t,i)=>{t?s(t):e(i)}))}))}getDemandedOptions(){return h([],0),v(this,et,"f").demandedOptions}getDemandedCommands(){return h([],0),v(this,et,"f").demandedCommands}getDeprecatedOptions(){return h([],0),v(this,et,"f").deprecatedOptions}getDetectLocale(){return v(this,G,"f")}getExitProcess(){return v(this,T,"f")}getGroups(){return Object.assign({},v(this,Y,"f"),v(this,at,"f"))}getHelp(){if(O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const t=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(t))return t.then((()=>v(this,pt,"f").help()))}const t=v(this,z,"f").runDefaultBuilderOn(this);if(f(t))return t.then((()=>v(this,pt,"f").help()))}return Promise.resolve(v(this,pt,"f").help())}getOptions(){return v(this,et,"f")}getStrict(){return v(this,ft,"f")}getStrictCommands(){return v(this,dt,"f")}getStrictOptions(){return v(this,ut,"f")}global(t,e){return h("<string|array> [boolean]",[t,e],arguments.length),t=[].concat(t),!1!==e?v(this,et,"f").local=v(this,et,"f").local.filter((e=>-1===t.indexOf(e))):t.forEach((t=>{v(this,et,"f").local.includes(t)||v(this,et,"f").local.push(t)})),this}group(t,e){h("<string|array> <string>",[t,e],arguments.length);const s=v(this,at,"f")[e]||v(this,Y,"f")[e];v(this,at,"f")[e]&&delete v(this,at,"f")[e];const i={};return v(this,Y,"f")[e]=(s||[]).concat(t).filter((t=>!i[t]&&(i[t]=!0))),this}hide(t){return h("<string>",[t],arguments.length),v(this,et,"f").hiddenOptions.push(t),this}implies(t,e){return h("<string|object> [number|string|array]",[t,e],arguments.length),v(this,mt,"f").implies(t,e),this}locale(t){return h("[string]",[t],arguments.length),t?(O(this,G,!1,"f"),v(this,ct,"f").y18n.setLocale(t),this):(this[_t](),v(this,ct,"f").y18n.getLocale())}middleware(t,e,s){return v(this,B,"f").addMiddleware(t,!!e,s)}nargs(t,e){return h("<string|object|array> [number]",[t,e],arguments.length),this[At](this.nargs.bind(this),"narg",t,e),this}normalize(t){return h("<array|string>",[t],arguments.length),this[Et]("normalize",t),this}number(t){return h("<array|string>",[t],arguments.length),this[Et]("number",t),this[Zt](t),this}option(t,e){if(h("<string|object> [object]",[t,e],arguments.length),"object"==typeof t)Object.keys(t).forEach((e=>{this.options(e,t[e])}));else{"object"!=typeof e&&(e={}),this[Zt](t),!v(this,gt,"f")||"version"!==t&&"version"!==(null==e?void 0:e.alias)||this[Ot](['"version" is a reserved word.',"Please do one of the following:",'- Disable version with `yargs.version(false)` if using "version" as an option',"- Use the built-in `yargs.version` method instead (if applicable)","- Use a different option key","https://yargs.js.org/docs/#api-reference-version"].join("\n"),void 0,"versionWarning"),v(this,et,"f").key[t]=!0,e.alias&&this.alias(t,e.alias);const s=e.deprecate||e.deprecated;s&&this.deprecateOption(t,s);const i=e.demand||e.required||e.require;i&&this.demand(t,i),e.demandOption&&this.demandOption(t,"string"==typeof e.demandOption?e.demandOption:void 0),e.conflicts&&this.conflicts(t,e.conflicts),"default"in e&&this.default(t,e.default),void 0!==e.implies&&this.implies(t,e.implies),void 0!==e.nargs&&this.nargs(t,e.nargs),e.config&&this.config(t,e.configParser),e.normalize&&this.normalize(t),e.choices&&this.choices(t,e.choices),e.coerce&&this.coerce(t,e.coerce),e.group&&this.group(t,e.group),(e.boolean||"boolean"===e.type)&&(this.boolean(t),e.alias&&this.boolean(e.alias)),(e.array||"array"===e.type)&&(this.array(t),e.alias&&this.array(e.alias)),(e.number||"number"===e.type)&&(this.number(t),e.alias&&this.number(e.alias)),(e.string||"string"===e.type)&&(this.string(t),e.alias&&this.string(e.alias)),(e.count||"count"===e.type)&&this.count(t),"boolean"==typeof e.global&&this.global(t,e.global),e.defaultDescription&&(v(this,et,"f").defaultDescription[t]=e.defaultDescription),e.skipValidation&&this.skipValidation(t);const n=e.describe||e.description||e.desc;this.describe(t,n),e.hidden&&this.hide(t),e.requiresArg&&this.requiresArg(t)}return this}options(t,e){return this.option(t,e)}parse(t,e,s){h("[string|array] [function|boolean|object] [function]",[t,e,s],arguments.length),this[wt](),void 0===t&&(t=v(this,ht,"f")),"object"==typeof e&&(O(this,rt,e,"f"),e=s),"function"==typeof e&&(O(this,nt,e,"f"),e=!1),e||O(this,ht,t,"f"),v(this,nt,"f")&&O(this,T,!1,"f");const i=this[Bt](t,!!e),n=this.parsed;return v(this,F,"f").setParsed(this.parsed),f(i)?i.then((t=>(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),t,v(this,tt,"f")),t))).catch((t=>{throw v(this,nt,"f")&&v(this,nt,"f")(t,this.parsed.argv,v(this,tt,"f")),t})).finally((()=>{this[Nt](),this.parsed=n})):(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),i,v(this,tt,"f")),this[Nt](),this.parsed=n,i)}parseAsync(t,e,s){const i=this.parse(t,e,s);return f(i)?i:Promise.resolve(i)}parseSync(t,s,i){const n=this.parse(t,s,i);if(f(n))throw new e(".parseSync() must not be used with asynchronous builders, handlers, or middleware");return n}parserConfiguration(t){return h("<object>",[t],arguments.length),O(this,it,t,"f"),this}pkgConf(t,e){h("<string> [string]",[t,e],arguments.length);let s=null;const i=this[xt](e||v(this,q,"f"));return i[t]&&"object"==typeof i[t]&&(s=n(i[t],e||v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(s)),this}positional(t,e){h("<string> <object>",[t,e],arguments.length);const s=["default","defaultDescription","implies","normalize","choices","conflicts","coerce","type","describe","desc","description","alias"];e=g(e,((t,e)=>!("type"===t&&!["string","number","boolean"].includes(e))&&s.includes(t)));const i=v(this,W,"f").fullCommands[v(this,W,"f").fullCommands.length-1],n=i?v(this,z,"f").cmdToParseOptions(i):{array:[],alias:{},default:{},demand:{}};return p(n).forEach((s=>{const i=n[s];Array.isArray(i)?-1!==i.indexOf(t)&&(e[s]=!0):i[t]&&!(s in e)&&(e[s]=i[t])})),this.group(t,v(this,pt,"f").getPositionalGroupName()),this.option(t,e)}recommendCommands(t=!0){return h("[boolean]",[t],arguments.length),O(this,lt,t,"f"),this}required(t,e,s){return this.demand(t,e,s)}require(t,e,s){return this.demand(t,e,s)}requiresArg(t){return h("<array|string|object> [number]",[t],arguments.length),"string"==typeof t&&v(this,et,"f").narg[t]||this[At](this.requiresArg.bind(this),"narg",t,NaN),this}showCompletionScript(t,e){return h("[string] [string]",[t,e],arguments.length),t=t||this.$0,v(this,Q,"f").log(v(this,F,"f").generateCompletionScript(t,e||v(this,U,"f")||"completion")),this}showHelp(t){if(h("[string|function]",[t],arguments.length),O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const e=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}const e=v(this,z,"f").runDefaultBuilderOn(this);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}return v(this,pt,"f").showHelp(t),this}scriptName(t){return this.customScriptName=!0,this.$0=t,this}showHelpOnFail(t,e){return h("[boolean|string] [string]",[t,e],arguments.length),v(this,pt,"f").showHelpOnFail(t,e),this}showVersion(t){return h("[string|function]",[t],arguments.length),v(this,pt,"f").showVersion(t),this}skipValidation(t){return h("<array|string>",[t],arguments.length),this[Et]("skipValidation",t),this}strict(t){return h("[boolean]",[t],arguments.length),O(this,ft,!1!==t,"f"),this}strictCommands(t){return h("[boolean]",[t],arguments.length),O(this,dt,!1!==t,"f"),this}strictOptions(t){return h("[boolean]",[t],arguments.length),O(this,ut,!1!==t,"f"),this}string(t){return h("<array|string>",[t],arguments.length),this[Et]("string",t),this[Zt](t),this}terminalWidth(){return h([],0),v(this,ct,"f").process.stdColumns}updateLocale(t){return this.updateStrings(t)}updateStrings(t){return h("<object>",[t],arguments.length),O(this,G,!1,"f"),v(this,ct,"f").y18n.updateLocale(t),this}usage(t,s,i,n){if(h("<string|null|undefined> [string|boolean] [function|object] [function]",[t,s,i,n],arguments.length),void 0!==s){if(d(t,null,v(this,ct,"f")),(t||"").match(/^\$0( |$)/))return this.command(t,s,i,n);throw new e(".usage() description must start with $0 if being used as alias for .command()")}return v(this,pt,"f").usage(t),this}version(t,e,s){const i="version";if(h("[boolean|string] [string] [string]",[t,e,s],arguments.length),v(this,gt,"f")&&(this[vt](v(this,gt,"f")),v(this,pt,"f").version(void 0),O(this,gt,null,"f")),0===arguments.length)s=this[Mt](),t=i;else if(1===arguments.length){if(!1===t)return this;s=t,t=i}else 2===arguments.length&&(s=e,e=void 0);return O(this,gt,"string"==typeof t?t:i,"f"),e=e||v(this,pt,"f").deferY18nLookup("Show version number"),v(this,pt,"f").version(s||void 0),this.boolean(v(this,gt,"f")),this.describe(v(this,gt,"f"),e),this}wrap(t){return h("<number|null|undefined>",[t],arguments.length),v(this,pt,"f").wrap(t),this}[(z=new WeakMap,q=new WeakMap,W=new WeakMap,F=new WeakMap,U=new WeakMap,L=new WeakMap,V=new WeakMap,G=new WeakMap,R=new WeakMap,T=new WeakMap,K=new WeakMap,B=new WeakMap,Y=new WeakMap,J=new WeakMap,Z=new WeakMap,X=new WeakMap,Q=new WeakMap,tt=new WeakMap,et=new WeakMap,st=new WeakMap,it=new WeakMap,nt=new WeakMap,rt=new WeakMap,ot=new WeakMap,at=new WeakMap,ht=new WeakMap,lt=new WeakMap,ct=new WeakMap,ft=new WeakMap,dt=new WeakMap,ut=new WeakMap,pt=new WeakMap,gt=new WeakMap,mt=new WeakMap,yt)](t){if(!t._||!t["--"])return t;t._.push.apply(t._,t["--"]);try{delete t["--"]}catch(t){}return t}[bt](){return{log:(...t)=>{this[Vt]()||console.log(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")},error:(...t)=>{this[Vt]()||console.error(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")}}}[vt](t){p(v(this,et,"f")).forEach((e=>{if("configObjects"===e)return;const s=v(this,et,"f")[e];Array.isArray(s)?s.includes(t)&&s.splice(s.indexOf(t),1):"object"==typeof s&&delete s[t]})),delete v(this,pt,"f").getDescriptions()[t]}[Ot](t,e,s){v(this,R,"f")[s]||(v(this,ct,"f").process.emitWarning(t,e),v(this,R,"f")[s]=!0)}[wt](){v(this,K,"f").push({options:v(this,et,"f"),configObjects:v(this,et,"f").configObjects.slice(0),exitProcess:v(this,T,"f"),groups:v(this,Y,"f"),strict:v(this,ft,"f"),strictCommands:v(this,dt,"f"),strictOptions:v(this,ut,"f"),completionCommand:v(this,U,"f"),output:v(this,tt,"f"),exitError:v(this,V,"f"),hasOutput:v(this,J,"f"),parsed:this.parsed,parseFn:v(this,nt,"f"),parseContext:v(this,rt,"f")}),v(this,pt,"f").freeze(),v(this,mt,"f").freeze(),v(this,z,"f").freeze(),v(this,B,"f").freeze()}[Ct](){let t,e="";return t=/\b(node|iojs|electron)(\.exe)?$/.test(v(this,ct,"f").process.argv()[0])?v(this,ct,"f").process.argv().slice(1,2):v(this,ct,"f").process.argv().slice(0,1),e=t.map((t=>{const e=this[Tt](v(this,q,"f"),t);return t.match(/^(\/|([a-zA-Z]:)?\\)/)&&e.length<t.length?e:t})).join(" ").trim(),v(this,ct,"f").getEnv("_")&&v(this,ct,"f").getProcessArgvBin()===v(this,ct,"f").getEnv("_")&&(e=v(this,ct,"f").getEnv("_").replace(`${v(this,ct,"f").path.dirname(v(this,ct,"f").process.execPath())}/`,"")),e}[jt](){return v(this,it,"f")}[_t](){if(!v(this,G,"f"))return;const t=v(this,ct,"f").getEnv("LC_ALL")||v(this,ct,"f").getEnv("LC_MESSAGES")||v(this,ct,"f").getEnv("LANG")||v(this,ct,"f").getEnv("LANGUAGE")||"en_US";this.locale(t.replace(/[.:].*/,""))}[Mt](){return this[xt]().version||"unknown"}[kt](t){const e=t["--"]?t["--"]:t._;for(let t,s=0;void 0!==(t=e[s]);s++)v(this,ct,"f").Parser.looksLikeNumber(t)&&Number.isSafeInteger(Math.floor(parseFloat(`${t}`)))&&(e[s]=Number(t));return t}[xt](t){const e=t||"*";if(v(this,ot,"f")[e])return v(this,ot,"f")[e];let s={};try{let e=t||v(this,ct,"f").mainFilename;!t&&v(this,ct,"f").path.extname(e)&&(e=v(this,ct,"f").path.dirname(e));const i=v(this,ct,"f").findUp(e,((t,e)=>e.includes("package.json")?"package.json":void 0));d(i,void 0,v(this,ct,"f")),s=JSON.parse(v(this,ct,"f").readFileSync(i,"utf8"))}catch(t){}return v(this,ot,"f")[e]=s||{},v(this,ot,"f")[e]}[Et](t,e){(e=[].concat(e)).forEach((e=>{e=this[$t](e),v(this,et,"f")[t].push(e)}))}[At](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=s}))}[Pt](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=(v(this,et,"f")[t][e]||[]).concat(s)}))}[St](t,e,s,i,n){if(Array.isArray(s))s.forEach((e=>{t(e,i)}));else if((t=>"object"==typeof t)(s))for(const e of p(s))t(e,s[e]);else n(e,this[$t](s),i)}[$t](t){return"__proto__"===t?"___proto___":t}[It](t,e){return this[At](this[It].bind(this),"key",t,e),this}[Nt](){var t,e,s,i,n,r,o,a,h,l,c,f;const u=v(this,K,"f").pop();let p;d(u,void 0,v(this,ct,"f")),t=this,e=this,s=this,i=this,n=this,r=this,o=this,a=this,h=this,l=this,c=this,f=this,({options:{set value(e){O(t,et,e,"f")}}.value,configObjects:p,exitProcess:{set value(t){O(e,T,t,"f")}}.value,groups:{set value(t){O(s,Y,t,"f")}}.value,output:{set value(t){O(i,tt,t,"f")}}.value,exitError:{set value(t){O(n,V,t,"f")}}.value,hasOutput:{set value(t){O(r,J,t,"f")}}.value,parsed:this.parsed,strict:{set value(t){O(o,ft,t,"f")}}.value,strictCommands:{set value(t){O(a,dt,t,"f")}}.value,strictOptions:{set value(t){O(h,ut,t,"f")}}.value,completionCommand:{set value(t){O(l,U,t,"f")}}.value,parseFn:{set value(t){O(c,nt,t,"f")}}.value,parseContext:{set value(t){O(f,rt,t,"f")}}.value}=u),v(this,et,"f").configObjects=p,v(this,pt,"f").unfreeze(),v(this,mt,"f").unfreeze(),v(this,z,"f").unfreeze(),v(this,B,"f").unfreeze()}[Dt](t,e){return j(e,(e=>(t(e),e)))}getInternalMethods(){return{getCommandInstance:this[Ht].bind(this),getContext:this[zt].bind(this),getHasOutput:this[qt].bind(this),getLoggerInstance:this[Wt].bind(this),getParseContext:this[Ft].bind(this),getParserConfiguration:this[jt].bind(this),getUsageInstance:this[Ut].bind(this),getValidationInstance:this[Lt].bind(this),hasParseCallback:this[Vt].bind(this),isGlobalContext:this[Gt].bind(this),postProcess:this[Rt].bind(this),reset:this[Kt].bind(this),runValidation:this[Yt].bind(this),runYargsParserAndExecuteCommands:this[Bt].bind(this),setHasOutput:this[Jt].bind(this)}}[Ht](){return v(this,z,"f")}[zt](){return v(this,W,"f")}[qt](){return v(this,J,"f")}[Wt](){return v(this,Q,"f")}[Ft](){return v(this,rt,"f")||{}}[Ut](){return v(this,pt,"f")}[Lt](){return v(this,mt,"f")}[Vt](){return!!v(this,nt,"f")}[Gt](){return v(this,X,"f")}[Rt](t,e,s,i){if(s)return t;if(f(t))return t;e||(t=this[yt](t));return(this[jt]()["parse-positional-numbers"]||void 0===this[jt]()["parse-positional-numbers"])&&(t=this[kt](t)),i&&(t=C(t,this,v(this,B,"f").getMiddleware(),!1)),t}[Kt](t={}){O(this,et,v(this,et,"f")||{},"f");const e={};e.local=v(this,et,"f").local||[],e.configObjects=v(this,et,"f").configObjects||[];const s={};e.local.forEach((e=>{s[e]=!0,(t[e]||[]).forEach((t=>{s[t]=!0}))})),Object.assign(v(this,at,"f"),Object.keys(v(this,Y,"f")).reduce(((t,e)=>{const i=v(this,Y,"f")[e].filter((t=>!(t in s)));return i.length>0&&(t[e]=i),t}),{})),O(this,Y,{},"f");return["array","boolean","string","skipValidation","count","normalize","number","hiddenOptions"].forEach((t=>{e[t]=(v(this,et,"f")[t]||[]).filter((t=>!s[t]))})),["narg","key","alias","default","defaultDescription","config","choices","demandedOptions","demandedCommands","deprecatedOptions"].forEach((t=>{e[t]=g(v(this,et,"f")[t],(t=>!s[t]))})),e.envPrefix=v(this,et,"f").envPrefix,O(this,et,e,"f"),O(this,pt,v(this,pt,"f")?v(this,pt,"f").reset(s):P(this,v(this,ct,"f")),"f"),O(this,mt,v(this,mt,"f")?v(this,mt,"f").reset(s):function(t,e,s){const i=s.y18n.__,n=s.y18n.__n,r={nonOptionCount:function(s){const i=t.getDemandedCommands(),r=s._.length+(s["--"]?s["--"].length:0)-t.getInternalMethods().getContext().commands.length;i._&&(r<i._.min||r>i._.max)&&(r<i._.min?void 0!==i._.minMsg?e.fail(i._.minMsg?i._.minMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.min.toString()):null):e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",r,r.toString(),i._.min.toString())):r>i._.max&&(void 0!==i._.maxMsg?e.fail(i._.maxMsg?i._.maxMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.max.toString()):null):e.fail(n("Too many non-option arguments: got %s, maximum of %s","Too many non-option arguments: got %s, maximum of %s",r,r.toString(),i._.max.toString()))))},positionalCount:function(t,s){s<t&&e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",s,s+"",t+""))},requiredArguments:function(t,s){let i=null;for(const e of Object.keys(s))Object.prototype.hasOwnProperty.call(t,e)&&void 0!==t[e]||(i=i||{},i[e]=s[e]);if(i){const t=[];for(const e of Object.keys(i)){const s=i[e];s&&t.indexOf(s)<0&&t.push(s)}const s=t.length?`\n${t.join("\n")}`:"";e.fail(n("Missing required argument: %s","Missing required arguments: %s",Object.keys(i).length,Object.keys(i).join(", ")+s))}},unknownArguments:function(s,i,o,a,h=!0){var l;const c=t.getInternalMethods().getCommandInstance().getCommands(),f=[],d=t.getInternalMethods().getContext();if(Object.keys(s).forEach((e=>{H.includes(e)||Object.prototype.hasOwnProperty.call(o,e)||Object.prototype.hasOwnProperty.call(t.getInternalMethods().getParseContext(),e)||r.isValidAndSomeAliasIsNotNew(e,i)||f.push(e)})),h&&(d.commands.length>0||c.length>0||a)&&s._.slice(d.commands.length).forEach((t=>{c.includes(""+t)||f.push(""+t)})),h){const e=(null===(l=t.getDemandedCommands()._)||void 0===l?void 0:l.max)||0,i=d.commands.length+e;i<s._.length&&s._.slice(i).forEach((t=>{t=String(t),d.commands.includes(t)||f.includes(t)||f.push(t)}))}f.length&&e.fail(n("Unknown argument: %s","Unknown arguments: %s",f.length,f.map((t=>t.trim()?t:`"${t}"`)).join(", ")))},unknownCommands:function(s){const i=t.getInternalMethods().getCommandInstance().getCommands(),r=[],o=t.getInternalMethods().getContext();return(o.commands.length>0||i.length>0)&&s._.slice(o.commands.length).forEach((t=>{i.includes(""+t)||r.push(""+t)})),r.length>0&&(e.fail(n("Unknown command: %s","Unknown commands: %s",r.length,r.join(", "))),!0)},isValidAndSomeAliasIsNotNew:function(e,s){if(!Object.prototype.hasOwnProperty.call(s,e))return!1;const i=t.parsed.newAliases;return[e,...s[e]].some((t=>!Object.prototype.hasOwnProperty.call(i,t)||!i[e]))},limitedChoices:function(s){const n=t.getOptions(),r={};if(!Object.keys(n.choices).length)return;Object.keys(s).forEach((t=>{-1===H.indexOf(t)&&Object.prototype.hasOwnProperty.call(n.choices,t)&&[].concat(s[t]).forEach((e=>{-1===n.choices[t].indexOf(e)&&void 0!==e&&(r[t]=(r[t]||[]).concat(e))}))}));const o=Object.keys(r);if(!o.length)return;let a=i("Invalid values:");o.forEach((t=>{a+=`\n  ${i("Argument: %s, Given: %s, Choices: %s",t,e.stringifiedValues(r[t]),e.stringifiedValues(n.choices[t]))}`})),e.fail(a)}};let o={};function a(t,e){const s=Number(e);return"number"==typeof(e=isNaN(s)?e:s)?e=t._.length>=e:e.match(/^--no-.+/)?(e=e.match(/^--no-(.+)/)[1],e=!Object.prototype.hasOwnProperty.call(t,e)):e=Object.prototype.hasOwnProperty.call(t,e),e}r.implies=function(e,i){h("<string|object> [array|number|string]",[e,i],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.implies(t,e[t])})):(t.global(e),o[e]||(o[e]=[]),Array.isArray(i)?i.forEach((t=>r.implies(e,t))):(d(i,void 0,s),o[e].push(i)))},r.getImplied=function(){return o},r.implications=function(t){const s=[];if(Object.keys(o).forEach((e=>{const i=e;(o[e]||[]).forEach((e=>{let n=i;const r=e;n=a(t,n),e=a(t,e),n&&!e&&s.push(` ${i} -> ${r}`)}))})),s.length){let t=`${i("Implications failed:")}\n`;s.forEach((e=>{t+=e})),e.fail(t)}};let l={};r.conflicts=function(e,s){h("<string|object> [array|string]",[e,s],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.conflicts(t,e[t])})):(t.global(e),l[e]||(l[e]=[]),Array.isArray(s)?s.forEach((t=>r.conflicts(e,t))):l[e].push(s))},r.getConflicting=()=>l,r.conflicting=function(n){Object.keys(n).forEach((t=>{l[t]&&l[t].forEach((s=>{s&&void 0!==n[t]&&void 0!==n[s]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,s))}))})),t.getInternalMethods().getParserConfiguration()["strip-dashed"]&&Object.keys(l).forEach((t=>{l[t].forEach((r=>{r&&void 0!==n[s.Parser.camelCase(t)]&&void 0!==n[s.Parser.camelCase(r)]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,r))}))}))},r.recommendCommands=function(t,s){s=s.sort(((t,e)=>e.length-t.length));let n=null,r=1/0;for(let e,i=0;void 0!==(e=s[i]);i++){const s=D(t,e);s<=3&&s<r&&(r=s,n=e)}n&&e.fail(i("Did you mean %s?",n))},r.reset=function(t){return o=g(o,(e=>!t[e])),l=g(l,(e=>!t[e])),r};const c=[];return r.freeze=function(){c.push({implied:o,conflicting:l})},r.unfreeze=function(){const t=c.pop();d(t,void 0,s),({implied:o,conflicting:l}=t)},r}(this,v(this,pt,"f"),v(this,ct,"f")),"f"),O(this,z,v(this,z,"f")?v(this,z,"f").reset():function(t,e,s,i){return new M(t,e,s,i)}(v(this,pt,"f"),v(this,mt,"f"),v(this,B,"f"),v(this,ct,"f")),"f"),v(this,F,"f")||O(this,F,function(t,e,s,i){return new N(t,e,s,i)}(this,v(this,pt,"f"),v(this,z,"f"),v(this,ct,"f")),"f"),v(this,B,"f").reset(),O(this,U,null,"f"),O(this,tt,"","f"),O(this,V,null,"f"),O(this,J,!1,"f"),this.parsed=!1,this}[Tt](t,e){return v(this,ct,"f").path.relative(t,e)}[Bt](t,s,i,n=0,r=!1){let o=!!i||r;t=t||v(this,ht,"f"),v(this,et,"f").__=v(this,ct,"f").y18n.__,v(this,et,"f").configuration=this[jt]();const a=!!v(this,et,"f").configuration["populate--"],h=Object.assign({},v(this,et,"f").configuration,{"populate--":!0}),l=v(this,ct,"f").Parser.detailed(t,Object.assign({},v(this,et,"f"),{configuration:{"parse-positional-numbers":!1,...h}})),c=Object.assign(l.argv,v(this,rt,"f"));let d;const u=l.aliases;let p=!1,g=!1;Object.keys(c).forEach((t=>{t===v(this,Z,"f")&&c[t]?p=!0:t===v(this,gt,"f")&&c[t]&&(g=!0)})),c.$0=this.$0,this.parsed=l,0===n&&v(this,pt,"f").clearCachedHelpMessage();try{if(this[_t](),s)return this[Rt](c,a,!!i,!1);if(v(this,Z,"f")){[v(this,Z,"f")].concat(u[v(this,Z,"f")]||[]).filter((t=>t.length>1)).includes(""+c._[c._.length-1])&&(c._.pop(),p=!0)}O(this,X,!1,"f");const h=v(this,z,"f").getCommands(),m=v(this,F,"f").completionKey in c,y=p||m||r;if(c._.length){if(h.length){let t;for(let e,s=n||0;void 0!==c._[s];s++){if(e=String(c._[s]),h.includes(e)&&e!==v(this,U,"f")){const t=v(this,z,"f").runCommand(e,this,l,s+1,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(!t&&e!==v(this,U,"f")){t=e;break}}!v(this,z,"f").hasDefaultCommand()&&v(this,lt,"f")&&t&&!y&&v(this,mt,"f").recommendCommands(t,h)}v(this,U,"f")&&c._.includes(v(this,U,"f"))&&!m&&(v(this,T,"f")&&E(!0),this.showCompletionScript(),this.exit(0))}if(v(this,z,"f").hasDefaultCommand()&&!y){const t=v(this,z,"f").runCommand(null,this,l,0,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(m){v(this,T,"f")&&E(!0);const s=(t=[].concat(t)).slice(t.indexOf(`--${v(this,F,"f").completionKey}`)+1);return v(this,F,"f").getCompletion(s,((t,s)=>{if(t)throw new e(t.message);(s||[]).forEach((t=>{v(this,Q,"f").log(t)})),this.exit(0)})),this[Rt](c,!a,!!i,!1)}if(v(this,J,"f")||(p?(v(this,T,"f")&&E(!0),o=!0,this.showHelp("log"),this.exit(0)):g&&(v(this,T,"f")&&E(!0),o=!0,v(this,pt,"f").showVersion("log"),this.exit(0))),!o&&v(this,et,"f").skipValidation.length>0&&(o=Object.keys(c).some((t=>v(this,et,"f").skipValidation.indexOf(t)>=0&&!0===c[t]))),!o){if(l.error)throw new e(l.error.message);if(!m){const t=this[Yt](u,{},l.error);i||(d=C(c,this,v(this,B,"f").getMiddleware(),!0)),d=this[Dt](t,null!=d?d:c),f(d)&&!i&&(d=d.then((()=>C(c,this,v(this,B,"f").getMiddleware(),!1))))}}}catch(t){if(!(t instanceof e))throw t;v(this,pt,"f").fail(t.message,t)}return this[Rt](null!=d?d:c,a,!!i,!0)}[Yt](t,s,i,n){const r={...this.getDemandedOptions()};return o=>{if(i)throw new e(i.message);v(this,mt,"f").nonOptionCount(o),v(this,mt,"f").requiredArguments(o,r);let a=!1;v(this,dt,"f")&&(a=v(this,mt,"f").unknownCommands(o)),v(this,ft,"f")&&!a?v(this,mt,"f").unknownArguments(o,t,s,!!n):v(this,ut,"f")&&v(this,mt,"f").unknownArguments(o,t,{},!1,!1),v(this,mt,"f").limitedChoices(o),v(this,mt,"f").implications(o),v(this,mt,"f").conflicting(o)}}[Jt](){O(this,J,!0,"f")}[Zt](t){if("string"==typeof t)v(this,et,"f").key[t]=!0;else for(const e of t)v(this,et,"f").key[e]=!0}}var Qt,te;const{readFileSync:ee}=require("fs"),{inspect:se}=require("util"),{resolve:ie}=require("path"),ne=require("y18n"),re=require("yargs-parser");var oe,ae={assert:{notStrictEqual:t.notStrictEqual,strictEqual:t.strictEqual},cliui:require("cliui"),findUp:require("escalade/sync"),getEnv:t=>process.env[t],getCallerFile:require("get-caller-file"),getProcessArgvBin:y,inspect:se,mainFilename:null!==(te=null===(Qt=null===require||void 0===require?void 0:require.main)||void 0===Qt?void 0:Qt.filename)&&void 0!==te?te:process.cwd(),Parser:re,path:require("path"),process:{argv:()=>process.argv,cwd:process.cwd,emitWarning:(t,e)=>process.emitWarning(t,e),execPath:()=>process.execPath,exit:t=>{process.exit(t)},nextTick:process.nextTick,stdColumns:void 0!==process.stdout.columns?process.stdout.columns:null},readFileSync:ee,require:require,requireDirectory:require("require-directory"),stringWidth:require("string-width"),y18n:ne({directory:ie(__dirname,"../locales"),updateFiles:!1})};const he=(null===(oe=null===process||void 0===process?void 0:process.env)||void 0===oe?void 0:oe.YARGS_MIN_NODE_VERSION)?Number(process.env.YARGS_MIN_NODE_VERSION):12;if(process&&process.version){if(Number(process.version.match(/v([^.]+)/)[1])<he)throw Error(`yargs supports a minimum Node.js version of ${he}. Read our version support policy: https://github.com/yargs/yargs#supported-nodejs-versions`)}const le=require("yargs-parser");var ce,fe={applyExtends:n,cjsPlatformShim:ae,Yargs:(ce=ae,(t=[],e=ce.process.cwd(),s)=>{const i=new Xt(t,e,s,ce);return Object.defineProperty(i,"argv",{get:()=>i.parse(),enumerable:!0}),i.help(),i.version(),i}),argsert:h,isPromise:f,objFilter:g,parseCommand:o,Parser:le,processArgv:b,YError:e};module.exports=fe;
++"use strict";
++// "Error.captureStackTrace(this,e)" is removed from the constructor of a
++// custom Error class because that property doesn't exist when running
++// with LavaMoat/SES.
++var t=require("assert");class e extends Error{constructor(t){super(t||"yargs error"),this.name="YError",Error.captureStackTrace(this,e)}}let s,i=[];function n(t,o,a,h){s=h;let l={};if(Object.prototype.hasOwnProperty.call(t,"extends")){if("string"!=typeof t.extends)return l;const r=/\.json|\..*rc$/.test(t.extends);let h=null;if(r)h=function(t,e){return s.path.resolve(t,e)}(o,t.extends);else try{h=require.resolve(t.extends)}catch(e){return t}!function(t){if(i.indexOf(t)>-1)throw new e(`Circular extended configurations: '${t}'.`)}(h),i.push(h),l=r?JSON.parse(s.readFileSync(h,"utf8")):require(t.extends),delete t.extends,l=n(l,s.path.dirname(h),a,s)}return i=[],a?r(l,t):Object.assign({},l,t)}function r(t,e){const s={};function i(t){return t&&"object"==typeof t&&!Array.isArray(t)}Object.assign(s,t);for(const n of Object.keys(e))i(e[n])&&i(s[n])?s[n]=r(t[n],e[n]):s[n]=e[n];return s}function o(t){const e=t.replace(/\s{2,}/g," ").split(/\s+(?![^[]*]|[^<]*>)/),s=/\.*[\][<>]/g,i=e.shift();if(!i)throw new Error(`No command found in: ${t}`);const n={cmd:i.replace(s,""),demanded:[],optional:[]};return e.forEach(((t,i)=>{let r=!1;t=t.replace(/\s/g,""),/\.+[\]>]/.test(t)&&i===e.length-1&&(r=!0),/^\[/.test(t)?n.optional.push({cmd:t.replace(s,"").split("|"),variadic:r}):n.demanded.push({cmd:t.replace(s,"").split("|"),variadic:r})})),n}const a=["first","second","third","fourth","fifth","sixth"];function h(t,s,i){try{let n=0;const[r,a,h]="object"==typeof t?[{demanded:[],optional:[]},t,s]:[o(`cmd ${t}`),s,i],f=[].slice.call(a);for(;f.length&&void 0===f[f.length-1];)f.pop();const d=h||f.length;if(d<r.demanded.length)throw new e(`Not enough arguments provided. Expected ${r.demanded.length} but received ${f.length}.`);const u=r.demanded.length+r.optional.length;if(d>u)throw new e(`Too many arguments provided. Expected max ${u} but received ${d}.`);r.demanded.forEach((t=>{const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1})),r.optional.forEach((t=>{if(0===f.length)return;const e=l(f.shift());0===t.cmd.filter((t=>t===e||"*"===t)).length&&c(e,t.cmd,n),n+=1}))}catch(t){console.warn(t.stack)}}function l(t){return Array.isArray(t)?"array":null===t?"null":typeof t}function c(t,s,i){throw new e(`Invalid ${a[i]||"manyith"} argument. Expected ${s.join(" or ")} but received ${t}.`)}function f(t){return!!t&&!!t.then&&"function"==typeof t.then}function d(t,e,s,i){s.assert.notStrictEqual(t,e,i)}function u(t,e){e.assert.strictEqual(typeof t,"string")}function p(t){return Object.keys(t)}function g(t={},e=(()=>!0)){const s={};return p(t).forEach((i=>{e(i,t[i])&&(s[i]=t[i])})),s}function m(){return process.versions.electron&&!process.defaultApp?0:1}function y(){return process.argv[m()]}var b=Object.freeze({__proto__:null,hideBin:function(t){return t.slice(m()+1)},getProcessArgvBin:y});function v(t,e,s,i){if("a"===s&&!i)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof e?t!==e||!i:!e.has(t))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===s?i:"a"===s?i.call(t):i?i.value:e.get(t)}function O(t,e,s,i,n){if("m"===i)throw new TypeError("Private method is not writable");if("a"===i&&!n)throw new TypeError("Private accessor was defined without a setter");if("function"==typeof e?t!==e||!n:!e.has(t))throw new TypeError("Cannot write private member to an object whose class did not declare it");return"a"===i?n.call(t,s):n?n.value=s:e.set(t,s),s}class w{constructor(t){this.globalMiddleware=[],this.frozens=[],this.yargs=t}addMiddleware(t,e,s=!0,i=!1){if(h("<array|function> [boolean] [boolean] [boolean]",[t,e,s],arguments.length),Array.isArray(t)){for(let i=0;i<t.length;i++){if("function"!=typeof t[i])throw Error("middleware must be a function");const n=t[i];n.applyBeforeValidation=e,n.global=s}Array.prototype.push.apply(this.globalMiddleware,t)}else if("function"==typeof t){const n=t;n.applyBeforeValidation=e,n.global=s,n.mutates=i,this.globalMiddleware.push(t)}return this.yargs}addCoerceMiddleware(t,e){const s=this.yargs.getAliases();return this.globalMiddleware=this.globalMiddleware.filter((t=>{const i=[...s[e]||[],e];return!t.option||!i.includes(t.option)})),t.option=e,this.addMiddleware(t,!0,!0,!0)}getMiddleware(){return this.globalMiddleware}freeze(){this.frozens.push([...this.globalMiddleware])}unfreeze(){const t=this.frozens.pop();void 0!==t&&(this.globalMiddleware=t)}reset(){this.globalMiddleware=this.globalMiddleware.filter((t=>t.global))}}function C(t,e,s,i){return s.reduce(((t,s)=>{if(s.applyBeforeValidation!==i)return t;if(s.mutates){if(s.applied)return t;s.applied=!0}if(f(t))return t.then((t=>Promise.all([t,s(t,e)]))).then((([t,e])=>Object.assign(t,e)));{const i=s(t,e);return f(i)?i.then((e=>Object.assign(t,e))):Object.assign(t,i)}}),t)}function j(t,e,s=(t=>{throw t})){try{const s="function"==typeof t?t():t;return f(s)?s.then((t=>e(t))):e(s)}catch(t){return s(t)}}const _=/(^\*)|(^\$0)/;class M{constructor(t,e,s,i){this.requireCache=new Set,this.handlers={},this.aliasMap={},this.frozens=[],this.shim=i,this.usage=t,this.globalMiddleware=s,this.validation=e}addDirectory(t,e,s,i){"boolean"!=typeof(i=i||{}).recurse&&(i.recurse=!1),Array.isArray(i.extensions)||(i.extensions=["js"]);const n="function"==typeof i.visit?i.visit:t=>t;i.visit=(t,e,s)=>{const i=n(t,e,s);if(i){if(this.requireCache.has(e))return i;this.requireCache.add(e),this.addHandler(i)}return i},this.shim.requireDirectory({require:e,filename:s},t,i)}addHandler(t,e,s,i,n,r){let a=[];const h=function(t){return t?t.map((t=>(t.applyBeforeValidation=!1,t))):[]}(n);if(i=i||(()=>{}),Array.isArray(t))if(function(t){return t.every((t=>"string"==typeof t))}(t))[t,...a]=t;else for(const e of t)this.addHandler(e);else{if(function(t){return"object"==typeof t&&!Array.isArray(t)}(t)){let e=Array.isArray(t.command)||"string"==typeof t.command?t.command:this.moduleName(t);return t.aliases&&(e=[].concat(e).concat(t.aliases)),void this.addHandler(e,this.extractDesc(t),t.builder,t.handler,t.middlewares,t.deprecated)}if(k(s))return void this.addHandler([t].concat(a),e,s.builder,s.handler,s.middlewares,s.deprecated)}if("string"==typeof t){const n=o(t);a=a.map((t=>o(t).cmd));let l=!1;const c=[n.cmd].concat(a).filter((t=>!_.test(t)||(l=!0,!1)));0===c.length&&l&&c.push("$0"),l&&(n.cmd=c[0],a=c.slice(1),t=t.replace(_,n.cmd)),a.forEach((t=>{this.aliasMap[t]=n.cmd})),!1!==e&&this.usage.command(t,e,l,a,r),this.handlers[n.cmd]={original:t,description:e,handler:i,builder:s||{},middlewares:h,deprecated:r,demanded:n.demanded,optional:n.optional},l&&(this.defaultCommand=this.handlers[n.cmd])}}getCommandHandlers(){return this.handlers}getCommands(){return Object.keys(this.handlers).concat(Object.keys(this.aliasMap))}hasDefaultCommand(){return!!this.defaultCommand}runCommand(t,e,s,i,n,r){const o=this.handlers[t]||this.handlers[this.aliasMap[t]]||this.defaultCommand,a=e.getInternalMethods().getContext(),h=a.commands.slice(),l=!t;t&&(a.commands.push(t),a.fullCommands.push(o.original));const c=this.applyBuilderUpdateUsageAndParse(l,o,e,s.aliases,h,i,n,r);return f(c)?c.then((t=>this.applyMiddlewareAndGetResult(l,o,t.innerArgv,a,n,t.aliases,e))):this.applyMiddlewareAndGetResult(l,o,c.innerArgv,a,n,c.aliases,e)}applyBuilderUpdateUsageAndParse(t,e,s,i,n,r,o,a){const h=e.builder;let l=s;if(x(h)){const c=h(s.getInternalMethods().reset(i),a);if(f(c))return c.then((i=>{var a;return l=(a=i)&&"function"==typeof a.getInternalMethods?i:s,this.parseAndUpdateUsage(t,e,l,n,r,o)}))}else(function(t){return"object"==typeof t})(h)&&(l=s.getInternalMethods().reset(i),Object.keys(e.builder).forEach((t=>{l.option(t,h[t])})));return this.parseAndUpdateUsage(t,e,l,n,r,o)}parseAndUpdateUsage(t,e,s,i,n,r){t&&s.getInternalMethods().getUsageInstance().unfreeze(!0),this.shouldUpdateUsage(s)&&s.getInternalMethods().getUsageInstance().usage(this.usageFromParentCommandsCommandHandler(i,e),e.description);const o=s.getInternalMethods().runYargsParserAndExecuteCommands(null,void 0,!0,n,r);return f(o)?o.then((t=>({aliases:s.parsed.aliases,innerArgv:t}))):{aliases:s.parsed.aliases,innerArgv:o}}shouldUpdateUsage(t){return!t.getInternalMethods().getUsageInstance().getUsageDisabled()&&0===t.getInternalMethods().getUsageInstance().getUsage().length}usageFromParentCommandsCommandHandler(t,e){const s=_.test(e.original)?e.original.replace(_,"").trim():e.original,i=t.filter((t=>!_.test(t)));return i.push(s),`$0 ${i.join(" ")}`}applyMiddlewareAndGetResult(t,e,s,i,n,r,o){let a={};if(n)return s;o.getInternalMethods().getHasOutput()||(a=this.populatePositionals(e,s,i,o));const h=this.globalMiddleware.getMiddleware().slice(0).concat(e.middlewares);if(s=C(s,o,h,!0),!o.getInternalMethods().getHasOutput()){const e=o.getInternalMethods().runValidation(r,a,o.parsed.error,t);s=j(s,(t=>(e(t),t)))}if(e.handler&&!o.getInternalMethods().getHasOutput()){o.getInternalMethods().setHasOutput();const i=!!o.getOptions().configuration["populate--"];o.getInternalMethods().postProcess(s,i,!1,!1),s=j(s=C(s,o,h,!1),(t=>{const s=e.handler(t);return f(s)?s.then((()=>t)):t})),t||o.getInternalMethods().getUsageInstance().cacheHelpMessage(),f(s)&&!o.getInternalMethods().hasParseCallback()&&s.catch((t=>{try{o.getInternalMethods().getUsageInstance().fail(null,t)}catch(t){}}))}return t||(i.commands.pop(),i.fullCommands.pop()),s}populatePositionals(t,e,s,i){e._=e._.slice(s.commands.length);const n=t.demanded.slice(0),r=t.optional.slice(0),o={};for(this.validation.positionalCount(n.length,e._.length);n.length;){const t=n.shift();this.populatePositional(t,e,o)}for(;r.length;){const t=r.shift();this.populatePositional(t,e,o)}return e._=s.commands.concat(e._.map((t=>""+t))),this.postProcessPositionals(e,o,this.cmdToParseOptions(t.original),i),o}populatePositional(t,e,s){const i=t.cmd[0];t.variadic?s[i]=e._.splice(0).map(String):e._.length&&(s[i]=[String(e._.shift())])}cmdToParseOptions(t){const e={array:[],default:{},alias:{},demand:{}},s=o(t);return s.demanded.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i,e.demand[s]=!0})),s.optional.forEach((t=>{const[s,...i]=t.cmd;t.variadic&&(e.array.push(s),e.default[s]=[]),e.alias[s]=i})),e}postProcessPositionals(t,e,s,i){const n=Object.assign({},i.getOptions());n.default=Object.assign(s.default,n.default);for(const t of Object.keys(s.alias))n.alias[t]=(n.alias[t]||[]).concat(s.alias[t]);n.array=n.array.concat(s.array),n.config={};const r=[];if(Object.keys(e).forEach((t=>{e[t].map((e=>{n.configuration["unknown-options-as-args"]&&(n.key[t]=!0),r.push(`--${t}`),r.push(e)}))})),!r.length)return;const o=Object.assign({},n.configuration,{"populate--":!1}),a=this.shim.Parser.detailed(r,Object.assign({},n,{configuration:o}));if(a.error)i.getInternalMethods().getUsageInstance().fail(a.error.message,a.error);else{const s=Object.keys(e);Object.keys(e).forEach((t=>{s.push(...a.aliases[t])}));const n=i.getOptions().default;Object.keys(a.argv).forEach((i=>{s.includes(i)&&(e[i]||(e[i]=a.argv[i]),!Object.hasOwnProperty.call(n,i)&&Object.hasOwnProperty.call(t,i)&&Object.hasOwnProperty.call(a.argv,i)&&(Array.isArray(t[i])||Array.isArray(a.argv[i]))?t[i]=[].concat(t[i],a.argv[i]):t[i]=a.argv[i])}))}}runDefaultBuilderOn(t){if(!this.defaultCommand)return;if(this.shouldUpdateUsage(t)){const e=_.test(this.defaultCommand.original)?this.defaultCommand.original:this.defaultCommand.original.replace(/^[^[\]<>]*/,"$0 ");t.getInternalMethods().getUsageInstance().usage(e,this.defaultCommand.description)}const e=this.defaultCommand.builder;if(x(e))return e(t,!0);k(e)||Object.keys(e).forEach((s=>{t.option(s,e[s])}))}moduleName(t){const e=function(t){if("undefined"==typeof require)return null;for(let e,s=0,i=Object.keys(require.cache);s<i.length;s++)if(e=require.cache[i[s]],e.exports===t)return e;return null}(t);if(!e)throw new Error(`No command name given for module: ${this.shim.inspect(t)}`);return this.commandFromFilename(e.filename)}commandFromFilename(t){return this.shim.path.basename(t,this.shim.path.extname(t))}extractDesc({describe:t,description:e,desc:s}){for(const i of[t,e,s]){if("string"==typeof i||!1===i)return i;d(i,!0,this.shim)}return!1}freeze(){this.frozens.push({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand})}unfreeze(){const t=this.frozens.pop();d(t,void 0,this.shim),({handlers:this.handlers,aliasMap:this.aliasMap,defaultCommand:this.defaultCommand}=t)}reset(){return this.handlers={},this.aliasMap={},this.defaultCommand=void 0,this.requireCache=new Set,this}}function k(t){return"object"==typeof t&&!!t.builder&&"function"==typeof t.handler}function x(t){return"function"==typeof t}function E(t){"undefined"!=typeof process&&[process.stdout,process.stderr].forEach((e=>{const s=e;s._handle&&s.isTTY&&"function"==typeof s._handle.setBlocking&&s._handle.setBlocking(t)}))}function A(t){return"boolean"==typeof t}function P(t,s){const i=s.y18n.__,n={},r=[];n.failFn=function(t){r.push(t)};let o=null,a=null,h=!0;n.showHelpOnFail=function(e=!0,s){const[i,r]="string"==typeof e?[!0,e]:[e,s];return t.getInternalMethods().isGlobalContext()&&(a=r),o=r,h=i,n};let l=!1;n.fail=function(s,i){const c=t.getInternalMethods().getLoggerInstance();if(!r.length){if(t.getExitProcess()&&E(!0),!l){l=!0,h&&(t.showHelp("error"),c.error()),(s||i)&&c.error(s||i);const e=o||a;e&&((s||i)&&c.error(""),c.error(e))}if(i=i||new e(s),t.getExitProcess())return t.exit(1);if(t.getInternalMethods().hasParseCallback())return t.exit(1,i);throw i}for(let t=r.length-1;t>=0;--t){const e=r[t];if(A(e)){if(i)throw i;if(s)throw Error(s)}else e(s,i,n)}};let c=[],f=!1;n.usage=(t,e)=>null===t?(f=!0,c=[],n):(f=!1,c.push([t,e||""]),n),n.getUsage=()=>c,n.getUsageDisabled=()=>f,n.getPositionalGroupName=()=>i("Positionals:");let d=[];n.example=(t,e)=>{d.push([t,e||""])};let u=[];n.command=function(t,e,s,i,n=!1){s&&(u=u.map((t=>(t[2]=!1,t)))),u.push([t,e||"",s,i,n])},n.getCommands=()=>u;let p={};n.describe=function(t,e){Array.isArray(t)?t.forEach((t=>{n.describe(t,e)})):"object"==typeof t?Object.keys(t).forEach((e=>{n.describe(e,t[e])})):p[t]=e},n.getDescriptions=()=>p;let m=[];n.epilog=t=>{m.push(t)};let y,b=!1;function v(){return b||(y=function(){const t=80;return s.process.stdColumns?Math.min(t,s.process.stdColumns):t}(),b=!0),y}n.wrap=t=>{b=!0,y=t};const O="__yargsString__:";function w(t,e,i){let n=0;return Array.isArray(t)||(t=Object.values(t).map((t=>[t]))),t.forEach((t=>{n=Math.max(s.stringWidth(i?`${i} ${I(t[0])}`:I(t[0]))+$(t[0]),n)})),e&&(n=Math.min(n,parseInt((.5*e).toString(),10))),n}let C;function j(e){return t.getOptions().hiddenOptions.indexOf(e)<0||t.parsed.argv[t.getOptions().showHiddenOpt]}function _(t,e){let s=`[${i("default:")} `;if(void 0===t&&!e)return null;if(e)s+=e;else switch(typeof t){case"string":s+=`"${t}"`;break;case"object":s+=JSON.stringify(t);break;default:s+=t}return`${s}]`}n.deferY18nLookup=t=>O+t,n.help=function(){if(C)return C;!function(){const e=t.getDemandedOptions(),s=t.getOptions();(Object.keys(s.alias)||[]).forEach((i=>{s.alias[i].forEach((r=>{p[r]&&n.describe(i,p[r]),r in e&&t.demandOption(i,e[r]),s.boolean.includes(r)&&t.boolean(i),s.count.includes(r)&&t.count(i),s.string.includes(r)&&t.string(i),s.normalize.includes(r)&&t.normalize(i),s.array.includes(r)&&t.array(i),s.number.includes(r)&&t.number(i)}))}))}();const e=t.customScriptName?t.$0:s.path.basename(t.$0),r=t.getDemandedOptions(),o=t.getDemandedCommands(),a=t.getDeprecatedOptions(),h=t.getGroups(),l=t.getOptions();let g=[];g=g.concat(Object.keys(p)),g=g.concat(Object.keys(r)),g=g.concat(Object.keys(o)),g=g.concat(Object.keys(l.default)),g=g.filter(j),g=Object.keys(g.reduce(((t,e)=>("_"!==e&&(t[e]=!0),t)),{}));const y=v(),b=s.cliui({width:y,wrap:!!y});if(!f)if(c.length)c.forEach((t=>{b.div({text:`${t[0].replace(/\$0/g,e)}`}),t[1]&&b.div({text:`${t[1]}`,padding:[1,0,0,0]})})),b.div();else if(u.length){let t=null;t=o._?`${e} <${i("command")}>\n`:`${e} [${i("command")}]\n`,b.div(`${t}`)}if(u.length>1||1===u.length&&!u[0][2]){b.div(i("Commands:"));const s=t.getInternalMethods().getContext(),n=s.commands.length?`${s.commands.join(" ")} `:"";!0===t.getInternalMethods().getParserConfiguration()["sort-commands"]&&(u=u.sort(((t,e)=>t[0].localeCompare(e[0]))));const r=e?`${e} `:"";u.forEach((t=>{const s=`${r}${n}${t[0].replace(/^\$0 ?/,"")}`;b.span({text:s,padding:[0,2,0,2],width:w(u,y,`${e}${n}`)+4},{text:t[1]});const o=[];t[2]&&o.push(`[${i("default")}]`),t[3]&&t[3].length&&o.push(`[${i("aliases:")} ${t[3].join(", ")}]`),t[4]&&("string"==typeof t[4]?o.push(`[${i("deprecated: %s",t[4])}]`):o.push(`[${i("deprecated")}]`)),o.length?b.div({text:o.join(" "),padding:[0,0,0,2],align:"right"}):b.div()})),b.div()}const M=(Object.keys(l.alias)||[]).concat(Object.keys(t.parsed.newAliases)||[]);g=g.filter((e=>!t.parsed.newAliases[e]&&M.every((t=>-1===(l.alias[t]||[]).indexOf(e)))));const k=i("Options:");h[k]||(h[k]=[]),function(t,e,s,i){let n=[],r=null;Object.keys(s).forEach((t=>{n=n.concat(s[t])})),t.forEach((t=>{r=[t].concat(e[t]),r.some((t=>-1!==n.indexOf(t)))||s[i].push(t)}))}(g,l.alias,h,k);const x=t=>/^--/.test(I(t)),E=Object.keys(h).filter((t=>h[t].length>0)).map((t=>({groupName:t,normalizedKeys:h[t].filter(j).map((t=>{if(M.includes(t))return t;for(let e,s=0;void 0!==(e=M[s]);s++)if((l.alias[e]||[]).includes(t))return e;return t}))}))).filter((({normalizedKeys:t})=>t.length>0)).map((({groupName:t,normalizedKeys:e})=>{const s=e.reduce(((e,s)=>(e[s]=[s].concat(l.alias[s]||[]).map((e=>t===n.getPositionalGroupName()?e:(/^[0-9]$/.test(e)?l.boolean.includes(s)?"-":"--":e.length>1?"--":"-")+e)).sort(((t,e)=>x(t)===x(e)?0:x(t)?1:-1)).join(", "),e)),{});return{groupName:t,normalizedKeys:e,switches:s}}));if(E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).some((({normalizedKeys:t,switches:e})=>!t.every((t=>x(e[t])))))&&E.filter((({groupName:t})=>t!==n.getPositionalGroupName())).forEach((({normalizedKeys:t,switches:e})=>{t.forEach((t=>{var s,i;x(e[t])&&(e[t]=(s=e[t],i="-x, ".length,S(s)?{text:s.text,indentation:s.indentation+i}:{text:s,indentation:i}))}))})),E.forEach((({groupName:t,normalizedKeys:e,switches:s})=>{b.div(t),e.forEach((t=>{const e=s[t];let o=p[t]||"",h=null;o.includes(O)&&(o=i(o.substring(O.length))),l.boolean.includes(t)&&(h=`[${i("boolean")}]`),l.count.includes(t)&&(h=`[${i("count")}]`),l.string.includes(t)&&(h=`[${i("string")}]`),l.normalize.includes(t)&&(h=`[${i("string")}]`),l.array.includes(t)&&(h=`[${i("array")}]`),l.number.includes(t)&&(h=`[${i("number")}]`);const c=[t in a?(f=a[t],"string"==typeof f?`[${i("deprecated: %s",f)}]`:`[${i("deprecated")}]`):null,h,t in r?`[${i("required")}]`:null,l.choices&&l.choices[t]?`[${i("choices:")} ${n.stringifiedValues(l.choices[t])}]`:null,_(l.default[t],l.defaultDescription[t])].filter(Boolean).join(" ");var f;b.span({text:I(e),padding:[0,2,0,2+$(e)],width:w(s,y)+4},o),c?b.div({text:c,padding:[0,0,0,2],align:"right"}):b.div()})),b.div()})),d.length&&(b.div(i("Examples:")),d.forEach((t=>{t[0]=t[0].replace(/\$0/g,e)})),d.forEach((t=>{""===t[1]?b.div({text:t[0],padding:[0,2,0,2]}):b.div({text:t[0],padding:[0,2,0,2],width:w(d,y)+4},{text:t[1]})})),b.div()),m.length>0){const t=m.map((t=>t.replace(/\$0/g,e))).join("\n");b.div(`${t}\n`)}return b.toString().replace(/\s*$/,"")},n.cacheHelpMessage=function(){C=this.help()},n.clearCachedHelpMessage=function(){C=void 0},n.hasCachedHelpMessage=function(){return!!C},n.showHelp=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(n.help())},n.functionDescription=t=>["(",t.name?s.Parser.decamelize(t.name,"-"):i("generated-value"),")"].join(""),n.stringifiedValues=function(t,e){let s="";const i=e||", ",n=[].concat(t);return t&&n.length?(n.forEach((t=>{s.length&&(s+=i),s+=JSON.stringify(t)})),s):s};let M=null;n.version=t=>{M=t},n.showVersion=e=>{const s=t.getInternalMethods().getLoggerInstance();e||(e="error");("function"==typeof e?e:s[e])(M)},n.reset=function(t){return o=null,l=!1,c=[],f=!1,m=[],d=[],u=[],p=g(p,(e=>!t[e])),n};const k=[];return n.freeze=function(){k.push({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p})},n.unfreeze=function(t=!1){const e=k.pop();e&&(t?(p={...e.descriptions,...p},u=[...e.commands,...u],c=[...e.usages,...c],d=[...e.examples,...d],m=[...e.epilogs,...m]):({failMessage:o,failureOutput:l,usages:c,usageDisabled:f,epilogs:m,examples:d,commands:u,descriptions:p}=e))},n}function S(t){return"object"==typeof t}function $(t){return S(t)?t.indentation:0}function I(t){return S(t)?t.text:t}class N{constructor(t,e,s,i){var n,r,o;this.yargs=t,this.usage=e,this.command=s,this.shim=i,this.completionKey="get-yargs-completions",this.aliases=null,this.customCompletionFunction=null,this.indexAfterLastReset=0,this.zshShell=null!==(o=(null===(n=this.shim.getEnv("SHELL"))||void 0===n?void 0:n.includes("zsh"))||(null===(r=this.shim.getEnv("ZSH_NAME"))||void 0===r?void 0:r.includes("zsh")))&&void 0!==o&&o}defaultCompletion(t,e,s,i){const n=this.command.getCommandHandlers();for(let e=0,s=t.length;e<s;++e)if(n[t[e]]&&n[t[e]].builder){const s=n[t[e]].builder;if(x(s)){this.indexAfterLastReset=e+1;const t=this.yargs.getInternalMethods().reset();return s(t,!0),t.argv}}const r=[];this.commandCompletions(r,t,s),this.optionCompletions(r,t,e,s),this.choicesFromOptionsCompletions(r,t,e,s),this.choicesFromPositionalsCompletions(r,t,e,s),i(null,r)}commandCompletions(t,e,s){const i=this.yargs.getInternalMethods().getContext().commands;s.match(/^-/)||i[i.length-1]===s||this.previousArgHasChoices(e)||this.usage.getCommands().forEach((s=>{const i=o(s[0]).cmd;if(-1===e.indexOf(i))if(this.zshShell){const e=s[1]||"";t.push(i.replace(/:/g,"\\:")+":"+e)}else t.push(i)}))}optionCompletions(t,e,s,i){if((i.match(/^-/)||""===i&&0===t.length)&&!this.previousArgHasChoices(e)){const n=this.yargs.getOptions(),r=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[];Object.keys(n.key).forEach((o=>{const a=!!n.configuration["boolean-negation"]&&n.boolean.includes(o);r.includes(o)||n.hiddenOptions.includes(o)||this.argsContainKey(e,s,o,a)||(this.completeOptionKey(o,t,i),a&&n.default[o]&&this.completeOptionKey(`no-${o}`,t,i))}))}}choicesFromOptionsCompletions(t,e,s,i){if(this.previousArgHasChoices(e)){const s=this.getPreviousArgChoices(e);s&&s.length>0&&t.push(...s.map((t=>t.replace(/:/g,"\\:"))))}}choicesFromPositionalsCompletions(t,e,s,i){if(""===i&&t.length>0&&this.previousArgHasChoices(e))return;const n=this.yargs.getGroups()[this.usage.getPositionalGroupName()]||[],r=Math.max(this.indexAfterLastReset,this.yargs.getInternalMethods().getContext().commands.length+1),o=n[s._.length-r-1];if(!o)return;const a=this.yargs.getOptions().choices[o]||[];for(const e of a)e.startsWith(i)&&t.push(e.replace(/:/g,"\\:"))}getPreviousArgChoices(t){if(t.length<1)return;let e=t[t.length-1],s="";if(!e.startsWith("-")&&t.length>1&&(s=e,e=t[t.length-2]),!e.startsWith("-"))return;const i=e.replace(/^-+/,""),n=this.yargs.getOptions(),r=[i,...this.yargs.getAliases()[i]||[]];let o;for(const t of r)if(Object.prototype.hasOwnProperty.call(n.key,t)&&Array.isArray(n.choices[t])){o=n.choices[t];break}return o?o.filter((t=>!s||t.startsWith(s))):void 0}previousArgHasChoices(t){const e=this.getPreviousArgChoices(t);return void 0!==e&&e.length>0}argsContainKey(t,e,s,i){if(-1!==t.indexOf(`--${s}`))return!0;if(i&&-1!==t.indexOf(`--no-${s}`))return!0;if(this.aliases)for(const t of this.aliases[s])if(void 0!==e[t])return!0;return!1}completeOptionKey(t,e,s){const i=this.usage.getDescriptions(),n=!/^--/.test(s)&&(t=>/^[^0-9]$/.test(t))(t)?"-":"--";if(this.zshShell){const s=i[t]||"";e.push(n+`${t.replace(/:/g,"\\:")}:${s.replace("__yargsString__:","")}`)}else e.push(n+t)}customCompletion(t,e,s,i){if(d(this.customCompletionFunction,null,this.shim),this.customCompletionFunction.length<3){const t=this.customCompletionFunction(s,e);return f(t)?t.then((t=>{this.shim.process.nextTick((()=>{i(null,t)}))})).catch((t=>{this.shim.process.nextTick((()=>{i(t,void 0)}))})):i(null,t)}return function(t){return t.length>3}(this.customCompletionFunction)?this.customCompletionFunction(s,e,((n=i)=>this.defaultCompletion(t,e,s,n)),(t=>{i(null,t)})):this.customCompletionFunction(s,e,(t=>{i(null,t)}))}getCompletion(t,e){const s=t.length?t[t.length-1]:"",i=this.yargs.parse(t,!0),n=this.customCompletionFunction?i=>this.customCompletion(t,i,s,e):i=>this.defaultCompletion(t,i,s,e);return f(i)?i.then(n):n(i)}generateCompletionScript(t,e){let s=this.zshShell?'#compdef {{app_name}}\n###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.zshrc\n#    or {{app_path}} {{completion_command}} >> ~/.zsh_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n  local reply\n  local si=$IFS\n  IFS=$\'\n\' reply=($(COMP_CWORD="$((CURRENT-1))" COMP_LINE="$BUFFER" COMP_POINT="$CURSOR" {{app_path}} --get-yargs-completions "${words[@]}"))\n  IFS=$si\n  _describe \'values\' reply\n}\ncompdef _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n':'###-begin-{{app_name}}-completions-###\n#\n# yargs command completion script\n#\n# Installation: {{app_path}} {{completion_command}} >> ~/.bashrc\n#    or {{app_path}} {{completion_command}} >> ~/.bash_profile on OSX.\n#\n_{{app_name}}_yargs_completions()\n{\n    local cur_word args type_list\n\n    cur_word="${COMP_WORDS[COMP_CWORD]}"\n    args=("${COMP_WORDS[@]}")\n\n    # ask yargs to generate completions.\n    type_list=$({{app_path}} --get-yargs-completions "${args[@]}")\n\n    COMPREPLY=( $(compgen -W "${type_list}" -- ${cur_word}) )\n\n    # if no match was found, fall back to filename completion\n    if [ ${#COMPREPLY[@]} -eq 0 ]; then\n      COMPREPLY=()\n    fi\n\n    return 0\n}\ncomplete -o bashdefault -o default -F _{{app_name}}_yargs_completions {{app_name}}\n###-end-{{app_name}}-completions-###\n';const i=this.shim.path.basename(t);return t.match(/\.js$/)&&(t=`./${t}`),s=s.replace(/{{app_name}}/g,i),s=s.replace(/{{completion_command}}/g,e),s.replace(/{{app_path}}/g,t)}registerFunction(t){this.customCompletionFunction=t}setParsed(t){this.aliases=t.aliases}}function D(t,e){if(0===t.length)return e.length;if(0===e.length)return t.length;const s=[];let i,n;for(i=0;i<=e.length;i++)s[i]=[i];for(n=0;n<=t.length;n++)s[0][n]=n;for(i=1;i<=e.length;i++)for(n=1;n<=t.length;n++)e.charAt(i-1)===t.charAt(n-1)?s[i][n]=s[i-1][n-1]:i>1&&n>1&&e.charAt(i-2)===t.charAt(n-1)&&e.charAt(i-1)===t.charAt(n-2)?s[i][n]=s[i-2][n-2]+1:s[i][n]=Math.min(s[i-1][n-1]+1,Math.min(s[i][n-1]+1,s[i-1][n]+1));return s[e.length][t.length]}const H=["$0","--","_"];var z,q,W,F,U,L,V,G,R,T,K,B,Y,J,Z,X,Q,tt,et,st,it,nt,rt,ot,at,ht,lt,ct,ft,dt,ut,pt,gt,mt;const yt=Symbol("copyDoubleDash"),bt=Symbol("copyDoubleDash"),vt=Symbol("deleteFromParserHintObject"),Ot=Symbol("emitWarning"),wt=Symbol("freeze"),Ct=Symbol("getDollarZero"),jt=Symbol("getParserConfiguration"),_t=Symbol("guessLocale"),Mt=Symbol("guessVersion"),kt=Symbol("parsePositionalNumbers"),xt=Symbol("pkgUp"),Et=Symbol("populateParserHintArray"),At=Symbol("populateParserHintSingleValueDictionary"),Pt=Symbol("populateParserHintArrayDictionary"),St=Symbol("populateParserHintDictionary"),$t=Symbol("sanitizeKey"),It=Symbol("setKey"),Nt=Symbol("unfreeze"),Dt=Symbol("validateAsync"),Ht=Symbol("getCommandInstance"),zt=Symbol("getContext"),qt=Symbol("getHasOutput"),Wt=Symbol("getLoggerInstance"),Ft=Symbol("getParseContext"),Ut=Symbol("getUsageInstance"),Lt=Symbol("getValidationInstance"),Vt=Symbol("hasParseCallback"),Gt=Symbol("isGlobalContext"),Rt=Symbol("postProcess"),Tt=Symbol("rebase"),Kt=Symbol("reset"),Bt=Symbol("runYargsParserAndExecuteCommands"),Yt=Symbol("runValidation"),Jt=Symbol("setHasOutput"),Zt=Symbol("kTrackManuallySetKeys");class Xt{constructor(t=[],e,s,i){this.customScriptName=!1,this.parsed=!1,z.set(this,void 0),q.set(this,void 0),W.set(this,{commands:[],fullCommands:[]}),F.set(this,null),U.set(this,null),L.set(this,"show-hidden"),V.set(this,null),G.set(this,!0),R.set(this,{}),T.set(this,!0),K.set(this,[]),B.set(this,void 0),Y.set(this,{}),J.set(this,!1),Z.set(this,null),X.set(this,!0),Q.set(this,void 0),tt.set(this,""),et.set(this,void 0),st.set(this,void 0),it.set(this,{}),nt.set(this,null),rt.set(this,null),ot.set(this,{}),at.set(this,{}),ht.set(this,void 0),lt.set(this,!1),ct.set(this,void 0),ft.set(this,!1),dt.set(this,!1),ut.set(this,!1),pt.set(this,void 0),gt.set(this,null),mt.set(this,void 0),O(this,ct,i,"f"),O(this,ht,t,"f"),O(this,q,e,"f"),O(this,st,s,"f"),O(this,B,new w(this),"f"),this.$0=this[Ct](),this[Kt](),O(this,z,v(this,z,"f"),"f"),O(this,pt,v(this,pt,"f"),"f"),O(this,mt,v(this,mt,"f"),"f"),O(this,et,v(this,et,"f"),"f"),v(this,et,"f").showHiddenOpt=v(this,L,"f"),O(this,Q,this[bt](),"f")}addHelpOpt(t,e){return h("[string|boolean] [string]",[t,e],arguments.length),v(this,Z,"f")&&(this[vt](v(this,Z,"f")),O(this,Z,null,"f")),!1===t&&void 0===e||(O(this,Z,"string"==typeof t?t:"help","f"),this.boolean(v(this,Z,"f")),this.describe(v(this,Z,"f"),e||v(this,pt,"f").deferY18nLookup("Show help"))),this}help(t,e){return this.addHelpOpt(t,e)}addShowHiddenOpt(t,e){if(h("[string|boolean] [string]",[t,e],arguments.length),!1===t&&void 0===e)return this;const s="string"==typeof t?t:v(this,L,"f");return this.boolean(s),this.describe(s,e||v(this,pt,"f").deferY18nLookup("Show hidden options")),v(this,et,"f").showHiddenOpt=s,this}showHidden(t,e){return this.addShowHiddenOpt(t,e)}alias(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.alias.bind(this),"alias",t,e),this}array(t){return h("<array|string>",[t],arguments.length),this[Et]("array",t),this[Zt](t),this}boolean(t){return h("<array|string>",[t],arguments.length),this[Et]("boolean",t),this[Zt](t),this}check(t,e){return h("<function> [boolean]",[t,e],arguments.length),this.middleware(((e,s)=>j((()=>t(e,s.getOptions())),(s=>(s?("string"==typeof s||s instanceof Error)&&v(this,pt,"f").fail(s.toString(),s):v(this,pt,"f").fail(v(this,ct,"f").y18n.__("Argument check failed: %s",t.toString())),e)),(t=>(v(this,pt,"f").fail(t.message?t.message:t.toString(),t),e)))),!1,e),this}choices(t,e){return h("<object|string|array> [string|array]",[t,e],arguments.length),this[Pt](this.choices.bind(this),"choices",t,e),this}coerce(t,s){if(h("<object|string|array> [function]",[t,s],arguments.length),Array.isArray(t)){if(!s)throw new e("coerce callback must be provided");for(const e of t)this.coerce(e,s);return this}if("object"==typeof t){for(const e of Object.keys(t))this.coerce(e,t[e]);return this}if(!s)throw new e("coerce callback must be provided");return v(this,et,"f").key[t]=!0,v(this,B,"f").addCoerceMiddleware(((i,n)=>{let r;return Object.hasOwnProperty.call(i,t)?j((()=>(r=n.getAliases(),s(i[t]))),(e=>{i[t]=e;const s=n.getInternalMethods().getParserConfiguration()["strip-aliased"];if(r[t]&&!0!==s)for(const s of r[t])i[s]=e;return i}),(t=>{throw new e(t.message)})):i}),t),this}conflicts(t,e){return h("<string|object> [string|array]",[t,e],arguments.length),v(this,mt,"f").conflicts(t,e),this}config(t="config",e,s){return h("[object|string] [string|function] [function]",[t,e,s],arguments.length),"object"!=typeof t||Array.isArray(t)?("function"==typeof e&&(s=e,e=void 0),this.describe(t,e||v(this,pt,"f").deferY18nLookup("Path to JSON config file")),(Array.isArray(t)?t:[t]).forEach((t=>{v(this,et,"f").config[t]=s||!0})),this):(t=n(t,v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(t),this)}completion(t,e,s){return h("[string] [string|boolean|function] [function]",[t,e,s],arguments.length),"function"==typeof e&&(s=e,e=void 0),O(this,U,t||v(this,U,"f")||"completion","f"),e||!1===e||(e="generate completion script"),this.command(v(this,U,"f"),e),s&&v(this,F,"f").registerFunction(s),this}command(t,e,s,i,n,r){return h("<string|array|object> [string|boolean] [function|object] [function] [array] [boolean|string]",[t,e,s,i,n,r],arguments.length),v(this,z,"f").addHandler(t,e,s,i,n,r),this}commands(t,e,s,i,n,r){return this.command(t,e,s,i,n,r)}commandDir(t,e){h("<string> [object]",[t,e],arguments.length);const s=v(this,st,"f")||v(this,ct,"f").require;return v(this,z,"f").addDirectory(t,s,v(this,ct,"f").getCallerFile(),e),this}count(t){return h("<array|string>",[t],arguments.length),this[Et]("count",t),this[Zt](t),this}default(t,e,s){return h("<object|string|array> [*] [string]",[t,e,s],arguments.length),s&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]=s),"function"==typeof e&&(u(t,v(this,ct,"f")),v(this,et,"f").defaultDescription[t]||(v(this,et,"f").defaultDescription[t]=v(this,pt,"f").functionDescription(e)),e=e.call()),this[At](this.default.bind(this),"default",t,e),this}defaults(t,e,s){return this.default(t,e,s)}demandCommand(t=1,e,s,i){return h("[number] [number|string] [string|null|undefined] [string|null|undefined]",[t,e,s,i],arguments.length),"number"!=typeof e&&(s=e,e=1/0),this.global("_",!1),v(this,et,"f").demandedCommands._={min:t,max:e,minMsg:s,maxMsg:i},this}demand(t,e,s){return Array.isArray(e)?(e.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})),e=1/0):"number"!=typeof e&&(s=e,e=1/0),"number"==typeof t?(d(s,!0,v(this,ct,"f")),this.demandCommand(t,e,s,s)):Array.isArray(t)?t.forEach((t=>{d(s,!0,v(this,ct,"f")),this.demandOption(t,s)})):"string"==typeof s?this.demandOption(t,s):!0!==s&&void 0!==s||this.demandOption(t),this}demandOption(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[At](this.demandOption.bind(this),"demandedOptions",t,e),this}deprecateOption(t,e){return h("<string> [string|boolean]",[t,e],arguments.length),v(this,et,"f").deprecatedOptions[t]=e,this}describe(t,e){return h("<object|string|array> [string]",[t,e],arguments.length),this[It](t,!0),v(this,pt,"f").describe(t,e),this}detectLocale(t){return h("<boolean>",[t],arguments.length),O(this,G,t,"f"),this}env(t){return h("[string|boolean]",[t],arguments.length),!1===t?delete v(this,et,"f").envPrefix:v(this,et,"f").envPrefix=t||"",this}epilogue(t){return h("<string>",[t],arguments.length),v(this,pt,"f").epilog(t),this}epilog(t){return this.epilogue(t)}example(t,e){return h("<string|array> [string]",[t,e],arguments.length),Array.isArray(t)?t.forEach((t=>this.example(...t))):v(this,pt,"f").example(t,e),this}exit(t,e){O(this,J,!0,"f"),O(this,V,e,"f"),v(this,T,"f")&&v(this,ct,"f").process.exit(t)}exitProcess(t=!0){return h("[boolean]",[t],arguments.length),O(this,T,t,"f"),this}fail(t){if(h("<function|boolean>",[t],arguments.length),"boolean"==typeof t&&!1!==t)throw new e("Invalid first argument. Expected function or boolean 'false'");return v(this,pt,"f").failFn(t),this}getAliases(){return this.parsed?this.parsed.aliases:{}}async getCompletion(t,e){return h("<array> [function]",[t,e],arguments.length),e?v(this,F,"f").getCompletion(t,e):new Promise(((e,s)=>{v(this,F,"f").getCompletion(t,((t,i)=>{t?s(t):e(i)}))}))}getDemandedOptions(){return h([],0),v(this,et,"f").demandedOptions}getDemandedCommands(){return h([],0),v(this,et,"f").demandedCommands}getDeprecatedOptions(){return h([],0),v(this,et,"f").deprecatedOptions}getDetectLocale(){return v(this,G,"f")}getExitProcess(){return v(this,T,"f")}getGroups(){return Object.assign({},v(this,Y,"f"),v(this,at,"f"))}getHelp(){if(O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const t=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(t))return t.then((()=>v(this,pt,"f").help()))}const t=v(this,z,"f").runDefaultBuilderOn(this);if(f(t))return t.then((()=>v(this,pt,"f").help()))}return Promise.resolve(v(this,pt,"f").help())}getOptions(){return v(this,et,"f")}getStrict(){return v(this,ft,"f")}getStrictCommands(){return v(this,dt,"f")}getStrictOptions(){return v(this,ut,"f")}global(t,e){return h("<string|array> [boolean]",[t,e],arguments.length),t=[].concat(t),!1!==e?v(this,et,"f").local=v(this,et,"f").local.filter((e=>-1===t.indexOf(e))):t.forEach((t=>{v(this,et,"f").local.includes(t)||v(this,et,"f").local.push(t)})),this}group(t,e){h("<string|array> <string>",[t,e],arguments.length);const s=v(this,at,"f")[e]||v(this,Y,"f")[e];v(this,at,"f")[e]&&delete v(this,at,"f")[e];const i={};return v(this,Y,"f")[e]=(s||[]).concat(t).filter((t=>!i[t]&&(i[t]=!0))),this}hide(t){return h("<string>",[t],arguments.length),v(this,et,"f").hiddenOptions.push(t),this}implies(t,e){return h("<string|object> [number|string|array]",[t,e],arguments.length),v(this,mt,"f").implies(t,e),this}locale(t){return h("[string]",[t],arguments.length),t?(O(this,G,!1,"f"),v(this,ct,"f").y18n.setLocale(t),this):(this[_t](),v(this,ct,"f").y18n.getLocale())}middleware(t,e,s){return v(this,B,"f").addMiddleware(t,!!e,s)}nargs(t,e){return h("<string|object|array> [number]",[t,e],arguments.length),this[At](this.nargs.bind(this),"narg",t,e),this}normalize(t){return h("<array|string>",[t],arguments.length),this[Et]("normalize",t),this}number(t){return h("<array|string>",[t],arguments.length),this[Et]("number",t),this[Zt](t),this}option(t,e){if(h("<string|object> [object]",[t,e],arguments.length),"object"==typeof t)Object.keys(t).forEach((e=>{this.options(e,t[e])}));else{"object"!=typeof e&&(e={}),this[Zt](t),!v(this,gt,"f")||"version"!==t&&"version"!==(null==e?void 0:e.alias)||this[Ot](['"version" is a reserved word.',"Please do one of the following:",'- Disable version with `yargs.version(false)` if using "version" as an option',"- Use the built-in `yargs.version` method instead (if applicable)","- Use a different option key","https://yargs.js.org/docs/#api-reference-version"].join("\n"),void 0,"versionWarning"),v(this,et,"f").key[t]=!0,e.alias&&this.alias(t,e.alias);const s=e.deprecate||e.deprecated;s&&this.deprecateOption(t,s);const i=e.demand||e.required||e.require;i&&this.demand(t,i),e.demandOption&&this.demandOption(t,"string"==typeof e.demandOption?e.demandOption:void 0),e.conflicts&&this.conflicts(t,e.conflicts),"default"in e&&this.default(t,e.default),void 0!==e.implies&&this.implies(t,e.implies),void 0!==e.nargs&&this.nargs(t,e.nargs),e.config&&this.config(t,e.configParser),e.normalize&&this.normalize(t),e.choices&&this.choices(t,e.choices),e.coerce&&this.coerce(t,e.coerce),e.group&&this.group(t,e.group),(e.boolean||"boolean"===e.type)&&(this.boolean(t),e.alias&&this.boolean(e.alias)),(e.array||"array"===e.type)&&(this.array(t),e.alias&&this.array(e.alias)),(e.number||"number"===e.type)&&(this.number(t),e.alias&&this.number(e.alias)),(e.string||"string"===e.type)&&(this.string(t),e.alias&&this.string(e.alias)),(e.count||"count"===e.type)&&this.count(t),"boolean"==typeof e.global&&this.global(t,e.global),e.defaultDescription&&(v(this,et,"f").defaultDescription[t]=e.defaultDescription),e.skipValidation&&this.skipValidation(t);const n=e.describe||e.description||e.desc;this.describe(t,n),e.hidden&&this.hide(t),e.requiresArg&&this.requiresArg(t)}return this}options(t,e){return this.option(t,e)}parse(t,e,s){h("[string|array] [function|boolean|object] [function]",[t,e,s],arguments.length),this[wt](),void 0===t&&(t=v(this,ht,"f")),"object"==typeof e&&(O(this,rt,e,"f"),e=s),"function"==typeof e&&(O(this,nt,e,"f"),e=!1),e||O(this,ht,t,"f"),v(this,nt,"f")&&O(this,T,!1,"f");const i=this[Bt](t,!!e),n=this.parsed;return v(this,F,"f").setParsed(this.parsed),f(i)?i.then((t=>(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),t,v(this,tt,"f")),t))).catch((t=>{throw v(this,nt,"f")&&v(this,nt,"f")(t,this.parsed.argv,v(this,tt,"f")),t})).finally((()=>{this[Nt](),this.parsed=n})):(v(this,nt,"f")&&v(this,nt,"f").call(this,v(this,V,"f"),i,v(this,tt,"f")),this[Nt](),this.parsed=n,i)}parseAsync(t,e,s){const i=this.parse(t,e,s);return f(i)?i:Promise.resolve(i)}parseSync(t,s,i){const n=this.parse(t,s,i);if(f(n))throw new e(".parseSync() must not be used with asynchronous builders, handlers, or middleware");return n}parserConfiguration(t){return h("<object>",[t],arguments.length),O(this,it,t,"f"),this}pkgConf(t,e){h("<string> [string]",[t,e],arguments.length);let s=null;const i=this[xt](e||v(this,q,"f"));return i[t]&&"object"==typeof i[t]&&(s=n(i[t],e||v(this,q,"f"),this[jt]()["deep-merge-config"]||!1,v(this,ct,"f")),v(this,et,"f").configObjects=(v(this,et,"f").configObjects||[]).concat(s)),this}positional(t,e){h("<string> <object>",[t,e],arguments.length);const s=["default","defaultDescription","implies","normalize","choices","conflicts","coerce","type","describe","desc","description","alias"];e=g(e,((t,e)=>!("type"===t&&!["string","number","boolean"].includes(e))&&s.includes(t)));const i=v(this,W,"f").fullCommands[v(this,W,"f").fullCommands.length-1],n=i?v(this,z,"f").cmdToParseOptions(i):{array:[],alias:{},default:{},demand:{}};return p(n).forEach((s=>{const i=n[s];Array.isArray(i)?-1!==i.indexOf(t)&&(e[s]=!0):i[t]&&!(s in e)&&(e[s]=i[t])})),this.group(t,v(this,pt,"f").getPositionalGroupName()),this.option(t,e)}recommendCommands(t=!0){return h("[boolean]",[t],arguments.length),O(this,lt,t,"f"),this}required(t,e,s){return this.demand(t,e,s)}require(t,e,s){return this.demand(t,e,s)}requiresArg(t){return h("<array|string|object> [number]",[t],arguments.length),"string"==typeof t&&v(this,et,"f").narg[t]||this[At](this.requiresArg.bind(this),"narg",t,NaN),this}showCompletionScript(t,e){return h("[string] [string]",[t,e],arguments.length),t=t||this.$0,v(this,Q,"f").log(v(this,F,"f").generateCompletionScript(t,e||v(this,U,"f")||"completion")),this}showHelp(t){if(h("[string|function]",[t],arguments.length),O(this,J,!0,"f"),!v(this,pt,"f").hasCachedHelpMessage()){if(!this.parsed){const e=this[Bt](v(this,ht,"f"),void 0,void 0,0,!0);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}const e=v(this,z,"f").runDefaultBuilderOn(this);if(f(e))return e.then((()=>{v(this,pt,"f").showHelp(t)})),this}return v(this,pt,"f").showHelp(t),this}scriptName(t){return this.customScriptName=!0,this.$0=t,this}showHelpOnFail(t,e){return h("[boolean|string] [string]",[t,e],arguments.length),v(this,pt,"f").showHelpOnFail(t,e),this}showVersion(t){return h("[string|function]",[t],arguments.length),v(this,pt,"f").showVersion(t),this}skipValidation(t){return h("<array|string>",[t],arguments.length),this[Et]("skipValidation",t),this}strict(t){return h("[boolean]",[t],arguments.length),O(this,ft,!1!==t,"f"),this}strictCommands(t){return h("[boolean]",[t],arguments.length),O(this,dt,!1!==t,"f"),this}strictOptions(t){return h("[boolean]",[t],arguments.length),O(this,ut,!1!==t,"f"),this}string(t){return h("<array|string>",[t],arguments.length),this[Et]("string",t),this[Zt](t),this}terminalWidth(){return h([],0),v(this,ct,"f").process.stdColumns}updateLocale(t){return this.updateStrings(t)}updateStrings(t){return h("<object>",[t],arguments.length),O(this,G,!1,"f"),v(this,ct,"f").y18n.updateLocale(t),this}usage(t,s,i,n){if(h("<string|null|undefined> [string|boolean] [function|object] [function]",[t,s,i,n],arguments.length),void 0!==s){if(d(t,null,v(this,ct,"f")),(t||"").match(/^\$0( |$)/))return this.command(t,s,i,n);throw new e(".usage() description must start with $0 if being used as alias for .command()")}return v(this,pt,"f").usage(t),this}version(t,e,s){const i="version";if(h("[boolean|string] [string] [string]",[t,e,s],arguments.length),v(this,gt,"f")&&(this[vt](v(this,gt,"f")),v(this,pt,"f").version(void 0),O(this,gt,null,"f")),0===arguments.length)s=this[Mt](),t=i;else if(1===arguments.length){if(!1===t)return this;s=t,t=i}else 2===arguments.length&&(s=e,e=void 0);return O(this,gt,"string"==typeof t?t:i,"f"),e=e||v(this,pt,"f").deferY18nLookup("Show version number"),v(this,pt,"f").version(s||void 0),this.boolean(v(this,gt,"f")),this.describe(v(this,gt,"f"),e),this}wrap(t){return h("<number|null|undefined>",[t],arguments.length),v(this,pt,"f").wrap(t),this}[(z=new WeakMap,q=new WeakMap,W=new WeakMap,F=new WeakMap,U=new WeakMap,L=new WeakMap,V=new WeakMap,G=new WeakMap,R=new WeakMap,T=new WeakMap,K=new WeakMap,B=new WeakMap,Y=new WeakMap,J=new WeakMap,Z=new WeakMap,X=new WeakMap,Q=new WeakMap,tt=new WeakMap,et=new WeakMap,st=new WeakMap,it=new WeakMap,nt=new WeakMap,rt=new WeakMap,ot=new WeakMap,at=new WeakMap,ht=new WeakMap,lt=new WeakMap,ct=new WeakMap,ft=new WeakMap,dt=new WeakMap,ut=new WeakMap,pt=new WeakMap,gt=new WeakMap,mt=new WeakMap,yt)](t){if(!t._||!t["--"])return t;t._.push.apply(t._,t["--"]);try{delete t["--"]}catch(t){}return t}[bt](){return{log:(...t)=>{this[Vt]()||console.log(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")},error:(...t)=>{this[Vt]()||console.error(...t),O(this,J,!0,"f"),v(this,tt,"f").length&&O(this,tt,v(this,tt,"f")+"\n","f"),O(this,tt,v(this,tt,"f")+t.join(" "),"f")}}}[vt](t){p(v(this,et,"f")).forEach((e=>{if("configObjects"===e)return;const s=v(this,et,"f")[e];Array.isArray(s)?s.includes(t)&&s.splice(s.indexOf(t),1):"object"==typeof s&&delete s[t]})),delete v(this,pt,"f").getDescriptions()[t]}[Ot](t,e,s){v(this,R,"f")[s]||(v(this,ct,"f").process.emitWarning(t,e),v(this,R,"f")[s]=!0)}[wt](){v(this,K,"f").push({options:v(this,et,"f"),configObjects:v(this,et,"f").configObjects.slice(0),exitProcess:v(this,T,"f"),groups:v(this,Y,"f"),strict:v(this,ft,"f"),strictCommands:v(this,dt,"f"),strictOptions:v(this,ut,"f"),completionCommand:v(this,U,"f"),output:v(this,tt,"f"),exitError:v(this,V,"f"),hasOutput:v(this,J,"f"),parsed:this.parsed,parseFn:v(this,nt,"f"),parseContext:v(this,rt,"f")}),v(this,pt,"f").freeze(),v(this,mt,"f").freeze(),v(this,z,"f").freeze(),v(this,B,"f").freeze()}[Ct](){let t,e="";return t=/\b(node|iojs|electron)(\.exe)?$/.test(v(this,ct,"f").process.argv()[0])?v(this,ct,"f").process.argv().slice(1,2):v(this,ct,"f").process.argv().slice(0,1),e=t.map((t=>{const e=this[Tt](v(this,q,"f"),t);return t.match(/^(\/|([a-zA-Z]:)?\\)/)&&e.length<t.length?e:t})).join(" ").trim(),v(this,ct,"f").getEnv("_")&&v(this,ct,"f").getProcessArgvBin()===v(this,ct,"f").getEnv("_")&&(e=v(this,ct,"f").getEnv("_").replace(`${v(this,ct,"f").path.dirname(v(this,ct,"f").process.execPath())}/`,"")),e}[jt](){return v(this,it,"f")}[_t](){if(!v(this,G,"f"))return;const t=v(this,ct,"f").getEnv("LC_ALL")||v(this,ct,"f").getEnv("LC_MESSAGES")||v(this,ct,"f").getEnv("LANG")||v(this,ct,"f").getEnv("LANGUAGE")||"en_US";this.locale(t.replace(/[.:].*/,""))}[Mt](){return this[xt]().version||"unknown"}[kt](t){const e=t["--"]?t["--"]:t._;for(let t,s=0;void 0!==(t=e[s]);s++)v(this,ct,"f").Parser.looksLikeNumber(t)&&Number.isSafeInteger(Math.floor(parseFloat(`${t}`)))&&(e[s]=Number(t));return t}[xt](t){const e=t||"*";if(v(this,ot,"f")[e])return v(this,ot,"f")[e];let s={};try{let e=t||v(this,ct,"f").mainFilename;!t&&v(this,ct,"f").path.extname(e)&&(e=v(this,ct,"f").path.dirname(e));const i=v(this,ct,"f").findUp(e,((t,e)=>e.includes("package.json")?"package.json":void 0));d(i,void 0,v(this,ct,"f")),s=JSON.parse(v(this,ct,"f").readFileSync(i,"utf8"))}catch(t){}return v(this,ot,"f")[e]=s||{},v(this,ot,"f")[e]}[Et](t,e){(e=[].concat(e)).forEach((e=>{e=this[$t](e),v(this,et,"f")[t].push(e)}))}[At](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=s}))}[Pt](t,e,s,i){this[St](t,e,s,i,((t,e,s)=>{v(this,et,"f")[t][e]=(v(this,et,"f")[t][e]||[]).concat(s)}))}[St](t,e,s,i,n){if(Array.isArray(s))s.forEach((e=>{t(e,i)}));else if((t=>"object"==typeof t)(s))for(const e of p(s))t(e,s[e]);else n(e,this[$t](s),i)}[$t](t){return"__proto__"===t?"___proto___":t}[It](t,e){return this[At](this[It].bind(this),"key",t,e),this}[Nt](){var t,e,s,i,n,r,o,a,h,l,c,f;const u=v(this,K,"f").pop();let p;d(u,void 0,v(this,ct,"f")),t=this,e=this,s=this,i=this,n=this,r=this,o=this,a=this,h=this,l=this,c=this,f=this,({options:{set value(e){O(t,et,e,"f")}}.value,configObjects:p,exitProcess:{set value(t){O(e,T,t,"f")}}.value,groups:{set value(t){O(s,Y,t,"f")}}.value,output:{set value(t){O(i,tt,t,"f")}}.value,exitError:{set value(t){O(n,V,t,"f")}}.value,hasOutput:{set value(t){O(r,J,t,"f")}}.value,parsed:this.parsed,strict:{set value(t){O(o,ft,t,"f")}}.value,strictCommands:{set value(t){O(a,dt,t,"f")}}.value,strictOptions:{set value(t){O(h,ut,t,"f")}}.value,completionCommand:{set value(t){O(l,U,t,"f")}}.value,parseFn:{set value(t){O(c,nt,t,"f")}}.value,parseContext:{set value(t){O(f,rt,t,"f")}}.value}=u),v(this,et,"f").configObjects=p,v(this,pt,"f").unfreeze(),v(this,mt,"f").unfreeze(),v(this,z,"f").unfreeze(),v(this,B,"f").unfreeze()}[Dt](t,e){return j(e,(e=>(t(e),e)))}getInternalMethods(){return{getCommandInstance:this[Ht].bind(this),getContext:this[zt].bind(this),getHasOutput:this[qt].bind(this),getLoggerInstance:this[Wt].bind(this),getParseContext:this[Ft].bind(this),getParserConfiguration:this[jt].bind(this),getUsageInstance:this[Ut].bind(this),getValidationInstance:this[Lt].bind(this),hasParseCallback:this[Vt].bind(this),isGlobalContext:this[Gt].bind(this),postProcess:this[Rt].bind(this),reset:this[Kt].bind(this),runValidation:this[Yt].bind(this),runYargsParserAndExecuteCommands:this[Bt].bind(this),setHasOutput:this[Jt].bind(this)}}[Ht](){return v(this,z,"f")}[zt](){return v(this,W,"f")}[qt](){return v(this,J,"f")}[Wt](){return v(this,Q,"f")}[Ft](){return v(this,rt,"f")||{}}[Ut](){return v(this,pt,"f")}[Lt](){return v(this,mt,"f")}[Vt](){return!!v(this,nt,"f")}[Gt](){return v(this,X,"f")}[Rt](t,e,s,i){if(s)return t;if(f(t))return t;e||(t=this[yt](t));return(this[jt]()["parse-positional-numbers"]||void 0===this[jt]()["parse-positional-numbers"])&&(t=this[kt](t)),i&&(t=C(t,this,v(this,B,"f").getMiddleware(),!1)),t}[Kt](t={}){O(this,et,v(this,et,"f")||{},"f");const e={};e.local=v(this,et,"f").local||[],e.configObjects=v(this,et,"f").configObjects||[];const s={};e.local.forEach((e=>{s[e]=!0,(t[e]||[]).forEach((t=>{s[t]=!0}))})),Object.assign(v(this,at,"f"),Object.keys(v(this,Y,"f")).reduce(((t,e)=>{const i=v(this,Y,"f")[e].filter((t=>!(t in s)));return i.length>0&&(t[e]=i),t}),{})),O(this,Y,{},"f");return["array","boolean","string","skipValidation","count","normalize","number","hiddenOptions"].forEach((t=>{e[t]=(v(this,et,"f")[t]||[]).filter((t=>!s[t]))})),["narg","key","alias","default","defaultDescription","config","choices","demandedOptions","demandedCommands","deprecatedOptions"].forEach((t=>{e[t]=g(v(this,et,"f")[t],(t=>!s[t]))})),e.envPrefix=v(this,et,"f").envPrefix,O(this,et,e,"f"),O(this,pt,v(this,pt,"f")?v(this,pt,"f").reset(s):P(this,v(this,ct,"f")),"f"),O(this,mt,v(this,mt,"f")?v(this,mt,"f").reset(s):function(t,e,s){const i=s.y18n.__,n=s.y18n.__n,r={nonOptionCount:function(s){const i=t.getDemandedCommands(),r=s._.length+(s["--"]?s["--"].length:0)-t.getInternalMethods().getContext().commands.length;i._&&(r<i._.min||r>i._.max)&&(r<i._.min?void 0!==i._.minMsg?e.fail(i._.minMsg?i._.minMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.min.toString()):null):e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",r,r.toString(),i._.min.toString())):r>i._.max&&(void 0!==i._.maxMsg?e.fail(i._.maxMsg?i._.maxMsg.replace(/\$0/g,r.toString()).replace(/\$1/,i._.max.toString()):null):e.fail(n("Too many non-option arguments: got %s, maximum of %s","Too many non-option arguments: got %s, maximum of %s",r,r.toString(),i._.max.toString()))))},positionalCount:function(t,s){s<t&&e.fail(n("Not enough non-option arguments: got %s, need at least %s","Not enough non-option arguments: got %s, need at least %s",s,s+"",t+""))},requiredArguments:function(t,s){let i=null;for(const e of Object.keys(s))Object.prototype.hasOwnProperty.call(t,e)&&void 0!==t[e]||(i=i||{},i[e]=s[e]);if(i){const t=[];for(const e of Object.keys(i)){const s=i[e];s&&t.indexOf(s)<0&&t.push(s)}const s=t.length?`\n${t.join("\n")}`:"";e.fail(n("Missing required argument: %s","Missing required arguments: %s",Object.keys(i).length,Object.keys(i).join(", ")+s))}},unknownArguments:function(s,i,o,a,h=!0){var l;const c=t.getInternalMethods().getCommandInstance().getCommands(),f=[],d=t.getInternalMethods().getContext();if(Object.keys(s).forEach((e=>{H.includes(e)||Object.prototype.hasOwnProperty.call(o,e)||Object.prototype.hasOwnProperty.call(t.getInternalMethods().getParseContext(),e)||r.isValidAndSomeAliasIsNotNew(e,i)||f.push(e)})),h&&(d.commands.length>0||c.length>0||a)&&s._.slice(d.commands.length).forEach((t=>{c.includes(""+t)||f.push(""+t)})),h){const e=(null===(l=t.getDemandedCommands()._)||void 0===l?void 0:l.max)||0,i=d.commands.length+e;i<s._.length&&s._.slice(i).forEach((t=>{t=String(t),d.commands.includes(t)||f.includes(t)||f.push(t)}))}f.length&&e.fail(n("Unknown argument: %s","Unknown arguments: %s",f.length,f.map((t=>t.trim()?t:`"${t}"`)).join(", ")))},unknownCommands:function(s){const i=t.getInternalMethods().getCommandInstance().getCommands(),r=[],o=t.getInternalMethods().getContext();return(o.commands.length>0||i.length>0)&&s._.slice(o.commands.length).forEach((t=>{i.includes(""+t)||r.push(""+t)})),r.length>0&&(e.fail(n("Unknown command: %s","Unknown commands: %s",r.length,r.join(", "))),!0)},isValidAndSomeAliasIsNotNew:function(e,s){if(!Object.prototype.hasOwnProperty.call(s,e))return!1;const i=t.parsed.newAliases;return[e,...s[e]].some((t=>!Object.prototype.hasOwnProperty.call(i,t)||!i[e]))},limitedChoices:function(s){const n=t.getOptions(),r={};if(!Object.keys(n.choices).length)return;Object.keys(s).forEach((t=>{-1===H.indexOf(t)&&Object.prototype.hasOwnProperty.call(n.choices,t)&&[].concat(s[t]).forEach((e=>{-1===n.choices[t].indexOf(e)&&void 0!==e&&(r[t]=(r[t]||[]).concat(e))}))}));const o=Object.keys(r);if(!o.length)return;let a=i("Invalid values:");o.forEach((t=>{a+=`\n  ${i("Argument: %s, Given: %s, Choices: %s",t,e.stringifiedValues(r[t]),e.stringifiedValues(n.choices[t]))}`})),e.fail(a)}};let o={};function a(t,e){const s=Number(e);return"number"==typeof(e=isNaN(s)?e:s)?e=t._.length>=e:e.match(/^--no-.+/)?(e=e.match(/^--no-(.+)/)[1],e=!Object.prototype.hasOwnProperty.call(t,e)):e=Object.prototype.hasOwnProperty.call(t,e),e}r.implies=function(e,i){h("<string|object> [array|number|string]",[e,i],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.implies(t,e[t])})):(t.global(e),o[e]||(o[e]=[]),Array.isArray(i)?i.forEach((t=>r.implies(e,t))):(d(i,void 0,s),o[e].push(i)))},r.getImplied=function(){return o},r.implications=function(t){const s=[];if(Object.keys(o).forEach((e=>{const i=e;(o[e]||[]).forEach((e=>{let n=i;const r=e;n=a(t,n),e=a(t,e),n&&!e&&s.push(` ${i} -> ${r}`)}))})),s.length){let t=`${i("Implications failed:")}\n`;s.forEach((e=>{t+=e})),e.fail(t)}};let l={};r.conflicts=function(e,s){h("<string|object> [array|string]",[e,s],arguments.length),"object"==typeof e?Object.keys(e).forEach((t=>{r.conflicts(t,e[t])})):(t.global(e),l[e]||(l[e]=[]),Array.isArray(s)?s.forEach((t=>r.conflicts(e,t))):l[e].push(s))},r.getConflicting=()=>l,r.conflicting=function(n){Object.keys(n).forEach((t=>{l[t]&&l[t].forEach((s=>{s&&void 0!==n[t]&&void 0!==n[s]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,s))}))})),t.getInternalMethods().getParserConfiguration()["strip-dashed"]&&Object.keys(l).forEach((t=>{l[t].forEach((r=>{r&&void 0!==n[s.Parser.camelCase(t)]&&void 0!==n[s.Parser.camelCase(r)]&&e.fail(i("Arguments %s and %s are mutually exclusive",t,r))}))}))},r.recommendCommands=function(t,s){s=s.sort(((t,e)=>e.length-t.length));let n=null,r=1/0;for(let e,i=0;void 0!==(e=s[i]);i++){const s=D(t,e);s<=3&&s<r&&(r=s,n=e)}n&&e.fail(i("Did you mean %s?",n))},r.reset=function(t){return o=g(o,(e=>!t[e])),l=g(l,(e=>!t[e])),r};const c=[];return r.freeze=function(){c.push({implied:o,conflicting:l})},r.unfreeze=function(){const t=c.pop();d(t,void 0,s),({implied:o,conflicting:l}=t)},r}(this,v(this,pt,"f"),v(this,ct,"f")),"f"),O(this,z,v(this,z,"f")?v(this,z,"f").reset():function(t,e,s,i){return new M(t,e,s,i)}(v(this,pt,"f"),v(this,mt,"f"),v(this,B,"f"),v(this,ct,"f")),"f"),v(this,F,"f")||O(this,F,function(t,e,s,i){return new N(t,e,s,i)}(this,v(this,pt,"f"),v(this,z,"f"),v(this,ct,"f")),"f"),v(this,B,"f").reset(),O(this,U,null,"f"),O(this,tt,"","f"),O(this,V,null,"f"),O(this,J,!1,"f"),this.parsed=!1,this}[Tt](t,e){return v(this,ct,"f").path.relative(t,e)}[Bt](t,s,i,n=0,r=!1){let o=!!i||r;t=t||v(this,ht,"f"),v(this,et,"f").__=v(this,ct,"f").y18n.__,v(this,et,"f").configuration=this[jt]();const a=!!v(this,et,"f").configuration["populate--"],h=Object.assign({},v(this,et,"f").configuration,{"populate--":!0}),l=v(this,ct,"f").Parser.detailed(t,Object.assign({},v(this,et,"f"),{configuration:{"parse-positional-numbers":!1,...h}})),c=Object.assign(l.argv,v(this,rt,"f"));let d;const u=l.aliases;let p=!1,g=!1;Object.keys(c).forEach((t=>{t===v(this,Z,"f")&&c[t]?p=!0:t===v(this,gt,"f")&&c[t]&&(g=!0)})),c.$0=this.$0,this.parsed=l,0===n&&v(this,pt,"f").clearCachedHelpMessage();try{if(this[_t](),s)return this[Rt](c,a,!!i,!1);if(v(this,Z,"f")){[v(this,Z,"f")].concat(u[v(this,Z,"f")]||[]).filter((t=>t.length>1)).includes(""+c._[c._.length-1])&&(c._.pop(),p=!0)}O(this,X,!1,"f");const h=v(this,z,"f").getCommands(),m=v(this,F,"f").completionKey in c,y=p||m||r;if(c._.length){if(h.length){let t;for(let e,s=n||0;void 0!==c._[s];s++){if(e=String(c._[s]),h.includes(e)&&e!==v(this,U,"f")){const t=v(this,z,"f").runCommand(e,this,l,s+1,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(!t&&e!==v(this,U,"f")){t=e;break}}!v(this,z,"f").hasDefaultCommand()&&v(this,lt,"f")&&t&&!y&&v(this,mt,"f").recommendCommands(t,h)}v(this,U,"f")&&c._.includes(v(this,U,"f"))&&!m&&(v(this,T,"f")&&E(!0),this.showCompletionScript(),this.exit(0))}if(v(this,z,"f").hasDefaultCommand()&&!y){const t=v(this,z,"f").runCommand(null,this,l,0,r,p||g||r);return this[Rt](t,a,!!i,!1)}if(m){v(this,T,"f")&&E(!0);const s=(t=[].concat(t)).slice(t.indexOf(`--${v(this,F,"f").completionKey}`)+1);return v(this,F,"f").getCompletion(s,((t,s)=>{if(t)throw new e(t.message);(s||[]).forEach((t=>{v(this,Q,"f").log(t)})),this.exit(0)})),this[Rt](c,!a,!!i,!1)}if(v(this,J,"f")||(p?(v(this,T,"f")&&E(!0),o=!0,this.showHelp("log"),this.exit(0)):g&&(v(this,T,"f")&&E(!0),o=!0,v(this,pt,"f").showVersion("log"),this.exit(0))),!o&&v(this,et,"f").skipValidation.length>0&&(o=Object.keys(c).some((t=>v(this,et,"f").skipValidation.indexOf(t)>=0&&!0===c[t]))),!o){if(l.error)throw new e(l.error.message);if(!m){const t=this[Yt](u,{},l.error);i||(d=C(c,this,v(this,B,"f").getMiddleware(),!0)),d=this[Dt](t,null!=d?d:c),f(d)&&!i&&(d=d.then((()=>C(c,this,v(this,B,"f").getMiddleware(),!1))))}}}catch(t){if(!(t instanceof e))throw t;v(this,pt,"f").fail(t.message,t)}return this[Rt](null!=d?d:c,a,!!i,!0)}[Yt](t,s,i,n){const r={...this.getDemandedOptions()};return o=>{if(i)throw new e(i.message);v(this,mt,"f").nonOptionCount(o),v(this,mt,"f").requiredArguments(o,r);let a=!1;v(this,dt,"f")&&(a=v(this,mt,"f").unknownCommands(o)),v(this,ft,"f")&&!a?v(this,mt,"f").unknownArguments(o,t,s,!!n):v(this,ut,"f")&&v(this,mt,"f").unknownArguments(o,t,{},!1,!1),v(this,mt,"f").limitedChoices(o),v(this,mt,"f").implications(o),v(this,mt,"f").conflicting(o)}}[Jt](){O(this,J,!0,"f")}[Zt](t){if("string"==typeof t)v(this,et,"f").key[t]=!0;else for(const e of t)v(this,et,"f").key[e]=!0}}var Qt,te;const{readFileSync:ee}=require("fs"),{inspect:se}=require("util"),{resolve:ie}=require("path"),ne=require("y18n"),re=require("yargs-parser");var oe,ae={assert:{notStrictEqual:t.notStrictEqual,strictEqual:t.strictEqual},cliui:require("cliui"),findUp:require("escalade/sync"),getEnv:t=>process.env[t],getCallerFile:require("get-caller-file"),getProcessArgvBin:y,inspect:se,mainFilename:null!==(te=null===(Qt=null===require||void 0===require?void 0:require.main)||void 0===Qt?void 0:Qt.filename)&&void 0!==te?te:process.cwd(),Parser:re,path:require("path"),process:{argv:()=>process.argv,cwd:process.cwd,emitWarning:(t,e)=>process.emitWarning(t,e),execPath:()=>process.execPath,exit:t=>{process.exit(t)},nextTick:process.nextTick,stdColumns:void 0!==process.stdout.columns?process.stdout.columns:null},readFileSync:ee,require:require,requireDirectory:require("require-directory"),stringWidth:require("string-width"),y18n:ne({directory:ie(__dirname,"../locales"),updateFiles:!1})};const he=(null===(oe=null===process||void 0===process?void 0:process.env)||void 0===oe?void 0:oe.YARGS_MIN_NODE_VERSION)?Number(process.env.YARGS_MIN_NODE_VERSION):12;if(process&&process.version){if(Number(process.version.match(/v([^.]+)/)[1])<he)throw Error(`yargs supports a minimum Node.js version of ${he}. Read our version support policy: https://github.com/yargs/yargs#supported-nodejs-versions`)}const le=require("yargs-parser");var ce,fe={applyExtends:n,cjsPlatformShim:ae,Yargs:(ce=ae,(t=[],e=ce.process.cwd(),s)=>{const i=new Xt(t,e,s,ce);return Object.defineProperty(i,"argv",{get:()=>i.parse(),enumerable:!0}),i.help(),i.version(),i}),argsert:h,isPromise:f,objFilter:g,parseCommand:o,Parser:le,processArgv:b,YError:e};module.exports=fe;
diff --git a/shared/constants/app.js b/shared/constants/app.js
index 0d1aecc066e9..bc27e0df168e 100644
--- a/shared/constants/app.js
+++ b/shared/constants/app.js
@@ -39,11 +39,14 @@ export const MESSAGE_TYPE = {
   ETH_REQUEST_ACCOUNTS: 'eth_requestAccounts',
   ETH_SIGN: 'eth_sign',
   ETH_SIGN_TYPED_DATA: 'eth_signTypedData',
+  ETH_SIGN_TYPED_DATA_V3: 'eth_signTypedData_v3',
+  ETH_SIGN_TYPED_DATA_V4: 'eth_signTypedData_v4',
   GET_PROVIDER_STATE: 'metamask_getProviderState',
   LOG_WEB3_SHIM_USAGE: 'metamask_logWeb3ShimUsage',
   PERSONAL_SIGN: 'personal_sign',
   SEND_METADATA: 'metamask_sendDomainMetadata',
   SWITCH_ETHEREUM_CHAIN: 'wallet_switchEthereumChain',
+  WALLET_REQUEST_PERMISSIONS: 'wallet_requestPermissions',
   WATCH_ASSET: 'wallet_watchAsset',
   WATCH_ASSET_LEGACY: 'metamask_watchAsset',
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
@@ -92,3 +95,5 @@ export const FIREFOX_BUILD_IDS = [
   METAMASK_PROD_FIREFOX_ID,
   METAMASK_FLASK_FIREFOX_ID,
 ];
+
+export const UNKNOWN_TICKER_SYMBOL = 'UNKNOWN';
diff --git a/shared/constants/gas.js b/shared/constants/gas.js
index ae674e4a24e4..f6a2ec337123 100644
--- a/shared/constants/gas.js
+++ b/shared/constants/gas.js
@@ -1,7 +1,9 @@
 import { addHexPrefix } from 'ethereumjs-util';
-import { MIN_GAS_LIMIT_HEX } from '../../ui/pages/send/send.constants';
 
 const ONE_HUNDRED_THOUSAND = 100000;
+const MIN_GAS_LIMIT_DEC = '21000';
+
+export const MIN_GAS_LIMIT_HEX = parseInt(MIN_GAS_LIMIT_DEC, 10).toString(16);
 
 export const GAS_LIMITS = {
   // maximum gasLimit of a simple send
@@ -10,9 +12,22 @@ export const GAS_LIMITS = {
   BASE_TOKEN_ESTIMATE: addHexPrefix(ONE_HUNDRED_THOUSAND.toString(16)),
 };
 
+/**
+ * @typedef {Object} GasEstimateTypes
+ * @property {'fee-market'} FEE_MARKET - A gas estimate for a fee market
+ *  transaction generated by our gas estimation API.
+ * @property {'legacy'} LEGACY - A gas estimate for a legacy Transaction
+ *  generated by our gas estimation API.
+ * @property {'eth_gasPrice'} ETH_GAS_PRICE - A gas estimate provided by the
+ *  Ethereum node via eth_gasPrice.
+ * @property {'none'} NONE - No gas estimate available.
+ */
+
 /**
  * These are already declared in @metamask/controllers but importing them from
  * that module and re-exporting causes the UI bundle size to expand beyond 4MB
+ *
+ * @type {GasEstimateTypes}
  */
 export const GAS_ESTIMATE_TYPES = {
   FEE_MARKET: 'fee-market',
diff --git a/shared/constants/metametrics.js b/shared/constants/metametrics.js
index d2c9e6663318..8d18c9dc09b6 100644
--- a/shared/constants/metametrics.js
+++ b/shared/constants/metametrics.js
@@ -164,6 +164,9 @@
  *  trait
  * @property {'networks_added'} NETWORKS_ADDED - when user modifies networks
  *  we identify the networks_added trait
+ * @property {'networks_without_ticker'} NETWORKS_WITHOUT_TICKER - when user
+ *  modifies networks we identify the networks_without_ticker trait for
+ *  networks without a ticker.
  * @property {'nft_autodetection_enabled'} NFT_AUTODETECTION_ENABLED - when Autodetect NFTs
  * feature is toggled we identify the nft_autodetection_enabled trait
  * @property {'number_of_accounts'} NUMBER_OF_ACCOUNTS - when identities
@@ -191,6 +194,7 @@ export const TRAITS = {
   ADDRESS_BOOK_ENTRIES: 'address_book_entries',
   LEDGER_CONNECTION_TYPE: 'ledger_connection_type',
   NETWORKS_ADDED: 'networks_added',
+  NETWORKS_WITHOUT_TICKER: 'networks_without_ticker',
   NFT_AUTODETECTION_ENABLED: 'nft_autodetection_enabled',
   NUMBER_OF_ACCOUNTS: 'number_of_accounts',
   NUMBER_OF_NFT_COLLECTIONS: 'number_of_nft_collections',
@@ -210,6 +214,9 @@ export const TRAITS = {
  *  type of ledger connection set by user preference.
  * @property {Array<string>} [networks_added] - An array consisting of chainIds
  *  that indicate the networks a user has added to their MetaMask.
+ * @property {Array<string>} [networks_without_ticker] - An array consisting of
+ *  chainIds that indicate the networks added by the user that do not have a
+ *  ticker.
  * @property {number} [nft_autodetection_enabled] - does the user have the
  * use collection/nft detection enabled?
  * @property {number} [number_of_accounts] - A number representing the number
@@ -269,13 +276,23 @@ export const REJECT_NOTFICIATION_CLOSE_SIG =
  */
 
 export const EVENT_NAMES = {
+  ENCRYPTION_PUBLIC_KEY_APPROVED: 'Encryption Public Key Approved',
+  ENCRYPTION_PUBLIC_KEY_REJECTED: 'Encryption Public Key Rejected',
   ENCRYPTION_PUBLIC_KEY_REQUESTED: 'Encryption Public Key Requested',
+  DECRYPTION_APPROVED: 'Decryption Approved',
+  DECRYPTION_REJECTED: 'Decryption Rejected',
   DECRYPTION_REQUESTED: 'Decryption Requested',
+  PERMISSIONS_APPROVED: 'Permissions Approved',
+  PERMISSIONS_REJECTED: 'Permissions Rejected',
   PERMISSIONS_REQUESTED: 'Permissions Requested',
+  PROVIDER_METHOD_CALLED: 'Provider Method Called',
+  SIGNATURE_APPROVED: 'Signature Approved',
+  SIGNATURE_REJECTED: 'Signature Rejected',
   SIGNATURE_REQUESTED: 'Signature Requested',
   TOKEN_ADDED: 'Token Added',
   TOKEN_DETECTED: 'Token Detected',
   TOKEN_HIDDEN: 'Token Hidden',
+  NFT_ADDED: 'NFT Added',
   TOKEN_IMPORT_CANCELED: 'Token Import Canceled',
   TOKEN_IMPORT_CLICKED: 'Token Import Clicked',
 };
@@ -298,6 +315,10 @@ export const EVENT = {
     WALLET: 'Wallet',
   },
   SOURCE: {
+    NETWORK: {
+      POPULAR_NETWORK_LIST: 'popular_network_list',
+      CUSTOM_NETWORK_FORM: 'custom_network_form',
+    },
     SWAPS: {
       MAIN_VIEW: 'Main View',
       TOKEN_VIEW: 'Token View',
diff --git a/shared/constants/network.js b/shared/constants/network.js
index 8036f36d4dcf..6891017d992b 100644
--- a/shared/constants/network.js
+++ b/shared/constants/network.js
@@ -7,6 +7,7 @@ export const MAINNET = 'mainnet';
 export const GOERLI = 'goerli';
 export const LOCALHOST = 'localhost';
 export const NETWORK_TYPE_RPC = 'rpc';
+export const HOMESTEAD = 'homestead';
 
 export const MAINNET_NETWORK_ID = '1';
 export const ROPSTEN_NETWORK_ID = '3';
@@ -23,11 +24,14 @@ export const KOVAN_CHAIN_ID = '0x2a';
 export const LOCALHOST_CHAIN_ID = '0x539';
 export const BSC_CHAIN_ID = '0x38';
 export const OPTIMISM_CHAIN_ID = '0xa';
-export const OPTIMISM_TESTNET_CHAIN_ID = '0x45';
+export const OPTIMISM_TESTNET_CHAIN_ID = '0x1a4';
 export const POLYGON_CHAIN_ID = '0x89';
 export const AVALANCHE_CHAIN_ID = '0xa86a';
 export const FANTOM_CHAIN_ID = '0xfa';
 export const CELO_CHAIN_ID = '0xa4ec';
+export const ARBITRUM_CHAIN_ID = '0xa4b1';
+export const HARMONY_CHAIN_ID = '0x63564c40';
+export const PALM_CHAIN_ID = '0x2a15c308d';
 
 /**
  * The largest possible chain ID we can handle.
@@ -43,9 +47,16 @@ export const GOERLI_DISPLAY_NAME = 'Goerli';
 export const LOCALHOST_DISPLAY_NAME = 'Localhost 8545';
 export const BSC_DISPLAY_NAME = 'Binance Smart Chain';
 export const POLYGON_DISPLAY_NAME = 'Polygon';
-export const AVALANCHE_DISPLAY_NAME = 'Avalanche';
+export const AVALANCHE_DISPLAY_NAME = 'Avalanche Network C-Chain';
+export const ARBITRUM_DISPLAY_NAME = 'Arbitrum One';
+export const BNB_DISPLAY_NAME =
+  'BNB Smart Chain (previously Binance Smart Chain Mainnet)';
+export const OPTIMISM_DISPLAY_NAME = 'Optimism';
+export const FANTOM_DISPLAY_NAME = 'Fantom Opera';
+export const HARMONY_DISPLAY_NAME = 'Harmony Mainnet Shard 0';
+export const PALM_DISPLAY_NAME = 'Palm';
 
-const infuraProjectId = process.env.INFURA_PROJECT_ID;
+export const infuraProjectId = process.env.INFURA_PROJECT_ID;
 export const getRpcUrl = ({ network, excludeProjectId = false }) =>
   `https://${network}.infura.io/v3/${excludeProjectId ? '' : infuraProjectId}`;
 
@@ -64,12 +75,20 @@ export const MATIC_SYMBOL = 'MATIC';
 export const AVALANCHE_SYMBOL = 'AVAX';
 export const FANTOM_SYMBOL = 'FTM';
 export const CELO_SYMBOL = 'CELO';
+export const ARBITRUM_SYMBOL = 'AETH';
+export const HARMONY_SYMBOL = 'ONE';
+export const PALM_SYMBOL = 'PALM';
 
 export const ETH_TOKEN_IMAGE_URL = './images/eth_logo.svg';
 export const TEST_ETH_TOKEN_IMAGE_URL = './images/black-eth-logo.svg';
 export const BNB_TOKEN_IMAGE_URL = './images/bnb.png';
 export const MATIC_TOKEN_IMAGE_URL = './images/matic-token.png';
 export const AVAX_TOKEN_IMAGE_URL = './images/avax-token.png';
+export const AETH_TOKEN_IMAGE_URL = './images/arbitrum.svg';
+export const FTM_TOKEN_IMAGE_URL = './images/fantom-opera.svg';
+export const HARMONY_ONE_TOKEN_IMAGE_URL = './images/harmony-one.svg';
+export const OPTIMISM_TOKEN_IMAGE_URL = './images/optimism.svg';
+export const PALM_TOKEN_IMAGE_URL = './images/palm.svg';
 
 export const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET, GOERLI];
 
@@ -166,6 +185,19 @@ export const CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP = {
   [AVALANCHE_CHAIN_ID]: AVAX_TOKEN_IMAGE_URL,
   [BSC_CHAIN_ID]: BNB_TOKEN_IMAGE_URL,
   [POLYGON_CHAIN_ID]: MATIC_TOKEN_IMAGE_URL,
+  [ARBITRUM_CHAIN_ID]: AETH_TOKEN_IMAGE_URL,
+  [BSC_CHAIN_ID]: BNB_TOKEN_IMAGE_URL,
+  [FANTOM_CHAIN_ID]: FTM_TOKEN_IMAGE_URL,
+  [HARMONY_CHAIN_ID]: HARMONY_ONE_TOKEN_IMAGE_URL,
+  [OPTIMISM_CHAIN_ID]: OPTIMISM_TOKEN_IMAGE_URL,
+  [PALM_CHAIN_ID]: PALM_TOKEN_IMAGE_URL,
+};
+
+export const NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP = {
+  [ROPSTEN_NETWORK_ID]: ROPSTEN,
+  [RINKEBY_NETWORK_ID]: RINKEBY,
+  [GOERLI_NETWORK_ID]: GOERLI,
+  [MAINNET_NETWORK_ID]: HOMESTEAD,
 };
 
 export const CHAIN_ID_TO_NETWORK_ID_MAP = Object.values(
@@ -236,6 +268,11 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'eth',
       showOnlyCurrencies: 'eth,usdt,usdc,dai',
     },
+    wyre: {
+      srn: 'ethereum',
+      currencyCode: ETH_SYMBOL,
+    },
+    coinbasePayCurrencies: [ETH_SYMBOL, 'USDC', 'DAI'],
   },
   [ROPSTEN_CHAIN_ID]: {
     nativeCurrency: TEST_NETWORK_TICKER_MAP[ROPSTEN],
@@ -270,6 +307,10 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'matic_polygon',
       showOnlyCurrencies: 'matic_polygon,usdc_polygon',
     },
+    wyre: {
+      srn: 'matic',
+      currencyCode: MATIC_SYMBOL,
+    },
   },
   [AVALANCHE_CHAIN_ID]: {
     nativeCurrency: AVALANCHE_SYMBOL,
@@ -279,6 +320,11 @@ export const BUYABLE_CHAINS_MAP = {
       defaultCurrencyCode: 'avax_cchain',
       showOnlyCurrencies: 'avax_cchain',
     },
+    wyre: {
+      srn: 'avalanche',
+      currencyCode: AVALANCHE_SYMBOL,
+    },
+    coinbasePayCurrencies: [AVALANCHE_SYMBOL],
   },
   [FANTOM_CHAIN_ID]: {
     nativeCurrency: FANTOM_SYMBOL,
@@ -295,3 +341,86 @@ export const BUYABLE_CHAINS_MAP = {
     },
   },
 };
+
+export const FEATURED_RPCS = [
+  {
+    chainId: ARBITRUM_CHAIN_ID,
+    nickname: ARBITRUM_DISPLAY_NAME,
+    rpcUrl: `https://arbitrum-mainnet.infura.io/v3/${infuraProjectId}`,
+    ticker: ARBITRUM_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://explorer.arbitrum.io',
+      imageUrl: AETH_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: AVALANCHE_CHAIN_ID,
+    nickname: AVALANCHE_DISPLAY_NAME,
+    rpcUrl: 'https://api.avax.network/ext/bc/C/rpc',
+    ticker: AVALANCHE_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://snowtrace.io/',
+      imageUrl: AVAX_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: BSC_CHAIN_ID,
+    nickname: BNB_DISPLAY_NAME,
+    rpcUrl: 'https://bsc-dataseed.binance.org/',
+    ticker: BNB_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://bscscan.com/',
+      imageUrl: BNB_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: FANTOM_CHAIN_ID,
+    nickname: FANTOM_DISPLAY_NAME,
+    rpcUrl: 'https://rpc.ftm.tools/',
+    ticker: FANTOM_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://ftmscan.com/',
+      imageUrl: FTM_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: HARMONY_CHAIN_ID,
+    nickname: HARMONY_DISPLAY_NAME,
+    rpcUrl: 'https://api.harmony.one/',
+    ticker: HARMONY_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://explorer.harmony.one/',
+      imageUrl: HARMONY_ONE_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: OPTIMISM_CHAIN_ID,
+    nickname: OPTIMISM_DISPLAY_NAME,
+    rpcUrl: `https://optimism-mainnet.infura.io/v3/${infuraProjectId}`,
+    ticker: ETH_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://optimistic.etherscan.io/',
+      imageUrl: OPTIMISM_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: PALM_CHAIN_ID,
+    nickname: PALM_DISPLAY_NAME,
+    rpcUrl: `https://palm-mainnet.infura.io/v3/${infuraProjectId}`,
+    ticker: PALM_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://explorer.palm.io/',
+      imageUrl: PALM_TOKEN_IMAGE_URL,
+    },
+  },
+  {
+    chainId: POLYGON_CHAIN_ID,
+    nickname: `${POLYGON_DISPLAY_NAME} ${capitalize(MAINNET)}`,
+    rpcUrl: `https://polygon-mainnet.infura.io/v3/${infuraProjectId}`,
+    ticker: MATIC_SYMBOL,
+    rpcPrefs: {
+      blockExplorerUrl: 'https://polygonscan.com/',
+      imageUrl: MATIC_TOKEN_IMAGE_URL,
+    },
+  },
+];
diff --git a/shared/constants/permissions.js b/shared/constants/permissions.js
index c1e4e69e7ebe..77df6431f804 100644
--- a/shared/constants/permissions.js
+++ b/shared/constants/permissions.js
@@ -21,6 +21,7 @@ export const PermissionNamespaces = Object.freeze({
 
 export const EndowmentPermissions = Object.freeze({
   'endowment:network-access': 'endowment:network-access',
+  'endowment:long-running': 'endowment:long-running',
 });
 
 // Methods / permissions in external packages that we are temporarily excluding.
diff --git a/shared/constants/permissions.test.js b/shared/constants/permissions.test.js
index c6ace6243656..3637fed5818a 100644
--- a/shared/constants/permissions.test.js
+++ b/shared/constants/permissions.test.js
@@ -1,4 +1,4 @@
-import { endowmentPermissionBuilders } from '@metamask/controllers';
+import { endowmentPermissionBuilders } from '@metamask/snap-controllers';
 import { restrictedMethodPermissionBuilders } from '@metamask/rpc-methods';
 import {
   EndowmentPermissions,
diff --git a/shared/constants/phishing.js b/shared/constants/phishing.js
new file mode 100644
index 000000000000..63dea370626b
--- /dev/null
+++ b/shared/constants/phishing.js
@@ -0,0 +1,4 @@
+export const PHISHING_NEW_ISSUE_URLS = {
+  MetaMask: 'https://github.com/metamask/eth-phishing-detect/issues/new',
+  PhishFort: 'https://github.com/phishfort/phishfort-lists/issues/new',
+};
diff --git a/shared/constants/swaps.js b/shared/constants/swaps.js
index 10db41a2e634..8482709caf09 100644
--- a/shared/constants/swaps.js
+++ b/shared/constants/swaps.js
@@ -206,3 +206,8 @@ export const TOKEN_BUCKET_PRIORITY = {
   OWNED: 'owned',
   TOP: 'top',
 };
+
+export const SLIPPAGE = {
+  DEFAULT: 2,
+  HIGH: 3,
+};
diff --git a/shared/constants/tokens.js b/shared/constants/tokens.js
index c4e52317a3ad..2a878f3df1de 100644
--- a/shared/constants/tokens.js
+++ b/shared/constants/tokens.js
@@ -8,3 +8,16 @@ import contractMap from '@metamask/contract-metadata';
 export const LISTED_CONTRACT_ADDRESSES = Object.keys(
   contractMap,
 ).map((address) => address.toLowerCase());
+
+/**
+ * @typedef {Object} TokenDetails
+ * @property {string} address - The address of the selected 'TOKEN' or
+ *  'COLLECTIBLE' contract.
+ * @property {string} [symbol] - The symbol of the token.
+ * @property {number} [decimals] - The number of decimals of the selected
+ *  'ERC20' asset.
+ * @property {number} [tokenId] - The id of the selected 'COLLECTIBLE' asset.
+ * @property {TokenStandardStrings} [standard] - The standard of the selected
+ *  asset.
+ * @property {boolean} [isERC721] - True when the asset is a ERC721 token.
+ */
diff --git a/shared/constants/transaction.js b/shared/constants/transaction.js
index 411e14248124..845f769a0310 100644
--- a/shared/constants/transaction.js
+++ b/shared/constants/transaction.js
@@ -15,6 +15,8 @@ import { MESSAGE_TYPE } from './app';
  *  to ensure that the receiver is an address capable of handling with the token being sent.
  * @property {'approve'} TOKEN_METHOD_APPROVE - A token transaction requesting an
  *  allowance of the token to spend on behalf of the user
+ * @property {'setapprovalforall'} TOKEN_METHOD_SET_APPROVAL_FOR_ALL - A token transaction requesting an
+ *  allowance of all of a user's token to spend on behalf of the user
  * @property {'incoming'} INCOMING - An incoming (deposit) transaction
  * @property {'simpleSend'} SIMPLE_SEND - A transaction sending a network's native asset to a recipient
  * @property {'contractInteraction'} CONTRACT_INTERACTION - A transaction that is
@@ -49,23 +51,24 @@ import { MESSAGE_TYPE } from './app';
  */
 export const TRANSACTION_TYPES = {
   CANCEL: 'cancel',
-  RETRY: 'retry',
-  TOKEN_METHOD_TRANSFER: 'transfer',
-  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
-  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
-  TOKEN_METHOD_APPROVE: 'approve',
-  INCOMING: 'incoming',
-  SIMPLE_SEND: 'simpleSend',
   CONTRACT_INTERACTION: 'contractInteraction',
   DEPLOY_CONTRACT: 'contractDeployment',
-  SWAP: 'swap',
-  SWAP_APPROVAL: 'swapApproval',
-  SMART: 'smart',
-  SIGN: MESSAGE_TYPE.ETH_SIGN,
-  SIGN_TYPED_DATA: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
-  PERSONAL_SIGN: MESSAGE_TYPE.PERSONAL_SIGN,
   ETH_DECRYPT: MESSAGE_TYPE.ETH_DECRYPT,
   ETH_GET_ENCRYPTION_PUBLIC_KEY: MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY,
+  INCOMING: 'incoming',
+  PERSONAL_SIGN: MESSAGE_TYPE.PERSONAL_SIGN,
+  RETRY: 'retry',
+  SIGN: MESSAGE_TYPE.ETH_SIGN,
+  SIGN_TYPED_DATA: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
+  SIMPLE_SEND: 'simpleSend',
+  SMART: 'smart',
+  SWAP: 'swap',
+  SWAP_APPROVAL: 'swapApproval',
+  TOKEN_METHOD_APPROVE: 'approve',
+  TOKEN_METHOD_SAFE_TRANSFER_FROM: 'safetransferfrom',
+  TOKEN_METHOD_TRANSFER: 'transfer',
+  TOKEN_METHOD_TRANSFER_FROM: 'transferfrom',
+  TOKEN_METHOD_SET_APPROVAL_FOR_ALL: 'setapprovalforall',
 };
 
 /**
@@ -214,10 +217,10 @@ export const SMART_TRANSACTION_STATUSES = {
  * @type {TransactionGroupCategories}
  */
 export const TRANSACTION_GROUP_CATEGORIES = {
-  SEND: 'send',
-  RECEIVE: 'receive',
-  INTERACTION: 'interaction',
   APPROVAL: 'approval',
+  INTERACTION: 'interaction',
+  RECEIVE: 'receive',
+  SEND: 'send',
   SIGNATURE_REQUEST: 'signature-request',
   SWAP: 'swap',
 };
@@ -249,6 +252,8 @@ export const TRANSACTION_GROUP_CATEGORIES = {
  * @property {number} id - An internally unique tx identifier.
  * @property {number} time - Time the transaction was first suggested, in unix
  *  epoch time (ms).
+ * @property {string} contractMethodName - A string representing a name of
+ * transaction contract method.
  * @property {TransactionTypeString} type - The type of transaction this txMeta
  *  represents.
  * @property {TransactionStatusString} status - The current status of the
@@ -323,13 +328,28 @@ export const TRANSACTION_EVENTS = {
   SUBMITTED: 'Transaction Submitted',
 };
 
+/**
+ * @typedef {Object} AssetTypes
+ * @property {'NATIVE'} NATIVE - The native asset for the current network, such
+ *  as ETH
+ * @property {'TOKEN'} TOKEN - An ERC20 token.
+ * @property {'COLLECTIBLE'} COLLECTIBLE - An ERC721 or ERC1155 token.
+ * @property {'UNKNOWN'} UNKNOWN - A transaction interacting with a contract
+ *  that isn't a token method interaction will be marked as dealing with an
+ *  unknown asset type.
+ */
+
+/**
+ * This type will work anywhere you expect a string that can be one of the
+ * above asset types
+ *
+ * @typedef {AssetTypes[keyof AssetTypes]} AssetTypesString
+ */
+
 /**
  * The types of assets that a user can send
- * 1. NATIVE - The native asset for the current network, such as ETH
- * 2. TOKEN - An ERC20 token.
- * 3. COLLECTIBLE - An ERC721 or ERC1155 token.
- * 4. UNKNOWN - A transaction interacting with a contract that isn't a token
- *  method interaction will be marked as dealing with an unknown asset type.
+ *
+ * @type {AssetTypes}
  */
 export const ASSET_TYPES = {
   NATIVE: 'NATIVE',
@@ -337,3 +357,36 @@ export const ASSET_TYPES = {
   COLLECTIBLE: 'COLLECTIBLE',
   UNKNOWN: 'UNKNOWN',
 };
+
+export const ERC20 = 'ERC20';
+export const ERC721 = 'ERC721';
+export const ERC1155 = 'ERC1155';
+
+/**
+ * @typedef {Object} TokenStandards
+ * @property {'ERC20'} ERC20 - A token that conforms to the ERC20 standard.
+ * @property {'ERC721'} ERC721 - A token that conforms to the ERC721 standard.
+ * @property {'ERC1155'} ERC1155 - A token that conforms to the ERC1155
+ *  standard.
+ * @property {'NONE'} NONE - Not a token, but rather the base asset of the
+ *  selected chain.
+ */
+
+/**
+ * This type will work anywhere you expect a string that can be one of the
+ * above statuses
+ *
+ * @typedef {TokenStandards[keyof TokenStandards]} TokenStandardStrings
+ */
+
+/**
+ * Describes the standard which a token conforms to.
+ *
+ * @type {TokenStandards}
+ */
+export const TOKEN_STANDARDS = {
+  ERC20,
+  ERC721,
+  ERC1155,
+  NONE: 'NONE',
+};
diff --git a/shared/modules/fetch-with-timeout.js b/shared/modules/fetch-with-timeout.js
index b12e8cba56d0..791470d77cdc 100644
--- a/shared/modules/fetch-with-timeout.js
+++ b/shared/modules/fetch-with-timeout.js
@@ -1,6 +1,7 @@
 import { memoize } from 'lodash';
+import { SECOND } from '../constants/time';
 
-const getFetchWithTimeout = memoize((timeout) => {
+const getFetchWithTimeout = memoize((timeout = SECOND * 30) => {
   if (!Number.isInteger(timeout) || timeout < 1) {
     throw new Error('Must specify positive integer timeout.');
   }
diff --git a/shared/modules/fetch-with-timeout.test.js b/shared/modules/fetch-with-timeout.test.js
index 8d7ae57852b9..2129db1c30fa 100644
--- a/shared/modules/fetch-with-timeout.test.js
+++ b/shared/modules/fetch-with-timeout.test.js
@@ -6,7 +6,7 @@ describe('getFetchWithTimeout', () => {
   it('fetches a url', async () => {
     nock('https://api.infura.io').get('/money').reply(200, '{"hodl": false}');
 
-    const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+    const fetchWithTimeout = getFetchWithTimeout();
     const response = await (
       await fetchWithTimeout('https://api.infura.io/money')
     ).json();
@@ -46,15 +46,9 @@ describe('getFetchWithTimeout', () => {
   });
 
   it('throws on invalid timeout', async () => {
-    await expect(() => getFetchWithTimeout()).toThrow(
-      'Must specify positive integer timeout.',
-    );
     await expect(() => getFetchWithTimeout(-1)).toThrow(
       'Must specify positive integer timeout.',
     );
-    await expect(() => getFetchWithTimeout({})).toThrow(
-      'Must specify positive integer timeout.',
-    );
     await expect(() => getFetchWithTimeout(true)).toThrow(
       'Must specify positive integer timeout.',
     );
diff --git a/shared/modules/mv3.utils.js b/shared/modules/mv3.utils.js
new file mode 100644
index 000000000000..a990075b680f
--- /dev/null
+++ b/shared/modules/mv3.utils.js
@@ -0,0 +1,4 @@
+import browser from 'webextension-polyfill';
+
+export const isManifestV3 = () =>
+  browser.runtime.getManifest().manifest_version === 3;
diff --git a/shared/modules/object.utils.js b/shared/modules/object.utils.js
new file mode 100644
index 000000000000..ea2af06c40fd
--- /dev/null
+++ b/shared/modules/object.utils.js
@@ -0,0 +1,22 @@
+/**
+ * Return a "masked" copy of the given object.
+ *
+ * The returned object includes only the properties present in the mask. The
+ * mask is an object that mirrors the structure of the given object, except
+ * the only values are `true` or a sub-mask. `true` implies the property
+ * should be included, and a sub-mask implies the property should be further
+ * masked according to that sub-mask.
+ *
+ * @param {Object} object - The object to mask
+ * @param {Object<Object|boolean>} mask - The mask to apply to the object
+ */
+export function maskObject(object, mask) {
+  return Object.keys(object).reduce((state, key) => {
+    if (mask[key] === true) {
+      state[key] = object[key];
+    } else if (mask[key]) {
+      state[key] = maskObject(object[key], mask[key]);
+    }
+    return state;
+  }, {});
+}
diff --git a/shared/modules/rpc.utils.js b/shared/modules/rpc.utils.js
index ab0c006b6fda..341ef1d97bb0 100644
--- a/shared/modules/rpc.utils.js
+++ b/shared/modules/rpc.utils.js
@@ -1,7 +1,6 @@
-import { SECOND } from '../constants/time';
 import getFetchWithTimeout from './fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 /**
  * Makes a JSON RPC request to the given URL, with the given RPC method and params.
diff --git a/shared/modules/transaction.utils.js b/shared/modules/transaction.utils.js
index 08adb46e3618..78c46d34d385 100644
--- a/shared/modules/transaction.utils.js
+++ b/shared/modules/transaction.utils.js
@@ -2,13 +2,16 @@ import { isHexString } from 'ethereumjs-util';
 import { ethers } from 'ethers';
 import { abiERC721, abiERC20, abiERC1155 } from '@metamask/metamask-eth-abis';
 import log from 'loglevel';
-import { TOKEN_STANDARDS } from '../../ui/helpers/constants/common';
-import { ASSET_TYPES, TRANSACTION_TYPES } from '../constants/transaction';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+  TRANSACTION_TYPES,
+} from '../constants/transaction';
 import { readAddressAsContract } from './contract-utils';
 import { isEqualCaseInsensitive } from './string-utils';
 
 /**
- * @typedef { 'transfer' | 'approve' | 'transferfrom' | 'contractInteraction'| 'simpleSend' } InferrableTransactionTypes
+ * @typedef { 'transfer' | 'approve' | 'setapprovalforall' | 'transferfrom' | 'contractInteraction'| 'simpleSend' } InferrableTransactionTypes
  */
 
 /**
@@ -148,32 +151,35 @@ export async function determineTransactionType(txParams, query) {
     log.debug('Failed to parse transaction data.', error, data);
   }
 
-  const tokenMethodName = [
-    TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-    TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-    TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
-    TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
-  ].find((methodName) => isEqualCaseInsensitive(methodName, name));
-
   let result;
-  if (data && tokenMethodName) {
-    result = tokenMethodName;
-  } else if (data && !to) {
-    result = TRANSACTION_TYPES.DEPLOY_CONTRACT;
-  }
-
   let contractCode;
 
-  if (!result) {
+  if (data && !to) {
+    result = TRANSACTION_TYPES.DEPLOY_CONTRACT;
+  } else {
     const {
       contractCode: resultCode,
       isContractAddress,
     } = await readAddressAsContract(query, to);
 
     contractCode = resultCode;
-    result = isContractAddress
-      ? TRANSACTION_TYPES.CONTRACT_INTERACTION
-      : TRANSACTION_TYPES.SIMPLE_SEND;
+
+    if (isContractAddress) {
+      const tokenMethodName = [
+        TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+        TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
+        TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
+        TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
+        TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
+      ].find((methodName) => isEqualCaseInsensitive(methodName, name));
+
+      result =
+        data && tokenMethodName
+          ? tokenMethodName
+          : TRANSACTION_TYPES.CONTRACT_INTERACTION;
+    } else {
+      result = TRANSACTION_TYPES.SIMPLE_SEND;
+    }
   }
 
   return { type: result, getCodeResponse: contractCode };
@@ -181,6 +187,7 @@ export async function determineTransactionType(txParams, query) {
 
 const INFERRABLE_TRANSACTION_TYPES = [
   TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+  TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
   TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
   TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
   TRANSACTION_TYPES.CONTRACT_INTERACTION,
@@ -220,6 +227,7 @@ export async function determineTransactionAssetType(
   // method to get the asset type.
   const isTokenMethod = [
     TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+    TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
   ].find((methodName) => methodName === inferrableType);
diff --git a/shared/modules/transaction.utils.test.js b/shared/modules/transaction.utils.test.js
index fba8c7827562..6998022e44cc 100644
--- a/shared/modules/transaction.utils.test.js
+++ b/shared/modules/transaction.utils.test.js
@@ -111,13 +111,23 @@ describe('Transaction.utils', function () {
     const genericProvider = createTestProviderTools().provider;
     const query = new EthQuery(genericProvider);
 
-    it('should return a simple send type when to is truthy but data is falsy', async function () {
+    it('should return a simple send type when to is truthy and is not a contract address', async function () {
+      const _providerResultStub = {
+        // 1 gwei
+        eth_gasPrice: '0x0de0b6b3a7640000',
+        // by default, all accounts are external accounts (not contracts)
+        eth_getCode: '0x',
+      };
+      const _provider = createTestProviderTools({
+        scaffold: _providerResultStub,
+      }).provider;
+
       const result = await determineTransactionType(
         {
           to: '0xabc',
           data: '',
         },
-        query,
+        new EthQuery(_provider),
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.SIMPLE_SEND,
@@ -125,33 +135,78 @@ describe('Transaction.utils', function () {
       });
     });
 
-    it('should return a token transfer type when data is for the respective method call', async function () {
+    it('should return a token transfer type when the recipient is a contract and data is for the respective method call', async function () {
+      const _providerResultStub = {
+        // 1 gwei
+        eth_gasPrice: '0x0de0b6b3a7640000',
+        // by default, all accounts are external accounts (not contracts)
+        eth_getCode: '0xab',
+      };
+      const _provider = createTestProviderTools({
+        scaffold: _providerResultStub,
+      }).provider;
+
       const result = await determineTransactionType(
         {
-          to: '0xabc',
+          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
           data:
             '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
         },
-        query,
+        new EthQuery(_provider),
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-        getCodeResponse: undefined,
+        getCodeResponse: '0xab',
       });
     });
 
-    it('should return a token approve type when data is for the respective method call', async function () {
+    it('should NOT return a token transfer type when the recipient is not a contract but the data matches the respective method call', async function () {
+      const _providerResultStub = {
+        // 1 gwei
+        eth_gasPrice: '0x0de0b6b3a7640000',
+        // by default, all accounts are external accounts (not contracts)
+        eth_getCode: '0x',
+      };
+      const _provider = createTestProviderTools({
+        scaffold: _providerResultStub,
+      }).provider;
+
       const result = await determineTransactionType(
         {
-          to: '0xabc',
+          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
+          data:
+            '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
+        },
+        new EthQuery(_provider),
+      );
+      expect(result).toMatchObject({
+        type: TRANSACTION_TYPES.SIMPLE_SEND,
+        getCodeResponse: '0x',
+      });
+    });
+
+    it('should return a token approve type when when the recipient is a contract and data is for the respective method call', async function () {
+      const _providerResultStub = {
+        // 1 gwei
+        eth_gasPrice: '0x0de0b6b3a7640000',
+        // by default, all accounts are external accounts (not contracts)
+        eth_getCode: '0xab',
+      };
+      const _provider = createTestProviderTools({
+        scaffold: _providerResultStub,
+      }).provider;
+
+      const result = await determineTransactionType(
+        {
+          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
           data:
             '0x095ea7b30000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C9700000000000000000000000000000000000000000000000000000000000000005',
         },
-        query,
+        new EthQuery(_provider),
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
-        getCodeResponse: undefined,
+        getCodeResponse: '0xab',
       });
     });
 
@@ -184,12 +239,22 @@ describe('Transaction.utils', function () {
     });
 
     it('should return a simple send type with a null getCodeResponse when to is truthy and there is data and but getCode returns an error', async function () {
+      const _providerResultStub = {
+        // 1 gwei
+        eth_gasPrice: '0x0de0b6b3a7640000',
+        // by default, all accounts are external accounts (not contracts)
+        eth_getCode: null,
+      };
+      const _provider = createTestProviderTools({
+        scaffold: _providerResultStub,
+      }).provider;
+
       const result = await determineTransactionType(
         {
-          to: '0xabc',
+          to: '0x9e673399f795D01116e9A8B2dD2F156705131ee9',
           data: '0xabd',
         },
-        query,
+        new EthQuery(_provider),
       );
       expect(result).toMatchObject({
         type: TRANSACTION_TYPES.SIMPLE_SEND,
diff --git a/shared/notifications/index.js b/shared/notifications/index.js
index 65fc49fdeb9e..a721b2e009c3 100644
--- a/shared/notifications/index.js
+++ b/shared/notifications/index.js
@@ -66,9 +66,13 @@ export const UI_NOTIFICATIONS = {
       width: '100%',
     },
   },
+  13: {
+    id: 13,
+    date: '2022-07-12',
+  },
 };
 
-export const getTranslatedUINoficiations = (t, locale) => {
+export const getTranslatedUINotifications = (t, locale) => {
   const formattedLocale = locale.replace('_', '-');
   return {
     1: {
@@ -182,5 +186,14 @@ export const getTranslatedUINoficiations = (t, locale) => {
         new Date(UI_NOTIFICATIONS[12].date),
       ),
     },
+    13: {
+      ...UI_NOTIFICATIONS[13],
+      title: t('notifications13Title'),
+      description: t('notifications13Description'),
+      actionText: t('notifications13ActionText'),
+      date: new Intl.DateTimeFormat(formattedLocale).format(
+        new Date(UI_NOTIFICATIONS[13].date),
+      ),
+    },
   };
 };
diff --git a/test/data/mock-state.json b/test/data/mock-state.json
index d856bb3b6a45..231f050696f1 100644
--- a/test/data/mock-state.json
+++ b/test/data/mock-state.json
@@ -37,6 +37,22 @@
         "1559": true
       }
     },
+    "notifications": {
+      "test": {
+        "id": "test",
+        "origin": "local:http://localhost:8086/",
+        "createdDate": 1652967897732,
+        "readDate": null,
+        "message": "Hello, http://localhost:8086!"
+      },
+      "test2": {
+        "id": "test2",
+        "origin": "local:http://localhost:8086/",
+        "createdDate": 1652967897732,
+        "readDate": 1652967897732,
+        "message": "Hello, http://localhost:8086!"
+      }
+    },
     "cachedBalances": {},
     "incomingTransactions": {},
     "unapprovedTxs": {
diff --git a/test/e2e/benchmark.js b/test/e2e/benchmark.js
index fe2dc7926c81..df4c957568a7 100644
--- a/test/e2e/benchmark.js
+++ b/test/e2e/benchmark.js
@@ -1,12 +1,16 @@
 #!/usr/bin/env node
 
 const path = require('path');
-const { promises: fs, constants: fsConstants } = require('fs');
+const { promises: fs } = require('fs');
 const yargs = require('yargs/yargs');
 const { hideBin } = require('yargs/helpers');
 const ttest = require('ttest');
 const { retry } = require('../../development/lib/retry');
 const { exitWithError } = require('../../development/lib/exit-with-error');
+const {
+  isWritable,
+  getFirstParentDirectoryThatExists,
+} = require('../helpers/file');
 const { withFixtures, tinyDelayMs } = require('./helpers');
 const { PAGES } = require('./webdriver/driver');
 
@@ -108,35 +112,6 @@ async function profilePageLoad(pages, numSamples, retries) {
   return results;
 }
 
-async function isWritable(directory) {
-  try {
-    await fs.access(directory, fsConstants.W_OK);
-    return true;
-  } catch (error) {
-    if (error.code !== 'EACCES') {
-      throw error;
-    }
-    return false;
-  }
-}
-
-async function getFirstParentDirectoryThatExists(directory) {
-  let nextDirectory = directory;
-  for (;;) {
-    try {
-      await fs.access(nextDirectory, fsConstants.F_OK);
-      return nextDirectory;
-    } catch (error) {
-      if (error.code !== 'ENOENT') {
-        throw error;
-      } else if (nextDirectory === path.dirname(nextDirectory)) {
-        throw new Error('Failed to find parent directory that exists');
-      }
-      nextDirectory = path.dirname(nextDirectory);
-    }
-  }
-}
-
 async function main() {
   const { argv } = yargs(hideBin(process.argv)).usage(
     '$0 [options]',
diff --git a/test/e2e/fixtures/address-entry/state.json b/test/e2e/fixtures/address-entry/state.json
index 96b17cdb1d08..1ce7f2d95f46 100644
--- a/test/e2e/fixtures/address-entry/state.json
+++ b/test/e2e/fixtures/address-entry/state.json
@@ -69,6 +69,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/connected-state/state.json b/test/e2e/fixtures/connected-state/state.json
index 4d48df472e21..11af1d9b2b4b 100644
--- a/test/e2e/fixtures/connected-state/state.json
+++ b/test/e2e/fixtures/connected-state/state.json
@@ -59,6 +59,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/custom-rpc/state.json b/test/e2e/fixtures/custom-rpc/state.json
index 222eb01592c9..02cc6d5f8eb0 100644
--- a/test/e2e/fixtures/custom-rpc/state.json
+++ b/test/e2e/fixtures/custom-rpc/state.json
@@ -55,6 +55,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/custom-token/state.json b/test/e2e/fixtures/custom-token/state.json
index ae1fcd1b49d3..baf7c2984d35 100644
--- a/test/e2e/fixtures/custom-token/state.json
+++ b/test/e2e/fixtures/custom-token/state.json
@@ -73,6 +73,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/eip-1559-v2-dapp/state.json b/test/e2e/fixtures/eip-1559-v2-dapp/state.json
index 8394842404e5..dc889b1e58e6 100644
--- a/test/e2e/fixtures/eip-1559-v2-dapp/state.json
+++ b/test/e2e/fixtures/eip-1559-v2-dapp/state.json
@@ -56,6 +56,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/eip-1559-v2/state.json b/test/e2e/fixtures/eip-1559-v2/state.json
index 0c79d8c61405..6ac0aa7ad373 100644
--- a/test/e2e/fixtures/eip-1559-v2/state.json
+++ b/test/e2e/fixtures/eip-1559-v2/state.json
@@ -56,6 +56,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/import-ui/state.json b/test/e2e/fixtures/import-ui/state.json
index 20c6bf87c4bc..c5f3da0043f5 100644
--- a/test/e2e/fixtures/import-ui/state.json
+++ b/test/e2e/fixtures/import-ui/state.json
@@ -110,6 +110,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/imported-account/state.json b/test/e2e/fixtures/imported-account/state.json
index cb5c96950091..7a79d293bf8d 100644
--- a/test/e2e/fixtures/imported-account/state.json
+++ b/test/e2e/fixtures/imported-account/state.json
@@ -55,6 +55,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/localization/state.json b/test/e2e/fixtures/localization/state.json
index 4b32460b55d7..45d09cf57ba3 100644
--- a/test/e2e/fixtures/localization/state.json
+++ b/test/e2e/fixtures/localization/state.json
@@ -55,6 +55,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/metrics-enabled/state.json b/test/e2e/fixtures/metrics-enabled/state.json
index 43b345204263..58c7c51090b9 100644
--- a/test/e2e/fixtures/metrics-enabled/state.json
+++ b/test/e2e/fixtures/metrics-enabled/state.json
@@ -59,6 +59,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/navigate-transactions/state.json b/test/e2e/fixtures/navigate-transactions/state.json
index 1613c7f5897f..e5774eed663f 100644
--- a/test/e2e/fixtures/navigate-transactions/state.json
+++ b/test/e2e/fixtures/navigate-transactions/state.json
@@ -55,6 +55,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/onboarding/state.json b/test/e2e/fixtures/onboarding/state.json
index 6a4c94b96946..06582c44332c 100644
--- a/test/e2e/fixtures/onboarding/state.json
+++ b/test/e2e/fixtures/onboarding/state.json
@@ -30,6 +30,9 @@
       "notifications": {
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/send-edit-v2/state.json b/test/e2e/fixtures/send-edit-v2/state.json
index 9de073c00046..90a8dc1d9c9a 100644
--- a/test/e2e/fixtures/send-edit-v2/state.json
+++ b/test/e2e/fixtures/send-edit-v2/state.json
@@ -56,6 +56,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/send-edit/state.json b/test/e2e/fixtures/send-edit/state.json
index 1272fbd04c7c..19dc61b39d14 100644
--- a/test/e2e/fixtures/send-edit/state.json
+++ b/test/e2e/fixtures/send-edit/state.json
@@ -56,6 +56,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/fixtures/special-settings/state.json b/test/e2e/fixtures/special-settings/state.json
new file mode 100644
index 000000000000..8b66b91559d4
--- /dev/null
+++ b/test/e2e/fixtures/special-settings/state.json
@@ -0,0 +1,149 @@
+{
+  "data": {
+    "AppStateController": {
+      "mkrMigrationReminderTimestamp": null
+    },
+    "CachedBalancesController": {
+      "cachedBalances": {
+        "4": {}
+      }
+    },
+    "CurrencyController": {
+      "conversionDate": 1575697244.188,
+      "conversionRate": 149.61,
+      "currentCurrency": "usd",
+      "nativeCurrency": "ETH"
+    },
+    "IncomingTransactionsController": {
+      "incomingTransactions": {},
+      "incomingTxLastFetchedBlocksByNetwork": {
+        "goerli": null,
+        "kovan": null,
+        "mainnet": null,
+        "rinkeby": 5570536
+      }
+    },
+    "KeyringController": {
+      "vault": "{\"data\":\"s6TpYjlUNsn7ifhEFTkuDGBUM1GyOlPrim7JSjtfIxgTt8/6MiXgiR/CtFfR4dWW2xhq85/NGIBYEeWrZThGdKGarBzeIqBfLFhw9n509jprzJ0zc2Rf+9HVFGLw+xxC4xPxgCS0IIWeAJQ+XtGcHmn0UZXriXm8Ja4kdlow6SWinB7sr/WM3R0+frYs4WgllkwggDf2/Tv6VHygvLnhtzp6hIJFyTjh+l/KnyJTyZW1TkZhDaNDzX3SCOHT\",\"iv\":\"FbeHDAW5afeWNORfNJBR0Q==\",\"salt\":\"TxZ+WbCW6891C9LK/hbMAoUsSEW1E8pyGLVBU6x5KR8=\"}"
+    },
+    "NetworkController": {
+      "network": "1337",
+      "provider": {
+        "nickname": "Localhost 8545",
+        "rpcUrl": "http://localhost:8545",
+        "chainId": "0x539",
+        "ticker": "ETH",
+        "type": "rpc"
+      }
+    },
+    "NotificationController": {
+      "notifications": {
+        "1": {
+          "isShown": true
+        },
+        "3": {
+          "isShown": true
+        },
+        "5": {
+          "isShown": true
+        },
+        "6": {
+          "isShown": true
+        },
+        "8": {
+          "isShown": true
+        },
+        "12": {
+          "isShown": true
+        },
+        "13": {
+          "isShown": true
+        }
+      }
+    },
+    "OnboardingController": {
+      "onboardingTabs": {},
+      "seedPhraseBackedUp": false
+    },
+    "PermissionsMetadata": {
+      "domainMetadata": {
+        "metamask.github.io": {
+          "icon": null,
+          "name": "M E T A M A S K M E S H T E S T"
+        }
+      },
+      "permissionsHistory": {},
+      "permissionsLog": [
+        {
+          "id": 746677923,
+          "method": "eth_accounts",
+          "methodType": "restricted",
+          "origin": "metamask.github.io",
+          "request": {
+            "id": 746677923,
+            "jsonrpc": "2.0",
+            "method": "eth_accounts",
+            "origin": "metamask.github.io",
+            "params": []
+          },
+          "requestTime": 1575697241368,
+          "response": {
+            "id": 746677923,
+            "jsonrpc": "2.0",
+            "result": []
+          },
+          "responseTime": 1575697241370,
+          "success": true
+        }
+      ]
+    },
+    "PreferencesController": {
+      "accountTokens": {
+        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
+          "rinkeby": [],
+          "ropsten": []
+        }
+      },
+      "assetImages": {},
+      "completedOnboarding": true,
+      "dismissSeedBackUpReminder": true,
+      "currentLocale": "en",
+      "featureFlags": {
+        "showIncomingTransactions": true,
+        "transactionTime": false,
+        "sendHexData": true
+      },
+      "firstTimeFlowType": "create",
+      "forgottenPassword": false,
+      "frequentRpcListDetail": [],
+      "identities": {
+        "0x5cfe73b6021e818b776b421b1c4db2474086a7e1": {
+          "address": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
+          "name": "Account 1"
+        }
+      },
+      "knownMethodData": {},
+      "lostIdentities": {},
+      "metaMetricsId": null,
+      "participateInMetaMetrics": false,
+      "preferences": {
+        "useNativeCurrencyAsPrimaryCurrency": true
+      },
+      "selectedAddress": "0x5cfe73b6021e818b776b421b1c4db2474086a7e1",
+      "suggestedTokens": {},
+      "tokens": [],
+      "useBlockie": false,
+      "useNonceField": false,
+      "usePhishDetect": true,
+      "useTokenDetection": true
+    },
+    "config": {},
+    "firstTimeInfo": {
+      "date": 1575697234195,
+      "version": "7.7.0"
+    }
+  },
+  "meta": {
+    "version": 40
+  }
+}
diff --git a/test/e2e/fixtures/threebox-enabled/state.json b/test/e2e/fixtures/threebox-enabled/state.json
index 78b6f1226a37..549ddb635242 100644
--- a/test/e2e/fixtures/threebox-enabled/state.json
+++ b/test/e2e/fixtures/threebox-enabled/state.json
@@ -66,6 +66,9 @@
         },
         "12": {
           "isShown": true
+        },
+        "13": {
+          "isShown": true
         }
       }
     },
diff --git a/test/e2e/helpers.js b/test/e2e/helpers.js
index 8e13c4c6cca6..6e1230a05916 100644
--- a/test/e2e/helpers.js
+++ b/test/e2e/helpers.js
@@ -6,8 +6,10 @@ const enLocaleMessages = require('../../app/_locales/en/messages.json');
 const { setupMocking } = require('./mock-e2e');
 const Ganache = require('./ganache');
 const FixtureServer = require('./fixture-server');
+const PhishingWarningPageServer = require('./phishing-warning-page-server');
 const { buildWebDriver } = require('./webdriver');
 const { ensureXServerIsRunning } = require('./x-server');
+const GanacheSeeder = require('./seeder/ganache-seeder');
 
 const tinyDelayMs = 200;
 const regularDelayMs = tinyDelayMs * 2;
@@ -22,11 +24,13 @@ async function withFixtures(options, testSuite) {
     dapp,
     fixtures,
     ganacheOptions,
+    smartContract,
     driverOptions,
     dappOptions,
     title,
     failOnConsoleError = true,
     dappPath = undefined,
+    dappPaths,
     testSpecificMock = function () {
       // do nothing.
     },
@@ -38,11 +42,20 @@ async function withFixtures(options, testSuite) {
   let secondaryGanacheServer;
   let numberOfDapps = dapp ? 1 : 0;
   const dappServer = [];
+  const phishingPageServer = new PhishingWarningPageServer();
 
   let webDriver;
   let failed = false;
   try {
     await ganacheServer.start(ganacheOptions);
+    let contractRegistry;
+
+    if (smartContract) {
+      const ganacheSeeder = new GanacheSeeder(true);
+      await ganacheSeeder.deploySmartContract(smartContract);
+      contractRegistry = ganacheSeeder.getContractRegistry();
+    }
+
     if (ganacheOptions?.concurrent) {
       const { port, chainId } = ganacheOptions.concurrent;
       secondaryGanacheServer = new Ganache();
@@ -55,14 +68,15 @@ async function withFixtures(options, testSuite) {
     }
     await fixtureServer.start();
     await fixtureServer.loadState(path.join(__dirname, 'fixtures', fixtures));
+    await phishingPageServer.start();
     if (dapp) {
       if (dappOptions?.numberOfDapps) {
         numberOfDapps = dappOptions.numberOfDapps;
       }
       for (let i = 0; i < numberOfDapps; i++) {
         let dappDirectory;
-        if (dappPath) {
-          dappDirectory = path.resolve(__dirname, dappPath);
+        if (dappPath || (dappPaths && dappPaths[i])) {
+          dappDirectory = path.resolve(__dirname, dappPath || dappPaths[i]);
         } else {
           dappDirectory = path.resolve(
             __dirname,
@@ -96,6 +110,7 @@ async function withFixtures(options, testSuite) {
     await testSuite({
       driver,
       mockServer,
+      contractRegistry,
     });
 
     if (process.env.SELENIUM_BROWSER === 'chrome') {
@@ -146,6 +161,9 @@ async function withFixtures(options, testSuite) {
           }
         }
       }
+      if (phishingPageServer.isRunning()) {
+        await phishingPageServer.quit();
+      }
       await mockServer.stop();
     }
   }
@@ -230,12 +248,12 @@ const completeImportSRPOnboardingFlow = async (
       tag: 'button',
     });
 
-    // clicks the "Import Wallet" option
-    await driver.clickElement({ text: 'Import wallet', tag: 'button' });
-
     // clicks the "No thanks" option on the metametrics opt-in screen
     await driver.clickElement('.btn-secondary');
 
+    // clicks the "Import Wallet" option
+    await driver.clickElement({ text: 'Import wallet', tag: 'button' });
+
     // Import Secret Recovery Phrase
     await driver.pasteIntoField(
       '[data-testid="import-srp__srp-word-0"]',
@@ -272,12 +290,12 @@ const completeImportSRPOnboardingFlowWordByWord = async (
     tag: 'button',
   });
 
-  // clicks the "Import Wallet" option
-  await driver.clickElement({ text: 'Import wallet', tag: 'button' });
-
   // clicks the "No thanks" option on the metametrics opt-in screen
   await driver.clickElement('.btn-secondary');
 
+  // clicks the "Import Wallet" option
+  await driver.clickElement({ text: 'Import wallet', tag: 'button' });
+
   const words = seedPhrase.split(' ');
   for (const word of words) {
     await driver.pasteIntoField(
diff --git a/test/e2e/lavamoat-stats.js b/test/e2e/lavamoat-stats.js
new file mode 100644
index 000000000000..4abf00a686b7
--- /dev/null
+++ b/test/e2e/lavamoat-stats.js
@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+
+/* eslint-disable node/shebang */
+const path = require('path');
+const { promises: fs, constants: fsConstants } = require('fs');
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const { exitWithError } = require('../../development/lib/exit-with-error');
+const { withFixtures, tinyDelayMs } = require('./helpers');
+
+async function measurePage() {
+  let metrics;
+  try {
+    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.findElement('#password');
+      await driver.delay(1000);
+      const logs = await driver.checkBrowserForLavamoatLogs();
+
+      let logString = '';
+      let inObject = false;
+
+      const parsedLogs = [];
+
+      logs.forEach((log) => {
+        if (log.indexOf('"version": 1') >= 0) {
+          logString += log;
+          parsedLogs.push(`{${logString}}`);
+          logString = '';
+          inObject = false;
+        } else if (inObject) {
+          logString += log;
+        } else if (
+          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0 ||
+          log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0
+        ) {
+          logString += log;
+          inObject = true;
+        }
+      });
+
+      metrics = parsedLogs.map((pl) => JSON.parse(pl));
+    });
+  } catch (error) {
+    // do nothing
+  }
+  return metrics;
+}
+
+async function profilePageLoad() {
+  const results = await measurePage();
+  const metrics = {};
+
+  metrics['background.js'] = results[0];
+  metrics['ui.js'] = results[1];
+
+  return metrics;
+}
+
+async function isWritable(directory) {
+  try {
+    await fs.access(directory, fsConstants.W_OK);
+    return true;
+  } catch (error) {
+    if (error.code !== 'EACCES') {
+      throw error;
+    }
+    return false;
+  }
+}
+
+async function getFirstParentDirectoryThatExists(directory) {
+  let nextDirectory = directory;
+  for (;;) {
+    try {
+      await fs.access(nextDirectory, fsConstants.F_OK);
+      return nextDirectory;
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
+      } else if (nextDirectory === path.dirname(nextDirectory)) {
+        throw new Error('Failed to find parent directory that exists');
+      }
+      nextDirectory = path.dirname(nextDirectory);
+    }
+  }
+}
+
+async function main() {
+  const { argv } = yargs(hideBin(process.argv)).usage(
+    '$0 [options]',
+    'Run a page load benchmark',
+    (_yargs) =>
+      _yargs.option('out', {
+        description:
+          'Output filename. Output printed to STDOUT of this is omitted.',
+        type: 'string',
+        normalize: true,
+      }),
+  );
+
+  const { out } = argv;
+
+  let outputDirectory;
+  let existingParentDirectory;
+  if (out) {
+    outputDirectory = path.dirname(out);
+    existingParentDirectory = await getFirstParentDirectoryThatExists(
+      outputDirectory,
+    );
+    if (!(await isWritable(existingParentDirectory))) {
+      throw new Error('Specified output file directory is not writable');
+    }
+  }
+
+  const results = await profilePageLoad();
+
+  if (out) {
+    if (outputDirectory !== existingParentDirectory) {
+      await fs.mkdir(outputDirectory, { recursive: true });
+    }
+
+    await fs.writeFile(
+      path.join(out, 'background.json'),
+      JSON.stringify(results['background.js'], null, 2),
+    );
+
+    await fs.writeFile(
+      path.join(out, 'ui.json'),
+      JSON.stringify(results['ui.js'], null, 2),
+    );
+  } else {
+    console.log(JSON.stringify(results, null, 2));
+  }
+}
+
+main().catch((error) => {
+  exitWithError(error);
+});
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index 854b597a09af..9e85bff8420d 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -99,13 +99,13 @@ describe('MetaMask', function () {
       await driver.delay(largeDelayMs);
     });
 
-    it('clicks the "Create New Wallet" option', async function () {
-      await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
+    it('clicks the "No thanks" option on the metametrics opt-in screen', async function () {
+      await driver.clickElement('.btn-secondary');
       await driver.delay(largeDelayMs);
     });
 
-    it('clicks the "No thanks" option on the metametrics opt-in screen', async function () {
-      await driver.clickElement('.btn-secondary');
+    it('clicks the "Create New Wallet" option', async function () {
+      await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
       await driver.delay(largeDelayMs);
     });
 
diff --git a/test/e2e/mock-e2e.js b/test/e2e/mock-e2e.js
index a6d5d6518eac..b4e6f595f191 100644
--- a/test/e2e/mock-e2e.js
+++ b/test/e2e/mock-e2e.js
@@ -25,6 +25,28 @@ async function setupMocking(server, testSpecificMock) {
     };
   });
 
+  await server
+    .forGet('https://www.4byte.directory/api/v1/signatures/')
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {
+          count: 1,
+          next: null,
+          previous: null,
+          results: [
+            {
+              id: 1,
+              created_at: null,
+              text_signature: 'deposit()',
+              hex_signature: null,
+              bytes_signature: null,
+            },
+          ],
+        },
+      };
+    });
+
   await server
     .forGet('https://gas-api.metaswap.codefi.network/networks/1/gasPrices')
     .thenCallback(() => {
@@ -154,6 +176,35 @@ async function setupMocking(server, testSpecificMock) {
       };
     });
 
+  await server
+    .forGet('https://token-api.metaswap.codefi.network/token/0x539')
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: {},
+      };
+    });
+
+  await server
+    .forGet(
+      'https://static.metaswap.codefi.network/api/v1/tokenIcons/1337/0x0d8775f648430679a709e98d2b0cb6250d2887ef.png',
+    )
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+      };
+    });
+
+  await server
+    .forGet(
+      'https://static.metaswap.codefi.network/api/v1/tokenIcons/1337/0x2efa2cb29c2341d8e5ba7d3262c9e9d6f1bf3711.png',
+    )
+    .thenCallback(() => {
+      return {
+        statusCode: 200,
+      };
+    });
+
   testSpecificMock(server);
 }
 
diff --git a/test/e2e/mock-page-with-disallowed-iframe/index.html b/test/e2e/mock-page-with-disallowed-iframe/index.html
new file mode 100644
index 000000000000..ffadeeefa819
--- /dev/null
+++ b/test/e2e/mock-page-with-disallowed-iframe/index.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <title>Mock E2E Phishing Page</title>
+</head>
+<script type="text/javascript">
+	function setIframeSource() {
+		const urlSearchParams = new URLSearchParams(window.location.search);
+		const params = Object.fromEntries(urlSearchParams.entries());
+		const extensionUrl = new URL(params.extensionUrl);
+		document.getElementById('frame').src = `http://localhost:9999/#hostname=${encodeURIComponent(extensionUrl.hostname)}&href=${encodeURIComponent(extensionUrl.href)}`;
+	}
+	window.onload = setIframeSource;
+</script>
+<body>
+	<div>Hello</div>
+	<iframe id="frame" width=900 height=900>
+</body>
+
+</html>
diff --git a/test/e2e/mock-page-with-iframe/index.html b/test/e2e/mock-page-with-iframe/index.html
new file mode 100644
index 000000000000..36b613dd2475
--- /dev/null
+++ b/test/e2e/mock-page-with-iframe/index.html
@@ -0,0 +1,11 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <title>Mock E2E Phishing Page</title>
+</head>
+<body>
+	<div>Hello</div>
+<iframe src="http://127.0.0.1:8081" width=900 height=900>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/test/e2e/mv3-perf-stats/bundle-size.js b/test/e2e/mv3-perf-stats/bundle-size.js
new file mode 100644
index 000000000000..da52d916c506
--- /dev/null
+++ b/test/e2e/mv3-perf-stats/bundle-size.js
@@ -0,0 +1,119 @@
+#!/usr/bin/env node
+
+/* eslint-disable node/shebang */
+const path = require('path');
+const { promises: fs } = require('fs');
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+const {
+  isWritable,
+  getFirstParentDirectoryThatExists,
+} = require('../../helpers/file');
+
+const { exitWithError } = require('../../../development/lib/exit-with-error');
+
+/**
+ * The e2e test case is used to capture bundle time statistics for extension.
+ */
+
+const backgroundFiles = [
+  'runtime-lavamoat.js',
+  'lockdown-more.js',
+  'globalthis.js',
+  'sentry-install.js',
+  'policy-load.js',
+];
+
+const uiFiles = [
+  'globalthis.js',
+  'sentry-install.js',
+  'runtime-lavamoat.js',
+  'lockdown-more.js',
+  'policy-load.js',
+];
+
+const BackgroundFileRegex = /background-[0-9]*.js/u;
+const CommonFileRegex = /common-[0-9]*.js/u;
+const UIFileRegex = /ui-[0-9]*.js/u;
+
+async function main() {
+  const { argv } = yargs(hideBin(process.argv)).usage(
+    '$0 [options]',
+    'Run a page load benchmark',
+    (_yargs) =>
+      _yargs.option('out', {
+        description:
+          'Output filename. Output printed to STDOUT of this is omitted.',
+        type: 'string',
+        normalize: true,
+      }),
+  );
+  const { out } = argv;
+
+  const distFolder = 'dist/chrome';
+  const backgroundFileList = [];
+  const uiFileList = [];
+
+  const files = await fs.readdir(distFolder);
+  for (let i = 0; i < files.length; i++) {
+    const file = files[i];
+    if (CommonFileRegex.test(file)) {
+      const stats = await fs.stat(`${distFolder}/${file}`);
+      backgroundFileList.push({ name: file, size: stats.size });
+      uiFileList.push({ name: file, size: stats.size });
+    } else if (
+      backgroundFiles.includes(file) ||
+      BackgroundFileRegex.test(file)
+    ) {
+      const stats = await fs.stat(`${distFolder}/${file}`);
+      backgroundFileList.push({ name: file, size: stats.size });
+    } else if (uiFiles.includes(file) || UIFileRegex.test(file)) {
+      const stats = await fs.stat(`${distFolder}/${file}`);
+      uiFileList.push({ name: file, size: stats.size });
+    }
+  }
+
+  const backgroundBundleSize = backgroundFileList.reduce(
+    (result, file) => result + file.size,
+    0,
+  );
+
+  const uiBundleSize = uiFileList.reduce(
+    (result, file) => result + file.size,
+    0,
+  );
+
+  const result = {
+    background: {
+      name: 'background',
+      size: backgroundBundleSize,
+      fileList: backgroundFileList,
+    },
+    ui: {
+      name: 'ui',
+      size: uiBundleSize,
+      fileList: uiFileList,
+    },
+  };
+
+  if (out) {
+    const outPath = `${out}/bundle_size.json`;
+    const outputDirectory = path.dirname(outPath);
+    const existingParentDirectory = await getFirstParentDirectoryThatExists(
+      outputDirectory,
+    );
+    if (!(await isWritable(existingParentDirectory))) {
+      throw new Error('Specified output file directory is not writable');
+    }
+    if (outputDirectory !== existingParentDirectory) {
+      await fs.mkdir(outputDirectory, { recursive: true });
+    }
+    await fs.writeFile(outPath, JSON.stringify(result, null, 2));
+  } else {
+    console.log(JSON.stringify(result, null, 2));
+  }
+}
+
+main().catch((error) => {
+  exitWithError(error);
+});
diff --git a/test/e2e/mv3-perf-stats/index.js b/test/e2e/mv3-perf-stats/index.js
new file mode 100644
index 000000000000..4e56a2385a67
--- /dev/null
+++ b/test/e2e/mv3-perf-stats/index.js
@@ -0,0 +1,2 @@
+require('./init-load-stats');
+require('./bundle-size');
diff --git a/test/e2e/mv3-perf-stats/init-load-stats.js b/test/e2e/mv3-perf-stats/init-load-stats.js
new file mode 100644
index 000000000000..de51940318e1
--- /dev/null
+++ b/test/e2e/mv3-perf-stats/init-load-stats.js
@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+
+/* eslint-disable node/shebang */
+const path = require('path');
+const { promises: fs } = require('fs');
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+
+const { exitWithError } = require('../../../development/lib/exit-with-error');
+const {
+  isWritable,
+  getFirstParentDirectoryThatExists,
+} = require('../../helpers/file');
+const { withFixtures, tinyDelayMs } = require('../helpers');
+
+/**
+ * The e2e test case is used to capture load and initialisation time statistics for extension in MV3 environment.
+ */
+
+async function profilePageLoad() {
+  const parsedLogs = {};
+  try {
+    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.delay(1000);
+      const logs = await driver.checkBrowserForLavamoatLogs();
+
+      let logString = '';
+      let logType = '';
+
+      logs.forEach((log) => {
+        if (log.indexOf('"version": 1') >= 0) {
+          // log end here
+          logString += log;
+          parsedLogs[logType] = JSON.parse(`{${logString}}`);
+          logString = '';
+          logType = '';
+        } else if (logType) {
+          // log string continues
+          logString += log;
+        } else if (
+          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
+        ) {
+          // background log starts
+          logString += log;
+          logType = 'background';
+        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
+          // ui log starts
+          logString += log;
+          logType = 'ui';
+        } else if (log.search(/"name": "Total"/u) >= 0) {
+          // load time log starts
+          logString += log;
+          logType = 'loadTime';
+        }
+      });
+    });
+  } catch (error) {
+    console.log('Error in trying to parse logs.');
+  }
+  return parsedLogs;
+}
+
+async function main() {
+  const { argv } = yargs(hideBin(process.argv)).usage(
+    '$0 [options]',
+    'Run a page load benchmark',
+    (_yargs) =>
+      _yargs.option('out', {
+        description:
+          'Output filename. Output printed to STDOUT of this is omitted.',
+        type: 'string',
+        normalize: true,
+      }),
+  );
+
+  const results = await profilePageLoad();
+  const { out } = argv;
+
+  const logCategories = [
+    { key: 'background', dirPath: 'initialisation/background/stacks.json' },
+    { key: 'ui', dirPath: 'initialisation/ui/stacks.json' },
+    { key: 'loadTime', dirPath: 'load_time/stats.json' },
+  ];
+
+  if (out) {
+    logCategories.forEach(async ({ key, dirPath }) => {
+      if (results[key]) {
+        const outPath = `${out}/${dirPath}`;
+        const outputDirectory = path.dirname(outPath);
+        const existingParentDirectory = await getFirstParentDirectoryThatExists(
+          outputDirectory,
+        );
+        if (!(await isWritable(existingParentDirectory))) {
+          throw new Error('Specified output file directory is not writable');
+        }
+        if (outputDirectory !== existingParentDirectory) {
+          await fs.mkdir(outputDirectory, { recursive: true });
+        }
+        await fs.writeFile(outPath, JSON.stringify(results[key], null, 2));
+      }
+    });
+  } else {
+    console.log(JSON.stringify(results, null, 2));
+  }
+}
+
+main().catch((error) => {
+  exitWithError(error);
+});
diff --git a/test/e2e/mv3-stats.js b/test/e2e/mv3-stats.js
new file mode 100644
index 000000000000..8e8180e024a9
--- /dev/null
+++ b/test/e2e/mv3-stats.js
@@ -0,0 +1,111 @@
+#!/usr/bin/env node
+
+/* eslint-disable node/shebang */
+const path = require('path');
+const { promises: fs } = require('fs');
+const yargs = require('yargs/yargs');
+const { hideBin } = require('yargs/helpers');
+
+const { exitWithError } = require('../../development/lib/exit-with-error');
+const {
+  isWritable,
+  getFirstParentDirectoryThatExists,
+} = require('../helpers/file');
+const { withFixtures, tinyDelayMs } = require('./helpers');
+
+/**
+ * The e2e test case is used to capture load and initialisation time statistics for extension in MV3 environment.
+ */
+
+async function profilePageLoad() {
+  const parsedLogs = {};
+  try {
+    await withFixtures({ fixtures: 'imported-account' }, async ({ driver }) => {
+      await driver.delay(tinyDelayMs);
+      await driver.navigate();
+      await driver.delay(1000);
+      const logs = await driver.checkBrowserForLavamoatLogs();
+
+      let logString = '';
+      let logType = '';
+
+      logs.forEach((log) => {
+        if (log.indexOf('"version": 1') >= 0) {
+          // log end here
+          logString += log;
+          parsedLogs[logType] = JSON.parse(`{${logString}}`);
+          logString = '';
+          logType = '';
+        } else if (logType) {
+          // log string continues
+          logString += log;
+        } else if (
+          log.search(/"name": ".*app\/scripts\/background.js",/u) >= 0
+        ) {
+          // background log starts
+          logString += log;
+          logType = 'background';
+        } else if (log.search(/"name": ".*app\/scripts\/ui.js",/u) >= 0) {
+          // ui log starts
+          logString += log;
+          logType = 'ui';
+        } else if (log.search(/"name": "Total"/u) >= 0) {
+          // load time log starts
+          logString += log;
+          logType = 'loadTime';
+        }
+      });
+    });
+  } catch (error) {
+    console.log('Error in trying to parse logs.');
+  }
+  return parsedLogs;
+}
+
+async function main() {
+  const { argv } = yargs(hideBin(process.argv)).usage(
+    '$0 [options]',
+    'Run a page load benchmark',
+    (_yargs) =>
+      _yargs.option('out', {
+        description:
+          'Output filename. Output printed to STDOUT of this is omitted.',
+        type: 'string',
+        normalize: true,
+      }),
+  );
+
+  const results = await profilePageLoad();
+  const { out } = argv;
+
+  const logCategories = [
+    { key: 'background', dirPath: 'initialisation/background/stacks.json' },
+    { key: 'ui', dirPath: 'initialisation/ui/stacks.json' },
+    { key: 'loadTime', dirPath: 'load_time/stats.json' },
+  ];
+
+  if (out) {
+    logCategories.forEach(async ({ key, dirPath }) => {
+      if (results[key]) {
+        const outPath = `${out}/${dirPath}`;
+        const outputDirectory = path.dirname(outPath);
+        const existingParentDirectory = await getFirstParentDirectoryThatExists(
+          outputDirectory,
+        );
+        if (!(await isWritable(existingParentDirectory))) {
+          throw new Error('Specified output file directory is not writable');
+        }
+        if (outputDirectory !== existingParentDirectory) {
+          await fs.mkdir(outputDirectory, { recursive: true });
+        }
+        await fs.writeFile(outPath, JSON.stringify(results[key], null, 2));
+      }
+    });
+  } else {
+    console.log(JSON.stringify(results, null, 2));
+  }
+}
+
+main().catch((error) => {
+  exitWithError(error);
+});
diff --git a/test/e2e/phishing-warning-page-server.js b/test/e2e/phishing-warning-page-server.js
new file mode 100644
index 000000000000..2f6099e1a3d0
--- /dev/null
+++ b/test/e2e/phishing-warning-page-server.js
@@ -0,0 +1,58 @@
+const path = require('path');
+const createStaticServer = require('../../development/create-static-server');
+
+const phishingWarningDirectory = path.resolve(
+  __dirname,
+  '..',
+  '..',
+  'node_modules',
+  '@metamask',
+  'phishing-warning',
+  'dist',
+);
+
+class PhishingWarningPageServer {
+  constructor() {
+    this._server = createStaticServer(phishingWarningDirectory);
+  }
+
+  async start({ port = 9999 } = {}) {
+    this._server.listen(port);
+
+    let resolveStart;
+    let rejectStart;
+    const result = new Promise((resolve, reject) => {
+      resolveStart = resolve;
+      rejectStart = reject;
+    });
+    this._server.once('listening', resolveStart);
+    this._server.once('error', rejectStart);
+
+    try {
+      await result;
+      // clean up listener to ensure later errors properly bubble up
+      this._server.removeListener('error', rejectStart);
+    } catch (error) {
+      this._server.removeListener('listening', resolveStart);
+      throw error;
+    }
+  }
+
+  isRunning() {
+    return this._server.listening;
+  }
+
+  async quit() {
+    await new Promise((resolve, reject) =>
+      this._server.close((error) => {
+        if (error) {
+          reject(error);
+        } else {
+          resolve();
+        }
+      }),
+    );
+  }
+}
+
+module.exports = PhishingWarningPageServer;
diff --git a/test/e2e/run-e2e-test.js b/test/e2e/run-e2e-test.js
index 195ec41b661e..043f061db760 100644
--- a/test/e2e/run-e2e-test.js
+++ b/test/e2e/run-e2e-test.js
@@ -70,10 +70,12 @@ async function main() {
   }
 
   let testTimeoutInMilliseconds = 60 * 1000;
+  let exit = '--exit';
 
   if (leaveRunning) {
     process.env.E2E_LEAVE_RUNNING = 'true';
     testTimeoutInMilliseconds = 0;
+    exit = '--no-exit';
   }
 
   await retry({ retries }, async () => {
@@ -83,6 +85,7 @@ async function main() {
       '--timeout',
       testTimeoutInMilliseconds,
       e2eTestPath,
+      exit,
     ]);
   });
 }
diff --git a/test/e2e/seeder/ganache-contract-address-registry.js b/test/e2e/seeder/ganache-contract-address-registry.js
new file mode 100644
index 000000000000..bfad708d3c90
--- /dev/null
+++ b/test/e2e/seeder/ganache-contract-address-registry.js
@@ -0,0 +1,28 @@
+/*
+ * Use this class to store pre-deployed smart contract addresses of the contracts deployed to
+ * a local blockchain instance ran by Ganache.
+ */
+class GanacheContractAddressRegistry {
+  #addresses = {};
+
+  /**
+   * Store new contract address in key:value pair.
+   *
+   * @param contractName
+   * @param contractAddress
+   */
+  storeNewContractAddress(contractName, contractAddress) {
+    this.#addresses[contractName] = contractAddress;
+  }
+
+  /**
+   * Get deployed contract address by its name (key).
+   *
+   * @param contractName
+   */
+  getContractAddress(contractName) {
+    return this.#addresses[contractName];
+  }
+}
+
+module.exports = GanacheContractAddressRegistry;
diff --git a/test/e2e/seeder/ganache-seeder.js b/test/e2e/seeder/ganache-seeder.js
new file mode 100644
index 000000000000..85cc199bca39
--- /dev/null
+++ b/test/e2e/seeder/ganache-seeder.js
@@ -0,0 +1,88 @@
+const { ethers } = require('ethers');
+const ganache = require('ganache');
+const { contractConfiguration } = require('./smart-contracts');
+const GanacheContractAddressRegistry = require('./ganache-contract-address-registry');
+
+/*
+ * Ganache seeder is used to seed initial smart contract or set initial blockchain state.
+ */
+class GanacheSeeder {
+  constructor(debug = false) {
+    this.debug = debug;
+    this.smartContractRegistry = new GanacheContractAddressRegistry();
+  }
+
+  /**
+   * Deploy initial smart contracts that can be used later within the e2e tests.
+   *
+   * @param contractName
+   */
+
+  async deploySmartContract(contractName) {
+    if (this.debug) {
+      console.log('Deploying smart contracts using GanacheSeeder');
+    }
+
+    const ethersProvider = new ethers.providers.Web3Provider(
+      ganache.provider(),
+      'any',
+    );
+    const contractFactory = new ethers.ContractFactory(
+      contractConfiguration[contractName].abi,
+      contractConfiguration[contractName].bytecode,
+      ethersProvider.getSigner(),
+    );
+
+    let contract;
+
+    if (contractName === 'hst') {
+      contract = await contractFactory.deploy(
+        contractConfiguration.hst.initialAmount,
+        contractConfiguration.hst.tokenName,
+        contractConfiguration.hst.decimalUnits,
+        contractConfiguration.hst.tokenSymbol,
+      );
+    } else {
+      contract = await contractFactory.deploy();
+    }
+
+    await contract.deployTransaction.wait();
+
+    if (this.debug) {
+      console.log(
+        `Contract mined! address: ${contract.address} transactionHash: ${contract.deployTransaction.hash}`,
+      );
+    }
+    this.storeSmartContractAddress(contractName, contract.address);
+  }
+
+  /**
+   * Store deployed smart contract address within the environment variables
+   * to make it available everywhere.
+   *
+   * @param contractName
+   * @param contractAddress
+   */
+  storeSmartContractAddress(contractName, contractAddress) {
+    if (this.debug) {
+      console.log(
+        `Storing smart contract address: [${contractName}] => ${contractAddress}`,
+      );
+    }
+    this.smartContractRegistry.storeNewContractAddress(
+      contractName,
+      contractAddress,
+    );
+  }
+
+  /**
+   * Return an instance of the currently used smart contract registry.
+   *
+   * @returns GanacheContractAddressRegistry
+   */
+  getContractRegistry() {
+    return this.smartContractRegistry;
+  }
+}
+
+module.exports = GanacheSeeder;
diff --git a/test/e2e/seeder/smart-contracts.js b/test/e2e/seeder/smart-contracts.js
new file mode 100644
index 000000000000..c2394bb9a70e
--- /dev/null
+++ b/test/e2e/seeder/smart-contracts.js
@@ -0,0 +1,43 @@
+const {
+  hstBytecode,
+  hstAbi,
+  piggybankBytecode,
+  piggybankAbi,
+  collectiblesAbi,
+  collectiblesBytecode,
+  failingContractAbi,
+  failingContractBytecode,
+} = require('../../../node_modules/@metamask/test-dapp/dist/constants.json');
+
+const hstFactory = {
+  initialAmount: 100,
+  tokenName: 'TST',
+  decimalUnits: 4,
+  tokenSymbol: 'TST',
+  bytecode: hstBytecode,
+  abi: hstAbi,
+};
+
+const collectiblesFactory = {
+  bytecode: collectiblesBytecode,
+  abi: collectiblesAbi,
+};
+
+const piggybankFactory = {
+  bytecode: piggybankBytecode,
+  abi: piggybankAbi,
+};
+
+const failingContract = {
+  bytecode: failingContractBytecode,
+  abi: failingContractAbi,
+};
+
+const contractConfiguration = {
+  hst: hstFactory,
+  collectibles: collectiblesFactory,
+  piggybank: piggybankFactory,
+  failing: failingContract,
+};
+
+module.exports = { contractConfiguration };
diff --git a/test/e2e/snaps/enums.js b/test/e2e/snaps/enums.js
new file mode 100644
index 000000000000..5787056e8155
--- /dev/null
+++ b/test/e2e/snaps/enums.js
@@ -0,0 +1,3 @@
+module.exports = {
+  TEST_SNAPS_WEBSITE_URL: 'https://metamask.github.io/test-snaps/2.0.0',
+};
diff --git a/test/e2e/snaps/test-snap-bip-44.spec.js b/test/e2e/snaps/test-snap-bip-44.spec.js
index 689e62b03e2c..541f38e1937f 100644
--- a/test/e2e/snaps/test-snap-bip-44.spec.js
+++ b/test/e2e/snaps/test-snap-bip-44.spec.js
@@ -1,5 +1,6 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap bip-44', function () {
   it('can pop up bip-44 snap and get private key result', async function () {
@@ -17,9 +18,6 @@ describe('Test Snap bip-44', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
-        driverOptions: {
-          type: 'flask',
-        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -29,12 +27,17 @@ describe('Test Snap bip-44', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get('https://metamask.github.io/test-snaps/0.1.3/');
-        await driver.fill('.snapId3', 'npm:@metamask/test-snap-bip44');
-        await driver.clickElement({
-          text: 'Connect BIP-44 Snap',
-          tag: 'button',
-        });
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+        await driver.delay(1000);
+        await driver.fill('#snapId3', 'npm:@metamask/test-snap-bip44');
+
+        // reveal snapId3 by finding and scrolling to #snapId4
+        const snapButton = await driver.findElement('#snapId4');
+        await driver.scrollToElement(snapButton);
+        await driver.delay(500);
+
+        // connect the snap
+        await driver.clickElement('#connectBip44');
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -76,14 +79,11 @@ describe('Test Snap bip-44', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Send Test to BIP-44 Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#sendBip44');
 
         // check the results of the public key test
         await driver.delay(2000);
-        const bip44Result = await driver.findElement('.bip44Result');
+        const bip44Result = await driver.findElement('#bip44Result');
         assert.equal(
           await bip44Result.getText(),
           'Public key: "0x86debb44fb3a984d93f326131d4c1db0bc39644f1a67b673b3ab45941a1cea6a385981755185ac4594b6521e4d1e8d1"',
diff --git a/test/e2e/snaps/test-snap-confirm.spec.js b/test/e2e/snaps/test-snap-confirm.spec.js
index 2100c2ff543f..02ff70ed238a 100644
--- a/test/e2e/snaps/test-snap-confirm.spec.js
+++ b/test/e2e/snaps/test-snap-confirm.spec.js
@@ -1,5 +1,6 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap Confirm', function () {
   it('can pop up a snap confirm and get its result', async function () {
@@ -17,9 +18,6 @@ describe('Test Snap Confirm', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
-        driverOptions: {
-          type: 'flask',
-        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -29,12 +27,9 @@ describe('Test Snap Confirm', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get('https://metamask.github.io/test-snaps/');
-        await driver.fill('.snapId', 'npm:@metamask/test-snap-confirm');
-        await driver.clickElement({
-          text: 'Connect To Confirm Snap',
-          tag: 'button',
-        });
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+        await driver.fill('#snapId1', 'npm:@metamask/test-snap-confirm');
+        await driver.clickElement('#connectHello');
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -69,10 +64,7 @@ describe('Test Snap Confirm', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Send Inputs to Hello Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#sendConfirmButton');
 
         // hit 'approve' on the custom confirm
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -90,7 +82,7 @@ describe('Test Snap Confirm', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        const confirmResult = await driver.findElement('.sendResults');
+        const confirmResult = await driver.findElement('#confirmResult');
         assert.equal(await confirmResult.getText(), 'true');
       },
     );
diff --git a/test/e2e/snaps/test-snap-error.spec.js b/test/e2e/snaps/test-snap-error.spec.js
index 91ebd2ce1c8f..866dc0cf30fa 100644
--- a/test/e2e/snaps/test-snap-error.spec.js
+++ b/test/e2e/snaps/test-snap-error.spec.js
@@ -1,6 +1,7 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
 const { PAGES } = require('../webdriver/driver');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap Error', function () {
   it('can pop up a snap error and see the error', async function () {
@@ -18,7 +19,6 @@ describe('Test Snap Error', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
-        driverOptions: { type: 'flask' },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -28,12 +28,9 @@ describe('Test Snap Error', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // navigate to test snaps page and connect
-        await driver.driver.get('https://metamask.github.io/test-snaps/');
-        await driver.fill('.snapId2', 'npm:@metamask/test-snap-error');
-        await driver.clickElement({
-          text: 'Connect Error Snap',
-          tag: 'button',
-        });
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+        await driver.fill('#snapId2', 'npm:@metamask/test-snap-error');
+        await driver.clickElement('#connectError');
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -67,10 +64,7 @@ describe('Test Snap Error', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Send Test to Error Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#sendError');
 
         await driver.navigate(PAGES.HOME);
 
diff --git a/test/e2e/snaps/test-snap-managestate.spec.js b/test/e2e/snaps/test-snap-managestate.spec.js
index 631724e17981..01341c00f908 100644
--- a/test/e2e/snaps/test-snap-managestate.spec.js
+++ b/test/e2e/snaps/test-snap-managestate.spec.js
@@ -1,5 +1,6 @@
 const { strict: assert } = require('assert');
 const { withFixtures } = require('../helpers');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
 
 describe('Test Snap manageState', function () {
   it('can pop up manageState snap and do update get and clear', async function () {
@@ -12,14 +13,12 @@ describe('Test Snap manageState', function () {
         },
       ],
     };
+
     await withFixtures(
       {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
-        driverOptions: {
-          type: 'flask',
-        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -28,13 +27,18 @@ describe('Test Snap manageState', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
-        // navigate to test snaps page and connect
-        await driver.driver.get('https://metamask.github.io/test-snaps/0.2.0/');
-        await driver.fill('.snapId3', 'npm:@metamask/test-snap-managestate');
-        await driver.clickElement({
-          text: 'Connect manageState Snap',
-          tag: 'button',
-        });
+        // navigate to test snaps page, then fill in the snapId
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+        await driver.delay(1000);
+        await driver.fill('#snapId4', 'npm:@metamask/test-snap-managestate');
+
+        // find and scroll to the rest of the card
+        const snapButton = await driver.findElement('#snapId4');
+        await driver.scrollToElement(snapButton);
+        await driver.delay(500);
+
+        // connect the snap
+        await driver.clickElement('#connectManageState');
 
         // switch to metamask extension and click connect
         await driver.waitUntilXWindowHandles(2, 5000, 10000);
@@ -50,7 +54,6 @@ describe('Test Snap manageState', function () {
           },
           10000,
         );
-
         await driver.delay(2000);
 
         // approve install of snap
@@ -69,32 +72,23 @@ describe('Test Snap manageState', function () {
         await driver.waitUntilXWindowHandles(1, 5000, 10000);
         windowHandles = await driver.getAllWindowHandles();
         await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.fill('.dataManageState', '23');
-        await driver.clickElement({
-          text: 'Send data to manageState Snap',
-          tag: 'button',
-        });
+        await driver.fill('#dataManageState', '23');
+        await driver.clickElement('#sendManageState');
 
         // check the results of the public key test
-        await driver.delay(2000);
+        await driver.delay(500);
         const manageStateResult = await driver.findElement(
-          '.sendManageStateResult',
+          '#sendManageStateResult',
         );
         assert.equal(await manageStateResult.getText(), 'true');
 
         // click get results
-        await driver.waitUntilXWindowHandles(1, 5000, 10000);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Get data from manageState Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#retrieveManageState');
 
         // check the results
-        await driver.delay(2000);
+        await driver.delay(500);
         const retrieveManageStateResult = await driver.findElement(
-          '.retrieveManageStateResult',
+          '#retrieveManageStateResult',
         );
         assert.equal(
           await retrieveManageStateResult.getText(),
@@ -102,34 +96,22 @@ describe('Test Snap manageState', function () {
         );
 
         // click clear results
-        await driver.waitUntilXWindowHandles(1, 5000, 10000);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Clear data of manageState Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#clearManageState');
 
         // check if true
-        await driver.delay(2000);
+        await driver.delay(500);
         const clearManageStateResult = await driver.findElement(
-          '.clearManageStateResult',
+          '#clearManageStateResult',
         );
         assert.equal(await clearManageStateResult.getText(), 'true');
 
         // click get results again
-        await driver.waitUntilXWindowHandles(1, 5000, 10000);
-        windowHandles = await driver.getAllWindowHandles();
-        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
-        await driver.clickElement({
-          text: 'Get data from manageState Snap',
-          tag: 'button',
-        });
+        await driver.clickElement('#retrieveManageState');
 
         // check result array is empty
-        await driver.delay(2000);
+        await driver.delay(500);
         const retrieveManageStateResult2 = await driver.findElement(
-          '.retrieveManageStateResult',
+          '#retrieveManageStateResult',
         );
         assert.equal(
           await retrieveManageStateResult2.getText(),
diff --git a/test/e2e/snaps/test-snap-notification.spec.js b/test/e2e/snaps/test-snap-notification.spec.js
new file mode 100644
index 000000000000..1be88412e400
--- /dev/null
+++ b/test/e2e/snaps/test-snap-notification.spec.js
@@ -0,0 +1,109 @@
+const { strict: assert } = require('assert');
+const { withFixtures } = require('../helpers');
+const { PAGES } = require('../webdriver/driver');
+const { TEST_SNAPS_WEBSITE_URL } = require('./enums');
+
+describe('Test Snap Notification', function () {
+  it('can send 1 correctly read inapp notification', async function () {
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: 25000000000000000000,
+        },
+      ],
+    };
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+
+        // enter pw into extension
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // navigate to test snaps page
+        await driver.driver.get(TEST_SNAPS_WEBSITE_URL);
+        await driver.delay(1000);
+
+        // find and scroll down to snapId5
+        const snapButton = await driver.findElement('#snapId5');
+        await driver.scrollToElement(snapButton);
+        await driver.delay(500);
+        await driver.fill('#snapId5', 'npm:@metamask/test-snap-notification');
+
+        // connect the snap
+        await driver.clickElement('#connectNotification');
+
+        // switch to metamask extension and click connect
+        await driver.waitUntilXWindowHandles(2, 5000, 10000);
+        let windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement(
+          {
+            text: 'Connect',
+            tag: 'button',
+          },
+          10000,
+        );
+        await driver.delay(2000);
+
+        // approve install of snap
+        await driver.waitUntilXWindowHandles(2, 5000, 10000);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({
+          text: 'Approve & Install',
+          tag: 'button',
+        });
+
+        // click send inputs on test snap page
+        await driver.waitUntilXWindowHandles(1, 5000, 10000);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle('Test Snaps', windowHandles);
+        await driver.clickElement('#sendInAppNotification');
+
+        // try to go to the MM pages
+        await driver.navigate(PAGES.HOME);
+        await driver.delay(1500);
+
+        // check to see that there is one notification
+        const notificationResult = await driver.findElement(
+          '.account-menu__icon__notification-count',
+        );
+        assert.equal(await notificationResult.getText(), '1');
+
+        // try to click on the account menu icon (via xpath)
+        await driver.clickElement('.account-menu__icon');
+        await driver.delay(500);
+
+        // try to click on the notification item (via xpath)
+        await driver.clickElement({
+          text: 'Notifications',
+          tag: 'div',
+        });
+        await driver.delay(500);
+
+        // look for the correct text in notifications (via xpath)
+        const notificationResultMessage = await driver.findElement(
+          '.notifications__item__details__message',
+        );
+        assert.equal(
+          await notificationResultMessage.getText(),
+          'TEST INAPP NOTIFICATION',
+        );
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/add-hide-token.spec.js b/test/e2e/tests/add-hide-token.spec.js
index 066bd87820b9..bb0655815484 100644
--- a/test/e2e/tests/add-hide-token.spec.js
+++ b/test/e2e/tests/add-hide-token.spec.js
@@ -72,6 +72,9 @@ describe('Add existing token using search', function () {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
+        driverOptions: {
+          timeOut: 20000,
+        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -80,7 +83,10 @@ describe('Add existing token using search', function () {
 
         await driver.clickElement({ text: 'import tokens', tag: 'a' });
         await driver.fill('#search-tokens', 'BAT');
-        await driver.clickElement({ text: 'BAT', tag: 'span' });
+        await driver.clickElement({
+          text: 'BAT',
+          tag: 'span',
+        });
         await driver.clickElement({ text: 'Next', tag: 'button' });
         await driver.clickElement({ text: 'Import Tokens', tag: 'button' });
 
diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js
index e4d43d347877..b0121bcab2d7 100644
--- a/test/e2e/tests/address-book.spec.js
+++ b/test/e2e/tests/address-book.spec.js
@@ -14,7 +14,6 @@ describe('Address Book', function () {
   it('Adds an entry to the address book and sends eth to that address', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/chain-interactions.spec.js b/test/e2e/tests/chain-interactions.spec.js
index c1879ccef5df..3b7d57408eee 100644
--- a/test/e2e/tests/chain-interactions.spec.js
+++ b/test/e2e/tests/chain-interactions.spec.js
@@ -2,16 +2,19 @@ const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
 
 describe('Chain Interactions', function () {
-  it('should add the XDAI chain and not switch the network', async function () {
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: convertToHexValue(25000000000000000000),
-        },
-      ],
-    };
+  const port = 8546;
+  const chainId = 1338;
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+    concurrent: { port, chainId },
+  };
+  it('should add the Ganache test chain and not switch the network', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -36,12 +39,14 @@ describe('Chain Interactions', function () {
         );
 
         // verify chain details
-        const [networkName, networkUrl, chainId] = await driver.findElements(
-          '.definition-list dd',
-        );
-        assert.equal(await networkName.getText(), 'xDAI Chain');
-        assert.equal(await networkUrl.getText(), 'https://dai.poa.network');
-        assert.equal(await chainId.getText(), '100');
+        const [
+          networkName,
+          networkUrl,
+          chainIdElement,
+        ] = await driver.findElements('.definition-list dd');
+        assert.equal(await networkName.getText(), `Localhost ${port}`);
+        assert.equal(await networkUrl.getText(), `http://127.0.0.1:${port}`);
+        assert.equal(await chainIdElement.getText(), chainId.toString());
 
         // approve add chain, cancel switch chain
         await driver.clickElement({ text: 'Approve', tag: 'button' });
@@ -55,25 +60,16 @@ describe('Chain Interactions', function () {
         const networkDisplay = await driver.findElement('.network-display');
         await networkDisplay.click();
         assert.equal(await networkDisplay.getText(), 'Localhost 8545');
-        const xDaiChain = await driver.findElements({
-          text: 'xDAI Chain',
+        const ganacheChain = await driver.findElements({
+          text: `Localhost ${port}`,
           tag: 'span',
         });
-        assert.ok(xDaiChain.length, 1);
+        assert.ok(ganacheChain.length, 1);
       },
     );
   });
 
-  it('should add the XDAI chain and switch the network', async function () {
-    const ganacheOptions = {
-      accounts: [
-        {
-          secretKey:
-            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
-          balance: convertToHexValue(25000000000000000000),
-        },
-      ],
-    };
+  it('should add the Ganache chain and switch the network', async function () {
     await withFixtures(
       {
         dapp: true,
@@ -107,7 +103,7 @@ describe('Chain Interactions', function () {
 
         // verify current network
         const networkDisplay = await driver.findElement('.network-display');
-        assert.equal(await networkDisplay.getText(), 'xDAI Chain');
+        assert.equal(await networkDisplay.getText(), `Localhost ${port}`);
       },
     );
   });
diff --git a/test/e2e/tests/contract-interactions.spec.js b/test/e2e/tests/contract-interactions.spec.js
index db70f08452cf..ad0ce7fd6dc8 100644
--- a/test/e2e/tests/contract-interactions.spec.js
+++ b/test/e2e/tests/contract-interactions.spec.js
@@ -103,7 +103,7 @@ describe('Deploy contract and call contract methods', function () {
         );
         await driver.waitForSelector({
           css: '.confirm-page-container-summary__action__name',
-          text: 'Withdraw',
+          text: 'Deposit',
         });
         await driver.clickElement({ text: 'Confirm', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
diff --git a/test/e2e/tests/custom-rpc-history.spec.js b/test/e2e/tests/custom-rpc-history.spec.js
index 49dd59059a3e..dad19482c4ad 100644
--- a/test/e2e/tests/custom-rpc-history.spec.js
+++ b/test/e2e/tests/custom-rpc-history.spec.js
@@ -1,5 +1,5 @@
 const { strict: assert } = require('assert');
-const { convertToHexValue, withFixtures } = require('../helpers');
+const { convertToHexValue, withFixtures, largeDelayMs } = require('../helpers');
 
 describe('Stores custom RPC history', function () {
   const ganacheOptions = {
@@ -29,6 +29,8 @@ describe('Stores custom RPC history', function () {
         const rpcUrl = `http://127.0.0.1:${port}`;
         const networkName = 'Secondary Ganache Testnet';
 
+        await driver.delay(largeDelayMs);
+
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -77,6 +79,8 @@ describe('Stores custom RPC history', function () {
         // duplicate network
         const duplicateRpcUrl = 'https://mainnet.infura.io/v3/';
 
+        await driver.delay(largeDelayMs);
+
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -113,6 +117,8 @@ describe('Stores custom RPC history', function () {
         const newRpcUrl = 'http://localhost:8544';
         const duplicateChainId = '0x539';
 
+        await driver.delay(largeDelayMs);
+
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
@@ -154,6 +160,8 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
+        await driver.delay(largeDelayMs);
+
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Ethereum Mainnet', tag: 'span' });
@@ -173,6 +181,7 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
+        await driver.delay(largeDelayMs);
         await driver.clickElement('.network-display');
 
         // only recent 3 are found and in correct order (most recent at the top)
@@ -202,6 +211,7 @@ describe('Stores custom RPC history', function () {
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
 
+        await driver.delay(largeDelayMs);
         await driver.clickElement('.network-display');
 
         await driver.clickElement({ text: 'Add Network', tag: 'button' });
diff --git a/test/e2e/tests/custom-token-add-approve.spec.js b/test/e2e/tests/custom-token-add-approve.spec.js
new file mode 100644
index 000000000000..0f366784c4a7
--- /dev/null
+++ b/test/e2e/tests/custom-token-add-approve.spec.js
@@ -0,0 +1,358 @@
+/* eslint-disable mocha/no-skipped-tests */
+const { strict: assert } = require('assert');
+
+const {
+  convertToHexValue,
+  withFixtures,
+  getWindowHandles,
+} = require('../helpers');
+
+describe.skip('Create token, approve token and approve token without gas', function () {
+  describe('Add a custom token from a dapp', function () {
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: convertToHexValue(25000000000000000000),
+        },
+      ],
+    };
+
+    it('creates, imports and renders the balance for the new token', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: 'connected-state',
+          ganacheOptions,
+          title: this.test.title,
+        },
+        async ({ driver }) => {
+          await driver.navigate();
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.press('#password', driver.Key.ENTER);
+
+          // create token
+          await driver.openNewPage(`http://127.0.0.1:8080/`);
+          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
+          await driver.clickElement({ text: 'Create Token', tag: 'button' });
+
+          const windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+          await driver.clickElement({ text: 'Edit', tag: 'button' });
+          const inputs = await driver.findElements('input[type="number"]');
+          const gasLimitInput = inputs[0];
+          const gasPriceInput = inputs[1];
+          await gasLimitInput.fill('4700000');
+          await gasPriceInput.fill('20');
+          await driver.waitForSelector({ text: 'Save', tag: 'button' });
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.switchToWindow(windowHandles.dapp);
+
+          const tokenContractAddress = await driver.waitForSelector({
+            css: '#tokenAddress',
+            text: '0x',
+          });
+          const tokenAddress = await tokenContractAddress.getText();
+
+          // imports custom token from extension
+          await driver.switchToWindow(windowHandles.extension);
+          await driver.clickElement(`[data-testid="home__asset-tab"]`);
+          await driver.clickElement({ tag: 'button', text: 'Assets' });
+
+          await driver.clickElement({ text: 'import tokens', tag: 'a' });
+          await driver.clickElement({
+            text: 'Custom Token',
+            tag: 'button',
+          });
+          await driver.waitForSelector('#custom-address');
+          await driver.fill('#custom-address', tokenAddress);
+          await driver.waitForSelector('#custom-symbol');
+          await driver.waitForSelector('#custom-decimals');
+          await driver.delay(2000);
+
+          await driver.clickElement({
+            text: 'Add Custom Token',
+            tag: 'button',
+          });
+
+          await driver.delay(2000);
+          await driver.clickElement({
+            text: 'Import Tokens',
+            tag: 'button',
+          });
+
+          // renders balance for newly created token
+          await driver.waitForSelector('.app-header__logo-container');
+          await driver.clickElement('.app-header__logo-container');
+          await driver.clickElement({ tag: 'button', text: 'Assets' });
+          const asset = await driver.waitForSelector({
+            css: '.asset-list-item__token-value',
+            text: '10',
+          });
+          assert.equal(await asset.getText(), '10');
+        },
+      );
+    });
+  });
+
+  describe('Approves a custom token from dapp', function () {
+    let windowHandles;
+
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: convertToHexValue(25000000000000000000),
+        },
+      ],
+    };
+    it('approves an already created token and displays the token approval data', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: 'connected-state',
+          ganacheOptions,
+          title: this.test.title,
+        },
+        async ({ driver }) => {
+          await driver.navigate();
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.press('#password', driver.Key.ENTER);
+
+          await driver.openNewPage(`http://127.0.0.1:8080/`);
+
+          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
+          await driver.clickElement({ text: 'Create Token', tag: 'button' });
+          windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.switchToWindow(windowHandles.dapp);
+          await driver.waitForSelector({
+            text: 'Approve Tokens',
+            tag: 'button',
+          });
+          await driver.clickElement({ text: 'Approve Tokens', tag: 'button' });
+
+          // displays the token approval data
+          // switch to popup
+          windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+
+          const functionType = await driver.findElement(
+            '.confirm-approve-content__data .confirm-approve-content__small-text',
+          );
+
+          await driver.scrollToElement(functionType);
+          const functionTypeText = await functionType.getText();
+          assert.equal(functionTypeText, 'Function: Approve');
+          const confirmDataDiv = await driver.findElement(
+            '.confirm-approve-content__data__data-block',
+          );
+          const confirmDataText = await confirmDataDiv.getText();
+          assert(
+            confirmDataText.match(
+              /0x095ea7b30000000000000000000000009bc5baf874d2da8d216ae9f137804184ee5afef4/u,
+            ),
+          );
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+          await driver.switchToWindow(windowHandles.extension);
+          await driver.clickElement({ tag: 'button', text: 'Activity' });
+
+          await driver.wait(async () => {
+            const pendingTxes = await driver.findElements(
+              '.transaction-list-item',
+            );
+            return pendingTxes.length === 2;
+          }, 10000);
+
+          await driver.waitForSelector({
+            // Selects only the very first transaction list item immediately following the 'Pending' header
+            css:
+              '.transaction-list__pending-transactions .transaction-list__header + .transaction-list-item .list-item__heading',
+            text: 'Approve Token spend limit',
+          });
+        },
+      );
+    });
+
+    it('customizes gas, edit permissions and checks transaction in transaction list', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: 'connected-state',
+          ganacheOptions,
+          title: this.test.title,
+        },
+        async ({ driver }) => {
+          await driver.navigate();
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.press('#password', driver.Key.ENTER);
+
+          await driver.openNewPage(`http://127.0.0.1:8080/`);
+
+          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
+          await driver.clickElement({ text: 'Create Token', tag: 'button' });
+          windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.switchToWindow(windowHandles.dapp);
+
+          await driver.waitForSelector({
+            text: 'Approve Tokens',
+            tag: 'button',
+          });
+          await driver.clickElement({ text: 'Approve Tokens', tag: 'button' });
+
+          // switch to popup
+          windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+
+          await driver.clickElement(
+            '.confirm-approve-content__small-blue-text',
+          );
+          await driver.clickElement(
+            { text: 'Edit suggested gas fee', tag: 'button' },
+            10000,
+          );
+          const [gasLimitInput, gasPriceInput] = await driver.findElements(
+            'input[type="number"]',
+          );
+          await gasPriceInput.clear();
+          await gasPriceInput.fill('10');
+          await gasLimitInput.clear();
+          await gasLimitInput.fill('60001');
+          await driver.findClickableElement({ text: 'Save', tag: 'button' });
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          await driver.waitForSelector({
+            css:
+              '.confirm-approve-content__transaction-details-content__secondary-fee',
+            text: '0.0006 ETH',
+          });
+
+          // edits the permission
+          const editButtons = await driver.findClickableElements(
+            '.confirm-approve-content__small-blue-text',
+          );
+          await editButtons[2].click();
+
+          // wait for permission modal to be visible
+          const permissionModal = await driver.findVisibleElement(
+            'span .modal',
+          );
+          const radioButtons = await driver.findClickableElements(
+            '.edit-approval-permission__edit-section__radio-button',
+          );
+          const customSpendLimit = await radioButtons[1];
+          await customSpendLimit.click();
+          await driver.fill('input', '5');
+          await driver.clickElement({ text: 'Save', tag: 'button' });
+
+          // wait for permission modal to be removed from DOM.
+          await permissionModal.waitForElementState('hidden');
+          const permissionInfo = await driver.findElements(
+            '.confirm-approve-content__medium-text',
+          );
+          const amountDiv = permissionInfo[0];
+          assert.equal(await amountDiv.getText(), '5 TST');
+
+          // submits the transaction
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          // finds the transaction in transaction list
+          await driver.switchToWindow(windowHandles.extension);
+          await driver.clickElement({ tag: 'button', text: 'Activity' });
+          await driver.waitForSelector({
+            // Select only the heading of the first entry in the transaction list.
+            css:
+              '.transaction-list__completed-transactions .transaction-list-item:first-child .list-item__heading',
+            text: 'Approve Token spend limit',
+          });
+        },
+      );
+    });
+  });
+
+  describe('Approves a custom token from dapp when no gas value is specified', function () {
+    let windowHandles;
+
+    const ganacheOptions = {
+      accounts: [
+        {
+          secretKey:
+            '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+          balance: convertToHexValue(25000000000000000000),
+        },
+      ],
+    };
+
+    it('approves an already created token, shows the correct recipient, submits the transaction and finds the transaction in the transactions list', async function () {
+      await withFixtures(
+        {
+          dapp: true,
+          fixtures: 'connected-state',
+          ganacheOptions,
+          title: this.test.title,
+        },
+        async ({ driver }) => {
+          await driver.navigate();
+          await driver.fill('#password', 'correct horse battery staple');
+          await driver.press('#password', driver.Key.ENTER);
+
+          await driver.openNewPage(`http://127.0.0.1:8080/`);
+
+          await driver.waitForSelector({ text: 'Create Token', tag: 'button' });
+          await driver.clickElement({ text: 'Create Token', tag: 'button' });
+          windowHandles = await getWindowHandles(driver, 3);
+          await driver.switchToWindow(windowHandles.popup);
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.switchToWindow(windowHandles.dapp);
+
+          await driver.clickElement({
+            text: 'Approve Tokens Without Gas',
+            tag: 'button',
+          });
+
+          await driver.switchToWindow(windowHandles.extension);
+          await driver.clickElement({ tag: 'button', text: 'Activity' });
+
+          await driver.wait(async () => {
+            const pendingTxes = await driver.findElements(
+              '.transaction-list__pending-transactions .transaction-list-item',
+            );
+            return pendingTxes.length === 1;
+          }, 10000);
+
+          await driver.waitForSelector({
+            // Selects only the very first transaction list item immediately following the 'Pending' header
+            css:
+              '.transaction-list__pending-transactions .transaction-list__header + .transaction-list-item .list-item__heading',
+            text: 'Approve Token spend limit',
+          });
+
+          await driver.clickElement('.transaction-list-item');
+
+          const permissionInfo = await driver.findElements(
+            '.confirm-approve-content__medium-text',
+          );
+          const recipientDiv = permissionInfo[1];
+          assert.equal(await recipientDiv.getText(), '0x2f318C33...C970');
+
+          await driver.clickElement({ text: 'Confirm', tag: 'button' });
+
+          await driver.waitForSelector({
+            css:
+              '.transaction-list__completed-transactions .transaction-list-item:first-child .list-item__heading',
+            text: 'Approve Token spend limit',
+          });
+        },
+      );
+    });
+  });
+});
diff --git a/test/e2e/tests/dapp-interactions.spec.js b/test/e2e/tests/dapp-interactions.spec.js
index af9f0af89189..40cef1b18a91 100644
--- a/test/e2e/tests/dapp-interactions.spec.js
+++ b/test/e2e/tests/dapp-interactions.spec.js
@@ -23,7 +23,10 @@ describe('Dapp interactions', function () {
       {
         dapp: true,
         fixtures: 'imported-account',
-        ganacheOptions,
+        ganacheOptions: {
+          ...ganacheOptions,
+          concurrent: { port: 8546, chainId: 1338 },
+        },
         title: this.test.title,
       },
       async ({ driver }) => {
@@ -44,6 +47,7 @@ describe('Dapp interactions', function () {
         // Trigger Notification
         await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
         await driver.clickElement('#addEthereumChain');
+        await driver.waitUntilXWindowHandles(3);
         await driver.switchToWindowWithTitle(
           'MetaMask Notification',
           windowHandles,
@@ -60,7 +64,7 @@ describe('Dapp interactions', function () {
     );
   });
 
-  it('should connect a second Dapp despite Metamask being locked', async function () {
+  it('should connect a second Dapp despite MetaMask being locked', async function () {
     await withFixtures(
       {
         dapp: true,
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index 6bc41b1facfe..41c63ccb10c4 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -9,7 +9,7 @@ const {
   completeImportSRPOnboardingFlowWordByWord,
 } = require('../helpers');
 
-describe('Metamask Import UI', function () {
+describe('MetaMask Import UI', function () {
   it('Importing wallet using Secret Recovery Phrase', async function () {
     const ganacheOptions = {
       accounts: [
@@ -72,7 +72,8 @@ describe('Metamask Import UI', function () {
         await driver.press('#password', driver.Key.ENTER);
 
         // Create a new account
-        // switches to locakhost
+        // switches to localhost
+        await driver.delay(largeDelayMs);
         await driver.clickElement('.network-display');
         await driver.clickElement({ text: 'Localhost', tag: 'span' });
 
diff --git a/test/e2e/tests/incremental-security.spec.js b/test/e2e/tests/incremental-security.spec.js
index a94f0f3e2a7f..a12f49831872 100644
--- a/test/e2e/tests/incremental-security.spec.js
+++ b/test/e2e/tests/incremental-security.spec.js
@@ -38,12 +38,12 @@ describe('Incremental Security', function () {
           tag: 'button',
         });
 
-        // clicks the "Create New Wallet" option
-        await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
-
         // clicks the "No thanks" option on the metametrics opt-in screen
         await driver.clickElement('.btn-secondary');
 
+        // clicks the "Create New Wallet" option
+        await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
+
         // accepts a secure password
         await driver.fill(
           '.first-time-flow__form #create-password',
diff --git a/test/e2e/tests/metamask-responsive-ui.spec.js b/test/e2e/tests/metamask-responsive-ui.spec.js
index 8daa2024ff44..3b796834ec13 100644
--- a/test/e2e/tests/metamask-responsive-ui.spec.js
+++ b/test/e2e/tests/metamask-responsive-ui.spec.js
@@ -2,7 +2,7 @@ const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures, tinyDelayMs } = require('../helpers');
 const enLocaleMessages = require('../../../app/_locales/en/messages.json');
 
-describe('Metamask Responsive UI', function () {
+describe('MetaMask Responsive UI', function () {
   it('Creating a new wallet', async function () {
     const driverOptions = { responsive: true };
 
@@ -87,12 +87,12 @@ describe('Metamask Responsive UI', function () {
           });
           await driver.delay(tinyDelayMs);
 
-          // clicks the "Create New Wallet" option
-          await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
-
           // clicks the "I Agree" option on the metametrics opt-in screen
           await driver.clickElement('.btn-primary');
 
+          // clicks the "Create New Wallet" option
+          await driver.clickElement({ text: 'Create a Wallet', tag: 'button' });
+
           // accepts a secure password
           await driver.fill(
             '.first-time-flow__form #create-password',
diff --git a/test/e2e/tests/navigate-transactions.spec.js b/test/e2e/tests/navigate-transactions.spec.js
index 4d02097f5005..08ca96a83671 100644
--- a/test/e2e/tests/navigate-transactions.spec.js
+++ b/test/e2e/tests/navigate-transactions.spec.js
@@ -14,7 +14,6 @@ describe('Navigate transactions', function () {
   it('should navigate the unapproved transactions', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -150,7 +149,6 @@ describe('Navigate transactions', function () {
   it('should reject and remove an unapproved transaction', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -182,7 +180,6 @@ describe('Navigate transactions', function () {
   it('should confirm and remove an unapproved transaction', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
@@ -214,7 +211,6 @@ describe('Navigate transactions', function () {
   it('should reject and remove all unapproved transactions', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'navigate-transactions',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/phishing-detection.spec.js b/test/e2e/tests/phishing-detection.spec.js
index 2b1450413392..ccad1dd4aa52 100644
--- a/test/e2e/tests/phishing-detection.spec.js
+++ b/test/e2e/tests/phishing-detection.spec.js
@@ -1,6 +1,9 @@
 const { strict: assert } = require('assert');
 const { convertToHexValue, withFixtures } = require('../helpers');
 
+const PHISHFORT_CDN_URL =
+  'https://cdn.jsdelivr.net/gh/phishfort/phishfort-lists@master/blacklists/hotlist.json';
+
 describe('Phishing Detection', function () {
   async function mockPhishingDetection(mockServer) {
     await mockServer
@@ -15,11 +18,19 @@ describe('Phishing Detection', function () {
             tolerance: 2,
             fuzzylist: [],
             whitelist: [],
-            blacklist: ['example.com'],
+            blacklist: ['127.0.0.1'],
           },
         };
       });
   }
+  async function mockPhishfortPhishingDetection(mockServer) {
+    await mockServer.forGet(PHISHFORT_CDN_URL).thenCallback(() => {
+      return {
+        statusCode: 200,
+        json: ['127.0.0.1'],
+      };
+    });
+  }
   const ganacheOptions = {
     accounts: [
       {
@@ -29,22 +40,124 @@ describe('Phishing Detection', function () {
       },
     ],
   };
-  it('should display the MetaMask Phishing Detection page', async function () {
+  it('should display the MetaMask Phishing Detection page and take the user to the blocked page if they continue', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: mockPhishingDetection,
+        dapp: true,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage('http://127.0.0.1:8080');
+        await driver.clickElement({
+          text: 'continuing at your own risk',
+        });
+        const header = await driver.findElement('h1');
+        assert.equal(await header.getText(), 'E2E Test Dapp');
+      },
+    );
+  });
+
+  it('should display the MetaMask Phishing Detection page in an iframe and take the user to the blocked page if they continue', async function () {
     await withFixtures(
       {
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
         testSpecificMock: mockPhishingDetection,
+        dapp: true,
+        dappPaths: ['mock-page-with-iframe'],
+        dappOptions: {
+          numberOfDapps: 2,
+        },
+        failOnConsoleError: false,
       },
       async ({ driver }) => {
         await driver.navigate();
         await driver.fill('#password', 'correct horse battery staple');
         await driver.press('#password', driver.Key.ENTER);
-        await driver.openNewPage('http://example.com');
-        await driver.waitForSelector({ text: 'continuing at your own risk' });
+        await driver.openNewPage('http://localhost:8080/');
+
+        const iframe = await driver.findElement('iframe');
+
+        await driver.switchToFrame(iframe);
+        await driver.clickElement({
+          text: 'Open this warning in a new tab',
+        });
+        await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+        await driver.clickElement({
+          text: 'continuing at your own risk',
+        });
         const header = await driver.findElement('h1');
-        assert.equal(await header.getText(), 'MetaMask Phishing Detection');
+        assert.equal(await header.getText(), 'E2E Test Dapp');
+      },
+    );
+  });
+
+  it('should display the MetaMask Phishing Detection page in an iframe but should NOT take the user to the blocked page if it is not an accessible resource', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: mockPhishingDetection,
+        dapp: true,
+        dappPaths: ['mock-page-with-disallowed-iframe'],
+        dappOptions: {
+          numberOfDapps: 2,
+        },
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage(
+          `http://localhost:8080?extensionUrl=${driver.extensionUrl}`,
+        );
+
+        const iframe = await driver.findElement('iframe');
+
+        await driver.switchToFrame(iframe);
+        await driver.clickElement({
+          text: 'Open this warning in a new tab',
+        });
+        await driver.switchToWindowWithTitle('MetaMask Phishing Detection');
+        await driver.clickElement({
+          text: 'continuing at your own risk',
+        });
+
+        // Ensure we're not on the wallet home page
+        await driver.assertElementNotPresent('[data-testid="wallet-balance"]');
+      },
+    );
+  });
+
+  it('should display the MetaMask Phishing Detection page with the correct new issue link if the issue was detected from the phishfort list', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        testSpecificMock: mockPhishfortPhishingDetection,
+        dapp: true,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+        await driver.openNewPage('http://127.0.0.1:8080');
+        const newIssueLink = await driver.findElements(
+          "a[href='https://github.com/phishfort/phishfort-lists/issues/new?title=[Legitimate%20Site%20Blocked]%20127.0.0.1&body=http%3A%2F%2F127.0.0.1%3A8080%2F']",
+        );
+        assert.equal(newIssueLink.length, 1);
       },
     );
   });
diff --git a/test/e2e/tests/provider-api.spec.js b/test/e2e/tests/provider-api.spec.js
index 14a4ff0eb300..b85b4fb32f19 100644
--- a/test/e2e/tests/provider-api.spec.js
+++ b/test/e2e/tests/provider-api.spec.js
@@ -47,7 +47,7 @@ describe('MetaMask', function () {
         await driver.switchToWindowWithTitle('E2E Test Dapp', windowHandles);
         const switchedNetworkDiv = await driver.waitForSelector({
           css: '#network',
-          text: '1',
+          text: '0x1',
         });
         const switchedChainIdDiv = await driver.waitForSelector({
           css: '#chainId',
@@ -55,7 +55,7 @@ describe('MetaMask', function () {
         });
         const accountsDiv = await driver.findElement('#accounts');
 
-        assert.equal(await switchedNetworkDiv.getText(), '1');
+        assert.equal(await switchedNetworkDiv.getText(), '0x1');
         assert.equal(await switchedChainIdDiv.getText(), '0x1');
         assert.equal(
           await accountsDiv.getText(),
diff --git a/test/e2e/tests/send-eth.spec.js b/test/e2e/tests/send-eth.spec.js
index e34ab57316c1..f14bb1bc52ad 100644
--- a/test/e2e/tests/send-eth.spec.js
+++ b/test/e2e/tests/send-eth.spec.js
@@ -92,6 +92,54 @@ describe('Send ETH from inside MetaMask using default gas', function () {
   });
 });
 
+describe('Send ETH non-contract address with data that matches ERC20 transfer data signature', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('renders the correct recipient on the confirmation screen', async function () {
+    await withFixtures(
+      {
+        fixtures: 'special-settings',
+        ganacheOptions,
+        title: this.test.title,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        await driver.fill(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+        );
+
+        await driver.fill(
+          'textarea[placeholder="Optional',
+          '0xa9059cbb0000000000000000000000002f318C334780961FB129D2a6c30D0763d9a5C970000000000000000000000000000000000000000000000000000000000000000a',
+        );
+
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        await driver.clickElement({ text: '0xc42...cd28' });
+
+        const recipientAddress = await driver.findElements({
+          text: '0xc427D562164062a23a5cFf596A4a3208e72Acd28',
+        });
+
+        assert.equal(recipientAddress.length, 1);
+      },
+    );
+  });
+});
+
 /* eslint-disable-next-line mocha/max-top-level-suites */
 describe('Send ETH from inside MetaMask using advanced gas modal', function () {
   const ganacheOptions = {
diff --git a/test/e2e/tests/send-hex-address.spec.js b/test/e2e/tests/send-hex-address.spec.js
new file mode 100644
index 000000000000..ed89901db453
--- /dev/null
+++ b/test/e2e/tests/send-hex-address.spec.js
@@ -0,0 +1,329 @@
+const { strict: assert } = require('assert');
+const { convertToHexValue, withFixtures } = require('../helpers');
+
+const hexPrefixedAddress = '0x2f318C334780961FB129D2a6c30D0763d9a5C970';
+const nonHexPrefixedAddress = hexPrefixedAddress.substring(2);
+
+describe('Send ETH to a 40 character hexadecimal address', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should ensure the address is prefixed with 0x when pasted and should send ETH to a valid hexadecimal address', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Send ETH
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Paste address without hex prefix
+        await driver.pasteIntoField(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          nonHexPrefixedAddress,
+        );
+        await driver.waitForSelector({
+          css: '.ens-input__selected-input__title',
+          text: hexPrefixedAddress,
+        });
+        await driver.wait(async () => {
+          const sendDialogMsgs = await driver.findElements(
+            '.send-v2__form div.dialog',
+          );
+          return sendDialogMsgs.length === 1;
+        }, 10000);
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        // Confirm transaction
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        const sendTransactionListItem = await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item',
+        );
+        await sendTransactionListItem.click();
+        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
+
+        // Verify address in activity log
+        const publicAddress = await driver.findElement(
+          '.nickname-popover__public-address',
+        );
+        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
+      },
+    );
+  });
+  it('should ensure the address is prefixed with 0x when typed and should send ETH to a valid hexadecimal address', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Send ETH
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Type address without hex prefix
+        await driver.fill(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          nonHexPrefixedAddress,
+        );
+        await driver.waitForSelector({
+          css: '.ens-input__selected-input__title',
+          text: hexPrefixedAddress,
+        });
+        await driver.wait(async () => {
+          const sendDialogMsgs = await driver.findElements(
+            '.send-v2__form div.dialog',
+          );
+          return sendDialogMsgs.length === 1;
+        }, 10000);
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        // Confirm transaction
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        const sendTransactionListItem = await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item',
+        );
+        await sendTransactionListItem.click();
+        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
+
+        // Verify address in activity log
+        const publicAddress = await driver.findElement(
+          '.nickname-popover__public-address',
+        );
+        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
+      },
+    );
+  });
+});
+
+describe('Send ERC20 to a 40 character hexadecimal address', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should ensure the address is prefixed with 0x when pasted and should send TST to a valid hexadecimal address', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Create TST
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        await driver.clickElement('#createToken');
+        await driver.waitUntilXWindowHandles(3);
+        let windowHandles = await driver.getAllWindowHandles();
+        const extension = windowHandles[0];
+        const dapp = await driver.switchToWindowWithTitle(
+          'E2E Test Dapp',
+          windowHandles,
+        );
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          { timeout: 10000 },
+        );
+
+        // Add token
+        await driver.switchToWindow(dapp);
+        await driver.clickElement('#watchAsset');
+        await driver.waitUntilXWindowHandles(3);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Add Token', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+
+        // Send TST
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+        await driver.clickElement('.token-cell');
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Paste address without hex prefix
+        await driver.pasteIntoField(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          nonHexPrefixedAddress,
+        );
+        await driver.waitForSelector({
+          css: '.ens-input__selected-input__title',
+          text: hexPrefixedAddress,
+        });
+        await driver.wait(async () => {
+          const sendDialogMsgs = await driver.findElements(
+            '.send-v2__form div.dialog',
+          );
+          return sendDialogMsgs.length === 1;
+        }, 10000);
+        await driver.delay(2000);
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        // Confirm transaction
+        await driver.waitForSelector({
+          css: '.confirm-page-container-summary__title',
+          text: '0 TST',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
+          { timeout: 10000 },
+        );
+        const sendTransactionListItem = await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+        );
+        await sendTransactionListItem.click();
+        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
+
+        // Verify address in activity log
+        const publicAddress = await driver.findElement(
+          '.nickname-popover__public-address',
+        );
+        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
+      },
+    );
+  });
+  it('should ensure the address is prefixed with 0x when typed and should send TST to a valid hexadecimal address', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Create TST
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        await driver.clickElement('#createToken');
+        await driver.waitUntilXWindowHandles(3);
+        let windowHandles = await driver.getAllWindowHandles();
+        const extension = windowHandles[0];
+        const dapp = await driver.switchToWindowWithTitle(
+          'E2E Test Dapp',
+          windowHandles,
+        );
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+          { timeout: 10000 },
+        );
+
+        // Add token
+        await driver.switchToWindow(dapp);
+        await driver.clickElement('#watchAsset');
+        await driver.waitUntilXWindowHandles(3);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Add Token', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+
+        // Send TST
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+        await driver.clickElement('.token-cell');
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Type address without hex prefix
+        await driver.fill(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          nonHexPrefixedAddress,
+        );
+        await driver.waitForSelector({
+          css: '.ens-input__selected-input__title',
+          text: hexPrefixedAddress,
+        });
+        await driver.wait(async () => {
+          const sendDialogMsgs = await driver.findElements(
+            '.send-v2__form div.dialog',
+          );
+          return sendDialogMsgs.length === 1;
+        }, 10000);
+        await driver.delay(2000);
+        await driver.clickElement({ text: 'Next', tag: 'button' });
+
+        // Confirm transaction
+        await driver.waitForSelector({
+          css: '.confirm-page-container-summary__title',
+          text: '0 TST',
+        });
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.clickElement('[data-testid="home__activity-tab"]');
+        await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(2)',
+          { timeout: 10000 },
+        );
+        const sendTransactionListItem = await driver.waitForSelector(
+          '.transaction-list__completed-transactions .transaction-list-item:nth-of-type(1)',
+        );
+        await sendTransactionListItem.click();
+        await driver.clickElement({ text: 'Activity log', tag: 'summary' });
+        await driver.clickElement('.sender-to-recipient__name:nth-of-type(2)');
+
+        // Verify address in activity log
+        const publicAddress = await driver.findElement(
+          '.nickname-popover__public-address',
+        );
+        assert.equal(await publicAddress.getText(), hexPrefixedAddress);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/send-to-contract.spec.js b/test/e2e/tests/send-to-contract.spec.js
new file mode 100644
index 000000000000..1ab704de10bb
--- /dev/null
+++ b/test/e2e/tests/send-to-contract.spec.js
@@ -0,0 +1,83 @@
+const { strict: assert } = require('assert');
+const { convertToHexValue, withFixtures } = require('../helpers');
+
+describe('Send ERC20 token to contract address', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should display the token contract warning to the user', async function () {
+    await withFixtures(
+      {
+        dapp: true,
+        fixtures: 'connected-state',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Create TST
+        await driver.openNewPage('http://127.0.0.1:8080/');
+        await driver.clickElement('#createToken');
+        await driver.waitUntilXWindowHandles(3);
+        let windowHandles = await driver.getAllWindowHandles();
+        const extension = windowHandles[0];
+        const dapp = await driver.switchToWindowWithTitle(
+          'E2E Test Dapp',
+          windowHandles,
+        );
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Confirm', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(dapp);
+        const tokenAddress = await driver.waitForSelector({
+          css: '#tokenAddress',
+          text: '0x',
+        });
+        const tokenAddressText = await tokenAddress.getText();
+
+        // Add token
+        await driver.switchToWindow(dapp);
+        await driver.clickElement('#watchAsset');
+        await driver.waitUntilXWindowHandles(3);
+        windowHandles = await driver.getAllWindowHandles();
+        await driver.switchToWindowWithTitle(
+          'MetaMask Notification',
+          windowHandles,
+        );
+        await driver.clickElement({ text: 'Add Token', tag: 'button' });
+        await driver.waitUntilXWindowHandles(2);
+        await driver.switchToWindow(extension);
+
+        // Send TST
+        await driver.clickElement('[data-testid="home__asset-tab"]');
+        await driver.clickElement('.token-cell');
+        await driver.clickElement('[data-testid="eth-overview-send"]');
+
+        // Type contract address
+        await driver.fill(
+          'input[placeholder="Search, public address (0x), or ENS"]',
+          tokenAddressText,
+        );
+
+        // Verify warning
+        const warningText =
+          'Warning: you are about to send to a token contract which could result in a loss of funds. Learn more\nI understand';
+        const warning = await driver.findElement('.send__warning-container');
+        assert.equal(await warning.getText(), warningText);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/settings-search.spec.js b/test/e2e/tests/settings-search.spec.js
index d817acb1ccc0..966e63d7eb90 100644
--- a/test/e2e/tests/settings-search.spec.js
+++ b/test/e2e/tests/settings-search.spec.js
@@ -25,7 +25,6 @@ describe('Settings Search', function () {
   it('should find element inside the General tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -52,7 +51,6 @@ describe('Settings Search', function () {
   it('should find element inside the Advanced tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -80,7 +78,6 @@ describe('Settings Search', function () {
   it('should find element inside the Contacts tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -108,7 +105,6 @@ describe('Settings Search', function () {
   it('should find element inside the Security tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -136,7 +132,6 @@ describe('Settings Search', function () {
   it('should find element inside the Alerts tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -164,7 +159,6 @@ describe('Settings Search', function () {
   it('should find element inside the Networks tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -192,7 +186,6 @@ describe('Settings Search', function () {
   it('should find element inside the Experimental tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -220,7 +213,6 @@ describe('Settings Search', function () {
   it('should find element inside the About tab', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
@@ -248,7 +240,6 @@ describe('Settings Search', function () {
   it('should display "Element not found" for a non-existing element', async function () {
     await withFixtures(
       {
-        dapp: true,
         fixtures: 'imported-account',
         ganacheOptions,
         title: this.test.title,
diff --git a/test/e2e/tests/state-logs.spec.js b/test/e2e/tests/state-logs.spec.js
new file mode 100644
index 000000000000..6152ff01afde
--- /dev/null
+++ b/test/e2e/tests/state-logs.spec.js
@@ -0,0 +1,65 @@
+const { strict: assert } = require('assert');
+const { promises: fs } = require('fs');
+const { convertToHexValue, withFixtures } = require('../helpers');
+
+const downloadsFolder = `${process.cwd()}/test-artifacts/downloads`;
+
+const createDownloadFolder = async () => {
+  await fs.rm(downloadsFolder, { recursive: true, force: true });
+  await fs.mkdir(downloadsFolder, { recursive: true });
+};
+
+const stateLogsExist = async () => {
+  try {
+    const stateLogs = `${downloadsFolder}/MetaMask State Logs.json`;
+    await fs.access(stateLogs);
+    return true;
+  } catch (e) {
+    return false;
+  }
+};
+
+describe('State logs', function () {
+  const ganacheOptions = {
+    accounts: [
+      {
+        secretKey:
+          '0x7C9529A67102755B7E6102D6D950AC5D5863C98713805CEC576B945B15B71EAC',
+        balance: convertToHexValue(25000000000000000000),
+      },
+    ],
+  };
+  it('should download state logs for the account', async function () {
+    await withFixtures(
+      {
+        fixtures: 'imported-account',
+        ganacheOptions,
+        title: this.test.title,
+        failOnConsoleError: false,
+      },
+      async ({ driver }) => {
+        await createDownloadFolder();
+        await driver.navigate();
+        await driver.fill('#password', 'correct horse battery staple');
+        await driver.press('#password', driver.Key.ENTER);
+
+        // Download State Logs
+        await driver.clickElement('.account-menu__icon');
+        await driver.clickElement({ text: 'Settings', tag: 'div' });
+        await driver.clickElement({ text: 'Advanced', tag: 'div' });
+        await driver.clickElement({
+          text: 'Download State Logs',
+          tag: 'button',
+        });
+
+        // Verify download
+        let fileExists;
+        await driver.wait(async () => {
+          fileExists = await stateLogsExist();
+          return fileExists === true;
+        }, 10000);
+        assert.equal(fileExists, true);
+      },
+    );
+  });
+});
diff --git a/test/e2e/tests/swap-eth.spec.js b/test/e2e/tests/swap-eth.spec.js
index 5e26b00e04d0..6ee37471086a 100644
--- a/test/e2e/tests/swap-eth.spec.js
+++ b/test/e2e/tests/swap-eth.spec.js
@@ -18,6 +18,9 @@ describe('Swap Eth for another Token', function () {
         ganacheOptions,
         title: this.test.title,
         failOnConsoleError: false,
+        driverOptions: {
+          timeOut: 20000,
+        },
       },
       async ({ driver }) => {
         await driver.navigate();
@@ -37,7 +40,6 @@ describe('Swap Eth for another Token', function () {
           '[class="dropdown-search-list__closed-primary-label dropdown-search-list__select-default"]',
         );
         await driver.clickElement('[placeholder="Search for a token"]');
-        await driver.clickElement('[placeholder="Search for a token"]');
         await driver.fill('[placeholder="Search for a token"]', 'DAI');
         await driver.waitForSelector(
           '[class="searchable-item-list__primary-label"]',
diff --git a/test/e2e/webdriver/chrome.js b/test/e2e/webdriver/chrome.js
index 13ff00f62e1c..09069906c1b6 100644
--- a/test/e2e/webdriver/chrome.js
+++ b/test/e2e/webdriver/chrome.js
@@ -18,10 +18,20 @@ class ChromeDriver {
     if (responsive) {
       args.push('--auto-open-devtools-for-tabs');
     }
-    args.push('--log-level=3');
+
+    if (process.env.ENABLE_MV3) {
+      args.push('--log-level=0');
+      args.push('--enable-logging');
+      args.push(`--user-data-dir=${process.cwd()}/test-artifacts/chrome`);
+    } else {
+      args.push('--log-level=3');
+    }
     const options = new chrome.Options().addArguments(args);
     options.setProxy(proxy.manual({ https: HTTPS_PROXY_HOST }));
     options.setAcceptInsecureCerts(true);
+    options.setUserPreferences({
+      'download.default_directory': `${process.cwd()}/test-artifacts/downloads`,
+    });
     const builder = new Builder()
       .forBrowser('chrome')
       .setChromeOptions(options);
diff --git a/test/e2e/webdriver/driver.js b/test/e2e/webdriver/driver.js
index 7c3ffa86e135..9886872a4a66 100644
--- a/test/e2e/webdriver/driver.js
+++ b/test/e2e/webdriver/driver.js
@@ -266,21 +266,21 @@ class Driver {
   /**
    * Paste a string into a field.
    *
-   * @param {string} element - The element locator.
+   * @param {string} rawLocator - The element locator.
    * @param {string} contentToPaste - The content to paste.
    */
-  async pasteIntoField(element, contentToPaste) {
+  async pasteIntoField(rawLocator, contentToPaste) {
     // Throw if double-quote is present in content to paste
     // so that we don't have to worry about escaping double-quotes
     if (contentToPaste.includes('"')) {
       throw new Error('Cannot paste content with double-quote');
     }
     // Click to focus the field
-    await this.clickElement(element);
+    await this.clickElement(rawLocator);
     await this.executeScript(
       `navigator.clipboard.writeText("${contentToPaste}")`,
     );
-    await this.fill(element, Key.chord(this.Key.MODIFIER, 'v'));
+    await this.fill(rawLocator, Key.chord(this.Key.MODIFIER, 'v'));
   }
 
   // Navigation
@@ -307,6 +307,10 @@ class Driver {
     await this.driver.switchTo().window(handle);
   }
 
+  async switchToFrame(element) {
+    await this.driver.switchTo().frame(element);
+  }
+
   async getAllWindowHandles() {
     return await this.driver.getAllWindowHandles();
   }
@@ -393,6 +397,20 @@ class Driver {
     );
   }
 
+  async checkBrowserForLavamoatLogs() {
+    const browserLogs = (
+      await fs.readFile(
+        `${process.cwd()}/test-artifacts/chrome/chrome_debug.log`,
+      )
+    )
+      .toString('utf-8')
+      .split(/\r?\n/u);
+
+    await fs.writeFile('/tmp/all_logs.json', JSON.stringify(browserLogs));
+
+    return browserLogs;
+  }
+
   async checkBrowserForConsoleErrors() {
     const ignoredLogTypes = ['WARNING'];
     const ignoredErrorMessages = [
diff --git a/test/e2e/webdriver/firefox.js b/test/e2e/webdriver/firefox.js
index 71111df58654..28afddc069e3 100644
--- a/test/e2e/webdriver/firefox.js
+++ b/test/e2e/webdriver/firefox.js
@@ -4,8 +4,6 @@ const path = require('path');
 const { Builder, By, until } = require('selenium-webdriver');
 const firefox = require('selenium-webdriver/firefox');
 const proxy = require('selenium-webdriver/proxy');
-const { getVersion } = require('../../../development/lib/get-version');
-const { BuildType } = require('../../../development/lib/build-type');
 
 /**
  * The prefix for temporary Firefox profiles. All Firefox profiles used for e2e tests
@@ -32,14 +30,18 @@ class FirefoxDriver {
    * @param {Object} options - the options for the build
    * @param options.responsive
    * @param options.port
-   * @param options.type
    * @returns {Promise<{driver: !ThenableWebDriver, extensionUrl: string, extensionId: string}>}
    */
-  static async build({ responsive, port, type }) {
+  static async build({ responsive, port }) {
     const templateProfile = fs.mkdtempSync(TEMP_PROFILE_PATH_PREFIX);
     const options = new firefox.Options().setProfile(templateProfile);
     options.setProxy(proxy.manual({ https: HTTPS_PROXY_HOST }));
     options.setAcceptInsecureCerts(true);
+    options.setPreference('browser.download.folderList', 2);
+    options.setPreference(
+      'browser.download.dir',
+      `${process.cwd()}/test-artifacts/downloads`,
+    );
     const builder = new Builder()
       .forBrowser('firefox')
       .setFirefoxOptions(options);
@@ -50,14 +52,7 @@ class FirefoxDriver {
     const driver = builder.build();
     const fxDriver = new FirefoxDriver(driver);
 
-    const version = getVersion(type || BuildType.main, 0);
-    let extensionString = `builds/metamask-firefox-${version}.zip`;
-
-    if (type) {
-      extensionString = `builds/metamask-${type}-firefox-${version}.zip`;
-    }
-
-    const extensionId = await fxDriver.installExtension(extensionString);
+    const extensionId = await fxDriver.installExtension('dist/firefox');
     const internalExtensionId = await fxDriver.getInternalId();
 
     if (responsive) {
diff --git a/test/e2e/webdriver/index.js b/test/e2e/webdriver/index.js
index 13fcbb29f82e..ebec9a002403 100644
--- a/test/e2e/webdriver/index.js
+++ b/test/e2e/webdriver/index.js
@@ -3,15 +3,15 @@ const Driver = require('./driver');
 const ChromeDriver = require('./chrome');
 const FirefoxDriver = require('./firefox');
 
-async function buildWebDriver({ responsive, port, type } = {}) {
+async function buildWebDriver({ responsive, port, timeOut } = {}) {
   const browser = process.env.SELENIUM_BROWSER;
 
   const {
     driver: seleniumDriver,
     extensionId,
     extensionUrl,
-  } = await buildBrowserWebDriver(browser, { responsive, port, type });
-  const driver = new Driver(seleniumDriver, browser, extensionUrl);
+  } = await buildBrowserWebDriver(browser, { responsive, port });
+  const driver = new Driver(seleniumDriver, browser, extensionUrl, timeOut);
 
   return {
     driver,
diff --git a/test/helpers/file.js b/test/helpers/file.js
new file mode 100644
index 000000000000..f2f13fa83bb7
--- /dev/null
+++ b/test/helpers/file.js
@@ -0,0 +1,37 @@
+/* eslint-disable node/shebang */
+const path = require('path');
+const { promises: fs, constants: fsConstants } = require('fs');
+
+async function isWritable(directory) {
+  try {
+    await fs.access(directory, fsConstants.W_OK);
+    return true;
+  } catch (error) {
+    if (error.code !== 'EACCES') {
+      throw error;
+    }
+    return false;
+  }
+}
+
+async function getFirstParentDirectoryThatExists(directory) {
+  let nextDirectory = directory;
+  for (;;) {
+    try {
+      await fs.access(nextDirectory, fsConstants.F_OK);
+      return nextDirectory;
+    } catch (error) {
+      if (error.code !== 'ENOENT') {
+        throw error;
+      } else if (nextDirectory === path.dirname(nextDirectory)) {
+        throw new Error('Failed to find parent directory that exists');
+      }
+      nextDirectory = path.dirname(nextDirectory);
+    }
+  }
+}
+
+module.exports = {
+  isWritable,
+  getFirstParentDirectoryThatExists,
+};
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 73f4892b3477..2595746c0c05 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -2,51 +2,102 @@ import { MAINNET_CHAIN_ID } from '../../shared/constants/network';
 
 const createGetSmartTransactionFeesApiResponse = () => {
   return {
-    cancelFees: [
-      { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
-      { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-      { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
-      { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-      { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
-      { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-      { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
-      { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-      { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
-      { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
-      { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-      { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-      { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
-      { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
-      { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
-      { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
-      { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
-      { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
-      { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
-    ],
-    feeEstimate: 42000000000000,
-    fees: [
-      { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
-      { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
-      { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
-      { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
-      { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
-      { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
-      { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
-      { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
-      { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
-      { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
-      { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
-      { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
-      { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
-      { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
-      { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
-      { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
-      { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
-      { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
-      { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
-    ],
-    gasLimit: 21000,
-    gasUsed: 21000,
+    tradeTxFees: {
+      // Approval tx.
+      cancelFees: [
+        { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
+        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
+        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
+        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+        { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
+        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+        { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
+        { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
+        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+        { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
+        { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
+        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
+        { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
+        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
+        { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
+        { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
+      ],
+      feeEstimate: 42000000000000,
+      fees: [
+        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
+        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
+        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+        { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
+        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+        { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
+        { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
+        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+        { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
+        { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
+        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
+        { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
+        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
+        { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
+        { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
+        { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
+      ],
+      gasLimit: 21000,
+      gasUsed: 21000,
+    },
+    approvalTxFees: {
+      // Trade tx.
+      cancelFees: [
+        { maxFeePerGas: 2100001000, maxPriorityFeePerGas: 466503987 },
+        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470851 },
+        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010971 },
+        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+        { maxFeePerGas: 3720300164, maxPriorityFeePerGas: 826444778 },
+        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+        { maxFeePerGas: 4501571383, maxPriorityFeePerGas: 1000000000 },
+        { maxFeePerGas: 4951733023, maxPriorityFeePerGas: 1100001000 },
+        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+        { maxFeePerGas: 6590774628, maxPriorityFeePerGas: 1464105324 },
+        { maxFeePerGas: 7249858682, maxPriorityFeePerGas: 1610517320 },
+        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570663 },
+        { maxFeePerGas: 8772344955, maxPriorityFeePerGas: 1948729500 },
+        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604399 },
+        { maxFeePerGas: 10614556694, maxPriorityFeePerGas: 2357966983 },
+        { maxFeePerGas: 11676022978, maxPriorityFeePerGas: 2593766039 },
+      ],
+      feeEstimate: 42000000000000,
+      fees: [
+        { maxFeePerGas: 2310003200, maxPriorityFeePerGas: 513154852 },
+        { maxFeePerGas: 2541005830, maxPriorityFeePerGas: 564470850 },
+        { maxFeePerGas: 2795108954, maxPriorityFeePerGas: 620918500 },
+        { maxFeePerGas: 3074622644, maxPriorityFeePerGas: 683010970 },
+        { maxFeePerGas: 3382087983, maxPriorityFeePerGas: 751312751 },
+        { maxFeePerGas: 3720300163, maxPriorityFeePerGas: 826444777 },
+        { maxFeePerGas: 4092333900, maxPriorityFeePerGas: 909090082 },
+        { maxFeePerGas: 4501571382, maxPriorityFeePerGas: 999999999 },
+        { maxFeePerGas: 4951733022, maxPriorityFeePerGas: 1100001000 },
+        { maxFeePerGas: 5446911277, maxPriorityFeePerGas: 1210002200 },
+        { maxFeePerGas: 5991607851, maxPriorityFeePerGas: 1331003630 },
+        { maxFeePerGas: 6590774627, maxPriorityFeePerGas: 1464105324 },
+        { maxFeePerGas: 7249858681, maxPriorityFeePerGas: 1610517320 },
+        { maxFeePerGas: 7974851800, maxPriorityFeePerGas: 1771570662 },
+        { maxFeePerGas: 8772344954, maxPriorityFeePerGas: 1948729500 },
+        { maxFeePerGas: 9649588222, maxPriorityFeePerGas: 2143604398 },
+        { maxFeePerGas: 10614556693, maxPriorityFeePerGas: 2357966982 },
+        { maxFeePerGas: 11676022977, maxPriorityFeePerGas: 2593766039 },
+        { maxFeePerGas: 12843636951, maxPriorityFeePerGas: 2853145236 },
+      ],
+      gasLimit: 21000,
+      gasUsed: 21000,
+    },
   };
 };
 
@@ -384,11 +435,6 @@ export const createSwapsMockStore = () => {
             },
           ],
         },
-        estimatedGas: {
-          txData: {
-            feeEstimate: 5435000587128155,
-          },
-        },
       },
     },
     appState: {
diff --git a/test/jest/mocks.js b/test/jest/mocks.js
index 6e257adaa9c7..47c8a1f99ccd 100644
--- a/test/jest/mocks.js
+++ b/test/jest/mocks.js
@@ -1,3 +1,8 @@
+import {
+  draftTransactionInitialState,
+  initialState,
+} from '../../ui/ducks/send';
+
 export const TOP_ASSETS_GET_RESPONSE = [
   {
     symbol: 'LINK',
@@ -103,3 +108,42 @@ export const createGasFeeEstimatesForFeeMarket = () => {
     estimatedBaseFee: '50',
   };
 };
+
+export const INITIAL_SEND_STATE_FOR_EXISTING_DRAFT = {
+  ...initialState,
+  currentTransactionUUID: 'test-uuid',
+  draftTransactions: {
+    'test-uuid': {
+      ...draftTransactionInitialState,
+    },
+  },
+};
+
+export const getInitialSendStateWithExistingTxState = (draftTxState) => ({
+  ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+  draftTransactions: {
+    'test-uuid': {
+      ...draftTransactionInitialState,
+      ...draftTxState,
+      amount: {
+        ...draftTransactionInitialState.amount,
+        ...draftTxState.amount,
+      },
+      asset: {
+        ...draftTransactionInitialState.asset,
+        ...draftTxState.asset,
+      },
+      gas: {
+        ...draftTransactionInitialState.gas,
+        ...draftTxState.gas,
+      },
+      recipient: {
+        ...draftTransactionInitialState.recipient,
+        ...draftTxState.recipient,
+      },
+      history: draftTxState.history ?? [],
+      // Use this key if you want to console.log inside the send.js file.
+      test: draftTxState.test ?? 'yo',
+    },
+  },
+});
diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index eaa8e32e76a4..44b68b739033 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -23,9 +23,11 @@ import {
   IMPORT_ACCOUNT_ROUTE,
   CONNECT_HARDWARE_ROUTE,
   DEFAULT_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  NOTIFICATIONS_ROUTE,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/routes';
 import TextField from '../../ui/text-field';
-import SearchIcon from '../../ui/search-icon';
 import IconCheck from '../../ui/icon/icon-check';
 import IconSpeechBubbles from '../../ui/icon/icon-speech-bubbles';
 import IconConnect from '../../ui/icon/icon-connect';
@@ -34,6 +36,7 @@ import IconPlus from '../../ui/icon/icon-plus';
 import IconImport from '../../ui/icon/icon-import';
 
 import Button from '../../ui/button';
+import SearchIcon from '../../ui/icon/search-icon';
 import KeyRingLabel from './keyring-label';
 
 export function AccountMenuItem(props) {
@@ -47,13 +50,13 @@ export function AccountMenuItem(props) {
       {children}
     </div>
   ) : (
-    <div className={itemClassName} onClick={onClick}>
+    <button className={itemClassName} onClick={onClick}>
       {icon ? <div className="account-menu__item__icon">{icon}</div> : null}
       {text ? <div className="account-menu__item__text">{text}</div> : null}
       {subText ? (
         <div className="account-menu__item__subtext">{subText}</div>
       ) : null}
-    </div>
+    </button>
   );
 }
 
@@ -84,6 +87,9 @@ export default class AccountMenu extends Component {
     toggleAccountMenu: PropTypes.func,
     addressConnectedSubjectMap: PropTypes.object,
     originOfCurrentTab: PropTypes.string,
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    unreadNotificationsCount: PropTypes.number,
+    ///: END:ONLY_INCLUDE_IN
   };
 
   accountsRef;
@@ -94,11 +100,12 @@ export default class AccountMenu extends Component {
   };
 
   addressFuse = new Fuse([], {
-    threshold: 0.45,
+    threshold: 0.55,
     location: 0,
     distance: 100,
     maxPatternLength: 32,
     minMatchCharLength: 1,
+    ignoreFieldNorm: true,
     keys: [
       { name: 'name', weight: 0.5 },
       { name: 'address', weight: 0.5 },
@@ -124,6 +131,11 @@ export default class AccountMenu extends Component {
   }
 
   renderAccountsSearch() {
+    const handleChange = (e) => {
+      const val = e.target.value.length > 1 ? e.target.value : '';
+      this.setSearchQuery(val);
+    };
+
     const inputAdornment = (
       <InputAdornment
         position="start"
@@ -133,7 +145,7 @@ export default class AccountMenu extends Component {
           marginLeft: '8px',
         }}
       >
-        <SearchIcon color="currentColor" />
+        <SearchIcon color="var(--color-icon-muted)" />
       </InputAdornment>
     );
 
@@ -143,8 +155,7 @@ export default class AccountMenu extends Component {
         id="search-accounts"
         placeholder={this.context.t('searchAccounts')}
         type="text"
-        value={this.state.searchQuery}
-        onChange={(e) => this.setSearchQuery(e.target.value)}
+        onChange={handleChange}
         startAdornment={inputAdornment}
         fullWidth
         theme="material-white-padded"
@@ -194,7 +205,7 @@ export default class AccountMenu extends Component {
       const iconAndNameForOpenSubject = addressSubjects[originOfCurrentTab];
 
       return (
-        <div
+        <button
           className="account-menu__account account-menu__item--clickable"
           onClick={() => {
             this.context.trackEvent({
@@ -233,7 +244,7 @@ export default class AccountMenu extends Component {
               />
             </div>
           ) : null}
-        </div>
+        </button>
       );
     });
   }
@@ -293,6 +304,9 @@ export default class AccountMenu extends Component {
       toggleAccountMenu,
       lockMetamask,
       history,
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      unreadNotificationsCount,
+      ///: END:ONLY_INCLUDE_IN
     } = this.props;
 
     if (!isAccountMenuOpen) {
@@ -350,7 +364,7 @@ export default class AccountMenu extends Component {
             });
             history.push(NEW_ACCOUNT_ROUTE);
           }}
-          icon={<IconPlus color="var(--color-icon-default)" />}
+          icon={<IconPlus color="var(--color-icon-alternative)" />}
           text={t('createAccount')}
         />
         <AccountMenuItem
@@ -368,7 +382,7 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconImport
-              color="var(--color-icon-default)"
+              color="var(--color-icon-alternative)"
               ariaLabel={t('importAccount')}
             />
           }
@@ -393,20 +407,44 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconConnect
-              color="var(--color-icon-default)"
+              color="var(--color-icon-alternative)"
               ariaLabel={t('connectHardwareWallet')}
             />
           }
           text={t('connectHardwareWallet')}
         />
         <div className="account-menu__divider" />
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          <>
+            <AccountMenuItem
+              onClick={() => {
+                toggleAccountMenu();
+                history.push(NOTIFICATIONS_ROUTE);
+              }}
+              icon={
+                <div className="account-menu__notifications">
+                  <i className="fa fa-bell fa-xl" />
+                  {unreadNotificationsCount > 0 && (
+                    <div className="account-menu__notifications__count">
+                      {unreadNotificationsCount}
+                    </div>
+                  )}
+                </div>
+              }
+              text={t('notifications')}
+            />
+            <div className="account-menu__divider" />
+          </>
+          ///: END:ONLY_INCLUDE_IN
+        }
         <AccountMenuItem
           onClick={() => {
             global.platform.openTab({ url: supportLink });
           }}
           icon={
             <IconSpeechBubbles
-              color="var(--color-icon-default)"
+              color="var(--color-icon-alternative)"
               ariaLabel={supportText}
             />
           }
@@ -428,7 +466,7 @@ export default class AccountMenu extends Component {
           }}
           icon={
             <IconCog
-              color="var(--color-icon-default)"
+              color="var(--color-icon-alternative)"
               ariaLabel={t('settings')}
             />
           }
diff --git a/ui/components/app/account-menu/account-menu.container.js b/ui/components/app/account-menu/account-menu.container.js
index 936c05eb652d..6862709201bd 100644
--- a/ui/components/app/account-menu/account-menu.container.js
+++ b/ui/components/app/account-menu/account-menu.container.js
@@ -13,6 +13,9 @@ import {
   getMetaMaskKeyrings,
   getOriginOfCurrentTab,
   getSelectedAddress,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  getUnreadNotificationsCount,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../../selectors';
 import AccountMenu from './account-menu.component';
 
@@ -28,7 +31,9 @@ function mapStateToProps(state) {
   const accounts = getMetaMaskAccountsOrdered(state);
   const origin = getOriginOfCurrentTab(state);
   const selectedAddress = getSelectedAddress(state);
-
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  const unreadNotificationsCount = getUnreadNotificationsCount(state);
+  ///: END:ONLY_INCLUDE_IN
   return {
     isAccountMenuOpen,
     addressConnectedSubjectMap: getAddressConnectedSubjectMap(state),
@@ -37,6 +42,9 @@ function mapStateToProps(state) {
     keyrings: getMetaMaskKeyrings(state),
     accounts,
     shouldShowAccountsSearch: accounts.length >= SHOW_SEARCH_ACCOUNTS_MIN_COUNT,
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    unreadNotificationsCount,
+    ///: END:ONLY_INCLUDE_IN
   };
 }
 
diff --git a/ui/components/app/account-menu/index.scss b/ui/components/app/account-menu/index.scss
index b5bb8846d6be..7d6e4a0131bb 100644
--- a/ui/components/app/account-menu/index.scss
+++ b/ui/components/app/account-menu/index.scss
@@ -5,7 +5,7 @@
   width: 320px;
   border-radius: 4px;
   background: var(--color-background-default);
-  box-shadow: rgba($black, 0.15) 0 2px 2px 2px;
+  box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
   min-width: 150px;
   color: var(--color-text-default);
 
@@ -32,6 +32,9 @@
     align-items: center;
     position: relative;
     z-index: 201;
+    border: 0;
+    background: none;
+    width: 100%;
 
     @media screen and (max-width: $break-small) {
       padding: 14px;
@@ -53,10 +56,18 @@
     &__icon {
       margin-right: 8px;
       display: flex;
+      color: var(--color-icon-alternative);
+
+      i {
+        text-align: center;
+        width: 24px;
+      }
     }
 
     &__text {
       @include Paragraph;
+
+      color: var(--color-text-default);
     }
 
     &__subtext {
@@ -100,8 +111,9 @@
   & &__lock-button {
     @include H7;
 
-    padding: 3.5px 5px;
-    width: 59px;
+    padding: 0.25rem 0.5rem;
+    min-width: 59px;
+    width: auto;
   }
 
   &__accounts-container {
@@ -122,7 +134,7 @@
     scrollbar-width: auto;
 
     @media screen and (max-width: $break-small) {
-      max-height: 228px;
+      max-height: 156px;
     }
 
     .keyring-label {
@@ -136,6 +148,7 @@
       margin-top: 5px;
       margin-right: 10px;
       background-color: var(--color-background-alternative);
+      border: 1px solid var(--color-border-default);
       color: var(--color-text-default);
       font-weight: normal;
       letter-spacing: 0.5px;
@@ -144,6 +157,25 @@
     }
   }
 
+  &__notifications {
+    position: relative;
+
+    &__count {
+      position: absolute;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      right: 0;
+      bottom: 0;
+      min-width: 12px;
+      min-height: 12px;
+      font-size: 8px;
+      border-radius: 50%;
+      background-color: var(--color-primary-default);
+      color: var(--color-primary-inverse);
+    }
+  }
+
   &__no-accounts {
     @include H6;
 
@@ -155,6 +187,9 @@
     flex-flow: row nowrap;
     padding: 16px 14px;
     flex: 0 0 auto;
+    background: none;
+    border: 0;
+    width: 100%;
 
     @media screen and (max-width: $break-small) {
       padding: 12px 14px;
@@ -203,6 +238,7 @@
     overflow: hidden;
     white-space: nowrap;
     max-width: 200px;
+    text-align: start;
   }
 
   &__balance {
diff --git a/ui/components/app/add-network/add-network.js b/ui/components/app/add-network/add-network.js
index c453eedf59ab..94dd233960c5 100644
--- a/ui/components/app/add-network/add-network.js
+++ b/ui/components/app/add-network/add-network.js
@@ -1,168 +1,287 @@
-import React, { useContext } from 'react';
-import { useSelector } from 'react-redux';
-import PropTypes from 'prop-types';
+import React, { useContext, useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
 import { I18nContext } from '../../../contexts/i18n';
 import Box from '../../ui/box';
 import Typography from '../../ui/typography';
 import {
   ALIGN_ITEMS,
-  BLOCK_SIZES,
   COLORS,
   DISPLAY,
   FLEX_DIRECTION,
   FONT_WEIGHT,
   TYPOGRAPHY,
   JUSTIFY_CONTENT,
+  SIZES,
 } from '../../../helpers/constants/design-system';
 import Button from '../../ui/button';
-import IconCaretLeft from '../../ui/icon/icon-caret-left';
 import Tooltip from '../../ui/tooltip';
 import IconWithFallback from '../../ui/icon-with-fallback';
 import IconBorder from '../../ui/icon-border';
-import { getTheme } from '../../../selectors';
-import { THEME_TYPE } from '../../../pages/settings/experimental-tab/experimental-tab.constant';
+import {
+  getFrequentRpcListDetail,
+  getUnapprovedConfirmations,
+} from '../../../selectors';
+
+import {
+  ENVIRONMENT_TYPE_FULLSCREEN,
+  ENVIRONMENT_TYPE_POPUP,
+  MESSAGE_TYPE,
+} from '../../../../shared/constants/app';
+import { requestUserApproval } from '../../../store/actions';
+import Popover from '../../ui/popover';
+import ConfirmationPage from '../../../pages/confirmation/confirmation';
+import { FEATURED_RPCS } from '../../../../shared/constants/network';
+import { ADD_NETWORK_ROUTE } from '../../../helpers/constants/routes';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 
-const AddNetwork = ({
-  onBackClick,
-  onAddNetworkClick,
-  onAddNetworkManuallyClick,
-  featuredRPCS,
-}) => {
+const AddNetwork = () => {
   const t = useContext(I18nContext);
-  const theme = useSelector(getTheme);
+  const dispatch = useDispatch();
+  const history = useHistory();
+  const frequentRpcList = useSelector(getFrequentRpcListDetail);
+
+  const frequentRpcListChainIds = Object.values(frequentRpcList).map(
+    (net) => net.chainId,
+  );
 
   const infuraRegex = /infura.io/u;
 
-  const nets = featuredRPCS
-    .sort((a, b) => (a.ticker > b.ticker ? 1 : -1))
-    .slice(0, 8);
+  const nets = FEATURED_RPCS.sort((a, b) =>
+    a.ticker > b.ticker ? 1 : -1,
+  ).slice(0, FEATURED_RPCS.length);
+
+  const notFrequentRpcNetworks = nets.filter(
+    (net) => frequentRpcListChainIds.indexOf(net.chainId) === -1,
+  );
+  const unapprovedConfirmations = useSelector(getUnapprovedConfirmations);
+  const [showPopover, setShowPopover] = useState(false);
+
+  useEffect(() => {
+    const anAddNetworkConfirmationFromMetaMaskExists = unapprovedConfirmations?.find(
+      (confirmation) => {
+        return (
+          confirmation.origin === 'metamask' &&
+          confirmation.type === MESSAGE_TYPE.ADD_ETHEREUM_CHAIN
+        );
+      },
+    );
+    if (!showPopover && anAddNetworkConfirmationFromMetaMaskExists) {
+      setShowPopover(true);
+    }
+
+    if (showPopover && !anAddNetworkConfirmationFromMetaMaskExists) {
+      setShowPopover(false);
+    }
+  }, [unapprovedConfirmations, showPopover]);
 
   return (
-    <Box>
-      <Box
-        height={BLOCK_SIZES.TWO_TWELFTHS}
-        padding={[4, 0, 4, 0]}
-        display={DISPLAY.FLEX}
-        alignItems={ALIGN_ITEMS.CENTER}
-        flexDirection={FLEX_DIRECTION.ROW}
-        className="add-network__header"
-      >
-        <IconCaretLeft
-          aria-label={t('back')}
-          onClick={onBackClick}
-          className="add-network__header__back-icon"
-        />
-        <Typography variant={TYPOGRAPHY.H3} color={COLORS.TEXT_DEFAULT}>
-          {t('addNetwork')}
-        </Typography>
-      </Box>
-      <Box
-        height={BLOCK_SIZES.FOUR_FIFTHS}
-        width={BLOCK_SIZES.TEN_TWELFTHS}
-        margin={[0, 6, 0, 6]}
-      >
-        <Typography
-          variant={TYPOGRAPHY.H6}
-          color={COLORS.TEXT_ALTERNATIVE}
-          margin={[4, 0, 0, 0]}
+    <>
+      {Object.keys(notFrequentRpcNetworks).length === 0 ? (
+        <Box
+          className="add-network__edge-case-box"
+          borderRadius={SIZES.MD}
+          padding={4}
+          marginTop={4}
+          marginRight={6}
+          marginLeft={6}
+          display={DISPLAY.FLEX}
+          flexDirection={FLEX_DIRECTION.ROW}
+          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
         >
-          {t('addFromAListOfPopularNetworks')}
-        </Typography>
-        <Typography
-          variant={TYPOGRAPHY.H7}
-          color={COLORS.TEXT_MUTED}
-          margin={[4, 0, 3, 0]}
-        >
-          {t('popularCustomNetworks')}
-        </Typography>
-        {nets.map((item, index) => (
+          <Box marginRight={4}>
+            <img src="images/info-fox.svg" />
+          </Box>
+          <Box>
+            <Typography variant={TYPOGRAPHY.H7}>
+              {t('youHaveAddedAll', [
+                <a
+                  key="link"
+                  className="add-network__edge-case-box__link"
+                  href="https://chainlist.wtf/"
+                  target="_blank"
+                  rel="noreferrer"
+                >
+                  {t('here')}.
+                </a>,
+                <Button
+                  key="button"
+                  type="inline"
+                  onClick={(event) => {
+                    event.preventDefault();
+                    getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+                      ? global.platform.openExtensionInBrowser(
+                          ADD_NETWORK_ROUTE,
+                        )
+                      : history.push(ADD_NETWORK_ROUTE);
+                  }}
+                >
+                  <Typography
+                    variant={TYPOGRAPHY.H7}
+                    color={COLORS.INFO_DEFAULT}
+                  >
+                    {t('addMoreNetworks')}.
+                  </Typography>
+                </Button>,
+              ])}
+            </Typography>
+          </Box>
+        </Box>
+      ) : (
+        <Box className="add-network__networks-container">
+          {getEnvironmentType() === ENVIRONMENT_TYPE_FULLSCREEN && (
+            <Box
+              display={DISPLAY.FLEX}
+              alignItems={ALIGN_ITEMS.CENTER}
+              flexDirection={FLEX_DIRECTION.ROW}
+              marginTop={7}
+              marginBottom={4}
+              paddingBottom={2}
+              className="add-network__header"
+            >
+              <Typography variant={TYPOGRAPHY.H4} color={COLORS.TEXT_MUTED}>
+                {t('networks')}
+              </Typography>
+              <span className="add-network__header__subtitle">{'  >  '}</span>
+              <Typography variant={TYPOGRAPHY.H4} color={COLORS.TEXT_DEFAULT}>
+                {t('addANetwork')}
+              </Typography>
+            </Box>
+          )}
           <Box
-            key={index}
-            display={DISPLAY.FLEX}
-            alignItems={ALIGN_ITEMS.CENTER}
-            justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
-            marginBottom={6}
+            marginTop={getEnvironmentType() === ENVIRONMENT_TYPE_POPUP ? 0 : 4}
+            marginBottom={1}
+            className="add-network__main-container"
           >
-            <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
-              <IconBorder size={24}>
-                <IconWithFallback
-                  icon={item.rpcPrefs.imageUrl}
-                  name={item.nickname}
-                  size={24}
-                />
-              </IconBorder>
-              <Typography
-                variant={TYPOGRAPHY.H7}
-                color={COLORS.TEXT_DEFAULT}
-                fontWeight={FONT_WEIGHT.BOLD}
-                boxProps={{ marginLeft: 2 }}
+            <Typography
+              variant={TYPOGRAPHY.H6}
+              color={COLORS.TEXT_ALTERNATIVE}
+              margin={0}
+              marginTop={4}
+            >
+              {t('addFromAListOfPopularNetworks')}
+            </Typography>
+            <Typography
+              variant={TYPOGRAPHY.H7}
+              color={COLORS.TEXT_MUTED}
+              marginTop={4}
+              marginBottom={3}
+            >
+              {t('popularCustomNetworks')}
+            </Typography>
+            {notFrequentRpcNetworks.map((item, index) => (
+              <Box
+                key={index}
+                display={DISPLAY.FLEX}
+                alignItems={ALIGN_ITEMS.CENTER}
+                justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
+                marginBottom={6}
+                className="add-network__list-of-networks"
               >
-                {item.nickname}
-              </Typography>
-            </Box>
-            <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
-              {
-                // Warning for the networks that doesn't use infura.io as the RPC
-                !infuraRegex.test(item.rpcUrl) && (
-                  <Tooltip
-                    className="add-network__warning-tooltip"
-                    position="top"
-                    interactive
-                    html={
-                      <Box margin={3} className="add-network__warning-tooltip">
-                        {t('addNetworkTooltipWarning', [
-                          <a
-                            key="zendesk_page_link"
-                            href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
-                            rel="noreferrer"
-                            target="_blank"
+                <Box display={DISPLAY.FLEX} alignItems={ALIGN_ITEMS.CENTER}>
+                  <Box>
+                    <IconBorder size={24}>
+                      <IconWithFallback
+                        icon={item.rpcPrefs.imageUrl}
+                        name={item.nickname}
+                        size={24}
+                      />
+                    </IconBorder>
+                  </Box>
+                  <Box marginLeft={2}>
+                    <Typography
+                      variant={TYPOGRAPHY.H7}
+                      color={COLORS.TEXT_DEFAULT}
+                      fontWeight={FONT_WEIGHT.BOLD}
+                    >
+                      {item.nickname}
+                    </Typography>
+                  </Box>
+                </Box>
+                <Box
+                  display={DISPLAY.FLEX}
+                  alignItems={ALIGN_ITEMS.CENTER}
+                  marginLeft={1}
+                >
+                  {
+                    // Warning for the networks that doesn't use infura.io as the RPC
+                    !infuraRegex.test(item.rpcUrl) && (
+                      <Tooltip
+                        position="top"
+                        interactive
+                        html={
+                          <Box
+                            margin={3}
+                            className="add-network__warning-tooltip"
                           >
-                            {t('learnMoreUpperCase')}
-                          </a>,
-                        ])}
-                      </Box>
-                    }
-                    trigger="mouseenter"
-                    theme={theme === THEME_TYPE.DEFAULT ? 'light' : 'dark'}
+                            {t('addNetworkTooltipWarning', [
+                              <a
+                                key="zendesk_page_link"
+                                href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
+                                rel="noreferrer"
+                                target="_blank"
+                              >
+                                {t('learnMoreUpperCase')}
+                              </a>,
+                            ])}
+                          </Box>
+                        }
+                        trigger="mouseenter"
+                      >
+                        <i
+                          className="fa fa-exclamation-triangle add-network__warning-icon"
+                          title={t('warning')}
+                        />
+                      </Tooltip>
+                    )
+                  }
+                  <Button
+                    type="inline"
+                    className="add-network__add-button"
+                    onClick={async () => {
+                      await dispatch(requestUserApproval(item, true));
+                    }}
                   >
-                    <i
-                      className="fa fa-exclamation-triangle add-network__warning-icon"
-                      title={t('warning')}
-                    />
-                  </Tooltip>
-                )
-              }
-              <Button
-                type="inline"
-                className="add-network__add-button"
-                onClick={onAddNetworkClick}
+                    {t('add')}
+                  </Button>
+                </Box>
+              </Box>
+            ))}
+          </Box>
+          <Box
+            padding={
+              getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+                ? [2, 0, 2, 6]
+                : [2, 0, 2, 0]
+            }
+            className="add-network__footer"
+          >
+            <Button
+              type="link"
+              onClick={(event) => {
+                event.preventDefault();
+                getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+                  ? global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE)
+                  : history.push(ADD_NETWORK_ROUTE);
+              }}
+            >
+              <Typography
+                variant={TYPOGRAPHY.H6}
+                color={COLORS.PRIMARY_DEFAULT}
               >
-                {t('add')}
-              </Button>
-            </Box>
+                {t('addANetworkManually')}
+              </Typography>
+            </Button>
           </Box>
-        ))}
-      </Box>
-      <Box
-        height={BLOCK_SIZES.ONE_TWELFTH}
-        padding={[4, 4, 4, 4]}
-        className="add-network__footer"
-      >
-        <Button type="link" onClick={onAddNetworkManuallyClick}>
-          <Typography variant={TYPOGRAPHY.H6} color={COLORS.PRIMARY_DEFAULT}>
-            {t('addANetworkManually')}
-          </Typography>
-        </Button>
-      </Box>
-    </Box>
+        </Box>
+      )}
+      {showPopover && (
+        <Popover>
+          <ConfirmationPage />
+        </Popover>
+      )}
+    </>
   );
 };
 
-AddNetwork.propTypes = {
-  onBackClick: PropTypes.func,
-  onAddNetworkClick: PropTypes.func,
-  onAddNetworkManuallyClick: PropTypes.func,
-  featuredRPCS: PropTypes.array,
-};
-
 export default AddNetwork;
diff --git a/ui/components/app/add-network/add-network.test.js b/ui/components/app/add-network/add-network.test.js
new file mode 100644
index 000000000000..d0272608f635
--- /dev/null
+++ b/ui/components/app/add-network/add-network.test.js
@@ -0,0 +1,60 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+import { renderWithProvider } from '../../../../test/jest';
+import configureStore from '../../../store/store';
+import mockState from '../../../../test/data/mock-state.json';
+import AddNetwork from './add-network';
+
+jest.mock('../../../selectors', () => ({
+  getFrequentRpcListDetail: () => ({
+    frequentRpcList: [
+      {
+        chainId: '0x539',
+        nickname: 'Localhost 8545',
+        rpcPrefs: {},
+        rpcUrl: 'http://localhost:8545',
+        ticker: 'ETH',
+      },
+      {
+        chainId: '0xA4B1',
+        nickname: 'Arbitrum One',
+        rpcPrefs: { blockExplorerUrl: 'https://explorer.arbitrum.io' },
+        rpcUrl:
+          'https://arbitrum-mainnet.infura.io/v3/7e127583378c4732a858df2550aff333',
+        ticker: 'AETH',
+      },
+    ],
+  }),
+  getUnapprovedConfirmations: jest.fn(),
+  getTheme: () => 'light',
+}));
+
+const render = () => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+    },
+  });
+  return renderWithProvider(<AddNetwork />, store);
+};
+
+describe('AddNetwork', () => {
+  it('should show Add from a list.. text', () => {
+    render();
+    expect(
+      screen.getByText(
+        'Add from a list of popular networks or add a network manually. Only interact with the entities you trust.',
+      ),
+    ).toBeInTheDocument();
+  });
+
+  it('should show Popular custom networks text', () => {
+    render();
+    expect(screen.getByText('Popular custom networks')).toBeInTheDocument();
+  });
+
+  it('should show Arbitrum One network nickname', () => {
+    render();
+    expect(screen.getByText('Arbitrum One')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/add-network/index.scss b/ui/components/app/add-network/index.scss
index 6da064bf57cb..4c7d9f9099b9 100644
--- a/ui/components/app/add-network/index.scss
+++ b/ui/components/app/add-network/index.scss
@@ -1,10 +1,36 @@
 .add-network {
+  &__networks-container {
+    padding-inline-end: 24px;
+
+    @media screen and (max-width: $break-small) {
+      padding: 0;
+    }
+  }
+
   &__header {
     border-bottom: 1px solid var(--color-border-default);
 
-    &__back-icon {
-      margin-left: 24px;
-      margin-right: 16px;
+    @media screen and (max-width: 575px) {
+      padding-inline-start: 24px;
+      padding-inline-end: 24px;
+    }
+
+    &__subtitle {
+      margin-inline-start: 10px;
+      margin-inline-end: 10px;
+    }
+  }
+
+  &__main-container {
+    @media screen and (max-width: 575px) {
+      padding-inline-start: 24px;
+      padding-inline-end: 24px;
+    }
+  }
+
+  &__list-of-networks {
+    @media screen and (min-width: $break-large) {
+      width: 75%;
     }
   }
 
@@ -23,19 +49,25 @@
 
   &__add-icon {
     color: var(--color-text-alternative);
-    margin-left: auto;
-    margin-right: 0;
+    margin-inline-start: auto;
+    margin-inline-end: 0;
     cursor: pointer;
   }
 
   &__add-button.button {
     color: var(--color-primary-default);
     font-size: $font-size-h7;
-    margin-left: 24px;
+    margin-inline-start: 24px;
   }
 
   &__footer {
     border-top: 1px solid var(--color-border-muted);
+    width: 100%;
+    padding-bottom: 8px;
+
+    @media screen and (max-width: 575px) {
+      padding-inline-start: 24px !important;
+    }
 
     & .btn-link {
       display: initial;
@@ -51,6 +83,14 @@
       color: var(--color-text-alternative);
     }
   }
-}
 
+  &__edge-case-box {
+    border: 1px solid var(--color-border-muted);
 
+    &__link {
+      color: var(--color-info-default);
+      display: inline;
+      padding: 0;
+    }
+  }
+}
diff --git a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
index cc2e09680e3f..ce7d4463fd40 100644
--- a/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
+++ b/ui/components/app/advanced-gas-controls/advanced-gas-controls.component.js
@@ -124,12 +124,12 @@ AdvancedGasControls.propTypes = {
   gasEstimateType: PropTypes.oneOf(Object.values(GAS_ESTIMATE_TYPES)),
   setMaxPriorityFee: PropTypes.func,
   setMaxFee: PropTypes.func,
-  maxPriorityFee: PropTypes.number,
-  maxFee: PropTypes.number,
+  maxPriorityFee: PropTypes.string,
+  maxFee: PropTypes.string,
   onManualChange: PropTypes.func,
   gasLimit: PropTypes.number,
   setGasLimit: PropTypes.func,
-  gasPrice: PropTypes.number,
+  gasPrice: PropTypes.string,
   setGasPrice: PropTypes.func,
   maxPriorityFeeFiat: PropTypes.string,
   maxFeeFiat: PropTypes.string,
diff --git a/ui/components/app/advanced-gas-controls/index.scss b/ui/components/app/advanced-gas-controls/index.scss
index e7b41ba31911..48e0d8707979 100644
--- a/ui/components/app/advanced-gas-controls/index.scss
+++ b/ui/components/app/advanced-gas-controls/index.scss
@@ -21,6 +21,6 @@
   }
 
   path {
-    fill: var(--color-icon-muted);
+    fill: var(--color-icon-alternative);
   }
 }
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
index beefff4fa066..24e68840715a 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-defaults/advanced-gas-fee-defaults.js
@@ -78,7 +78,9 @@ const AdvancedGasFeeDefaults = () => {
     <Box
       display={DISPLAY.FLEX}
       flexDirection={FLEX_DIRECTION.ROW}
-      margin={[4, 2, 0, 2]}
+      marginTop={4}
+      marginLeft={2}
+      marginRight={2}
       className="advanced-gas-fee-defaults"
     >
       <label className="advanced-gas-fee-defaults__label">
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
index 94359ce9afe4..1be16963df94 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-gas-limit/advanced-gas-fee-gas-limit.js
@@ -7,7 +7,6 @@ import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { MAX_GAS_LIMIT_DEC } from '../../../../pages/send/send.constants';
 import Button from '../../../ui/button';
 import FormField from '../../../ui/form-field';
-import I18nValue from '../../../ui/i18n-value';
 import Typography from '../../../ui/typography';
 
 import { useAdvancedGasFeePopoverContext } from '../context';
@@ -66,11 +65,11 @@ const AdvancedGasFeeGasLimit = () => {
       tag={TYPOGRAPHY.Paragraph}
       variant={TYPOGRAPHY.H7}
       className="advanced-gas-fee-gas-limit"
-      margin={[4, 2, 0, 2]}
+      marginTop={4}
+      marginLeft={2}
+      marginRight={2}
     >
-      <strong>
-        <I18nValue messageKey="gasLimitV2" />
-      </strong>
+      <strong>{t('gasLimitV2')}</strong>
       <span>{gasLimit}</span>
       <Button
         data-testid="advanced-gas-fee-edit"
@@ -78,7 +77,7 @@ const AdvancedGasFeeGasLimit = () => {
         onClick={() => setEditing(true)}
         type="link"
       >
-        <I18nValue messageKey="edit" />
+        {t('edit')}
       </Button>
     </Typography>
   );
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
index ddc0fd1ad4ac..9aba43ec0a9e 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
@@ -25,7 +25,7 @@ function determineTrendInfo(trend, t) {
     case 'level':
       return {
         className: 'fa-arrow-right advanced-gas-fee-input-subtext__level',
-        color: 'var(--color-icon-default)',
+        color: 'var(--color-icon-alternative)',
         title: t('levelArrow'),
       };
     default:
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
index ee3737431e2f..466a965322dc 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
@@ -115,7 +115,7 @@ const BaseFeeInput = () => {
   ]);
 
   return (
-    <Box className="base-fee-input" margin={[0, 2]}>
+    <Box className="base-fee-input" marginLeft={2} marginRight={2}>
       <FormField
         dataTestId="base-fee-input"
         error={baseFeeError ? t(baseFeeError) : ''}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
index a2b13fe944ad..b06798b817a6 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
@@ -103,7 +103,12 @@ const PriorityFeeInput = () => {
   ]);
 
   return (
-    <Box margin={[4, 2, 0, 2]} className="priority-fee-input">
+    <Box
+      marginTop={4}
+      marginLeft={2}
+      marginRight={2}
+      className="priority-fee-input"
+    >
       <FormField
         dataTestId="priority-fee-input"
         error={priorityFeeError ? t(priorityFeeError) : ''}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
index 47c3abd28cd9..ee0ecaf08cf7 100644
--- a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
@@ -5,8 +5,8 @@ import { decGWEIToHexWEI } from '../../../../../shared/modules/conversion.utils'
 import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
 import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
 import Button from '../../../ui/button';
-import I18nValue from '../../../ui/i18n-value';
 
 import { useAdvancedGasFeePopoverContext } from '../context';
 
@@ -14,6 +14,7 @@ const AdvancedGasFeeSaveButton = () => {
   const { closeModal } = useTransactionModalContext();
   const { updateTransactionEventFragment } = useTransactionEventFragment();
   const { updateTransaction } = useGasFeeContext();
+  const t = useI18nContext();
   const {
     gasLimit,
     hasErrors,
@@ -38,7 +39,7 @@ const AdvancedGasFeeSaveButton = () => {
 
   return (
     <Button type="primary" disabled={hasErrors} onClick={onSave}>
-      <I18nValue messageKey="save" />
+      {t('save')}
     </Button>
   );
 };
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index 3920e5372416..6fd148adc069 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -14,6 +14,7 @@
 @import 'collectibles-items/index';
 @import 'collectibles-tab/index';
 @import 'collectible-details/index';
+@import 'collectible-default-image/index';
 @import 'collectible-options/index';
 @import 'collectibles-detection-notice/index';
 @import 'connected-accounts-list/index';
diff --git a/ui/components/app/app-header/app-header.component.js b/ui/components/app/app-header/app-header.component.js
index c2a6a092640a..8f3fc588d2b7 100644
--- a/ui/components/app/app-header/app-header.component.js
+++ b/ui/components/app/app-header/app-header.component.js
@@ -20,6 +20,9 @@ export default class AppHeader extends PureComponent {
     disabled: PropTypes.bool,
     disableNetworkIndicator: PropTypes.bool,
     isAccountMenuOpen: PropTypes.bool,
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    unreadNotificationsCount: PropTypes.number,
+    ///: END:ONLY_INCLUDE_IN
     onClick: PropTypes.func,
   };
 
@@ -66,11 +69,14 @@ export default class AppHeader extends PureComponent {
       selectedAddress,
       disabled,
       isAccountMenuOpen,
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      unreadNotificationsCount,
+      ///: END:ONLY_INCLUDE_IN
     } = this.props;
 
     return (
       isUnlocked && (
-        <div
+        <button
           className={classnames('account-menu__icon', {
             'account-menu__icon--disabled': disabled,
           })}
@@ -90,7 +96,16 @@ export default class AppHeader extends PureComponent {
           }}
         >
           <Identicon address={selectedAddress} diameter={32} addBorder />
-        </div>
+          {
+            ///: BEGIN:ONLY_INCLUDE_IN(flask)
+            unreadNotificationsCount > 0 && (
+              <div className="account-menu__icon__notification-count">
+                {unreadNotificationsCount}
+              </div>
+            )
+            ///: END:ONLY_INCLUDE_IN
+          }
+        </button>
       )
     );
   }
diff --git a/ui/components/app/app-header/app-header.container.js b/ui/components/app/app-header/app-header.container.js
index a7d632b6d89d..e30049bc387f 100644
--- a/ui/components/app/app-header/app-header.container.js
+++ b/ui/components/app/app-header/app-header.container.js
@@ -1,6 +1,9 @@
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
 import { compose } from 'redux';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { getUnreadNotificationsCount } from '../../../selectors';
+///: END:ONLY_INCLUDE_IN
 
 import * as actions from '../../../store/actions';
 import AppHeader from './app-header.component';
@@ -10,11 +13,18 @@ const mapStateToProps = (state) => {
   const { networkDropdownOpen } = appState;
   const { selectedAddress, isUnlocked, isAccountMenuOpen } = metamask;
 
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  const unreadNotificationsCount = getUnreadNotificationsCount(state);
+  ///: END:ONLY_INCLUDE_IN
+
   return {
     networkDropdownOpen,
     selectedAddress,
     isUnlocked,
     isAccountMenuOpen,
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    unreadNotificationsCount,
+    ///: END:ONLY_INCLUDE_IN
   };
 };
 
diff --git a/ui/components/app/app-header/index.scss b/ui/components/app/app-header/index.scss
index a5906af7f46d..dd3e27fd15cd 100644
--- a/ui/components/app/app-header/index.scss
+++ b/ui/components/app/app-header/index.scss
@@ -86,4 +86,25 @@
     width: 0;
     justify-content: flex-end;
   }
+
+  .account-menu__icon {
+    position: relative;
+    border: 0;
+    background: none;
+
+    &__notification-count {
+      position: absolute;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      right: 0;
+      bottom: 0;
+      min-width: 16px;
+      min-height: 16px;
+      font-size: 10px;
+      border-radius: 50%;
+      background-color: var(--color-primary-default);
+      color: var(--color-primary-inverse);
+    }
+  }
 }
diff --git a/ui/components/app/asset-list-item/asset-list-item.js b/ui/components/app/asset-list-item/asset-list-item.js
index 77ab7f53d67f..bc19aff878c8 100644
--- a/ui/components/app/asset-list-item/asset-list-item.js
+++ b/ui/components/app/asset-list-item/asset-list-item.js
@@ -9,7 +9,7 @@ import Tooltip from '../../ui/tooltip';
 import InfoIcon from '../../ui/icon/info-icon.component';
 import Button from '../../ui/button';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import { updateSendAsset } from '../../../ducks/send';
+import { startNewDraftTransaction } from '../../../ducks/send';
 import { SEND_ROUTE } from '../../../helpers/constants/routes';
 import { SEVERITIES } from '../../../helpers/constants/design-system';
 import { INVALID_ASSET_TYPE } from '../../../helpers/constants/error-keys';
@@ -74,7 +74,7 @@ const AssetListItem = ({
           });
           try {
             await dispatch(
-              updateSendAsset({
+              startNewDraftTransaction({
                 type: ASSET_TYPES.TOKEN,
                 details: {
                   address: tokenAddress,
diff --git a/ui/components/app/asset-list/asset-list.js b/ui/components/app/asset-list/asset-list.js
index 3ba7a0c7dc3a..08f8c6169358 100644
--- a/ui/components/app/asset-list/asset-list.js
+++ b/ui/components/app/asset-list/asset-list.js
@@ -7,7 +7,7 @@ import AssetListItem from '../asset-list-item';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { useUserPreferencedCurrency } from '../../../hooks/useUserPreferencedCurrency';
 import {
-  getCurrentAccountWithSendEtherInfo,
+  getSelectedAccountCachedBalance,
   getShouldShowFiat,
   getNativeCurrencyImage,
   getDetectedTokensInCurrentNetwork,
@@ -33,12 +33,12 @@ const AssetList = ({ onClickAsset }) => {
 
   const [showDetectedTokens, setShowDetectedTokens] = useState(false);
 
-  const selectedAccountBalance = useSelector(
-    (state) => getCurrentAccountWithSendEtherInfo(state).balance,
-  );
+  const selectedAccountBalance = useSelector(getSelectedAccountCachedBalance);
   const nativeCurrency = useSelector(getNativeCurrency);
   const showFiat = useSelector(getShouldShowFiat);
   const trackEvent = useContext(MetaMetricsContext);
+  const balance = useSelector(getSelectedAccountCachedBalance);
+  const balanceIsLoading = !balance;
 
   const {
     currency: primaryCurrency,
@@ -78,7 +78,7 @@ const AssetList = ({ onClickAsset }) => {
         }
         tokenSymbol={primaryCurrencyProperties.suffix}
         secondary={showFiat ? secondaryCurrencyDisplay : undefined}
-        tokenImage={primaryTokenImage}
+        tokenImage={balanceIsLoading ? null : primaryTokenImage}
         identiconBorder
       />
       <TokenList
diff --git a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
index aa487cc6dd7c..55f68a1ad3e3 100644
--- a/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
+++ b/ui/components/app/cancel-speedup-popover/cancel-speedup-popover.js
@@ -20,7 +20,6 @@ import EditGasFeeButton from '../edit-gas-fee-button';
 import GasDetailsItem from '../gas-details-item';
 import Box from '../../ui/box';
 import Button from '../../ui/button';
-import I18nValue from '../../ui/i18n-value';
 import InfoTooltip from '../../ui/info-tooltip';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography';
@@ -104,16 +103,12 @@ const CancelSpeedupPopover = () => {
         <Typography
           boxProps={{ alignItems: ALIGN_ITEMS.CENTER, display: DISPLAY.FLEX }}
           variant={TYPOGRAPHY.H6}
-          margin={[0, 0, 2, 0]}
+          marginTop={0}
+          marginBottom={2}
         >
-          <I18nValue
-            messageKey="cancelSpeedUpLabel"
-            options={[
-              <strong key="cancelSpeedupReplace">
-                <I18nValue messageKey="replace" />
-              </strong>,
-            ]}
-          />
+          {t('cancelSpeedUpLabel', [
+            <strong key="cancelSpeedupReplace">{t('replace')}</strong>,
+          ])}
           <InfoTooltip
             position="top"
             contentText={
@@ -151,7 +146,7 @@ const CancelSpeedupPopover = () => {
           </Box>
         </Box>
         <Button type="primary" onClick={submitTransactionChange}>
-          <I18nValue messageKey="submit" />
+          {t('submit')}
         </Button>
       </div>
     </Popover>
diff --git a/ui/components/app/collectible-default-image/collectible-default-image.js b/ui/components/app/collectible-default-image/collectible-default-image.js
new file mode 100644
index 000000000000..c301c2c2ca58
--- /dev/null
+++ b/ui/components/app/collectible-default-image/collectible-default-image.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import Typography from '../../ui/typography';
+import { TYPOGRAPHY } from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export default function CollectibleDefaultImage({
+  name,
+  tokenId,
+  handleImageClick,
+}) {
+  const t = useI18nContext();
+  return (
+    <div
+      className={classnames('collectible-default', {
+        'collectible-default--clickable': handleImageClick,
+      })}
+      onClick={handleImageClick}
+    >
+      <Typography variant={TYPOGRAPHY.H6} className="collectible-default__text">
+        {name ?? t('unknownCollection')} <br /> #{tokenId}
+      </Typography>
+    </div>
+  );
+}
+
+CollectibleDefaultImage.propTypes = {
+  /**
+   * The name of the collectible collection if not supplied will default to "Unnamed collection"
+   */
+  name: PropTypes.string,
+  /**
+   * The token id of the collectible
+   */
+  tokenId: PropTypes.string,
+  /**
+   * The click handler for the collectible default image
+   */
+  handleImageClick: PropTypes.func,
+};
diff --git a/ui/components/app/collectible-default-image/collectible-default-image.stories.js b/ui/components/app/collectible-default-image/collectible-default-image.stories.js
new file mode 100644
index 000000000000..d4b7a2a69fd5
--- /dev/null
+++ b/ui/components/app/collectible-default-image/collectible-default-image.stories.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import CollectibleDefaultImage from '.';
+
+export default {
+  title: 'Components/App/CollectibleDefaultImage',
+  id: __filename,
+  argTypes: {
+    name: {
+      control: 'text',
+    },
+    tokenId: {
+      control: 'text',
+    },
+    handleImageClick: {
+      action: 'handleImageClick',
+    },
+  },
+  args: {
+    name: null,
+    tokenId: '12345',
+    handleImageClick: null,
+  },
+};
+
+export const DefaultStory = (args) => (
+  <div style={{ width: 200, height: 200 }}>
+    <CollectibleDefaultImage {...args} />
+  </div>
+);
+
+DefaultStory.storyName = 'Default';
+
+export const handleImageClick = (args) => (
+  <div style={{ width: 200, height: 200 }}>
+    <CollectibleDefaultImage {...args} />
+  </div>
+);
+
+handleImageClick.args = {
+  // eslint-disable-next-line no-alert
+  handleImageClick: () => window.alert('CollectibleDefaultImage clicked!'),
+};
diff --git a/ui/components/app/collectible-default-image/index.js b/ui/components/app/collectible-default-image/index.js
new file mode 100644
index 000000000000..76ab58746e9b
--- /dev/null
+++ b/ui/components/app/collectible-default-image/index.js
@@ -0,0 +1 @@
+export { default } from './collectible-default-image';
diff --git a/ui/components/app/collectible-default-image/index.scss b/ui/components/app/collectible-default-image/index.scss
new file mode 100644
index 000000000000..ff2ba60e15a4
--- /dev/null
+++ b/ui/components/app/collectible-default-image/index.scss
@@ -0,0 +1,22 @@
+.collectible-default {
+  background-color: var(--color-background-alternative);
+  padding-top: 100%; // retains 1:1 aspect ratio
+  position: relative;
+  width: 100%;
+
+  &__text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    text-align: center;
+    position: absolute;
+    white-space: nowrap;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: calc(100% - 32px);
+  }
+
+  &--clickable {
+    cursor: pointer;
+  }
+}
diff --git a/ui/components/app/collectible-details/collectible-details.js b/ui/components/app/collectible-details/collectible-details.js
index 4e7c433d4a63..b50dd60627a0 100644
--- a/ui/components/app/collectible-details/collectible-details.js
+++ b/ui/components/app/collectible-details/collectible-details.js
@@ -45,13 +45,13 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import CollectibleOptions from '../collectible-options/collectible-options';
 import Button from '../../ui/button';
-import { updateSendAsset } from '../../../ducks/send';
+import { startNewDraftTransaction } from '../../../ducks/send';
 import InfoTooltip from '../../ui/info-tooltip';
-import { ERC721 } from '../../../helpers/constants/common';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
-import { ASSET_TYPES } from '../../../../shared/constants/transaction';
+import { ASSET_TYPES, ERC721 } from '../../../../shared/constants/transaction';
+import CollectibleDefaultImage from '../collectible-default-image';
 
 export default function CollectibleDetails({ collectible }) {
   const {
@@ -119,7 +119,7 @@ export default function CollectibleDetails({ collectible }) {
 
   const onSend = async () => {
     await dispatch(
-      updateSendAsset({
+      startNewDraftTransaction({
         type: ASSET_TYPES.COLLECTIBLE,
         details: collectible,
       }),
@@ -176,7 +176,11 @@ export default function CollectibleDetails({ collectible }) {
             justifyContent={JUSTIFY_CONTENT.CENTER}
             className="collectible-details__card"
           >
-            <img className="collectible-details__image" src={image} />
+            {image ? (
+              <img className="collectible-details__image" src={image} />
+            ) : (
+              <CollectibleDefaultImage name={name} tokenId={tokenId} />
+            )}
           </Card>
           <Box
             flexDirection={FLEX_DIRECTION.COLUMN}
@@ -215,6 +219,7 @@ export default function CollectibleDetails({ collectible }) {
                 <Typography
                   color={COLORS.TEXT_ALTERNATIVE}
                   variant={TYPOGRAPHY.H6}
+                  overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
                   boxProps={{ margin: 0, marginBottom: 4 }}
                 >
                   {description}
@@ -311,7 +316,7 @@ export default function CollectibleDetails({ collectible }) {
                 {copied ? (
                   t('copiedExclamation')
                 ) : (
-                  <Copy size={15} color="var(--color-icon-default)" />
+                  <Copy size={15} color="var(--color-icon-alternative)" />
                 )}
               </button>
             </Box>
diff --git a/ui/components/app/collectible-details/collectible-details.stories.js b/ui/components/app/collectible-details/collectible-details.stories.js
index bbd18bac0b74..a40e81c0299e 100644
--- a/ui/components/app/collectible-details/collectible-details.stories.js
+++ b/ui/components/app/collectible-details/collectible-details.stories.js
@@ -1,6 +1,15 @@
 import React from 'react';
 import CollectibleDetails from './collectible-details';
 
+const collectible = {
+  name: 'Catnip Spicywright',
+  tokenId: '1124157',
+  address: '0x06012c8cf97bead5deae237070f9587f8e7a266d',
+  image: './catnip-spicywright.png',
+  description:
+    "Good day. My name is Catnip Spicywight, which got me teased a lot in high school. If I want to put low fat mayo all over my hamburgers, I shouldn't have to answer to anyone about it, am I right? One time I beat Arlene in an arm wrestle.",
+};
+
 export default {
   title: 'Components/App/CollectiblesDetail',
   id: __filename,
@@ -9,23 +18,24 @@ export default {
       control: 'object',
     },
   },
+  args: {
+    collectible,
+  },
 };
 
-const collectible = {
-  name: 'Catnip Spicywright',
-  tokenId: '1124157',
-  address: '0x06012c8cf97bead5deae237070f9587f8e7a266d',
-  image: './catnip-spicywright.png',
-  description:
-    "Good day. My name is Catnip Spicywight, which got me teased a lot in high school. If I want to put low fat mayo all over my hamburgers, I shouldn't have to answer to anyone about it, am I right? One time I beat Arlene in an arm wrestle.",
-};
-
-export const DefaultStory = () => {
-  return <CollectibleDetails collectible={collectible} />;
+export const DefaultStory = (args) => {
+  return <CollectibleDetails {...args} />;
 };
 
 DefaultStory.storyName = 'Default';
 
-DefaultStory.args = {
-  collectible,
+export const NoImage = (args) => {
+  return <CollectibleDetails {...args} />;
+};
+
+NoImage.args = {
+  collectible: {
+    ...collectible,
+    image: undefined,
+  },
 };
diff --git a/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js b/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
index 3cf95e716d8b..00e51238551f 100644
--- a/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
+++ b/ui/components/app/collectibles-detection-notice/collectibles-detection-notice.js
@@ -56,8 +56,9 @@ export default function CollectiblesDetectionNotice() {
             </Typography>
             <Button
               type="link"
-              onClick={() => {
-                history.push(EXPERIMENTAL_ROUTE);
+              onClick={(e) => {
+                e.preventDefault();
+                history.push(`${EXPERIMENTAL_ROUTE}#autodetect-nfts`);
               }}
               className="collectibles-detection-notice__message__link"
             >
diff --git a/ui/components/app/collectibles-items/collectibles-items.js b/ui/components/app/collectibles-items/collectibles-items.js
index 1027cda9f6bd..2f3eeb21166d 100644
--- a/ui/components/app/collectibles-items/collectibles-items.js
+++ b/ui/components/app/collectibles-items/collectibles-items.js
@@ -28,6 +28,8 @@ import { getAssetImageURL } from '../../../helpers/utils/util';
 import { updateCollectibleDropDownState } from '../../../store/actions';
 import { usePrevious } from '../../../hooks/usePrevious';
 import { getCollectiblesDropdownState } from '../../../ducks/metamask/metamask';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import CollectibleDefaultImage from '../collectible-default-image';
 
 const width =
   getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
@@ -46,6 +48,7 @@ export default function CollectiblesItems({
   const previousCollectionKeys = usePrevious(collectionsKeys);
   const selectedAddress = useSelector(getSelectedAddress);
   const chainId = useSelector(getCurrentChainId);
+  const t = useI18nContext();
 
   useEffect(() => {
     if (
@@ -101,7 +104,7 @@ export default function CollectiblesItems({
     }
     return (
       <div className="collectibles-items__collection-image-alt">
-        {collectionName[0]}
+        {collectionName?.[0]?.toUpperCase() ?? null}
       </div>
     );
   };
@@ -162,13 +165,20 @@ export default function CollectiblesItems({
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H5}
-                margin={[0, 0, 0, 2]}
+                marginTop={0}
+                marginBottom={2}
               >
-                {`${collectionName} (${collectibles.length})`}
+                {`${collectionName ?? t('unknownCollection')} (${
+                  collectibles.length
+                })`}
               </Typography>
             </Box>
             <Box alignItems={ALIGN_ITEMS.FLEX_END}>
-              <i className={`fa fa-chevron-${isExpanded ? 'down' : 'right'}`} />
+              <i
+                className={`collectibles-items__collection__icon-chevron fa fa-chevron-${
+                  isExpanded ? 'down' : 'right'
+                }`}
+              />
             </Box>
           </Box>
         </button>
@@ -176,29 +186,48 @@ export default function CollectiblesItems({
         {isExpanded ? (
           <Box display={DISPLAY.FLEX} flexWrap={FLEX_WRAP.WRAP} gap={4}>
             {collectibles.map((collectible, i) => {
-              const { image, address, tokenId, backgroundColor } = collectible;
+              const {
+                image,
+                address,
+                tokenId,
+                backgroundColor,
+                name,
+              } = collectible;
               const collectibleImage = getAssetImageURL(image, ipfsGateway);
+              const handleImageClick = () =>
+                history.push(`${ASSET_ROUTE}/${address}/${tokenId}`);
+
               return (
                 <Box
                   width={width}
                   key={`collectible-${i}`}
-                  className="collectibles-items__collection-item-wrapper"
+                  className="collectibles-items__item-wrapper"
                 >
-                  <Card padding={0} justifyContent={JUSTIFY_CONTENT.CENTER}>
-                    <div
-                      className="collectibles-items__collection-item"
-                      style={{
-                        backgroundColor,
-                      }}
-                    >
-                      <img
-                        onClick={() =>
-                          history.push(`${ASSET_ROUTE}/${address}/${tokenId}`)
-                        }
-                        className="collectibles-items__collection-item-image"
-                        src={collectibleImage}
+                  <Card
+                    padding={0}
+                    justifyContent={JUSTIFY_CONTENT.CENTER}
+                    className="collectibles-items__item-wrapper__card"
+                  >
+                    {collectibleImage ? (
+                      <div
+                        className="collectibles-items__item"
+                        style={{
+                          backgroundColor,
+                        }}
+                      >
+                        <img
+                          onClick={handleImageClick}
+                          className="collectibles-items__item-image"
+                          src={collectibleImage}
+                        />
+                      </div>
+                    ) : (
+                      <CollectibleDefaultImage
+                        name={name}
+                        tokenId={tokenId}
+                        handleImageClick={handleImageClick}
                       />
-                    </div>
+                    )}
                   </Card>
                 </Box>
               );
@@ -211,7 +240,13 @@ export default function CollectiblesItems({
 
   return (
     <div className="collectibles-items">
-      <Box padding={[6, 4]} flexDirection={FLEX_DIRECTION.COLUMN}>
+      <Box
+        paddingTop={6}
+        paddingBottom={6}
+        paddingLeft={4}
+        paddingRight={4}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+      >
         <>
           {collectionsKeys.map((key) => {
             const {
diff --git a/ui/components/app/collectibles-items/index.scss b/ui/components/app/collectibles-items/index.scss
index a2dc0dd58a89..545528fde4d4 100644
--- a/ui/components/app/collectibles-items/index.scss
+++ b/ui/components/app/collectibles-items/index.scss
@@ -27,25 +27,33 @@
       color: var(--color-overlay-inverse);
       text-align: center;
     }
+  }
 
-    &-item-wrapper {
-      align-self: center;
-    }
+  &__item-wrapper {
+    align-self: center;
 
-    &-item {
-      border-radius: 4px;
-      width: 100%;
-      display: flex;
-      justify-content: center;
-      cursor: pointer;
-      align-self: center;
+    &__card {
+      overflow: hidden;
     }
+  }
+
+  &__item {
+    border-radius: 4px;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    cursor: pointer;
+    align-self: center;
 
-    &-item-image {
+    &-image {
       border-radius: 4px;
       width: 100%;
       height: 100%;
       cursor: pointer;
     }
   }
+
+  &__icon-chevron {
+    color: var(--color-icon-default);
+  }
 }
diff --git a/ui/components/app/collectibles-tab/collectibles-tab.test.js b/ui/components/app/collectibles-tab/collectibles-tab.test.js
index 9a1eba4611d2..d364d5b51d2b 100644
--- a/ui/components/app/collectibles-tab/collectibles-tab.test.js
+++ b/ui/components/app/collectibles-tab/collectibles-tab.test.js
@@ -214,14 +214,16 @@ describe('Collectible Items', () => {
       });
       expect(screen.queryByText('New! NFT detection')).not.toBeInTheDocument();
     });
-    it('should take user to the experimental settings tab in setings when user clicks "Turn on NFT detection in Settings"', () => {
+    it('should take user to the experimental settings tab in settings when user clicks "Turn on NFT detection in Settings"', () => {
       render({
         selectedAddress: ACCOUNT_2,
         collectibles: COLLECTIBLES,
       });
       fireEvent.click(screen.queryByText('Turn on NFT detection in Settings'));
       expect(historyPushMock).toHaveBeenCalledTimes(1);
-      expect(historyPushMock).toHaveBeenCalledWith(EXPERIMENTAL_ROUTE);
+      expect(historyPushMock).toHaveBeenCalledWith(
+        `${EXPERIMENTAL_ROUTE}#autodetect-nfts`,
+      );
     });
     it('should not render the Collectibles Detection Notice when currently selected network is Mainnet and currently selected account has no collectibles but use collectible autodetection preference is set to true', () => {
       render({
diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
new file mode 100644
index 000000000000..929082c4ddc3
--- /dev/null
+++ b/ui/components/app/confirm-page-container/confirm-detail-row/confirm-detail-row.stories.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import ConfirmDetailRow from '.';
+
+export default {
+  title: 'Components/App/ConfirmPageContainer/ConfirmDetailRow',
+  id: __filename,
+  argTypes: {
+    headerText: {
+      control: 'text',
+    },
+    headerTextClassName: {
+      control: 'text',
+    },
+    label: {
+      control: 'text',
+    },
+    onHeaderClick: {
+      control: 'text',
+    },
+    primaryValueTextColor: {
+      control: 'text',
+    },
+    primaryText: {
+      control: 'text',
+    },
+    secondaryText: {
+      control: 'text',
+    },
+    value: {
+      control: 'text',
+    },
+  },
+  args: {
+    headerText: 'headerText',
+    headerTextClassName: 'headerTextClassName',
+    label: 'label',
+    onHeaderClick: 'onHeaderClick',
+    primaryValueTextColor: 'primaryValueTextColor',
+    primaryText: 'primaryText',
+    secondaryText: 'secondaryText',
+    value: 'value',
+  },
+};
+
+export const DefaultStory = (args) => <ConfirmDetailRow {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/confirm-page-container/confirm-detail-row/index.scss b/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
index 25a7d8fe16e5..cfb382f83f8f 100644
--- a/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
+++ b/ui/components/app/confirm-page-container/confirm-detail-row/index.scss
@@ -26,7 +26,7 @@
   }
 
   &__secondary {
-    color: var(--color-icon-default);
+    color: var(--color-text-alternative);
     justify-content: flex-end;
   }
 
@@ -35,7 +35,7 @@
 
     text-transform: uppercase;
     margin-bottom: 6px;
-    color: var(--color-icon-default);
+    color: var(--color-text-default);
 
     &--edit {
       color: var(--color-primary-default);
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
index a83cc1e4eb67..e31e81bce2b6 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-summary/confirm-page-container-summary.component.js
@@ -14,6 +14,7 @@ import NicknamePopovers from '../../../modals/nickname-popovers';
 import Typography from '../../../../ui/typography';
 import { TYPOGRAPHY } from '../../../../../helpers/constants/design-system';
 import { ORIGIN_METAMASK } from '../../../../../../shared/constants/app';
+import SiteOrigin from '../../../../ui/site-origin';
 
 const ConfirmPageContainerSummary = (props) => {
   const {
@@ -52,7 +53,8 @@ const ConfirmPageContainerSummary = (props) => {
     contractAddress =
       transactionType === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
       transactionType === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
+      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM ||
+      transactionType === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL
         ? tokenAddress
         : toAddress;
   }
@@ -85,7 +87,10 @@ const ConfirmPageContainerSummary = (props) => {
   return (
     <div className={classnames('confirm-page-container-summary', className)}>
       {origin === ORIGIN_METAMASK ? null : (
-        <div className="confirm-page-container-summary__origin">{origin}</div>
+        <SiteOrigin
+          className="confirm-page-container-summary__origin"
+          siteOrigin={origin}
+        />
       )}
       <div className="confirm-page-container-summary__action-row">
         <div className="confirm-page-container-summary__action">
diff --git a/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js b/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
index b9019424e250..a0d33a1512ef 100644
--- a/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
+++ b/ui/components/app/confirm-page-container/enableEIP1559V2-notice/enableEIP1559V2-notice.js
@@ -34,7 +34,9 @@ export default function EnableEIP1559V2Notice({ isFirstAlert }) {
 
   return (
     <Box
-      margin={[0, 4, 4, 4]}
+      marginRight={4}
+      marginBottom={4}
+      marginLeft={4}
       marginTop={isFirstAlert ? 4 : 0}
       className="enableEIP1559V2-notice"
     >
diff --git a/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js b/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
new file mode 100644
index 000000000000..48f79b19e134
--- /dev/null
+++ b/ui/components/app/connected-accounts-list/connected-accounts-list.stories.js
@@ -0,0 +1,38 @@
+import React from 'react';
+import ConnectedAccountsList from '.';
+
+export default {
+  title: 'Components/App/ConnectedAccountsList',
+  id: __filename,
+  argTypes: {
+    connectedAccounts: {
+      control: 'array',
+    },
+    selectedAddress: {
+      control: 'text',
+    },
+    shouldRenderListOptions: {
+      control: 'boolean',
+    },
+  },
+  args: {
+    connectedAccounts: [
+      {
+        name: 'This is a Really Long Account Name',
+        address: '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
+        index: 0,
+        balance: '0x176e5b6f173ebe66',
+      },
+      {
+        name: 'Account 2',
+        address: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
+        index: 1,
+        balance: '0x2d3142f5000',
+      },
+    ],
+  },
+};
+
+export const DefaultStory = (args) => <ConnectedAccountsList {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/connected-sites-list/connected-sites-list.component.js b/ui/components/app/connected-sites-list/connected-sites-list.component.js
index 52245e7cb42a..7b23820c033d 100644
--- a/ui/components/app/connected-sites-list/connected-sites-list.component.js
+++ b/ui/components/app/connected-sites-list/connected-sites-list.component.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import Button from '../../ui/button';
 import SiteIcon from '../../ui/site-icon';
 import { stripHttpsSchemeWithoutPort } from '../../../helpers/utils/util';
+import SiteOrigin from '../../ui/site-origin';
 
 export default class ConnectedSitesList extends Component {
   static contextTypes = {
@@ -33,12 +34,11 @@ export default class ConnectedSitesList extends Component {
           >
             <div className="connected-sites-list__subject-info">
               <SiteIcon icon={subject.iconUrl} name={subject.name} size={32} />
-              <span
+              <SiteOrigin
                 className="connected-sites-list__subject-name"
                 title={subject.extensionId || subject.origin}
-              >
-                {this.getSubjectDisplayName(subject)}
-              </span>
+                siteOrigin={this.getSubjectDisplayName(subject)}
+              />
             </div>
             <Button
               className="connected-sites-list__content-row-link-button"
diff --git a/ui/components/app/connected-sites-list/index.scss b/ui/components/app/connected-sites-list/index.scss
index 3a690d18931c..7e9fc0d105ec 100644
--- a/ui/components/app/connected-sites-list/index.scss
+++ b/ui/components/app/connected-sites-list/index.scss
@@ -34,10 +34,6 @@
 
   &__subject-name {
     max-width: 215px;
-    white-space: nowrap;
-    overflow: hidden;
-    direction: rtl;
-    text-overflow: ellipsis;
     margin-left: 6px;
   }
 }
diff --git a/ui/components/app/currency-input/currency-input.js b/ui/components/app/currency-input/currency-input.js
index 194b4838112b..df8e85660512 100644
--- a/ui/components/app/currency-input/currency-input.js
+++ b/ui/components/app/currency-input/currency-input.js
@@ -44,17 +44,11 @@ export default function CurrencyInput({
 
   const [isSwapped, setSwapped] = useState(false);
   const [newHexValue, setNewHexValue] = useState(hexValue);
-
-  const shouldUseFiat = () => {
-    if (hideSecondary) {
-      return false;
-    }
-
-    return Boolean(featureSecondary);
-  };
+  const [shouldDisplayFiat, setShouldDisplayFiat] = useState(featureSecondary);
+  const shouldUseFiat = hideSecondary ? false : Boolean(shouldDisplayFiat);
 
   const getDecimalValue = () => {
-    const decimalValueString = shouldUseFiat()
+    const decimalValueString = shouldUseFiat
       ? getValueFromWeiHex({
           value: hexValue,
           toCurrency: secondaryCurrency,
@@ -71,22 +65,15 @@ export default function CurrencyInput({
   };
 
   const initialDecimalValue = hexValue ? getDecimalValue() : 0;
-  const [decimalValue, setDecimalValue] = useState(initialDecimalValue);
-
-  useEffect(() => {
-    setNewHexValue(hexValue);
-    const newDecimalValue = getDecimalValue();
-    setDecimalValue(newDecimalValue);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [hexValue]);
 
   const swap = async () => {
     await onPreferenceToggle();
     setSwapped(!isSwapped);
+    setShouldDisplayFiat(!shouldDisplayFiat);
   };
 
   const handleChange = (newDecimalValue) => {
-    const hexValueNew = shouldUseFiat()
+    const hexValueNew = shouldUseFiat
       ? getWeiHexFromDecimalValue({
           value: newDecimalValue,
           fromCurrency: secondaryCurrency,
@@ -101,17 +88,20 @@ export default function CurrencyInput({
         });
 
     setNewHexValue(hexValueNew);
-    setDecimalValue(newDecimalValue);
     onChange(hexValueNew);
     setSwapped(!isSwapped);
   };
 
   useEffect(() => {
-    if (isSwapped) {
-      handleChange(decimalValue);
+    setNewHexValue(hexValue);
+  }, [hexValue]);
+
+  useEffect(() => {
+    if (featureSecondary) {
+      handleChange(initialDecimalValue);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isSwapped]);
+  }, [featureSecondary, initialDecimalValue]);
 
   const renderConversionComponent = () => {
     let currency, numberOfDecimals;
@@ -124,7 +114,7 @@ export default function CurrencyInput({
       );
     }
 
-    if (shouldUseFiat()) {
+    if (shouldUseFiat) {
       // Display ETH
       currency = preferredCurrency || ETH;
       numberOfDecimals = 8;
@@ -156,9 +146,9 @@ export default function CurrencyInput({
         onChange,
         onPreferenceToggle,
       }}
-      suffix={shouldUseFiat() ? secondarySuffix : primarySuffix}
+      suffix={shouldUseFiat ? secondarySuffix : primarySuffix}
       onChange={handleChange}
-      value={decimalValue}
+      value={initialDecimalValue}
       actionComponent={
         <button className="currency-input__swap-component" onClick={swap}>
           <i className="fa fa-retweet fa-lg" />
diff --git a/ui/components/app/currency-input/currency-input.test.js b/ui/components/app/currency-input/currency-input.test.js
index a12e529df6bf..0b452307d194 100644
--- a/ui/components/app/currency-input/currency-input.test.js
+++ b/ui/components/app/currency-input/currency-input.test.js
@@ -109,10 +109,15 @@ describe('CurrencyInput Component', () => {
         },
       };
       const store = configureMockStore()(mockStore);
+      const handleChangeSpy = sinon.spy();
 
       const wrapper = mount(
         <Provider store={store}>
-          <CurrencyInput hexValue="f602f2234d0ea" featureSecondary />
+          <CurrencyInput
+            onChange={handleChangeSpy}
+            hexValue="f602f2234d0ea"
+            featureSecondary
+          />
         </Provider>,
       );
 
@@ -140,12 +145,16 @@ describe('CurrencyInput Component', () => {
         },
         hideSecondary: true,
       };
-
       const store = configureMockStore()(mockStore);
+      const handleChangeSpy = sinon.spy();
 
       const wrapper = mount(
         <Provider store={store}>
-          <CurrencyInput hexValue="f602f2234d0ea" featureSecondary />
+          <CurrencyInput
+            onChange={handleChangeSpy}
+            hexValue="f602f2234d0ea"
+            featureSecondary
+          />
         </Provider>,
         {
           context: { t: (str) => `${str}_t` },
@@ -205,7 +214,7 @@ describe('CurrencyInput Component', () => {
       expect(input.props().value).toStrictEqual(0.00432788);
 
       input.simulate('change', { target: { value: 1 } });
-      expect(handleChangeSpy.callCount).toStrictEqual(2);
+      expect(handleChangeSpy.callCount).toStrictEqual(1);
       expect(handleChangeSpy.calledWith('de0b6b3a7640000')).toStrictEqual(true);
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
         '$231.06USD',
@@ -234,7 +243,7 @@ describe('CurrencyInput Component', () => {
       );
 
       expect(wrapper).toHaveLength(1);
-      expect(handleChangeSpy.callCount).toStrictEqual(0);
+      expect(handleChangeSpy.callCount).toStrictEqual(1);
       expect(handleBlurSpy.callCount).toStrictEqual(0);
 
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
@@ -307,7 +316,7 @@ describe('CurrencyInput Component', () => {
       );
 
       expect(wrapper).toHaveLength(1);
-      expect(handleChangeSpy.callCount).toStrictEqual(0);
+      expect(handleChangeSpy.callCount).toStrictEqual(1);
       expect(handleBlurSpy.callCount).toStrictEqual(0);
 
       expect(wrapper.find('.currency-display-component').text()).toStrictEqual(
diff --git a/ui/components/app/detected-token/detected-token-address/detected-token-address.js b/ui/components/app/detected-token/detected-token-address/detected-token-address.js
index 3c4f012de6cc..8002bf7431c1 100644
--- a/ui/components/app/detected-token/detected-token-address/detected-token-address.js
+++ b/ui/components/app/detected-token/detected-token-address/detected-token-address.js
@@ -29,7 +29,8 @@ const DetectedTokenAddress = ({ tokenAddress }) => {
       <Typography
         variant={TYPOGRAPHY.H7}
         color={COLORS.PRIMARY_DEFAULT}
-        margin={[1, 2]}
+        marginLeft={2}
+        marginRight={2}
       >
         {shortenAddress(tokenAddress)}
       </Typography>
diff --git a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
index 25777ed4973d..6eaa9c3529d0 100644
--- a/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
+++ b/ui/components/app/detected-token/detected-token-ignored-popover/detected-token-ignored-popover.js
@@ -41,7 +41,10 @@ const DetectedTokenIgnoredPopover = ({
       <Typography
         variant={TYPOGRAPHY.H6}
         tag={TYPOGRAPHY.H6}
-        margin={[0, 5, 7, 5]}
+        marginTop={0}
+        marginRight={5}
+        marginBottom={7}
+        marginLeft={5}
       >
         {t('ignoreTokenWarning')}
       </Typography>
diff --git a/ui/components/app/detected-token/detected-token.js b/ui/components/app/detected-token/detected-token.js
index 0bfede9d144b..02416ec3710b 100644
--- a/ui/components/app/detected-token/detected-token.js
+++ b/ui/components/app/detected-token/detected-token.js
@@ -4,15 +4,17 @@ import { useSelector, useDispatch } from 'react-redux';
 import { chain } from 'lodash';
 
 import {
-  importTokens,
+  addImportedTokens,
   ignoreTokens,
   setNewTokensImported,
 } from '../../../store/actions';
 import { getDetectedTokensInCurrentNetwork } from '../../../selectors';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 
-import { TOKEN_STANDARDS } from '../../../helpers/constants/common';
-import { ASSET_TYPES } from '../../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+} from '../../../../shared/constants/transaction';
 import { EVENT, EVENT_NAMES } from '../../../../shared/constants/metametrics';
 import DetectedTokenSelectionPopover from './detected-token-selection-popover/detected-token-selection-popover';
 import DetectedTokenIgnoredPopover from './detected-token-ignored-popover/detected-token-ignored-popover';
@@ -63,7 +65,7 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         },
       });
     });
-    await dispatch(importTokens(selectedTokens));
+    await dispatch(addImportedTokens(selectedTokens));
     const tokenSymbols = selectedTokens.map(({ symbol }) => symbol);
     dispatch(setNewTokensImported(tokenSymbols.join(', ')));
   };
@@ -90,7 +92,15 @@ const DetectedToken = ({ setShowDetectedTokens }) => {
         asset_type: ASSET_TYPES.TOKEN,
       },
     });
-    await dispatch(ignoreTokens(deSelectedTokens));
+    const deSelectedTokensAddresses = deSelectedTokens.map(
+      ({ address }) => address,
+    );
+    await dispatch(
+      ignoreTokens({
+        tokensToIgnore: deSelectedTokensAddresses,
+        dontShowLoadingIndicator: true,
+      }),
+    );
     setShowDetectedTokens(false);
   };
 
diff --git a/ui/components/app/detected-token/detected-token.test.js b/ui/components/app/detected-token/detected-token.test.js
index 7c7f9ee791eb..e130708f44fe 100644
--- a/ui/components/app/detected-token/detected-token.test.js
+++ b/ui/components/app/detected-token/detected-token.test.js
@@ -8,7 +8,11 @@ import DetectedToken from './detected-token';
 describe('DetectedToken', () => {
   it('should render the detected token found page', async () => {
     const store = configureStore(testData);
-    renderWithProvider(<DetectedToken />, store);
+    const props = {
+      setShowDetectedTokens: jest.fn(),
+    };
+
+    renderWithProvider(<DetectedToken {...props} />, store);
 
     expect(screen.getByText('0 LINK')).toBeInTheDocument();
     expect(screen.getByText('0 COMP')).toBeInTheDocument();
diff --git a/ui/components/app/dropdowns/dropdown.js b/ui/components/app/dropdowns/dropdown.js
index 18e87d215589..de296034b8c2 100644
--- a/ui/components/app/dropdowns/dropdown.js
+++ b/ui/components/app/dropdowns/dropdown.js
@@ -18,7 +18,7 @@ export class Dropdown extends Component {
       borderRadius: '4px',
       padding: '8px 16px',
       background: 'var(--color-background-default)',
-      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
       ...innerStyle,
     };
 
diff --git a/ui/components/app/dropdowns/network-dropdown.js b/ui/components/app/dropdowns/network-dropdown.js
index 48af4be2c898..54af45b12e0e 100644
--- a/ui/components/app/dropdowns/network-dropdown.js
+++ b/ui/components/app/dropdowns/network-dropdown.js
@@ -20,6 +20,7 @@ import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
 import { EVENT } from '../../../../shared/constants/metametrics';
 import {
   ADD_NETWORK_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
   ADVANCED_ROUTE,
 } from '../../../helpers/constants/routes';
 import IconCheck from '../../ui/icon/icon-check';
@@ -49,6 +50,7 @@ function mapStateToProps(state) {
     frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     networkDropdownOpen: state.appState.networkDropdownOpen,
     showTestnetMessageInDropdown: state.metamask.showTestnetMessageInDropdown,
+    addPopularNetworkFeatureToggledOn: state.metamask.customNetworkListEnabled,
   };
 }
 
@@ -101,6 +103,7 @@ class NetworkDropdown extends Component {
     showTestnetMessageInDropdown: PropTypes.bool.isRequired,
     hideTestNetMessage: PropTypes.func.isRequired,
     history: PropTypes.object,
+    addPopularNetworkFeatureToggledOn: PropTypes.bool,
   };
 
   handleClick(newProviderType) {
@@ -129,10 +132,12 @@ class NetworkDropdown extends Component {
         <Button
           type="secondary"
           onClick={() => {
-            if (getEnvironmentType() === ENVIRONMENT_TYPE_POPUP) {
-              global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
+            if (this.props.addPopularNetworkFeatureToggledOn) {
+              this.props.history.push(ADD_POPULAR_CUSTOM_NETWORK);
             } else {
-              this.props.history.push(ADD_NETWORK_ROUTE);
+              getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+                ? global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE)
+                : this.props.history.push(ADD_NETWORK_ROUTE);
             }
             this.props.hideNetworkDropdown();
           }}
@@ -174,7 +179,7 @@ class NetworkDropdown extends Component {
             <div className="network-check__transparent">✓</div>
           )}
           <ColorIndicator
-            color={opts.isLocalHost ? 'localhost' : COLORS.TEXT_MUTED}
+            color={opts.isLocalHost ? 'localhost' : COLORS.ICON_MUTED}
             size={SIZES.LG}
             type={ColorIndicator.TYPES.FILLED}
           />
diff --git a/ui/components/app/dropdowns/network-dropdown.test.js b/ui/components/app/dropdowns/network-dropdown.test.js
index 1a963c9e86b6..5067988ca380 100644
--- a/ui/components/app/dropdowns/network-dropdown.test.js
+++ b/ui/components/app/dropdowns/network-dropdown.test.js
@@ -19,6 +19,7 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
+        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: true,
         },
@@ -50,6 +51,7 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
+        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: true,
         },
@@ -77,7 +79,7 @@ describe('Network Dropdown', () => {
       let found = false;
       while (!found) {
         if (
-          _wrapper.find(ColorIndicator).at(i).prop('color') === 'text-muted'
+          _wrapper.find(ColorIndicator).at(i).prop('color') === 'icon-muted'
         ) {
           i += 1;
         } else {
@@ -156,6 +158,7 @@ describe('Network Dropdown', () => {
         provider: {
           type: 'test',
         },
+        showTestnetMessageInDropdown: false,
         preferences: {
           showTestNetworks: false,
         },
diff --git a/ui/components/app/edit-gas-display/edit-gas-display.component.js b/ui/components/app/edit-gas-display/edit-gas-display.component.js
index f1d0b04f4986..2025ee30accf 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.component.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.component.js
@@ -81,7 +81,7 @@ export default function EditGasDisplay({
   const isMainnet = useSelector(getIsMainnet);
   const supportsEIP1559 =
     useSelector(checkNetworkAndAccountSupports1559) &&
-    !isLegacyTransaction(transaction.txParams);
+    !isLegacyTransaction(transaction?.txParams);
   const showAdvancedInlineGasIfPossible = useSelector(
     getAdvancedInlineGasShown,
   );
@@ -217,8 +217,8 @@ export default function EditGasDisplay({
             hasGasErrors === false &&
             supportsEIP1559 && (
               <GasTiming
-                maxFeePerGas={maxFeePerGas}
-                maxPriorityFeePerGas={maxPriorityFeePerGas}
+                maxFeePerGas={maxFeePerGas.toString()}
+                maxPriorityFeePerGas={maxPriorityFeePerGas.toString()}
                 gasWarnings={gasWarnings}
               />
             )
diff --git a/ui/components/app/edit-gas-display/edit-gas-display.stories.js b/ui/components/app/edit-gas-display/edit-gas-display.stories.js
index 9de3300f2a34..89ef4174b0e3 100644
--- a/ui/components/app/edit-gas-display/edit-gas-display.stories.js
+++ b/ui/components/app/edit-gas-display/edit-gas-display.stories.js
@@ -4,32 +4,36 @@ import EditGasDisplay from '.';
 export default {
   title: 'Components/App/EditGasDisplay',
   id: __filename,
+  args: {
+    transaction: {},
+  },
 };
 
-export const DefaultStory = () => {
+export const DefaultStory = (args) => {
   return (
     <div style={{ width: '600px' }}>
-      <EditGasDisplay />
+      <EditGasDisplay {...args} />
     </div>
   );
 };
 
 DefaultStory.storyName = 'Default';
 
-export const WithEducation = () => {
+export const WithEducation = (args) => {
   return (
     <div style={{ width: '600px' }}>
-      <EditGasDisplay showEducationButton />
+      <EditGasDisplay showEducationButton {...args} />
     </div>
   );
 };
 
-export const WithDappSuggestedGas = () => {
+export const WithDappSuggestedGas = (args) => {
   return (
     <div style={{ width: '600px' }}>
       <EditGasDisplay
         dappSuggestedGasFee="100000"
         dappOrigin="davidwalsh.name"
+        {...args}
       />
     </div>
   );
diff --git a/ui/components/app/edit-gas-display/index.scss b/ui/components/app/edit-gas-display/index.scss
index 3af1e402ca2e..ee0e13145098 100644
--- a/ui/components/app/edit-gas-display/index.scss
+++ b/ui/components/app/edit-gas-display/index.scss
@@ -28,8 +28,8 @@
   button.edit-gas-display__dapp-acknowledgement-button {
     margin: 40px auto 0 auto;
     display: block;
-    color: var(--color-secondary-default);
-    border: 1px solid var(--color-secondary-default);
+    color: var(--color-warning-default);
+    border: 1px solid var(--color-warning-default);
     text-transform: unset;
     width: auto;
     background: transparent;
diff --git a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
index 7f73181c919f..d872a28957a5 100644
--- a/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
+++ b/ui/components/app/edit-gas-fee-button/edit-gas-fee-button.js
@@ -80,23 +80,22 @@ export default function EditGasFeeButton({ userAcknowledgedGasMissing }) {
         <InfoTooltip
           contentText={
             <div className="edit-gas-fee-button__tooltip">
-              <Typography
-                variant={TYPOGRAPHY.H7}
-                color={COLORS.TEXT_ALTERNATIVE}
-              >
-                {t('dappSuggestedTooltip', [transaction.origin])}
-              </Typography>
+              {transaction?.origin && (
+                <Typography
+                  variant={TYPOGRAPHY.H7}
+                  color={COLORS.TEXT_ALTERNATIVE}
+                >
+                  {t('dappSuggestedTooltip', [transaction.origin])}
+                </Typography>
+              )}
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxBaseFee')}</b>
-                {maxFeePerGas}
+                <b>{t('maxBaseFee')}</b> {maxFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('maxPriorityFee')}</b>
-                {maxPriorityFeePerGas}
+                <b>{t('maxPriorityFee')}</b> {maxPriorityFeePerGas}
               </Typography>
               <Typography variant={TYPOGRAPHY.H7}>
-                <b>{t('gasLimit')}</b>
-                {gasLimit}
+                <b>{t('gasLimit')}</b> {gasLimit}
               </Typography>
             </div>
           }
diff --git a/ui/components/app/edit-gas-fee-button/index.scss b/ui/components/app/edit-gas-fee-button/index.scss
index 52c7cbaf48bf..448eab6741dd 100644
--- a/ui/components/app/edit-gas-fee-button/index.scss
+++ b/ui/components/app/edit-gas-fee-button/index.scss
@@ -47,3 +47,10 @@
     }
   }
 }
+
+
+// Overrides react-tippy
+
+.tippy-tooltip .tippy-tooltip-content .edit-gas-fee-button__tooltip {
+  min-width: 170px;
+}
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
index 0eade1419e1f..af4da536b4a1 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
@@ -8,7 +8,6 @@ import { useI18nContext } from '../../../hooks/useI18nContext';
 import { useTransactionModalContext } from '../../../contexts/transaction-modal';
 import Box from '../../ui/box';
 import ErrorMessage from '../../ui/error-message';
-import I18nValue from '../../ui/i18n-value';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography/typography';
 
@@ -60,15 +59,13 @@ const EditGasFeePopover = () => {
               )}
               <div className="edit-gas-fee-popover__content__header">
                 <span className="edit-gas-fee-popover__content__header-option">
-                  <I18nValue messageKey="gasOption" />
+                  {t('gasOption')}
                 </span>
                 <span className="edit-gas-fee-popover__content__header-time">
-                  {editGasMode !== EDIT_GAS_MODES.SWAPS && (
-                    <I18nValue messageKey="time" />
-                  )}
+                  {editGasMode !== EDIT_GAS_MODES.SWAPS && t('time')}
                 </span>
                 <span className="edit-gas-fee-popover__content__header-max-fee">
-                  <I18nValue messageKey="maxFee" />
+                  {t('maxFee')}
                 </span>
               </div>
               {(editGasMode === EDIT_GAS_MODES.CANCEL ||
@@ -97,19 +94,16 @@ const EditGasFeePopover = () => {
                 tag={TYPOGRAPHY.Paragraph}
                 variant={TYPOGRAPHY.H7}
               >
-                <I18nValue
-                  messageKey="learmMoreAboutGas"
-                  options={[
-                    <a
-                      key="learnMoreLink"
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      href="https://metamask.zendesk.com/hc/en-us/articles/4404600179227-User-Guide-Gas"
-                    >
-                      <I18nValue messageKey="learnMore" />
-                    </a>,
-                  ]}
-                />
+                {t('learmMoreAboutGas', [
+                  <a
+                    key="learnMoreLink"
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    href="https://metamask.zendesk.com/hc/en-us/articles/4404600179227-User-Guide-Gas"
+                  >
+                    {t('learnMore')}
+                  </a>,
+                ])}
               </Typography>
             </Box>
           </div>
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
index e8ffe93e1527..e3fbc9eb9f69 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
@@ -13,7 +13,6 @@ import { useGasFeeContext } from '../../../../contexts/gasFee';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { useTransactionEventFragment } from '../../../../hooks/useTransactionEventFragment';
 import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
-import I18nValue from '../../../ui/i18n-value';
 import InfoTooltip from '../../../ui/info-tooltip';
 import LoadingHeartBeat from '../../../ui/loading-heartbeat';
 import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display';
@@ -121,7 +120,7 @@ const EditGasItem = ({ priorityLevel }) => {
             {PRIORITY_LEVEL_ICON_MAP[icon]}
           </span>
         )}
-        <I18nValue messageKey={title} />
+        {t(title)}
       </span>
       <span
         className={`edit-gas-item__time-estimate edit-gas-item__time-estimate-${priorityLevel}`}
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
index ed6fd00357aa..8e8e2607a041 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
@@ -78,7 +78,7 @@
 
   &__time-estimate-low,
   &__fee-estimate-high {
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
   }
 
   &__time-estimate-medium,
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
index 92d067deca58..0e354d33eb79 100644
--- a/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-tooltip/index.scss
@@ -17,7 +17,7 @@
     }
 
     &__dialog {
-      background-color: var(--color-secondary-default);
+      background-color: var(--color-warning-default);
       border-radius: 30px;
       margin: 4px 0;
       text-align: center;
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
index 548490b2e68d..e108164471be 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/network-statistics.js
@@ -32,7 +32,8 @@ const NetworkStatistics = () => {
       <Typography
         color={COLORS.TEXT_ALTERNATIVE}
         fontWeight={FONT_WEIGHT.BOLD}
-        margin={[3, 0]}
+        marginTop={3}
+        marginBottom={3}
         variant={TYPOGRAPHY.H8}
       >
         {t('networkStatus')}
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
index 1c295cbb96db..d8a89e0fc0e6 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/index.scss
@@ -29,7 +29,7 @@
     height: 0;
     border-left: 10px solid transparent;
     border-right: 10px solid transparent;
-    border-top: 10px solid white;
+    border-top: 10px solid var(--color-background-default);
     position: relative;
     margin-bottom: -2px;
   }
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
index 13987af3bc4d..35889b6874e9 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/status-slider/status-slider.js
@@ -2,7 +2,7 @@ import React from 'react';
 
 import { NETWORK_CONGESTION_THRESHOLDS } from '../../../../../../shared/constants/gas';
 import { useGasFeeContext } from '../../../../../contexts/gasFee';
-import I18nValue from '../../../../ui/i18n-value';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
 import { NetworkStabilityTooltip } from '../tooltips';
 
 const GRADIENT_COLORS = [
@@ -49,6 +49,7 @@ const determineStatusInfo = (givenNetworkCongestion) => {
 };
 
 const StatusSlider = () => {
+  const t = useI18nContext();
   const { gasFeeEstimates } = useGasFeeContext();
   const statusInfo = determineStatusInfo(gasFeeEstimates.networkCongestion);
 
@@ -81,7 +82,7 @@ const StatusSlider = () => {
           style={{ color: statusInfo.color }}
           data-testid="status-slider-label"
         >
-          <I18nValue messageKey={statusInfo.statusLabel} />
+          {t(statusInfo.statusLabel)}
         </div>
       </div>
     </NetworkStabilityTooltip>
diff --git a/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js b/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
index f626959bd341..1e5a409d7f0c 100644
--- a/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
+++ b/ui/components/app/edit-gas-fee-popover/network-statistics/tooltips.js
@@ -11,7 +11,7 @@ import {
 } from '../../../../helpers/constants/design-system';
 
 const NetworkStatusTooltip = ({ children, html, title }) => (
-  <Tooltip position="top" html={html} title={title} theme="tippy-tooltip-info">
+  <Tooltip position="top" html={html} title={title}>
     <Box display={DISPLAY.FLEX} flexDirection={FLEX_DIRECTION.COLUMN}>
       {children}
     </Box>
diff --git a/ui/components/app/flask/snaps-authorship-pill/index.scss b/ui/components/app/flask/snaps-authorship-pill/index.scss
index a67d876d7a2b..1d6b6b3a9f40 100644
--- a/ui/components/app/flask/snaps-authorship-pill/index.scss
+++ b/ui/components/app/flask/snaps-authorship-pill/index.scss
@@ -3,6 +3,18 @@
 .snaps-authorship-pill {
   display: inline-block;
 
+  .chip {
+    padding-right: 8px;
+    margin-top: 4px;
+  }
+
+  .chip__label {
+    max-width: 168px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+  }
+
   &:hover,
   &:focus {
     .chip {
@@ -12,5 +24,14 @@
 }
 
 .snaps-authorship-icon {
-  color: var(--color-icon-default);
+  color: var(--color-icon-alternative);
+}
+
+.snaps-authorship-version {
+  border-radius: 100px;
+  line-height: 100%;
+}
+
+.snaps-authorship-version > span {
+  vertical-align: middle;
 }
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
index 6625694b7b6e..c6846a052a25 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
+++ b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.js
@@ -7,9 +7,22 @@ import Typography from '../../../ui/typography';
 import {
   COLORS,
   TYPOGRAPHY,
+  TEXT_ALIGN,
 } from '../../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
 
-const SnapsAuthorshipPill = ({ packageName, className, url }) => {
+const snapIdPrefixes = ['npm:', 'local:'];
+
+const SnapsAuthorshipPill = ({ snapId, version, className }) => {
+  // @todo Use getSnapPrefix from snaps-skunkworks when possible
+  const snapPrefix = snapIdPrefixes.find((prefix) => snapId.startsWith(prefix));
+  const packageName = snapId.replace(snapPrefix, '');
+  const isNPM = snapPrefix === 'npm:';
+  const url = isNPM
+    ? `https://www.npmjs.com/package/${packageName}`
+    : packageName;
+  const icon = isNPM ? 'fab fa-npm fa-lg' : 'fas fa-code';
+  const t = useI18nContext();
   return (
     <a
       href={url}
@@ -20,9 +33,29 @@ const SnapsAuthorshipPill = ({ packageName, className, url }) => {
       <Chip
         leftIcon={
           <Box paddingLeft={2}>
-            <i className="fab fa-npm fa-lg snaps-authorship-icon" />
+            <i className={`${icon} snaps-authorship-icon`} />
           </Box>
         }
+        rightIcon={
+          version && (
+            <Box
+              className="snaps-authorship-version"
+              backgroundColor={COLORS.PRIMARY_DEFAULT}
+              paddingLeft={2}
+              paddingRight={2}
+            >
+              <Typography
+                color={COLORS.PRIMARY_INVERSE}
+                variant={TYPOGRAPHY.H7}
+                align={TEXT_ALIGN.CENTER}
+                tag="span"
+                className="version"
+              >
+                {t('shorthandVersion', [version])}
+              </Typography>
+            </Box>
+          )
+        }
         backgroundColor={COLORS.BACKGROUND_DEFAULT}
       >
         <Typography
@@ -30,6 +63,7 @@ const SnapsAuthorshipPill = ({ packageName, className, url }) => {
           variant={TYPOGRAPHY.H7}
           tag="span"
           color={COLORS.TEXT_ALTERNATIVE}
+          title={packageName}
         >
           {packageName}
         </Typography>
@@ -40,17 +74,17 @@ const SnapsAuthorshipPill = ({ packageName, className, url }) => {
 
 SnapsAuthorshipPill.propTypes = {
   /**
-   * NPM package name of the snap
+   * The id of the snap
    */
-  packageName: PropTypes.string,
+  snapId: PropTypes.string,
   /**
-   * The className of the SnapsAuthorshipPill
+   * The version of the snap
    */
-  className: PropTypes.string,
+  version: PropTypes.string,
   /**
-   * The url of the snap's package
+   * The className of the SnapsAuthorshipPill
    */
-  url: PropTypes.string,
+  className: PropTypes.string,
 };
 
 export default SnapsAuthorshipPill;
diff --git a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
index 2bd50d0df02b..3808ea5baf16 100644
--- a/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
+++ b/ui/components/app/flask/snaps-authorship-pill/snaps-authorship-pill.stories.js
@@ -6,10 +6,7 @@ export default {
   id: __filename,
   component: SnapsAuthorshipPill,
   argTypes: {
-    packageName: {
-      control: 'text',
-    },
-    url: {
+    snapId: {
       control: 'text',
     },
   },
@@ -20,6 +17,5 @@ export const DefaultStory = (args) => <SnapsAuthorshipPill {...args} />;
 DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
-  packageName: 'npm-package-name',
-  url: 'https://www.npmjs.com/package/@airswap/protocols',
+  snapId: 'npm:@metamask/test-snap-bip44',
 };
diff --git a/ui/components/app/gas-customization/advanced-gas-inputs/index.scss b/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
index a389efc655b2..177078d9a638 100644
--- a/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
+++ b/ui/components/app/gas-customization/advanced-gas-inputs/index.scss
@@ -23,7 +23,7 @@
       }
 
       .fa-info-circle {
-        color: var(--color-icon-default);
+        color: var(--color-icon-alternative);
         cursor: pointer;
       }
 
@@ -41,7 +41,7 @@
     &__warning-text {
       @include H7;
 
-      color: var(--color-secondary-default);
+      color: var(--color-warning-default);
     }
 
     &__input-wrapper {
diff --git a/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js b/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
new file mode 100644
index 000000000000..41db3bd8755c
--- /dev/null
+++ b/ui/components/app/gas-customization/gas-price-button-group/gas-price-button-group.stories.js
@@ -0,0 +1,47 @@
+import React from 'react';
+import { GAS_ESTIMATE_TYPES } from '../../../../helpers/constants/common';
+import GasPriceButtonGroup from '.';
+
+export default {
+  title: 'Components/App/GasCustomization/GasPriceButtonGroup',
+  id: __filename,
+  argTypes: {
+    handleGasPriceSelection: {
+      action: 'handleGasPriceSelection',
+    },
+  },
+  args: {
+    buttonDataLoading: false,
+    className: 'gas-price-button-group',
+    gasButtonInfo: [
+      {
+        gasEstimateType: GAS_ESTIMATE_TYPES.SLOW,
+        feeInPrimaryCurrency: '$0.52',
+        feeInSecondaryCurrency: '0.0048 ETH',
+        timeEstimate: '~ 1 min 0 sec',
+        priceInHexWei: '0xa1b2c3f',
+      },
+      {
+        gasEstimateType: GAS_ESTIMATE_TYPES.AVERAGE,
+        feeInPrimaryCurrency: '$0.39',
+        feeInSecondaryCurrency: '0.004 ETH',
+        timeEstimate: '~ 1 min 30 sec',
+        priceInHexWei: '0xa1b2c39',
+      },
+      {
+        gasEstimateType: GAS_ESTIMATE_TYPES.FAST,
+        feeInPrimaryCurrency: '$0.30',
+        feeInSecondaryCurrency: '0.00354 ETH',
+        timeEstimate: '~ 2 min 1 sec',
+        priceInHexWei: '0xa1b2c30',
+      },
+    ],
+    noButtonActiveByDefault: true,
+    defaultActiveButtonIndex: 2,
+    showCheck: true,
+  },
+};
+
+export const DefaultStory = (args) => <GasPriceButtonGroup {...args} />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/gas-customization/gas-price-button-group/index.scss b/ui/components/app/gas-customization/gas-price-button-group/index.scss
index 5573d923d2a7..51137268fc59 100644
--- a/ui/components/app/gas-customization/gas-price-button-group/index.scss
+++ b/ui/components/app/gas-customization/gas-price-button-group/index.scss
@@ -195,7 +195,7 @@
     color: var(--color-text-default);
     width: 108px;
     height: 97px;
-    box-shadow: 0 2px 6px rgba(0, 0, 0, 0.151579);
+    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
     border-radius: 6px;
     border: none;
 
diff --git a/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js b/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
new file mode 100644
index 000000000000..a2c0a3b56c20
--- /dev/null
+++ b/ui/components/app/gas-customization/gas-slider/gas-slider.stories.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import GasSlider from '.';
+
+export default {
+  title: 'Components/App/GasCustomization/GasSlider',
+  id: __filename,
+  argTypes: {
+    onChange: {
+      action: 'onChange',
+    },
+    lowLabel: {
+      control: 'text',
+    },
+    highLabel: {
+      control: 'text',
+    },
+    value: {
+      control: 'number',
+    },
+    step: {
+      control: 'number',
+    },
+    max: {
+      control: 'number',
+    },
+    min: {
+      control: 'number',
+    },
+  },
+};
+
+export const DefaultStory = () => <GasSlider />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/gas-customization/gas-slider/index.scss b/ui/components/app/gas-customization/gas-slider/index.scss
index 876c5664b942..e3d3ac45565a 100644
--- a/ui/components/app/gas-customization/gas-slider/index.scss
+++ b/ui/components/app/gas-customization/gas-slider/index.scss
@@ -17,7 +17,6 @@
     height: 34px;
     width: 34px;
     background-color: var(--color-primary-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
     border-radius: 50%;
     position: relative;
     z-index: 10;
diff --git a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
index 6dde9ea3c47f..447116953abd 100644
--- a/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
+++ b/ui/components/app/gas-details-item/gas-details-item-title/gas-details-item-title.js
@@ -5,7 +5,6 @@ import { TYPOGRAPHY } from '../../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
 import { getIsMainnet } from '../../../../selectors';
 import Box from '../../../ui/box';
-import I18nValue from '../../../ui/i18n-value';
 import InfoTooltip from '../../../ui/info-tooltip/info-tooltip';
 import Typography from '../../../ui/typography/typography';
 
@@ -15,11 +14,9 @@ const GasDetailsItemTitle = () => {
 
   return (
     <Box display="flex">
-      <Box marginRight={1}>
-        <I18nValue messageKey="gas" />
-      </Box>
+      <Box marginRight={1}>{t('gas')}</Box>
       <span className="gas-details-item-title__estimate">
-        (<I18nValue messageKey="transactionDetailGasInfoV2" />)
+        ({t('transactionDetailGasInfoV2')})
       </span>
       <InfoTooltip
         contentText={
diff --git a/ui/components/app/gas-details-item/gas-details-item.js b/ui/components/app/gas-details-item/gas-details-item.js
index bb90fbe4a5e2..560031f5c0c6 100644
--- a/ui/components/app/gas-details-item/gas-details-item.js
+++ b/ui/components/app/gas-details-item/gas-details-item.js
@@ -7,9 +7,9 @@ import { COLORS } from '../../../helpers/constants/design-system';
 import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { getPreferences } from '../../../selectors';
 import { useGasFeeContext } from '../../../contexts/gasFee';
+import { useI18nContext } from '../../../hooks/useI18nContext';
 
 import Box from '../../ui/box';
-import I18nValue from '../../ui/i18n-value';
 import LoadingHeartBeat from '../../ui/loading-heartbeat';
 import GasTiming from '../gas-timing/gas-timing.component';
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
@@ -17,6 +17,7 @@ import UserPreferencedCurrencyDisplay from '../user-preferenced-currency-display
 import GasDetailsItemTitle from './gas-details-item-title';
 
 const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
+  const t = useI18nContext();
   const {
     estimateUsed,
     hasSimulationError,
@@ -70,7 +71,7 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
             <Box marginRight={1}>
               <strong>
                 {estimateUsed === 'high' && '⚠ '}
-                <I18nValue messageKey="editGasSubTextFeeLabel" />
+                {t('editGasSubTextFeeLabel')}
               </strong>
             </Box>
             <div
@@ -90,8 +91,8 @@ const GasDetailsItem = ({ userAcknowledgedGasMissing = false }) => {
       }
       subTitle={
         <GasTiming
-          maxPriorityFeePerGas={maxPriorityFeePerGas}
-          maxFeePerGas={maxFeePerGas}
+          maxPriorityFeePerGas={maxPriorityFeePerGas.toString()}
+          maxFeePerGas={maxFeePerGas.toString()}
         />
       }
     />
diff --git a/ui/components/app/gas-details-item/index.scss b/ui/components/app/gas-details-item/index.scss
index 43b2da44ba2f..c73c6f42145e 100644
--- a/ui/components/app/gas-details-item/index.scss
+++ b/ui/components/app/gas-details-item/index.scss
@@ -1,6 +1,6 @@
 .gas-details-item {
   &__gas-fee-warning {
-    color: var(--color-secondary-default); //@TODO: revisit when warning color tokens are revisited
+    color: var(--color-warning-default);
   }
 
   &__currency-container,
diff --git a/ui/components/app/gas-timing/index.scss b/ui/components/app/gas-timing/index.scss
index ca8d1e989b5a..00d6c024db7c 100644
--- a/ui/components/app/gas-timing/index.scss
+++ b/ui/components/app/gas-timing/index.scss
@@ -20,7 +20,7 @@
   }
 
   &--negative-V2 {
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
     font-weight: bold;
   }
 
diff --git a/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js b/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
index 076b02f30576..ad8db9347fa9 100644
--- a/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
+++ b/ui/components/app/hold-to-reveal-button/hold-to-reveal-button.js
@@ -160,7 +160,7 @@ export default function HoldToRevealButton({ buttonText, onLongPressed }) {
         </div>
       </div>
     ) : null;
-  }, [isUnlocking, hasTriggeredUnlock, t]);
+  }, [isUnlocking, hasTriggeredUnlock, triggerOnLongPressed, t]);
 
   return (
     <Button
diff --git a/ui/components/app/home-notification/index.scss b/ui/components/app/home-notification/index.scss
index a8e99db346df..a1e812ee1ecd 100644
--- a/ui/components/app/home-notification/index.scss
+++ b/ui/components/app/home-notification/index.scss
@@ -3,7 +3,7 @@
   flex-flow: column;
   justify-content: space-between;
   background: var(--color-background-default);
-  box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
+  box-shadow: var(--shadow-size-md) var(--color-shadow-default);
   border: 1px solid var(--color-border-muted);
   border-radius: 8px;
   min-height: 116px;
diff --git a/ui/components/app/metamask-template-renderer/metamask-template-renderer.js b/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
index 6aaca546b564..ad15d03cb89c 100644
--- a/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
+++ b/ui/components/app/metamask-template-renderer/metamask-template-renderer.js
@@ -43,6 +43,9 @@ const MetaMaskTemplateRenderer = ({ sections }) => {
   return (
     <>
       {sections.reduce((allChildren, child) => {
+        if (child?.hide === true) {
+          return allChildren;
+        }
         if (typeof child === 'string') {
           // React can render strings directly, so push them into the accumulator
           allChildren.push(child);
diff --git a/ui/components/app/metamask-template-renderer/safe-component-list.js b/ui/components/app/metamask-template-renderer/safe-component-list.js
index 29ded06ac425..07aad3630f26 100644
--- a/ui/components/app/metamask-template-renderer/safe-component-list.js
+++ b/ui/components/app/metamask-template-renderer/safe-component-list.js
@@ -9,6 +9,8 @@ import MetaMaskTranslation from '../metamask-translation';
 import NetworkDisplay from '../network-display';
 import TextArea from '../../ui/textarea/textarea';
 import ConfirmationNetworkSwitch from '../../../pages/confirmation/components/confirmation-network-switch';
+import UrlIcon from '../../ui/url-icon';
+import Tooltip from '../../ui/tooltip/tooltip';
 
 export const safeComponentList = {
   MetaMaskTranslation,
@@ -27,4 +29,7 @@ export const safeComponentList = {
   NetworkDisplay,
   TextArea,
   ConfirmationNetworkSwitch,
+  UrlIcon,
+  Tooltip,
+  i: 'i',
 };
diff --git a/ui/components/app/modals/account-details-modal/account-details-modal.test.js b/ui/components/app/modals/account-details-modal/account-details-modal.test.js
index 917be6bf3e6c..8b61394d8928 100644
--- a/ui/components/app/modals/account-details-modal/account-details-modal.test.js
+++ b/ui/components/app/modals/account-details-modal/account-details-modal.test.js
@@ -30,12 +30,14 @@ describe('Account Details Modal', () => {
         name: 'Account 1',
       },
     },
-    accounts: {
-      address: '0xAddress',
-      lastSelected: 1637764711510,
-      name: 'Account 1',
-      balance: '0x543a5fb6caccf599',
-    },
+    accounts: [
+      {
+        address: '0xAddress',
+        lastSelected: 1637764711510,
+        name: 'Account 1',
+        balance: '0x543a5fb6caccf599',
+      },
+    ],
   };
 
   beforeEach(() => {
diff --git a/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js b/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
index 21f16a640f8a..6b5cc9673f70 100644
--- a/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
+++ b/ui/components/app/modals/convert-token-to-nft-modal/convert-token-to-nft-modal.js
@@ -12,7 +12,7 @@ import {
   ASSET_ROUTE,
 } from '../../../../helpers/constants/routes';
 import { getCollectibles } from '../../../../ducks/metamask/metamask';
-import { removeToken } from '../../../../store/actions';
+import { ignoreTokens } from '../../../../store/actions';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 
 const ConvertTokenToNFTModal = ({ hideModal, tokenAddress }) => {
@@ -28,7 +28,12 @@ const ConvertTokenToNFTModal = ({ hideModal, tokenAddress }) => {
     <Modal
       onSubmit={async () => {
         if (tokenAddedAsNFT) {
-          await dispatch(removeToken(tokenAddress));
+          await dispatch(
+            ignoreTokens({
+              tokensToIgnore: tokenAddress,
+              dontShowLoadingIndicator: true,
+            }),
+          );
           const { tokenId } = tokenAddedAsNFT;
           history.push({
             pathname: `${ASSET_ROUTE}/${tokenAddress}/${tokenId}`,
diff --git a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
index 42730a460792..561932fa1453 100644
--- a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
+++ b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.component.js
@@ -9,6 +9,7 @@ import Button from '../../../ui/button';
 import LogoMoonPay from '../../../ui/logo/logo-moonpay';
 import LogoWyre from '../../../ui/logo/logo-wyre';
 import LogoTransak from '../../../ui/logo/logo-transak';
+import LogoCoinbasePay from '../../../ui/logo/logo-coinbasepay';
 import LogoDepositEth from '../../../ui/logo/logo-deposit-eth';
 
 export default class DepositEtherModal extends Component {
@@ -20,12 +21,14 @@ export default class DepositEtherModal extends Component {
   static propTypes = {
     chainId: PropTypes.string.isRequired,
     isTestnet: PropTypes.bool.isRequired,
-    isMainnet: PropTypes.bool.isRequired,
     isBuyableTransakChain: PropTypes.bool.isRequired,
     isBuyableMoonPayChain: PropTypes.bool.isRequired,
+    isBuyableWyreChain: PropTypes.bool.isRequired,
+    isBuyableCoinbasePayChain: PropTypes.bool.isRequired,
     toWyre: PropTypes.func.isRequired,
     toTransak: PropTypes.func.isRequired,
     toMoonPay: PropTypes.func.isRequired,
+    toCoinbasePay: PropTypes.func.isRequired,
     address: PropTypes.string.isRequired,
     toFaucet: PropTypes.func.isRequired,
     hideWarning: PropTypes.func.isRequired,
@@ -101,12 +104,14 @@ export default class DepositEtherModal extends Component {
       toWyre,
       toTransak,
       toMoonPay,
+      toCoinbasePay,
       address,
       toFaucet,
       isTestnet,
-      isMainnet,
       isBuyableTransakChain,
       isBuyableMoonPayChain,
+      isBuyableWyreChain,
+      isBuyableCoinbasePayChain,
     } = this.props;
     const { t } = this.context;
     const networkName = NETWORK_TO_NAME_MAP[chainId];
@@ -131,6 +136,24 @@ export default class DepositEtherModal extends Component {
         </div>
         <div className="page-container__content">
           <div className="deposit-ether-modal__buy-rows">
+            {this.renderRow({
+              logo: <LogoCoinbasePay className="deposit-ether-modal__logo" />,
+              title: t('buyCryptoWithCoinbasePay', [symbol]),
+              text: t('buyCryptoWithCoinbasePayDescription', [symbol]),
+              buttonLabel: t('continueToCoinbasePay'),
+              onButtonClick: () => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.ACCOUNTS,
+                  event: 'Click buy Ether via Coinbase Pay',
+                  properties: {
+                    action: 'Deposit Ether',
+                    legacy_event: true,
+                  },
+                });
+                toCoinbasePay(address, chainId);
+              },
+              hide: !isBuyableCoinbasePayChain,
+            })}
             {this.renderRow({
               logo: <LogoTransak className="deposit-ether-modal__logo" />,
               title: t('buyCryptoWithTransak', [symbol]),
@@ -169,8 +192,8 @@ export default class DepositEtherModal extends Component {
             })}
             {this.renderRow({
               logo: <LogoWyre className="deposit-ether-modal__logo" />,
-              title: t('buyWithWyre'),
-              text: t('buyWithWyreDescription'),
+              title: t('buyWithWyre', [symbol]),
+              text: t('buyWithWyreDescription', [symbol]),
               buttonLabel: t('continueToWyre'),
               onButtonClick: () => {
                 this.context.trackEvent({
@@ -181,9 +204,9 @@ export default class DepositEtherModal extends Component {
                     legacy_event: true,
                   },
                 });
-                toWyre(address);
+                toWyre(address, chainId);
               },
-              hide: !isMainnet,
+              hide: !isBuyableWyreChain,
             })}
             {this.renderRow({
               logo: (
diff --git a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
index 227e630473cc..3b71d5740f69 100644
--- a/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
+++ b/ui/components/app/modals/deposit-ether-modal/deposit-ether-modal.container.js
@@ -12,6 +12,8 @@ import {
   getSelectedAddress,
   getIsBuyableTransakChain,
   getIsBuyableMoonPayChain,
+  getIsBuyableWyreChain,
+  getIsBuyableCoinbasePayChain,
 } from '../../../../selectors/selectors';
 import DepositEtherModal from './deposit-ether-modal.component';
 
@@ -23,13 +25,15 @@ function mapStateToProps(state) {
     address: getSelectedAddress(state),
     isBuyableTransakChain: getIsBuyableTransakChain(state),
     isBuyableMoonPayChain: getIsBuyableMoonPayChain(state),
+    isBuyableWyreChain: getIsBuyableWyreChain(state),
+    isBuyableCoinbasePayChain: getIsBuyableCoinbasePayChain(state),
   };
 }
 
 function mapDispatchToProps(dispatch) {
   return {
-    toWyre: (address) => {
-      dispatch(buyEth({ service: 'wyre', address }));
+    toWyre: (address, chainId) => {
+      dispatch(buyEth({ service: 'wyre', address, chainId }));
     },
     toTransak: (address, chainId) => {
       dispatch(buyEth({ service: 'transak', address, chainId }));
@@ -37,6 +41,9 @@ function mapDispatchToProps(dispatch) {
     toMoonPay: (address, chainId) => {
       dispatch(buyEth({ service: 'moonpay', address, chainId }));
     },
+    toCoinbasePay: (address, chainId) => {
+      dispatch(buyEth({ service: 'coinbase', address, chainId }));
+    },
     hideModal: () => {
       dispatch(hideModal());
     },
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
index 480d1610b920..ef1a962d09ca 100644
--- a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
+++ b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation-modal.js
@@ -17,7 +17,11 @@ function mapDispatchToProps(dispatch) {
   return {
     hideModal: () => dispatch(actions.hideModal()),
     hideToken: (address) => {
-      dispatch(actions.removeToken(address)).then(() => {
+      dispatch(
+        actions.ignoreTokens({
+          tokensToIgnore: address,
+        }),
+      ).then(() => {
         dispatch(actions.hideModal());
       });
     },
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
new file mode 100644
index 000000000000..4d4cebcf09cd
--- /dev/null
+++ b/ui/components/app/modals/hide-token-confirmation-modal/hide-token-confirmation.stories.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import HideTokenConfirmationModal from '.';
+
+export default {
+  title: 'Components/App/Modals/HideTokenConfirmationModal',
+  id: __filename,
+};
+
+export const DefaultStory = () => <HideTokenConfirmationModal />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/modals/hide-token-confirmation-modal/index.scss b/ui/components/app/modals/hide-token-confirmation-modal/index.scss
index 90e9dbc32e4c..43cbe304e8aa 100644
--- a/ui/components/app/modals/hide-token-confirmation-modal/index.scss
+++ b/ui/components/app/modals/hide-token-confirmation-modal/index.scss
@@ -2,7 +2,7 @@
   min-height: 250.72px;
   border-radius: 4px;
   background-color: var(--color-background-default);
-  box-shadow: 0 1px 7px 0 rgba(0, 0, 0, 0.5);
+  box-shadow: var(--shadow-size-md) var(--color-shadow-default);
 
   &__container {
     padding: 24px 27px 21px;
diff --git a/ui/components/app/modals/modal.js b/ui/components/app/modals/modal.js
index 0e5d1dcda4cd..4df937f2d27f 100644
--- a/ui/components/app/modals/modal.js
+++ b/ui/components/app/modals/modal.js
@@ -35,7 +35,7 @@ const modalContainerBaseStyle = {
   border: '1px solid var(--color-border-default)',
   borderRadius: '8px',
   backgroundColor: 'var(--color-background-default)',
-  boxShadow: '0 2px 22px 0 rgba(0,0,0,0.2)',
+  boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
 };
 
 const modalContainerLaptopStyle = {
@@ -54,7 +54,7 @@ const accountModalStyle = {
   mobileModalStyle: {
     width: '95%',
     // top: isPopupOrNotification() === 'popup' ? '52vh' : '36.5vh',
-    boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+    boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
     borderRadius: '4px',
     top: '10%',
     transform: 'none',
@@ -65,7 +65,7 @@ const accountModalStyle = {
   laptopModalStyle: {
     width: '335px',
     // top: 'calc(33% + 45px)',
-    boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+    boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
     borderRadius: '4px',
     top: '10%',
     transform: 'none',
@@ -89,7 +89,7 @@ const MODALS = {
       left: '0',
       right: '0',
       margin: '0 auto',
-      boxShadow: '0 0 7px 0 rgba(0,0,0,0.08)',
+      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
       top: '0',
       display: 'flex',
     },
@@ -100,7 +100,7 @@ const MODALS = {
       left: '0',
       right: '0',
       margin: '0 auto',
-      boxShadow: '0 0 6px 0 rgba(0,0,0,0.3)',
+      boxShadow: 'var(--shadow-size-sm) var(--color-shadow-default)',
       borderRadius: '7px',
       transform: 'none',
       height: 'calc(80% - 20px)',
@@ -117,7 +117,7 @@ const MODALS = {
     mobileModalStyle: {
       width: '95%',
       top: '10%',
-      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+      boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
       transform: 'none',
       left: '0',
       right: '0',
@@ -127,7 +127,7 @@ const MODALS = {
     laptopModalStyle: {
       width: '375px',
       top: '10%',
-      boxShadow: 'rgba(0, 0, 0, 0.15) 0px 2px 2px 2px',
+      boxShadow: 'var(--shadow-size-xs) var(--color-shadow-default)',
       transform: 'none',
       left: '0',
       right: '0',
diff --git a/ui/components/app/modals/new-account-modal/index.scss b/ui/components/app/modals/new-account-modal/index.scss
index 364cf1ce4a23..dc9a19e9498a 100644
--- a/ui/components/app/modals/new-account-modal/index.scss
+++ b/ui/components/app/modals/new-account-modal/index.scss
@@ -3,7 +3,7 @@
   flex-flow: column nowrap;
   background-color: var(--color-background-default);
   border-radius: 10px;
-  box-shadow: 0 5px 16px rgba($black, 0.25);
+  box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
 
   &__content {
     @extend %col-nowrap;
diff --git a/ui/components/app/modals/new-account-modal/new-account-modal.stories.js b/ui/components/app/modals/new-account-modal/new-account-modal.stories.js
new file mode 100644
index 000000000000..e751f3ddf943
--- /dev/null
+++ b/ui/components/app/modals/new-account-modal/new-account-modal.stories.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import NewAccountModal from './new-account-modal.component';
+
+export default {
+  title: 'Components/App/Modals/NewAccountModal',
+  id: __filename,
+};
+
+export const DefaultStory = () => <NewAccountModal />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
index 664358a66868..adc2ae25489c 100644
--- a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
+++ b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
@@ -43,7 +43,7 @@ const NicknamePopovers = ({ address, onClose }) => {
       <UpdateNicknamePopover
         address={address}
         nickname={recipientNickname || null}
-        memo={addressBookEntryObject?.memo}
+        memo={addressBookEntryObject?.memo || null}
         onClose={() => setPopoverToDisplay(SHOW_NICKNAME_POPOVER)}
         onAdd={(recipient, nickname, memo) =>
           dispatch(addToAddressBook(recipient, nickname, memo))
diff --git a/ui/components/app/modals/qr-scanner/qr-scanner.component.js b/ui/components/app/modals/qr-scanner/qr-scanner.component.js
index 68cd8444f31c..a3fd4350138a 100644
--- a/ui/components/app/modals/qr-scanner/qr-scanner.component.js
+++ b/ui/components/app/modals/qr-scanner/qr-scanner.component.js
@@ -251,7 +251,7 @@ export default class QrScanner extends Component {
               }}
             />
             {ready === READY_STATE.READY ? null : (
-              <Spinner color="var(--color-secondary-default)" />
+              <Spinner color="var(--color-warning-default)" />
             )}
           </div>
         </div>
diff --git a/ui/components/app/network-display/network-display.js b/ui/components/app/network-display/network-display.js
index 6e3d6aabbefd..63af71f90f5d 100644
--- a/ui/components/app/network-display/network-display.js
+++ b/ui/components/app/network-display/network-display.js
@@ -48,9 +48,7 @@ export default function NetworkDisplay({
         >
           <ColorIndicator
             color={
-              networkType === NETWORK_TYPE_RPC
-                ? COLORS.ICON_DEFAULT
-                : networkType
+              networkType === NETWORK_TYPE_RPC ? COLORS.ICON_MUTED : networkType
             }
             size={indicatorSize}
             type={ColorIndicator.TYPES.FILLED}
diff --git a/ui/components/app/permissions-connect-header/index.scss b/ui/components/app/permissions-connect-header/index.scss
index faecd4ab15af..3f77ad9f5ba7 100644
--- a/ui/components/app/permissions-connect-header/index.scss
+++ b/ui/components/app/permissions-connect-header/index.scss
@@ -7,6 +7,7 @@
     display: flex;
     flex-direction: column;
     align-items: center;
+    margin-bottom: 16px;
   }
 
   &__title {
@@ -14,7 +15,6 @@
 
     text-align: center;
     color: var(--color-text-default);
-    margin-top: 16px;
     font-weight: bold;
   }
 
diff --git a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
index c5ddf011074c..70603789974c 100644
--- a/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
+++ b/ui/components/app/permissions-connect-header/permissions-connect-header.component.js
@@ -5,15 +5,9 @@ import Box from '../../ui/box';
 import {
   FLEX_DIRECTION,
   JUSTIFY_CONTENT,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
-  COLORS,
-  TYPOGRAPHY,
-  TEXT_ALIGN,
-  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/design-system';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import SnapsAuthorshipPill from '../flask/snaps-authorship-pill';
-import Typography from '../../ui/typography';
 ///: END:ONLY_INCLUDE_IN
 
 export default class PermissionsConnectHeader extends Component {
@@ -31,8 +25,8 @@ export default class PermissionsConnectHeader extends Component {
     boxProps: PropTypes.shape({ ...Box.propTypes }),
     headerText: PropTypes.string,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    npmPackageName: PropTypes.string,
     snapVersion: PropTypes.string,
+    isSnapInstall: PropTypes.bool,
     ///: END:ONLY_INCLUDE_IN
   };
 
@@ -44,11 +38,29 @@ export default class PermissionsConnectHeader extends Component {
   };
 
   renderHeaderIcon() {
-    const { iconUrl, iconName, siteOrigin } = this.props;
+    const {
+      iconUrl,
+      iconName,
+      siteOrigin,
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      isSnapInstall,
+      ///: END:ONLY_INCLUDE_IN
+    } = this.props;
+
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    if (isSnapInstall) {
+      return null;
+    }
+    ///: END:ONLY_INCLUDE_IN
 
     return (
       <div className="permissions-connect-header__icon">
-        <SiteOrigin siteOrigin={siteOrigin} iconSrc={iconUrl} name={iconName} />
+        <SiteOrigin
+          chip
+          siteOrigin={siteOrigin}
+          iconSrc={iconUrl}
+          name={iconName}
+        />
       </div>
     );
   }
@@ -59,14 +71,11 @@ export default class PermissionsConnectHeader extends Component {
       headerTitle,
       headerText,
       ///: BEGIN:ONLY_INCLUDE_IN(flask)
-      npmPackageName,
+      siteOrigin,
       snapVersion,
+      isSnapInstall,
       ///: END:ONLY_INCLUDE_IN
     } = this.props;
-    ///: BEGIN:ONLY_INCLUDE_IN(flask)
-    const npmPackageUrl = `https://www.npmjs.com/package/${npmPackageName}`;
-    const { t } = this.context;
-    ///: END:ONLY_INCLUDE_IN
     return (
       <Box
         className="permissions-connect-header"
@@ -78,29 +87,8 @@ export default class PermissionsConnectHeader extends Component {
         <div className="permissions-connect-header__title">{headerTitle}</div>
         {
           ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          npmPackageName ? (
-            <SnapsAuthorshipPill
-              packageName={npmPackageName}
-              url={npmPackageUrl}
-            />
-          ) : null
-          ///: END:ONLY_INCLUDE_IN
-        }
-        {
-          ///: BEGIN:ONLY_INCLUDE_IN(flask)
-          snapVersion && (
-            <Typography
-              boxProps={{
-                margin: [2, 0],
-              }}
-              color={COLORS.TEXT_MUTED}
-              variant={TYPOGRAPHY.H7}
-              align={TEXT_ALIGN.CENTER}
-              tag="span"
-              className="version"
-            >
-              {t('shorthandVersion', [snapVersion])}
-            </Typography>
+          isSnapInstall && (
+            <SnapsAuthorshipPill snapId={siteOrigin} version={snapVersion} />
           )
           ///: END:ONLY_INCLUDE_IN
         }
diff --git a/ui/components/app/permissions-connect-permission-list/index.scss b/ui/components/app/permissions-connect-permission-list/index.scss
index cb2b462db2ca..8dfc4cb6bca2 100644
--- a/ui/components/app/permissions-connect-permission-list/index.scss
+++ b/ui/components/app/permissions-connect-permission-list/index.scss
@@ -17,7 +17,7 @@
       padding: 16px;
       min-width: 16px;
       min-height: 16px;
-      color: var(--color-icon-default);
+      color: var(--color-icon-alternative);
       font-size: 1rem;
     }
   }
diff --git a/ui/components/app/qr-hardware-popover/enhanced-reader.js b/ui/components/app/qr-hardware-popover/enhanced-reader.js
index ae753145e3a2..18ae2f931da2 100644
--- a/ui/components/app/qr-hardware-popover/enhanced-reader.js
+++ b/ui/components/app/qr-hardware-popover/enhanced-reader.js
@@ -55,7 +55,7 @@ const EnhancedReader = ({ handleScan }) => {
           filter: 'blur(4px)',
         }}
       />
-      {canplay ? null : <Spinner color="var(--color-secondary-default)" />}
+      {canplay ? null : <Spinner color="var(--color-warning-default)" />}
     </div>
   );
 };
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
index ea55f6b0911d..d74acef9b768 100644
--- a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
@@ -43,7 +43,12 @@ const Player = ({ type, cbor, cancelQRHardwareSignRequest, toRead }) => {
         alignItems={ALIGN_ITEMS.CENTER}
         flexDirection={FLEX_DIRECTION.COLUMN}
       >
-        <div style={{ border: '20px solid var(--qr-code-white-background)' }}>
+        <div
+          style={{
+            padding: 20,
+            backgroundColor: 'var(--qr-code-white-background)',
+          }}
+        >
           <QRCode value={currentQRCode.toUpperCase()} size={250} />
         </div>
       </Box>
diff --git a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
index 46778932fcb3..570d7c2a153d 100644
--- a/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
+++ b/ui/components/app/recovery-phrase-reminder/recovery-phrase-reminder.js
@@ -29,7 +29,12 @@ export default function RecoveryPhraseReminder({ onConfirm, hasBackedUp }) {
 
   return (
     <Popover centerTitle title={t('recoveryPhraseReminderTitle')}>
-      <Box padding={[0, 4, 6, 4]} className="recovery-phrase-reminder">
+      <Box
+        paddingRight={4}
+        paddingBottom={6}
+        paddingLeft={4}
+        className="recovery-phrase-reminder"
+      >
         <Typography
           color={COLORS.TEXT_DEFAULT}
           align={TEXT_ALIGN.CENTER}
@@ -38,7 +43,7 @@ export default function RecoveryPhraseReminder({ onConfirm, hasBackedUp }) {
         >
           {t('recoveryPhraseReminderSubText')}
         </Typography>
-        <Box margin={[4, 0, 8, 0]}>
+        <Box marginTop={4} marginBottom={8}>
           <ul className="recovery-phrase-reminder__list">
             <li>
               <Typography
diff --git a/ui/components/app/selected-account/selected-account.component.js b/ui/components/app/selected-account/selected-account.component.js
index 1dc3c135fab1..06609b54f263 100644
--- a/ui/components/app/selected-account/selected-account.component.js
+++ b/ui/components/app/selected-account/selected-account.component.js
@@ -63,7 +63,7 @@ class SelectedAccount extends Component {
             <div className="selected-account__address">
               {shortenAddress(checksummedAddress)}
               <div className="selected-account__copy">
-                <CopyIcon size={11} color="var(--color-icon-default)" />
+                <CopyIcon size={11} color="var(--color-icon-alternative)" />
               </div>
             </div>
           </button>
diff --git a/ui/components/app/signature-request-original/README.mdx b/ui/components/app/signature-request-original/README.mdx
new file mode 100644
index 000000000000..6c07ccd380d1
--- /dev/null
+++ b/ui/components/app/signature-request-original/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import SignatureRequestOriginal from '.';
+
+# Signature Request
+
+dApp requesting a signature from the user. This component appears for eth_signTypedData signatures are not v3 or v4. For other signatures, please see SignatureRequest.
+
+<Canvas>
+  <Story id="ui-components-app-signature-request-signature-request-original-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={SignatureRequestOriginal} />
diff --git a/ui/components/app/signature-request-original/index.scss b/ui/components/app/signature-request-original/index.scss
index 2e2aca65fa1f..65ff59fa5ddf 100644
--- a/ui/components/app/signature-request-original/index.scss
+++ b/ui/components/app/signature-request-original/index.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -20,6 +20,10 @@
     @media screen and (min-width: $break-large) {
       height: 620px;
     }
+
+    &__reject {
+      padding-bottom: 20px;
+    }
   }
 
   &__typed-container {
@@ -166,8 +170,6 @@
 
   &__origin {
     margin-left: 5px;
-    overflow: hidden;
-    text-overflow: ellipsis;
   }
 
   &__notice,
diff --git a/ui/components/app/signature-request-original/signature-request-original.component.js b/ui/components/app/signature-request-original/signature-request-original.component.js
index 80954ce93abe..6b878ac33f2c 100644
--- a/ui/components/app/signature-request-original/signature-request-original.component.js
+++ b/ui/components/app/signature-request-original/signature-request-original.component.js
@@ -13,6 +13,7 @@ import AccountListItem from '../account-list-item';
 import { conversionUtil } from '../../../../shared/modules/conversion.utils';
 import Button from '../../ui/button';
 import SiteIcon from '../../ui/site-icon';
+import SiteOrigin from '../../ui/site-origin';
 
 export default class SignatureRequestOriginal extends Component {
   static contextTypes = {
@@ -38,6 +39,9 @@ export default class SignatureRequestOriginal extends Component {
     hardwareWalletRequiresConnection: PropTypes.bool,
     isLedgerWallet: PropTypes.bool,
     nativeCurrency: PropTypes.string.isRequired,
+    messagesCount: PropTypes.number,
+    showRejectTransactionsConfirmationModal: PropTypes.func.isRequired,
+    cancelAll: PropTypes.func.isRequired,
   };
 
   state = {
@@ -145,9 +149,10 @@ export default class SignatureRequestOriginal extends Component {
             size={24}
           />
         ) : null}
-        <div className="request-signature__origin">
-          {txData.msgParams.origin}
-        </div>
+        <SiteOrigin
+          className="request-signature__origin"
+          siteOrigin={txData.msgParams.origin}
+        />
       </div>
     );
   };
@@ -315,7 +320,31 @@ export default class SignatureRequestOriginal extends Component {
     );
   };
 
+  handleCancelAll = () => {
+    const {
+      cancelAll,
+      clearConfirmTransaction,
+      history,
+      mostRecentOverviewPage,
+      showRejectTransactionsConfirmationModal,
+      messagesCount,
+    } = this.props;
+    const unapprovedTxCount = messagesCount;
+
+    showRejectTransactionsConfirmationModal({
+      unapprovedTxCount,
+      onSubmit: async () => {
+        await cancelAll();
+        clearConfirmTransaction();
+        history.push(mostRecentOverviewPage);
+      },
+    });
+  };
+
   render = () => {
+    const { messagesCount } = this.props;
+    const { t } = this.context;
+    const rejectNText = t('rejectTxsN', [messagesCount]);
     return (
       <div className="request-signature__container">
         {this.renderHeader()}
@@ -326,6 +355,15 @@ export default class SignatureRequestOriginal extends Component {
           </div>
         ) : null}
         {this.renderFooter()}
+        {messagesCount > 1 ? (
+          <Button
+            type="link"
+            className="request-signature__container__reject"
+            onClick={() => this.handleCancelAll()}
+          >
+            {rejectNText}
+          </Button>
+        ) : null}
       </div>
     );
   };
diff --git a/ui/components/app/signature-request-original/signature-request-original.container.js b/ui/components/app/signature-request-original/signature-request-original.container.js
index 8031d92ede83..f30310358782 100644
--- a/ui/components/app/signature-request-original/signature-request-original.container.js
+++ b/ui/components/app/signature-request-original/signature-request-original.container.js
@@ -3,14 +3,16 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
 
 import { MESSAGE_TYPE } from '../../../../shared/constants/app';
-import { goHome } from '../../../store/actions';
+import { goHome, cancelMsgs, showModal } from '../../../store/actions';
 import {
   accountsWithSendEtherInfoSelector,
   conversionRateSelector,
   getSubjectMetadata,
   doesAddressRequireLedgerHidConnection,
+  unconfirmedMessagesHashSelector,
+  getTotalUnapprovedMessagesCount,
 } from '../../../selectors';
-import { getAccountByAddress } from '../../../helpers/utils/util';
+import { getAccountByAddress, valuesFor } from '../../../helpers/utils/util';
 import { clearConfirmTransaction } from '../../../ducks/confirm-transaction/confirm-transaction.duck';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import {
@@ -29,6 +31,8 @@ function mapStateToProps(state, ownProps) {
     from,
   );
   const isLedgerWallet = isAddressLedger(state, from);
+  const messagesList = unconfirmedMessagesHashSelector(state);
+  const messagesCount = getTotalUnapprovedMessagesCount(state);
 
   return {
     requester: null,
@@ -41,6 +45,8 @@ function mapStateToProps(state, ownProps) {
     // not passed to component
     allAccounts: accountsWithSendEtherInfoSelector(state),
     subjectMetadata: getSubjectMetadata(state),
+    messagesList,
+    messagesCount,
   };
 }
 
@@ -48,6 +54,19 @@ function mapDispatchToProps(dispatch) {
   return {
     goHome: () => dispatch(goHome()),
     clearConfirmTransaction: () => dispatch(clearConfirmTransaction()),
+    showRejectTransactionsConfirmationModal: ({
+      onSubmit,
+      unapprovedTxCount: messagesCount,
+    }) => {
+      return dispatch(
+        showModal({
+          name: 'REJECT_TRANSACTIONS',
+          onSubmit,
+          unapprovedTxCount: messagesCount,
+        }),
+      );
+    },
+    cancelAll: (messagesList) => dispatch(cancelMsgs(messagesList)),
   };
 }
 
@@ -62,7 +81,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     txData,
   } = ownProps;
 
-  const { allAccounts, ...otherStateProps } = stateProps;
+  const { allAccounts, messagesList, ...otherStateProps } = stateProps;
 
   const {
     type,
@@ -71,6 +90,8 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
 
   const fromAccount = getAccountByAddress(allAccounts, from);
 
+  const { cancelAll: dispatchCancelAll } = dispatchProps;
+
   let cancel;
   let sign;
   if (type === MESSAGE_TYPE.PERSONAL_SIGN) {
@@ -92,6 +113,7 @@ function mergeProps(stateProps, dispatchProps, ownProps) {
     txData,
     cancel,
     sign,
+    cancelAll: () => dispatchCancelAll(valuesFor(messagesList)),
   };
 }
 
diff --git a/ui/components/app/signature-request-original/signature-request-original.stories.js b/ui/components/app/signature-request-original/signature-request-original.stories.js
new file mode 100644
index 000000000000..bc2c73900073
--- /dev/null
+++ b/ui/components/app/signature-request-original/signature-request-original.stories.js
@@ -0,0 +1,132 @@
+import React from 'react';
+import { action } from '@storybook/addon-actions';
+import { MESSAGE_TYPE } from '../../../../shared/constants/app';
+import testData from '../../../../.storybook/test-data';
+import README from './README.mdx';
+import SignatureRequestOriginal from './signature-request-original.component';
+
+const [MOCK_PRIMARY_IDENTITY] = Object.values(testData.metamask.identities);
+
+const MOCK_SIGN_DATA = JSON.stringify({
+  domain: {
+    name: 'happydapp.website',
+  },
+  message: {
+    string: 'haay wuurl',
+    number: 42,
+  },
+  primaryType: 'Mail',
+  types: {
+    EIP712Domain: [
+      { name: 'name', type: 'string' },
+      { name: 'version', type: 'string' },
+      { name: 'chainId', type: 'uint256' },
+      { name: 'verifyingContract', type: 'address' },
+    ],
+    Group: [
+      { name: 'name', type: 'string' },
+      { name: 'members', type: 'Person[]' },
+    ],
+    Mail: [
+      { name: 'from', type: 'Person' },
+      { name: 'to', type: 'Person[]' },
+      { name: 'contents', type: 'string' },
+    ],
+    Person: [
+      { name: 'name', type: 'string' },
+      { name: 'wallets', type: 'address[]' },
+    ],
+  },
+});
+
+export default {
+  title: 'Components/App/SignatureRequestOriginal',
+  id: __filename,
+  component: SignatureRequestOriginal,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    fromAccount: {
+      table: {
+        address: { control: 'text' },
+        balance: { control: 'text' },
+        name: { control: 'text' },
+      },
+    },
+    hardwareWalletRequiresConnection: { control: 'boolean' },
+    isLedgerWallet: { control: 'boolean' },
+    nativeCurrency: { control: 'text' },
+    txData: { control: 'object' },
+    clearConfirmTransaction: { action: 'Clean Confirm' },
+    cancel: { action: 'Cancel' },
+    sign: { action: 'Sign' },
+  },
+  args: {
+    fromAccount: MOCK_PRIMARY_IDENTITY,
+    history: {
+      push: action('history.push()'),
+    },
+    mostRecentOverviewPage: '/',
+    nativeCurrency: 'ETH',
+  },
+};
+
+const Template = (args) => {
+  return <SignatureRequestOriginal {...args} />;
+};
+
+export const DefaultStory = Template.bind({});
+
+DefaultStory.storyName = 'personal_sign Type';
+
+DefaultStory.args = {
+  txData: {
+    msgParams: {
+      data: MOCK_SIGN_DATA,
+      origin: 'https://happydapp.website/governance?futarchy=true',
+    },
+    type: MESSAGE_TYPE.PERSONAL_SIGN,
+  },
+};
+
+export const ETHSignStory = Template.bind({});
+
+ETHSignStory.storyName = 'eth_sign Type';
+
+ETHSignStory.args = {
+  txData: {
+    msgParams: {
+      data: MOCK_SIGN_DATA,
+      origin: 'https://happydapp.website/governance?futarchy=true',
+    },
+    type: MESSAGE_TYPE.ETH_SIGN,
+  },
+};
+
+export const ETHSignTypedStory = Template.bind({});
+
+ETHSignTypedStory.storyName = 'eth_signTypedData Type';
+
+ETHSignTypedStory.args = {
+  txData: {
+    msgParams: {
+      data: [
+        {
+          type: 'string',
+          name: 'Message',
+          value: 'Hi, Alice!',
+        },
+        {
+          type: 'uint32',
+          name: 'A number',
+          value: '1337',
+        },
+      ],
+      origin: 'https://happydapp.website/governance?futarchy=true',
+    },
+    type: MESSAGE_TYPE.ETH_SIGN_TYPED_DATA,
+  },
+};
diff --git a/ui/components/app/signature-request/index.scss b/ui/components/app/signature-request/index.scss
index 1483054d52d7..f1e6f6906387 100644
--- a/ui/components/app/signature-request/index.scss
+++ b/ui/components/app/signature-request/index.scss
@@ -53,7 +53,6 @@
     border-radius: 50%;
     border: 1px solid var(--color-background-default);
     position: absolute;
-    box-shadow: 0 2px 2px 0.5px rgba(0, 0, 0, 0.19);
   }
 
   &__identicon-initial {
@@ -63,11 +62,13 @@
     font-size: 60px;
     color: var(--color-background-default);
     z-index: 1;
-    text-shadow: 0 4px 6px rgba(0, 0, 0, 0.422);
+    text-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 
   &__info {
     @include H7;
+
+    padding: 0 12px 4px;
   }
 
   &__info--bolded {
@@ -81,10 +82,5 @@
 
     color: var(--color-text-muted);
   }
-
-  .identicon {}
 }
 
-.signature-request-footer {
-  flex: 1 1 auto;
-}
diff --git a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
index a42e4f2ae561..f4a84b734389 100644
--- a/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
+++ b/ui/components/app/signature-request/signature-request-footer/signature-request-footer.component.js
@@ -17,10 +17,10 @@ export default class SignatureRequestFooter extends PureComponent {
     const { cancelAction, signAction, disabled = false } = this.props;
     return (
       <div className="signature-request-footer">
-        <Button onClick={cancelAction} type="secondary" large>
+        <Button onClick={cancelAction} type="secondary">
           {this.context.t('cancel')}
         </Button>
-        <Button onClick={signAction} type="primary" disabled={disabled} large>
+        <Button onClick={signAction} type="primary" disabled={disabled}>
           {this.context.t('sign')}
         </Button>
       </div>
diff --git a/ui/components/app/signature-request/signature-request-message/index.scss b/ui/components/app/signature-request/signature-request-message/index.scss
index 343bd0563b4d..ef2baa76d58f 100644
--- a/ui/components/app/signature-request/signature-request-message/index.scss
+++ b/ui/components/app/signature-request/signature-request-message/index.scss
@@ -1,7 +1,7 @@
 .signature-request-message {
   flex: 1 60%;
   display: flex;
-  max-height: 230px;
+  max-height: 231px;
   flex-direction: column;
   position: relative;
 
diff --git a/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js b/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
index 2a02cdcdd387..64193191910b 100644
--- a/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
+++ b/ui/components/app/signature-request/signature-request-message/signature-request-message.component.js
@@ -26,7 +26,7 @@ export default class SignatureRequestMessage extends PureComponent {
     }
 
     const { scrollTop, offsetHeight, scrollHeight } = this.props.messageRootRef;
-    const isAtBottom = scrollTop + offsetHeight >= scrollHeight;
+    const isAtBottom = Math.round(scrollTop) + offsetHeight >= scrollHeight;
 
     if (isAtBottom) {
       this.setState({ messageIsScrolled: true });
diff --git a/ui/components/app/signature-request/signature-request.component.js b/ui/components/app/signature-request/signature-request.component.js
index 4edaab599176..a76dfa8b0387 100644
--- a/ui/components/app/signature-request/signature-request.component.js
+++ b/ui/components/app/signature-request/signature-request.component.js
@@ -4,6 +4,7 @@ import Identicon from '../../ui/identicon';
 import LedgerInstructionField from '../ledger-instruction-field';
 import { sanitizeMessage } from '../../../helpers/utils/util';
 import { EVENT } from '../../../../shared/constants/metametrics';
+import SiteOrigin from '../../ui/site-origin';
 import Header from './signature-request-header';
 import Footer from './signature-request-footer';
 import Message from './signature-request-message';
@@ -124,7 +125,10 @@ export default class SignatureRequest extends PureComponent {
           <div className="signature-request-content__info--bolded">
             {domain.name}
           </div>
-          <div className="signature-request-content__info">{origin}</div>
+          <SiteOrigin
+            className="signature-request-content__info"
+            siteOrigin={origin}
+          />
           <div className="signature-request-content__info">
             {this.formatWallet(fromAddress)}
           </div>
diff --git a/ui/components/app/signature-request/signature-request.component.test.js b/ui/components/app/signature-request/signature-request.component.test.js
index f2e235b6f075..f20d49942cc6 100644
--- a/ui/components/app/signature-request/signature-request.component.test.js
+++ b/ui/components/app/signature-request/signature-request.component.test.js
@@ -66,7 +66,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={() => false}
+          hardwareWalletRequiresConnection={false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
@@ -105,7 +105,7 @@ describe('Signature Request Component', () => {
       };
       const wrapper = shallowWithContext(
         <SignatureRequest
-          hardwareWalletRequiresConnection={() => false}
+          hardwareWalletRequiresConnection={false}
           clearConfirmTransaction={() => undefined}
           cancel={() => undefined}
           sign={() => undefined}
diff --git a/ui/components/app/signature-request/signature-request.container.test.js b/ui/components/app/signature-request/signature-request.container.test.js
index 0eb4a6deb4ea..5ed1888ae766 100644
--- a/ui/components/app/signature-request/signature-request.container.test.js
+++ b/ui/components/app/signature-request/signature-request.container.test.js
@@ -32,6 +32,7 @@ describe('Signature Request', () => {
     history: {
       push: sinon.spy(),
     },
+    hardwareWalletRequiresConnection: false,
     clearConfirmTransaction: sinon.spy(),
     cancelMessage: sinon.spy(),
     cancel: sinon.stub().resolves(),
diff --git a/ui/components/app/signature-request/signature-request.stories.js b/ui/components/app/signature-request/signature-request.stories.js
index a1c53a69b8ff..f3ebe0e1bf62 100644
--- a/ui/components/app/signature-request/signature-request.stories.js
+++ b/ui/components/app/signature-request/signature-request.stories.js
@@ -3,7 +3,7 @@ import testData from '../../../../.storybook/test-data';
 import README from './README.mdx';
 import SignatureRequest from './signature-request.component';
 
-const primaryIdentity = Object.values(testData.metamask.identities)[0];
+const [MOCK_PRIMARY_IDENTITY] = Object.values(testData.metamask.identities);
 
 export default {
   title: 'Components/App/SignatureRequest',
@@ -23,13 +23,11 @@ export default {
         name: { control: 'text' },
       },
     },
+    hardwareWalletRequiresConnection: { control: 'boolean' },
     isLedgerWallet: { control: 'boolean' },
     clearConfirmTransaction: { action: 'Clean Confirm' },
     cancel: { action: 'Cancel' },
     sign: { action: 'Sign' },
-    hardwareWalletRequiresConnection: {
-      action: 'hardwareWalletRequiresConnection',
-    },
   },
 };
 
@@ -50,11 +48,31 @@ DefaultStory.args = {
           string: 'haay wuurl',
           number: 42,
         },
+        primaryType: 'Mail',
+        types: {
+          EIP712Domain: [
+            { name: 'name', type: 'string' },
+            { name: 'version', type: 'string' },
+            { name: 'chainId', type: 'uint256' },
+            { name: 'verifyingContract', type: 'address' },
+          ],
+          Group: [
+            { name: 'name', type: 'string' },
+            { name: 'members', type: 'Person[]' },
+          ],
+          Mail: [
+            { name: 'from', type: 'Person' },
+            { name: 'to', type: 'Person[]' },
+            { name: 'contents', type: 'string' },
+          ],
+          Person: [
+            { name: 'name', type: 'string' },
+            { name: 'wallets', type: 'address[]' },
+          ],
+        },
       }),
       origin: 'https://happydapp.website/governance?futarchy=true',
     },
   },
-  fromAccount: primaryIdentity,
+  fromAccount: MOCK_PRIMARY_IDENTITY,
 };
-
-DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/srp-input/srp-input.js b/ui/components/app/srp-input/srp-input.js
index c2f3b1bd0191..7cde8bb454a1 100644
--- a/ui/components/app/srp-input/srp-input.js
+++ b/ui/components/app/srp-input/srp-input.js
@@ -10,6 +10,7 @@ import Typography from '../../ui/typography';
 import ShowHideToggle from '../../ui/show-hide-toggle';
 import {
   FONT_WEIGHT,
+  TEXT_ALIGN,
   TYPOGRAPHY,
 } from '../../../helpers/constants/design-system';
 import { parseSecretRecoveryPhrase } from './parse-secret-recovery-phrase';
@@ -18,6 +19,10 @@ const { isValidMnemonic } = ethers.utils;
 
 const defaultNumberOfWords = 12;
 
+const hasUpperCase = (draftSrp) => {
+  return draftSrp !== draftSrp.toLowerCase();
+};
+
 export default function SrpInput({ onChange, srpText }) {
   const [srpError, setSrpError] = useState('');
   const [pasteFailed, setPasteFailed] = useState(false);
@@ -34,11 +39,13 @@ export default function SrpInput({ onChange, srpText }) {
   const onSrpChange = useCallback(
     (newDraftSrp) => {
       let newSrpError = '';
-      const joinedDraftSrp = newDraftSrp.join(' ');
+      const joinedDraftSrp = newDraftSrp.join(' ').trim();
 
       if (newDraftSrp.some((word) => word !== '')) {
         if (newDraftSrp.some((word) => word === '')) {
           newSrpError = t('seedPhraseReq');
+        } else if (hasUpperCase(joinedDraftSrp)) {
+          newSrpError = t('invalidSeedPhraseCaseSensitive');
         } else if (!isValidMnemonic(joinedDraftSrp)) {
           newSrpError = t('invalidSeedPhrase');
         }
@@ -124,7 +131,11 @@ export default function SrpInput({ onChange, srpText }) {
   return (
     <div className="import-srp__container">
       <label className="import-srp__srp-label">
-        <Typography variant={TYPOGRAPHY.H4} fontWeight={FONT_WEIGHT.BOLD}>
+        <Typography
+          align={TEXT_ALIGN.LEFT}
+          variant={TYPOGRAPHY.H4}
+          fontWeight={FONT_WEIGHT.BOLD}
+        >
           {srpText}
         </Typography>
       </label>
diff --git a/ui/components/app/srp-input/srp-input.scss b/ui/components/app/srp-input/srp-input.scss
index 21f0a576bb69..5d971147b4ef 100644
--- a/ui/components/app/srp-input/srp-input.scss
+++ b/ui/components/app/srp-input/srp-input.scss
@@ -2,27 +2,28 @@
   &__container {
     display: grid;
     grid-template-areas:
-      "title dropdown"
-      "paste-tip paste-tip"
-      "input input"
-      "error error"
-      "too-many-words-error too-many-words-error";
+      'title dropdown'
+      'paste-tip paste-tip'
+      'input input'
+      'error error'
+      'too-many-words-error too-many-words-error';
   }
 
   @media (max-width: 767px) {
     &__container {
       grid-template-areas:
-        "title"
-        "dropdown"
-        "paste-tip"
-        "input"
-        "error"
-        "too-many-words-error";
+        'title'
+        'dropdown'
+        'paste-tip'
+        'input'
+        'error'
+        'too-many-words-error';
     }
   }
 
   &__srp-label {
     grid-area: title;
+    text-align: center;
   }
 
   &__number-of-words-dropdown {
@@ -30,7 +31,7 @@
   }
 
   &__paste-tip {
-    margin-bottom: 8px;
+    margin: 24px 0;
     grid-area: paste-tip;
     width: auto;
     margin-left: auto;
diff --git a/ui/components/app/step-progress-bar/index.scss b/ui/components/app/step-progress-bar/index.scss
index 7d37e2fae245..b248cf69f0c7 100644
--- a/ui/components/app/step-progress-bar/index.scss
+++ b/ui/components/app/step-progress-bar/index.scss
@@ -1,8 +1,10 @@
+$progress-bar-width: calc(100% - 34px); // 100% - (circle size + (circle border size * 2))
+$progress-bar-position-left: calc(-50% + 17px); // -50% + ((circle size / 2) + circle border size)
+
 .progressbar {
   counter-reset: step;
   display: flex;
-  justify-content: space-evenly;
-  width: 500px;
+  justify-content: space-between;
   margin: 0 auto;
 }
 
@@ -11,14 +13,17 @@ ul.two-steps {
 }
 
 .progressbar li {
+  @include H7;
+
   list-style-type: none;
-  width: 25%;
-  float: left;
-  font-size: 12px;
   position: relative;
   text-align: center;
   color: var(--color-text-alternative);
   z-index: 2;
+  align-items: center;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
 }
 
 .progressbar li::before {
@@ -28,32 +33,30 @@ ul.two-steps {
   counter-increment: step;
   line-height: 30px;
   border: 2px solid var(--color-border-muted);
-  display: block;
+  display: flex;
+  justify-content: center;
+  align-items: center;
   text-align: center;
   margin: 0 auto 10px auto;
   border-radius: 50%;
   background-color: var(--color-background-default);
-  z-index: -1;
 }
 
 .progressbar li::after {
-  width: 100%;
+  width: $progress-bar-width;
   height: 2px;
   content: '';
   position: absolute;
   background-color: var(--color-background-alternative);
   top: 15px;
-  right: 77px;
-  z-index: -1;
+  left: $progress-bar-position-left;
 
   [dir='rtl'] & {
-    width: 100%;
+    width: $progress-bar-width;
     height: 2px;
     content: '';
     position: absolute;
     background-color: var(--color-background-alternative);
-    right: 77px;
-    z-index: -1;
   }
 }
 
@@ -104,13 +107,11 @@ ul.two-steps {
 }
 
 .progressbar li.two-steps::after {
-  width: 180px;
   height: 2px;
   content: '';
   position: absolute;
   background-color: var(--color-background-alternative);
   top: 15px;
-  right: 75px;
   z-index: -1;
 
   [dir='rtl'] & {
@@ -119,7 +120,6 @@ ul.two-steps {
     content: '';
     position: absolute;
     background-color: var(--color-background-alternative);
-    right: 75px;
     z-index: -1;
   }
 }
diff --git a/ui/components/app/step-progress-bar/step-progress-bar.js b/ui/components/app/step-progress-bar/step-progress-bar.js
index 88f49a82646b..71fe934b5ad8 100644
--- a/ui/components/app/step-progress-bar/step-progress-bar.js
+++ b/ui/components/app/step-progress-bar/step-progress-bar.js
@@ -19,10 +19,10 @@ export const twoStepStages = {
   PASSWORD_CREATE: 2,
 };
 
-export function ThreeStepProgressBar({ stage }) {
+export function ThreeStepProgressBar({ stage, ...boxProps }) {
   const t = useI18nContext();
   return (
-    <Box>
+    <Box {...boxProps}>
       <ul className="progressbar">
         <li
           className={classnames({
@@ -53,10 +53,10 @@ export function ThreeStepProgressBar({ stage }) {
   );
 }
 
-export function TwoStepProgressBar({ stage }) {
+export function TwoStepProgressBar({ stage, ...boxProps }) {
   const t = useI18nContext();
   return (
-    <Box margin={4} width={BLOCK_SIZES.FULL}>
+    <Box width={BLOCK_SIZES.FULL} {...boxProps}>
       <ul className="progressbar two-steps">
         <li
           className={classnames({
@@ -81,8 +81,10 @@ export function TwoStepProgressBar({ stage }) {
 
 ThreeStepProgressBar.propTypes = {
   stage: PropTypes.number,
+  ...Box.propTypes,
 };
 
 TwoStepProgressBar.propTypes = {
   stage: PropTypes.number,
+  ...Box.propTypes,
 };
diff --git a/ui/components/app/tab-bar/index.scss b/ui/components/app/tab-bar/index.scss
index 4329b5b5cc19..be543a9cb23e 100644
--- a/ui/components/app/tab-bar/index.scss
+++ b/ui/components/app/tab-bar/index.scss
@@ -38,7 +38,6 @@
     &__content {
       padding: 12px 18px;
       display: flex;
-      flex: 1 1 auto;
       align-items: center;
       position: relative;
 
@@ -68,6 +67,7 @@
         justify-content: center;
         margin-inline-end: 16px;
         flex: 0 0 18px;
+        color: var(--color-icon-alternative);
 
         @media screen and (min-width: $break-large) {
           flex: 0 0 14px;
diff --git a/ui/components/app/token-cell/token-cell.js b/ui/components/app/token-cell/token-cell.js
index 9329769777cd..5a771b0b59fd 100644
--- a/ui/components/app/token-cell/token-cell.js
+++ b/ui/components/app/token-cell/token-cell.js
@@ -29,7 +29,7 @@ export default function TokenCell({
         rel="noopener noreferrer"
         target="_blank"
         onClick={(event) => event.stopPropagation()}
-        style={{ color: 'var(--color-secondary-default)' }}
+        style={{ color: 'var(--color-warning-default)' }}
       >
         {t('here')}
       </a>
diff --git a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
index 94bda3be5318..0436f28d15e5 100644
--- a/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
+++ b/ui/components/app/transaction-activity-log/transaction-activity-log-icon/transaction-activity-log-icon.stories.js
@@ -14,6 +14,9 @@ export default {
       options: Object.keys(imageHash),
     },
   },
+  args: {
+    eventKey: Object.keys(imageHash)[0],
+  },
 };
 
 export const DefaultStory = (args) => <TransactionActivityLogIcon {...args} />;
diff --git a/ui/components/app/transaction-decoding/transaction-decoding.component.js b/ui/components/app/transaction-decoding/transaction-decoding.component.js
index 00b858d4f3e2..d1a73ca9dc81 100644
--- a/ui/components/app/transaction-decoding/transaction-decoding.component.js
+++ b/ui/components/app/transaction-decoding/transaction-decoding.component.js
@@ -185,7 +185,7 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
         </details>
       </li>
     ) : (
-      <li className="solidity-value">
+      <li className="solidity-value" key={`solidity-value-${index}`}>
         <div className="solidity-named-item solidity-item">
           {typeClass !== 'array' && !Array.isArray(value) ? (
             <span className="param-name typography--color-black">{name}: </span>
@@ -202,7 +202,7 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
     if (loading) {
       return (
         <div className="tx-insight-loading">
-          <Spinner color="var(--color-secondary-default)" />
+          <Spinner color="var(--color-warning-default)" />
         </div>
       );
     }
@@ -239,6 +239,6 @@ export default function TransactionDecoding({ to = '', inputData: data = '' }) {
 }
 
 TransactionDecoding.propTypes = {
-  to: PropTypes.string.isRequired,
+  to: PropTypes.string,
   inputData: PropTypes.string.isRequired,
 };
diff --git a/ui/components/app/transaction-detail-item/index.scss b/ui/components/app/transaction-detail-item/index.scss
index c7a39c250dba..a51cae46decb 100644
--- a/ui/components/app/transaction-detail-item/index.scss
+++ b/ui/components/app/transaction-detail-item/index.scss
@@ -34,7 +34,7 @@
     margin-inline-start: 4px;
 
     path {
-      fill: var(--color-icon-default);
+      fill: var(--color-icon-alternative);
     }
   }
 
diff --git a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
index e82c78f1ab47..d3968679d10d 100644
--- a/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
+++ b/ui/components/app/transaction-detail-item/transaction-detail-item.component.js
@@ -52,7 +52,9 @@ export default function TransactionDetailItem({
             color={COLORS.TEXT_DEFAULT}
             fontWeight={boldHeadings ? FONT_WEIGHT.BOLD : FONT_WEIGHT.NORMAL}
             variant={TYPOGRAPHY.H6}
-            margin={[1, 0, 1, 1]}
+            marginTop={1}
+            marginBottom={1}
+            marginLeft={1}
             boxProps={{ textAlign: TEXT_ALIGN.RIGHT }}
           >
             {detailTotal}
diff --git a/ui/components/app/transaction-icon/transaction-icon.js b/ui/components/app/transaction-icon/transaction-icon.js
index 1036b853a040..e87b8520af87 100644
--- a/ui/components/app/transaction-icon/transaction-icon.js
+++ b/ui/components/app/transaction-icon/transaction-icon.js
@@ -17,9 +17,9 @@ import { captureSingleException } from '../../../store/actions';
 const ICON_MAP = {
   [TRANSACTION_GROUP_CATEGORIES.APPROVAL]: Approve,
   [TRANSACTION_GROUP_CATEGORIES.INTERACTION]: Interaction,
+  [TRANSACTION_GROUP_CATEGORIES.RECEIVE]: Receive,
   [TRANSACTION_GROUP_CATEGORIES.SEND]: Send,
   [TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST]: Sign,
-  [TRANSACTION_GROUP_CATEGORIES.RECEIVE]: Receive,
   [TRANSACTION_GROUP_CATEGORIES.SWAP]: Swap,
 };
 
@@ -29,13 +29,13 @@ const OK_COLOR = 'var(--color-primary-default)';
 
 const COLOR_MAP = {
   [TRANSACTION_GROUP_STATUSES.PENDING]: PENDING_COLOR,
-  [TRANSACTION_STATUSES.UNAPPROVED]: PENDING_COLOR,
+  [TRANSACTION_GROUP_STATUSES.CANCELLED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.APPROVED]: PENDING_COLOR,
+  [TRANSACTION_STATUSES.DROPPED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.FAILED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.REJECTED]: FAIL_COLOR,
-  [TRANSACTION_GROUP_STATUSES.CANCELLED]: FAIL_COLOR,
-  [TRANSACTION_STATUSES.DROPPED]: FAIL_COLOR,
   [TRANSACTION_STATUSES.SUBMITTED]: PENDING_COLOR,
+  [TRANSACTION_STATUSES.UNAPPROVED]: PENDING_COLOR,
 };
 
 export default function TransactionIcon({ status, category }) {
@@ -58,22 +58,22 @@ export default function TransactionIcon({ status, category }) {
 
 TransactionIcon.propTypes = {
   status: PropTypes.oneOf([
+    TRANSACTION_GROUP_STATUSES.CANCELLED,
     TRANSACTION_GROUP_STATUSES.PENDING,
-    TRANSACTION_STATUSES.UNAPPROVED,
     TRANSACTION_STATUSES.APPROVED,
+    TRANSACTION_STATUSES.CONFIRMED,
+    TRANSACTION_STATUSES.DROPPED,
     TRANSACTION_STATUSES.FAILED,
     TRANSACTION_STATUSES.REJECTED,
-    TRANSACTION_GROUP_STATUSES.CANCELLED,
-    TRANSACTION_STATUSES.DROPPED,
-    TRANSACTION_STATUSES.CONFIRMED,
     TRANSACTION_STATUSES.SUBMITTED,
+    TRANSACTION_STATUSES.UNAPPROVED,
   ]).isRequired,
   category: PropTypes.oneOf([
     TRANSACTION_GROUP_CATEGORIES.APPROVAL,
     TRANSACTION_GROUP_CATEGORIES.INTERACTION,
+    TRANSACTION_GROUP_CATEGORIES.RECEIVE,
     TRANSACTION_GROUP_CATEGORIES.SEND,
     TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST,
-    TRANSACTION_GROUP_CATEGORIES.RECEIVE,
     TRANSACTION_GROUP_CATEGORIES.SWAP,
   ]).isRequired,
 };
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
index 331885364b05..f65c82f63f7b 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.js
@@ -251,7 +251,10 @@ export default class TransactionListItemDetails extends PureComponent {
             <div className="transaction-list-item-details__cards-container">
               <TransactionBreakdown
                 nonce={transactionGroup.initialTransaction.txParams.nonce}
-                isTokenApprove={type === TRANSACTION_TYPES.TOKEN_METHOD_APPROVE}
+                isTokenApprove={
+                  type === TRANSACTION_TYPES.TOKEN_METHOD_APPROVE ||
+                  type === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL
+                }
                 transaction={transaction}
                 primaryCurrency={primaryCurrency}
                 className="transaction-list-item-details__transaction-breakdown"
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
index 4164de3a3092..18417627cdd2 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js
@@ -6,6 +6,7 @@ import TransactionBreakdown from '../transaction-breakdown';
 import TransactionActivityLog from '../transaction-activity-log';
 import { TRANSACTION_STATUSES } from '../../../../shared/constants/transaction';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
+import TransactionStatus from '../transaction-status/transaction-status.component';
 import TransactionListItemDetails from './transaction-list-item-details.component';
 
 describe('TransactionListItemDetails Component', () => {
@@ -40,6 +41,7 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
+        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -86,6 +88,7 @@ describe('TransactionListItemDetails Component', () => {
         showSpeedUp
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
+        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -127,6 +130,7 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
+        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
@@ -171,6 +175,7 @@ describe('TransactionListItemDetails Component', () => {
         transactionGroup={transactionGroup}
         senderNickname="sender-nickname"
         recipientNickname="recipient-nickname"
+        transactionStatus={TransactionStatus}
       />,
       { context: { t: (str1, str2) => (str2 ? str1 + str2 : str1) } },
     );
diff --git a/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js b/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
index 280cec0209b0..dc3775fb2acd 100644
--- a/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
+++ b/ui/components/app/transaction-list-item-details/transaction-list-item-details.container.js
@@ -3,18 +3,17 @@ import { tryReverseResolveAddress } from '../../../store/actions';
 import {
   getAddressBook,
   getRpcPrefsForCurrentProvider,
+  getEnsResolutionByAddress,
 } from '../../../selectors';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
 import TransactionListItemDetails from './transaction-list-item-details.component';
 
 const mapStateToProps = (state, ownProps) => {
-  const { metamask } = state;
-  const { ensResolutionsByAddress } = metamask;
   const { recipientAddress, senderAddress } = ownProps;
   let recipientEns;
   if (recipientAddress) {
     const address = toChecksumHexAddress(recipientAddress);
-    recipientEns = ensResolutionsByAddress[address] || '';
+    recipientEns = getEnsResolutionByAddress(state, address);
   }
   const addressBook = getAddressBook(state);
 
diff --git a/ui/components/app/transaction-list-item/index.scss b/ui/components/app/transaction-list-item/index.scss
index 69413b1e107f..f523714bdc4a 100644
--- a/ui/components/app/transaction-list-item/index.scss
+++ b/ui/components/app/transaction-list-item/index.scss
@@ -53,15 +53,9 @@
     margin: 0 4px;
   }
 
-  &__origin,
   &__address {
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
   }
-
-  &__origin {
-    /*rtl:ignore*/
-    direction: rtl;
-  }
 }
diff --git a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
index 26133341eb9e..156b9d8efe9b 100644
--- a/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/smart-transaction-list-item.component.js
@@ -14,6 +14,7 @@ import {
 
 import CancelButton from '../cancel-button';
 import { cancelSwapsSmartTransaction } from '../../../ducks/swaps/swaps';
+import SiteOrigin from '../../ui/site-origin';
 
 export default function SmartTransactionListItem({
   smartTransaction,
@@ -60,9 +61,11 @@ export default function SmartTransactionListItem({
               date={date}
               status={displayedStatusKey}
             />
-            <span className="transaction-list-item__origin" title={subtitle}>
-              {subtitle}
-            </span>
+            <SiteOrigin
+              className="transaction-list-item__origin"
+              siteOrigin={subtitle}
+              title={subtitle}
+            />
           </h3>
         }
       >
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.component.js b/ui/components/app/transaction-list-item/transaction-list-item.component.js
index 5cc73bc032c4..867d236f950a 100644
--- a/ui/components/app/transaction-list-item/transaction-list-item.component.js
+++ b/ui/components/app/transaction-list-item/transaction-list-item.component.js
@@ -39,6 +39,7 @@ import CancelSpeedupPopover from '../cancel-speedup-popover';
 import EditGasFeePopover from '../edit-gas-fee-popover';
 import EditGasPopover from '../edit-gas-popover';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
+import SiteOrigin from '../../ui/site-origin';
 
 function TransactionListItemInner({
   transactionGroup,
@@ -191,16 +192,13 @@ function TransactionListItemInner({
               date={date}
               status={displayedStatusKey}
             />
-            <span
-              className={
-                subtitleContainsOrigin
-                  ? 'transaction-list-item__origin'
-                  : 'transaction-list-item__address'
-              }
-              title={subtitle}
-            >
-              {subtitle}
-            </span>
+            {subtitleContainsOrigin ? (
+              <SiteOrigin siteOrigin={subtitle} />
+            ) : (
+              <span className="transaction-list-item__address" title={subtitle}>
+                {subtitle}
+              </span>
+            )}
           </h3>
         }
         rightContent={
diff --git a/ui/components/app/transaction-list-item/transaction-list-item.stories.js b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
new file mode 100644
index 000000000000..0d030310a291
--- /dev/null
+++ b/ui/components/app/transaction-list-item/transaction-list-item.stories.js
@@ -0,0 +1,210 @@
+import React from 'react';
+import {
+  TRANSACTION_STATUSES,
+  TRANSACTION_TYPES,
+} from '../../../../shared/constants/transaction';
+import { MOCK_TRANSACTION_BY_TYPE } from '../../../../.storybook/initial-states/transactions';
+import TransactionListItem from '.';
+
+/**
+ * @typedef {(import('../../selectors/transactions').TransactionGroup} TransactionGroup
+ */
+
+/**
+ * @param {Object} args
+ * @returns {TransactionGroup}
+ */
+const getMockTransactionGroup = (args) => {
+  const status = args['transactionGroup.primaryTransaction.status'];
+  const tx = {
+    ...args['transactionGroup.primaryTransaction'],
+    status,
+    submittedTime: args['transactionGroup.primaryTransaction.submittedTime'],
+  };
+
+  return {
+    hasCancelled: args['transactionGroup.hasCancelled'],
+    hasRetried: args['transactionGroup.hasRetried'],
+    nonce: '0x1',
+    initialTransaction: tx,
+    primaryTransaction: tx,
+    transactions: [tx],
+  };
+};
+
+/**
+ * Transaction List Item Storybook Page
+ *
+ * Each page displays a different Transaction Type (TRANSACTION_TYPES)
+ * except TRANSACTION_TYPES.CANCEL and TRANSACTION_TYPES.RETRY as these two types
+ * are never initialTransactions
+ */
+export default {
+  title: 'Components/App/TransactionListItem',
+  id: __filename,
+  argTypes: {
+    isEarliestNonce: { control: 'boolean' },
+    'transactionGroup.hasCancelled': { control: 'boolean' },
+    'transactionGroup.hasRetried': { control: 'boolean' },
+    'transactionGroup.primaryTransaction.status': {
+      options: Object.values(TRANSACTION_STATUSES)
+        .filter((status) => {
+          return status !== TRANSACTION_STATUSES.SIGNED;
+        })
+        .sort(),
+      control: { type: 'select' },
+    },
+    'transactionGroup.primaryTransaction.submittedTime': { control: 'number' },
+    'transactionGroup.primaryTransaction': { control: 'object' },
+  },
+  args: {
+    isEarliestNonce: true,
+    'transactionGroup.hasCancelled': false,
+    'transactionGroup.hasRetried': false,
+    'transactionGroup.primaryTransaction.status': TRANSACTION_STATUSES.PENDING,
+    'transactionGroup.primaryTransaction.submittedTime': 19999999999999,
+  },
+};
+
+const Template = (args) => {
+  const transactionGroup = getMockTransactionGroup(args);
+  return (
+    <TransactionListItem
+      transactionGroup={transactionGroup}
+      isEarliestNonce={args.isEarliestNonce}
+    />
+  );
+};
+
+export const ContractInteraction = Template.bind({});
+export const DeployContract = Template.bind({});
+export const EthDecrypt = Template.bind({});
+export const EthGetEncryptionPublicKey = Template.bind({});
+export const Incoming = Template.bind({});
+export const PersonalSign = Template.bind({});
+export const Sign = Template.bind({});
+export const SignTypeData = Template.bind({});
+export const SimpleSend = Template.bind({});
+export const Smart = Template.bind({});
+export const Swap = Template.bind({});
+export const SwapApproval = Template.bind({});
+export const TokenMethodApprove = Template.bind({});
+export const TokenMethodSafeTransferFrom = Template.bind({});
+export const TokenMethodTransfer = Template.bind({});
+export const TokenMethodTransferFrom = Template.bind({});
+
+ContractInteraction.storyName = 'contractInteraction';
+ContractInteraction.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.CONTRACT_INTERACTION],
+  },
+};
+
+DeployContract.storyName = 'contractDeployment';
+DeployContract.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.DEPLOY_CONTRACT],
+  },
+};
+
+EthDecrypt.storyName = 'eth_decrypt';
+EthDecrypt.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.ETH_DECRYPT],
+  },
+};
+
+EthGetEncryptionPublicKey.storyName = 'eth_getEncryptionPublicKey';
+EthGetEncryptionPublicKey.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[
+      TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY
+    ],
+  },
+};
+
+Incoming.storyName = 'incoming';
+Incoming.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.INCOMING],
+  },
+};
+
+PersonalSign.storyName = 'personal_sign';
+PersonalSign.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.PERSONAL_SIGN],
+  },
+};
+
+Sign.storyName = 'eth_sign';
+Sign.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIGN],
+  },
+};
+
+SignTypeData.storyName = 'eth_signTypedData';
+SignTypeData.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIGN_TYPED_DATA],
+  },
+};
+
+SimpleSend.storyName = 'simpleSend';
+SimpleSend.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SIMPLE_SEND],
+  },
+};
+
+Smart.storyName = 'smart';
+Smart.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SMART],
+  },
+};
+
+Swap.storyName = 'swap';
+Swap.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SWAP],
+  },
+};
+
+SwapApproval.storyName = 'swapApproval';
+SwapApproval.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.SWAP_APPROVAL],
+  },
+};
+
+TokenMethodApprove.storyName = 'approve';
+TokenMethodApprove.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_APPROVE],
+  },
+};
+
+TokenMethodSafeTransferFrom.storyName = 'safetransferfrom';
+TokenMethodSafeTransferFrom.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[
+      TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
+    ],
+  },
+};
+
+TokenMethodTransfer.storyName = 'transfer';
+TokenMethodTransfer.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER],
+  },
+};
+
+TokenMethodTransferFrom.storyName = 'transferfrom';
+TokenMethodTransferFrom.args = {
+  'transactionGroup.primaryTransaction': {
+    ...MOCK_TRANSACTION_BY_TYPE[TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM],
+  },
+};
diff --git a/ui/components/app/transaction-status/index.scss b/ui/components/app/transaction-status/index.scss
index 55c22472cedd..6212c0849579 100644
--- a/ui/components/app/transaction-status/index.scss
+++ b/ui/components/app/transaction-status/index.scss
@@ -14,7 +14,7 @@
 
   &--unapproved,
   &--pending {
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
   }
 
   &--queued {
diff --git a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
index ed2a56fab3e1..6c73d75768c6 100644
--- a/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
+++ b/ui/components/app/user-preferenced-currency-display/user-preferenced-currency-display.component.test.js
@@ -4,7 +4,7 @@ import sinon from 'sinon';
 import CurrencyDisplay from '../../ui/currency-display';
 import * as currencyHook from '../../../hooks/useCurrencyDisplay';
 import * as currencyPrefHook from '../../../hooks/useUserPreferencedCurrency';
-import UserPreferencedCurrencyDisplay from './user-preferenced-currency-display.component';
+import UserPreferencedCurrencyDisplay from '.';
 
 describe('UserPreferencedCurrencyDisplay Component', () => {
   describe('rendering', () => {
diff --git a/ui/components/app/wallet-overview/eth-overview.js b/ui/components/app/wallet-overview/eth-overview.js
index de3339b3e182..26b0019b15e5 100644
--- a/ui/components/app/wallet-overview/eth-overview.js
+++ b/ui/components/app/wallet-overview/eth-overview.js
@@ -16,13 +16,13 @@ import { PRIMARY, SECONDARY } from '../../../helpers/constants/common';
 import { showModal } from '../../../store/actions';
 import {
   isBalanceCached,
-  getSelectedAccount,
   getShouldShowFiat,
   getCurrentKeyring,
   getSwapsDefaultToken,
   getIsSwapsChain,
   getIsBuyableChain,
   getNativeCurrencyImage,
+  getSelectedAccountCachedBalance,
 } from '../../../selectors/selectors';
 import SwapIcon from '../../ui/icon/swap-icon.component';
 import BuyIcon from '../../ui/icon/overview-buy-icon.component';
@@ -32,6 +32,9 @@ import IconButton from '../../ui/icon-button';
 import { isHardwareKeyring } from '../../../helpers/utils/hardware';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { EVENT } from '../../../../shared/constants/metametrics';
+import Spinner from '../../ui/spinner';
+import { startNewDraftTransaction } from '../../../ducks/send';
+import { ASSET_TYPES } from '../../../../shared/constants/transaction';
 import WalletOverview from './wallet-overview';
 
 const EthOverview = ({ className }) => {
@@ -43,8 +46,7 @@ const EthOverview = ({ className }) => {
   const usingHardwareWallet = isHardwareKeyring(keyring?.type);
   const balanceIsCached = useSelector(isBalanceCached);
   const showFiat = useSelector(getShouldShowFiat);
-  const selectedAccount = useSelector(getSelectedAccount);
-  const { balance } = selectedAccount;
+  const balance = useSelector(getSelectedAccountCachedBalance);
   const isSwapsChain = useSelector(getIsSwapsChain);
   const isBuyableChain = useSelector(getIsBuyableChain);
   const primaryTokenImage = useSelector(getNativeCurrencyImage);
@@ -52,6 +54,7 @@ const EthOverview = ({ className }) => {
 
   return (
     <WalletOverview
+      loading={!balance}
       balance={
         <Tooltip
           position="top"
@@ -60,21 +63,28 @@ const EthOverview = ({ className }) => {
         >
           <div className="eth-overview__balance">
             <div className="eth-overview__primary-container">
-              <UserPreferencedCurrencyDisplay
-                className={classnames('eth-overview__primary-balance', {
-                  'eth-overview__cached-balance': balanceIsCached,
-                })}
-                data-testid="eth-overview__primary-currency"
-                value={balance}
-                type={PRIMARY}
-                ethNumberOfDecimals={4}
-                hideTitle
-              />
+              {balance ? (
+                <UserPreferencedCurrencyDisplay
+                  className={classnames('eth-overview__primary-balance', {
+                    'eth-overview__cached-balance': balanceIsCached,
+                  })}
+                  data-testid="eth-overview__primary-currency"
+                  value={balance}
+                  type={PRIMARY}
+                  ethNumberOfDecimals={4}
+                  hideTitle
+                />
+              ) : (
+                <Spinner
+                  color="var(--color-secondary-default)"
+                  className="loading-overlay__spinner"
+                />
+              )}
               {balanceIsCached ? (
                 <span className="eth-overview__cached-star">*</span>
               ) : null}
             </div>
-            {showFiat && (
+            {showFiat && balance && (
               <UserPreferencedCurrencyDisplay
                 className={classnames({
                   'eth-overview__cached-secondary-balance': balanceIsCached,
@@ -123,7 +133,11 @@ const EthOverview = ({ className }) => {
                   legacy_event: true,
                 },
               });
-              history.push(SEND_ROUTE);
+              dispatch(
+                startNewDraftTransaction({ type: ASSET_TYPES.NATIVE }),
+              ).then(() => {
+                history.push(SEND_ROUTE);
+              });
             }}
           />
           <IconButton
diff --git a/ui/components/app/wallet-overview/index.scss b/ui/components/app/wallet-overview/index.scss
index e408604d94ac..16526b518ab6 100644
--- a/ui/components/app/wallet-overview/index.scss
+++ b/ui/components/app/wallet-overview/index.scss
@@ -67,7 +67,7 @@
 
   &__cached-balance,
   &__cached-star {
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
   }
 
   &__cached-secondary-balance {
diff --git a/ui/components/app/wallet-overview/token-overview.js b/ui/components/app/wallet-overview/token-overview.js
index 23d8997d87c2..a02f0263e1df 100644
--- a/ui/components/app/wallet-overview/token-overview.js
+++ b/ui/components/app/wallet-overview/token-overview.js
@@ -14,7 +14,7 @@ import {
 } from '../../../helpers/constants/routes';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { useTokenFiatAmount } from '../../../hooks/useTokenFiatAmount';
-import { updateSendAsset } from '../../../ducks/send';
+import { startNewDraftTransaction } from '../../../ducks/send';
 import { setSwapsFromToken } from '../../../ducks/swaps/swaps';
 import {
   getCurrentKeyring,
@@ -93,7 +93,7 @@ const TokenOverview = ({ className, token }) => {
               });
               try {
                 await dispatch(
-                  updateSendAsset({
+                  startNewDraftTransaction({
                     type: ASSET_TYPES.TOKEN,
                     details: token,
                   }),
diff --git a/ui/components/app/wallet-overview/wallet-overview.js b/ui/components/app/wallet-overview/wallet-overview.js
index 6f5d1341d3e6..9265e31b08ea 100644
--- a/ui/components/app/wallet-overview/wallet-overview.js
+++ b/ui/components/app/wallet-overview/wallet-overview.js
@@ -2,11 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-const WalletOverview = ({ balance, buttons, className, icon }) => {
+const WalletOverview = ({ balance, buttons, className, icon, loading }) => {
   return (
     <div className={classnames('wallet-overview', className)}>
       <div className="wallet-overview__balance">
-        {icon}
+        {loading ? null : icon}
         {balance}
       </div>
       <div className="wallet-overview__buttons">{buttons}</div>
@@ -19,6 +19,7 @@ WalletOverview.propTypes = {
   buttons: PropTypes.element.isRequired,
   className: PropTypes.string,
   icon: PropTypes.element.isRequired,
+  loading: PropTypes.bool,
 };
 
 WalletOverview.defaultProps = {
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 59b171102ea2..87670992f335 100644
--- a/ui/components/app/whats-new-popup/whats-new-popup.js
+++ b/ui/components/app/whats-new-popup/whats-new-popup.js
@@ -10,7 +10,7 @@ import Button from '../../ui/button';
 import Popover from '../../ui/popover';
 import Typography from '../../ui/typography';
 import { updateViewedNotifications } from '../../../store/actions';
-import { getTranslatedUINoficiations } from '../../../../shared/notifications';
+import { getTranslatedUINotifications } from '../../../../shared/notifications';
 import { getSortedAnnouncementsToShow } from '../../../selectors';
 import {
   BUILD_QUOTE_ROUTE,
@@ -54,6 +54,10 @@ function getActionFunctionById(id, history) {
       updateViewedNotifications({ 12: true });
       history.push(EXPERIMENTAL_ROUTE);
     },
+    13: () => {
+      updateViewedNotifications({ 13: true });
+      history.push(`${EXPERIMENTAL_ROUTE}#show-custom-network`);
+    },
   };
 
   return actionFunctions[id];
@@ -237,7 +241,7 @@ export default function WhatsNewPopup({ onClose }) {
     >
       <div className="whats-new-popup__notifications">
         {notifications.map(({ id }, index) => {
-          const notification = getTranslatedUINoficiations(t, locale)[id];
+          const notification = getTranslatedUINotifications(t, locale)[id];
           const isLast = index === notifications.length - 1;
           // Display the swaps notification with full image
           return index === 0 || id === 1
diff --git a/ui/components/ui/alert/README.mdx b/ui/components/ui/alert/README.mdx
new file mode 100644
index 000000000000..71981e0801cd
--- /dev/null
+++ b/ui/components/ui/alert/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import Alert from '.';
+
+# Alert
+
+Alert element used to notify the user about some information or warning.
+
+<Canvas>
+  <Story id="ui-components-ui-alert-alert-stories-js--default-alert" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={Alert} />
\ No newline at end of file
diff --git a/ui/components/ui/alert/alert.stories.js b/ui/components/ui/alert/alert.stories.js
new file mode 100644
index 000000000000..d99bfd3c5a09
--- /dev/null
+++ b/ui/components/ui/alert/alert.stories.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import README from './README.mdx';
+import Alert from '.';
+
+export default {
+  title: 'Components/UI/Alert',
+  id: __filename,
+  component: Alert,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    visible: {
+      control: 'boolean',
+    },
+    msg: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultAlert = (args) => {
+  return <Alert {...args} />;
+};
+
+DefaultAlert.storyName = 'Default';
+DefaultAlert.args = {
+  visible: true,
+  msg: 'Alert',
+};
diff --git a/ui/components/ui/alert/index.js b/ui/components/ui/alert/index.js
index 19a18126e69b..fe5d24ac6886 100644
--- a/ui/components/ui/alert/index.js
+++ b/ui/components/ui/alert/index.js
@@ -1,56 +1,49 @@
 import classnames from 'classnames';
 import PropTypes from 'prop-types';
-import React, { Component } from 'react';
+import React, { useState, useEffect } from 'react';
+import { usePrevious } from '../../../hooks/usePrevious';
 import { MILLISECOND } from '../../../../shared/constants/time';
 
-class Alert extends Component {
-  state = {
-    visible: false,
-    msg: false,
-    className: '',
-  };
-
-  UNSAFE_componentWillReceiveProps(nextProps) {
-    if (!this.props.visible && nextProps.visible) {
-      this.animateIn(nextProps.msg);
-    } else if (this.props.visible && !nextProps.visible) {
-      this.animateOut();
-    }
-  }
+function Alert(props) {
+  const [visible, setVisible] = useState(false);
+  const [className, setClassName] = useState('');
+  const lastVisible = usePrevious(props.visible);
 
-  animateIn(msg) {
-    this.setState({
-      msg,
-      visible: true,
-      className: 'visible',
-    });
-  }
+  useEffect(() => {
+    const animateIn = () => {
+      setClassName('visible');
+      setVisible(true);
+    };
 
-  animateOut() {
-    this.setState({
-      msg: null,
-      className: 'hidden',
-    });
+    const animateOut = () => {
+      setClassName('hidden');
 
-    setTimeout((_) => {
-      this.setState({ visible: false });
-    }, MILLISECOND * 500);
-  }
+      setTimeout((_) => {
+        setVisible(false);
+      }, MILLISECOND * 500);
+    };
 
-  render() {
-    if (this.state.visible) {
-      return (
-        <div className={classnames('global-alert', this.state.className)}>
-          <a className="msg">{this.state.msg}</a>
-        </div>
-      );
+    if (!lastVisible && props.visible) {
+      animateIn(props.msg);
+    } else if (lastVisible && !props.visible) {
+      animateOut();
     }
+  }, [lastVisible, props.msg, props.visible]);
+
+  if (!visible) {
     return null;
   }
+
+  return (
+    <div className={classnames('global-alert', className)}>
+      <a className="msg">{props.msg}</a>
+    </div>
+  );
 }
 
 Alert.propTypes = {
   visible: PropTypes.bool.isRequired,
-  msg: PropTypes.string /* eslint-disable-line react/no-unused-prop-types */,
+  msg: PropTypes.string,
 };
+
 export default Alert;
diff --git a/ui/components/ui/alert/index.test.js b/ui/components/ui/alert/index.test.js
index aae068be30a9..7689d6d83ed3 100644
--- a/ui/components/ui/alert/index.test.js
+++ b/ui/components/ui/alert/index.test.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import sinon from 'sinon';
 import { shallow } from 'enzyme';
 import Alert from '.';
 
@@ -14,27 +13,4 @@ describe('Alert', () => {
     const alert = wrapper.find('.global-alert');
     expect(alert).toHaveLength(0);
   });
-
-  it('renders when visible in state is true, and message', () => {
-    const errorMessage = 'Error Message';
-
-    wrapper.setState({ visible: true, msg: errorMessage });
-
-    const alert = wrapper.find('.global-alert');
-    expect(alert).toHaveLength(1);
-
-    const errorText = wrapper.find('.msg');
-    expect(errorText.text()).toStrictEqual(errorMessage);
-  });
-
-  it('calls component method when componentWillReceiveProps is called', () => {
-    const animateInSpy = sinon.stub(wrapper.instance(), 'animateIn');
-    const animateOutSpy = sinon.stub(wrapper.instance(), 'animateOut');
-
-    wrapper.setProps({ visible: true });
-    expect(animateInSpy.calledOnce).toStrictEqual(true);
-
-    wrapper.setProps({ visible: false });
-    expect(animateOutSpy.calledOnce).toStrictEqual(true);
-  });
 });
diff --git a/ui/components/ui/box/README.mdx b/ui/components/ui/box/README.mdx
index fe43d23804cd..5a20734a7d4e 100644
--- a/ui/components/ui/box/README.mdx
+++ b/ui/components/ui/box/README.mdx
@@ -14,42 +14,127 @@ Box is a utility component that can be used for layout or as a base for other UI
 
 ## Component API
 
-| Name            | Description                         | Default            |
-| --------------- | ----------------------------------- | ------------------ |
-| children        | node func                           | -                  |
-| flexDirection   | Object.values(FLEX_DIRECTION)       | FLEX_DIRECTION.ROW |
-| flexWrap        | Object.values(FLEX_WRAP)            | -                  |
-| gap             | 1,2,4,6,8                           | -                  |
-| margin          | 1,2,4,6,8 or array of numbers [1,2] | -                  |
-| marginTop       | 1,2,4,6,8                           | -                  |
-| marginBottom    | 1,2,4,6,8                           | -                  |
-| marginRight     | 1,2,4,6,8                           | -                  |
-| marginLeft      | 1,2,4,6,8                           | -                  |
-| padding         | 1,2,4,6,8 or array of numbers [1,2] | -                  |
-| paddingTop      | 1,2,4,6,8                           | -                  |
-| paddingBottom   | 1,2,4,6,8                           | -                  |
-| paddingRight    | 1,2,4,6,8                           | -                  |
-| paddingLeft     | 1,2,4,6,8                           | -                  |
-| borderColor     | Object.values(COLORS)               | -                  |
-| borderWidth     | number                              | -                  |
-| borderRadius    | Object.values(SIZES)                | -                  |
-| borderStyle     | Object.values(BORDER_STYLE)         | -                  |
-| alignItems      | Object.values(ALIGN_ITEMS)          | -                  |
-| justifyContent  | Object.values(JUSTIFY_CONTENT)      | -                  |
-| textAlign       | Object.values(TEXT_ALIGN)           | -                  |
-| display         | Object.values(DISPLAY)              | -                  |
-| width           | Object.values(BLOCK_SIZES)          | -                  |
-| height          | Object.values(BLOCK_SIZES)          | -                  |
-| backgroundColor | Object.values(COLORS)               | -                  |
-| className       | string                              |                    |
+| Name            | Description                                                                                                                                                                                                                                                                             | Default            |
+| --------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------ |
+| children        | The children of the Box component. If `function` type will render the child as the Box node instead of a child of the Box                                                                                                                                                               | -                  |
+| className       | Additional className of the Box component                                                                                                                                                                                                                                               | -                  |
+| margin          | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
+| marginTop       | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
+| marginBottom    | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
+| marginRight     | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
+| marginLeft      | 0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto' or array of values [1, 2, 'auto']                                                                                                                                                                                                                   | -                  |
+| padding         | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| paddingTop      | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| paddingBottom   | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| paddingRight    | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| paddingLeft     | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| display         | [DISPLAY](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L125-L133) values or array of [DISPLAY](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L125-L133) values                 | -                  |
+| flexDirection   | [FLEX_DIRECTION](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L112-L117) values or array of [FLEX_DIRECTION](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L112-L117) values   | FLEX_DIRECTION.ROW |
+| flexWrap        | [FLEX_WRAP](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L119-L123) values or array of [FLEX_WRAP](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L119-L123) values             | -                  |
+| alignItems      | [ALIGN_ITEMS](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L95-L101) values or array of [ALIGN_ITEMS](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L95-L101) values           | -                  |
+| justifyContent  | [JUSTIFY_CONTENT](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L103-L110) values or array of [JUSTIFY_CONTENT](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L103-L110) values | -                  |
+| gap             | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| textAlign       | [TEXT_ALIGN](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L172-L178) values or array of [TEXT_ALIGN](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L172-L178) values           | -                  |
+| width           | [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values or array of [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values         | -                  |
+| height          | [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values or array of [BLOCK_SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L164-L170) values         | -                  |
+| backgroundColor | COLORS values or array of COLORS values                                                                                                                                                                                                                                                 | -                  |
+| borderColor     | COLORS values or array of COLOR values                                                                                                                                                                                                                                                  | -                  |
+| borderWidth     | 0, 1, 2, 4, 6, 8, 9, 10, 12 or array of numbers [1, 2]                                                                                                                                                                                                                                  | -                  |
+| borderRadius    | [SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L74-L81) values or array of [SIZES](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L74-L81) values                         | -                  |
+| borderStyle     | [BORDER_STYLE](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L83-L88) values or array of [BORDER_STYLE](https://github.com/MetaMask/metamask-extension/blob/develop/ui/helpers/constants/design-system.js#L83-L88) values           | -                  |
 
 ## Usage
 
 The following describes the props and example usage for this component.
 
+### Margin
+
+The margin props `margin`, `marginTop`, `marginRight`, `marginBottom`, and `marginLeft` can be used to set the margins of the `Box` component. All of the margin props accept [responsive props](#responsive-props) in the form of array props
+
+Accepted props are: `0, 1, 2, 4, 6, 8, 9, 10, 12, 'auto` or array of these values
+
+<Canvas>
+  <Story id="ui-components-ui-box-box-stories-js--margin" />
+</Canvas>
+
+```jsx
+<Box margin={4} />
+<Box marginTop={4} />
+<Box marginRight={4} />
+<Box marginBottom={4} />
+<Box marginLeft={'auto'} />
+
+// Responsive props
+<Box margin={[4, 8]} />
+<Box marginTop={[4, 8]} />
+<Box marginRight={[4, 8]} />
+<Box marginBottom={[4, 8]} />
+<Box marginLeft={['auto', 8]} />
+```
+
+### Padding
+
+The padding props work very similarly to margin. The padding props `padding`, `paddingTop`, `paddingRight`, `paddingBottom`, and `paddingLeft` can be used to set the paddings of the `Box` component. All of the padding props accept [responsive props](#responsive-props) in the form of array props
+
+Accepted props are: `0, 1, 2, 4, 6, 8, 9, 10, 12` or array of these values
+
+<Canvas>
+  <Story id="ui-components-ui-box-box-stories-js--padding" />
+</Canvas>
+
+```jsx
+<Box padding={4} />
+<Box paddingTop={4} />
+<Box paddingRight={4} />
+<Box paddingBottom={4} />
+<Box paddingLeft={4} />
+
+// Responsive props
+<Box padding={[4, 8]} />
+<Box paddingTop={[4, 8]} />
+<Box paddingRight={[4, 8]} />
+<Box paddingBottom={[4, 8]} />
+<Box paddingLeft={[4, 8]} />
+```
+
+### Display
+
+The `display` prop can be used to set the display of the `Box` component. All of the display props accept [responsive props](#responsive-props) in the form of array props.
+
+Accepted props imported from the design system `DISPLAY` const are:
+
+- `DISPLAY.BLOCK`
+- `DISPLAY.FLEX`
+- `DISPLAY.GRID`
+- `DISPLAY.INLINE_BLOCK`
+- `DISPLAY.INLINE_FLEX`
+- `DISPLAY.INLINE_GRID`
+- `DISPLAY.INLINE`
+- `DISPLAY.LIST_ITEM`
+- `DISPLAY.NONE`
+
+or array of these values.
+
+```jsx
+import { DISPLAY } from '../../../helpers/constants/design-system';
+import Box from '../ui/box';
+
+
+
+<Box display={DISPLAY.BLOCK} />
+<Box display={DISPLAY.FLEX} />
+<Box display={DISPLAY.GRID} />
+<Box display={DISPLAY.INLINE_BLOCK} />
+<Box display={DISPLAY.INLINE_FLEX} />
+<Box display={DISPLAY.INLINE} />
+<Box display={DISPLAY.NONE} />
+```
+
 ### Background Color
 
-Use the `backgroundColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change background color.
+Use the `backgroundColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change background color. The `backgroundColor` prop accepts [responsive props](#responsive-props) in the form of array props.
+
+````jsx
 
 <Canvas>
   <Story id="ui-components-ui-box-box-stories-js--background-color" />
@@ -66,11 +151,11 @@ import Box from '../ui/box';
 <Box backgroundColor={COLORS.BACKGROUND_DEFAULT}>
   <Typography color={COLORS.TEXT_DEFAULT}>COLORS.BACKGROUND_DEFAULT</Typography>
 </Box>;
-```
+````
 
 ### Border Color
 
-Use the `borderColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change border color
+Use the `borderColor` prop along with the `COLORS` object from `ui/helpers/constants/design-system.js` to change border color. The `borderColor` prop accepts [responsive props](#responsive-props) in the form of array props.
 
 <Canvas>
   <Story id="ui-components-ui-box-box-stories-js--border-color" />
@@ -91,3 +176,63 @@ import Box from '../ui/box';
   <Typography color={COLORS.TEXT_DEFAULT}>COLORS.BORDER_DEFAULT</Typography>
 </Box>;
 ```
+
+### Responsive Props
+
+The box component provides a responsive props api in the form of array props. Array props are inspired by [styled-systems array props](https://styled-system.com/guides/array-props). The responsive props follow a mobile first methodology with the first item in the array applying the style to the base level size e.g. `0px` and up. The second item overwrites the first items styles at the next breakpoint.
+
+- All Box props accept the responsive props format
+- To skip a breakpoint use `null` as the skipped item's value e.g. `<Box display={['display', null, ;flex']} />`
+
+```
+// the responsive props
+<Box display={['block', 'flex']} />
+
+// is equivalent to the css
+.box {
+  display: block;
+
+  @media screen and (max-width: $breakpoint-sm) {
+    display: flex;
+  }
+}
+```
+
+<Canvas>
+  <Story id="ui-components-ui-box-box-stories-js--responsive-props" />
+</Canvas>
+
+```jsx
+import { COLORS } from '../../../helpers/constants/design-system';
+import Box from '../ui/box';
+
+<Box
+  padding={[2, 4]}
+  gap={[2, 4]}
+  display={['flex']}
+  flexDirection={['column', 'row']}
+  borderColor={COLORS.BORDER_DEFAULT}
+>
+  <Box
+    padding={[4, 8]}
+    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+    borderColor={COLORS.BORDER_MUTED}
+  >
+    responsive
+  </Box>
+  <Box
+    padding={[4, 8]}
+    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+    borderColor={COLORS.BORDER_MUTED}
+  >
+    props
+  </Box>
+  <Box
+    padding={[4, 8]}
+    backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+    borderColor={COLORS.BORDER_MUTED}
+  >
+    example
+  </Box>
+</Box>;
+```
diff --git a/ui/components/ui/box/box.js b/ui/components/ui/box/box.js
index 73dbb37fe551..713b2d03f71c 100644
--- a/ui/components/ui/box/box.js
+++ b/ui/components/ui/box/box.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
+import { memoize } from 'lodash';
 import {
   ALIGN_ITEMS,
   BLOCK_SIZES,
@@ -12,26 +13,12 @@ import {
   TEXT_ALIGN,
   FLEX_DIRECTION,
   FLEX_WRAP,
+  BREAKPOINTS,
 } from '../../../helpers/constants/design-system';
 
-const ValidSize = PropTypes.oneOf([
-  0,
-  1,
-  2,
-  3,
-  4,
-  5,
-  6,
-  7,
-  8,
-  9,
-  10,
-  11,
-  12,
-  'auto',
-]);
-
-export const ValidBackgroundColors = [
+const BASE_CLASS_NAME = 'box';
+const Sizes = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+export const BackgroundColors = [
   COLORS.BACKGROUND_DEFAULT,
   COLORS.BACKGROUND_ALTERNATIVE,
   COLORS.OVERLAY_DEFAULT,
@@ -67,8 +54,7 @@ export const ValidBackgroundColors = [
   COLORS.TRANSPARENT,
   COLORS.LOCALHOST,
 ];
-
-export const ValidBorderColors = [
+export const BorderColors = [
   COLORS.BORDER_DEFAULT,
   COLORS.BORDER_MUTED,
   COLORS.PRIMARY_DEFAULT,
@@ -104,56 +90,134 @@ export const ValidBorderColors = [
   COLORS.LOCALHOST,
 ];
 
+const ValidSize = PropTypes.oneOf(Sizes);
+const ValidSizeAndAuto = PropTypes.oneOf([...Sizes, 'auto']);
+const ValidBackgroundColors = PropTypes.oneOf(BackgroundColors);
+const ValidBorderColors = PropTypes.oneOf(BorderColors);
+
 const ArrayOfValidSizes = PropTypes.arrayOf(ValidSize);
 export const MultipleSizes = PropTypes.oneOfType([
   ValidSize,
   ArrayOfValidSizes,
 ]);
 
-function isValidValue(type, value) {
-  // for now only margin type can have 'auto'
-  return typeof value === 'number' || (type === 'margin' && value === 'auto');
-}
+const ArrayOfValidSizesAndAuto = PropTypes.arrayOf(ValidSizeAndAuto);
+export const MultipleSizesAndAuto = PropTypes.oneOfType([
+  ValidSizeAndAuto,
+  ArrayOfValidSizesAndAuto,
+]);
 
-function generateSizeClasses(baseClass, type, main, top, right, bottom, left) {
-  const arr = Array.isArray(main) ? main : [];
-  const singleDigit = Array.isArray(main) ? undefined : main;
-  if (Array.isArray(main) && ![2, 3, 4].includes(main.length)) {
-    throw new Error(
-      `Expected prop ${type} to have length between 2 and 4, received ${main.length}`,
-    );
-  }
+const ArrayOfValidBorderColors = PropTypes.arrayOf(ValidBorderColors);
+export const MultipleBorderColors = PropTypes.oneOfType([
+  ValidBorderColors,
+  ArrayOfValidBorderColors,
+]);
+
+const ArrayOfValidBackgroundColors = PropTypes.arrayOf(ValidBackgroundColors);
+export const MultipleBackgroundColors = PropTypes.oneOfType([
+  ValidBackgroundColors,
+  ArrayOfValidBackgroundColors,
+]);
 
-  const isHorizontalAndVertical = arr.length === 2;
-  const isTopHorizontalAndBottom = arr.length === 3;
-  const isAllFour = arr.length === 4;
-  const hasAtLeastTwo = arr.length >= 2;
-  const hasAtLeastThree = arr.length >= 3;
+function isValidSize(type, value) {
+  // Only margin types allow 'auto'
+  return (
+    typeof value === 'number' ||
+    ((type === 'margin' ||
+      type === 'margin-top' ||
+      type === 'margin-right' ||
+      type === 'margin-bottom' ||
+      type === 'margin-left') &&
+      value === 'auto')
+  );
+}
 
-  return {
-    [`${baseClass}--${type}-${singleDigit}`]: isValidValue(type, singleDigit),
-    [`${baseClass}--${type}-top-${top}`]: isValidValue(type, top),
-    [`${baseClass}--${type}-right-${right}`]: isValidValue(type, right),
-    [`${baseClass}--${type}-bottom-${bottom}`]: isValidValue(type, bottom),
-    [`${baseClass}--${type}-left-${left}`]: isValidValue(type, left),
-    // As long as an array of length >= 2 has been provided, the first number
-    // will always be for the top value.
-    [`${baseClass}--${type}-top-${arr?.[0]}`]: hasAtLeastTwo,
-    // As long as an array of length >= 2 has been provided, the second number
-    // will always be for the right value.
-    [`${baseClass}--${type}-right-${arr?.[1]}`]: hasAtLeastTwo,
-    // If an array has 2 values, the first number is the bottom value. If
-    // instead if has 3 or more values, the third number will be the bottom.
-    [`${baseClass}--${type}-bottom-${arr?.[2]}`]: hasAtLeastThree,
-    [`${baseClass}--${type}-bottom-${arr?.[0]}`]: isHorizontalAndVertical,
-    // If an array has 2 or 3 values, the second number will be the left value
-    [`${baseClass}--${type}-left-${arr?.[1]}`]:
-      isHorizontalAndVertical || isTopHorizontalAndBottom,
-    // If an array has 4 values, the fourth number is the left value
-    [`${baseClass}--${type}-left-${arr?.[3]}`]: isAllFour,
-  };
+function isValidString(type, value) {
+  return typeof type === 'string' && typeof value === 'string';
 }
 
+/**
+ * Generate classnames
+ * Generates classnames for different utility styles
+ * Also accepts responsive props in the form of an array
+ * Maps responsive props to mobile first breakpoints
+ *
+ * @param {string} type - The style declaration type "margin", "margin-top", "padding", "display" etc
+ * @param {array || number || string} value - prop value being passed in array props are responsive props
+ * @param {*} validatorFn - The validation function for each type of value
+ * @returns
+ */
+
+const generateClassNames = memoize(
+  (type, value, validatorFn) => {
+    // if value does not exist return null
+    if (!value) {
+      return null;
+    }
+    const classesObject = {};
+    // if value is an array with single item e.g. marginTop={[1]}
+    const singleArrayItemProp =
+      Array.isArray(value) && value.length === 1 ? value[0] : undefined;
+    // if value single value e.g. marginTop={1}
+    const singleValueProp =
+      (!Array.isArray(value) && typeof value === 'string') ||
+      typeof value === 'number'
+        ? value
+        : undefined;
+    // single digit equals single value or single array item
+    const singleValue = singleValueProp || singleArrayItemProp;
+    // 0 is an acceptable value but is falsy in js
+    if (singleValue || singleValue === 0) {
+      // add base style without any breakpoint prefixes to classObject
+      classesObject[`${BASE_CLASS_NAME}--${type}-${singleValue}`] = validatorFn(
+        type,
+        singleValue,
+      );
+    } else {
+      // If array with more than one item
+      switch (value.length) {
+        case 4:
+          // add base/sm/md/lg
+          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
+            value[0] && validatorFn(type, value[0]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
+          ] = value[1] && validatorFn(type, value[1]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[2]}:${type}-${value[2]}`
+          ] = value[2] && validatorFn(type, value[2]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[3]}:${type}-${value[3]}`
+          ] = value[3] && validatorFn(type, value[3]);
+          break;
+        case 3:
+          // add base/sm/md
+          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
+            value[0] && validatorFn(type, value[0]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
+          ] = value[1] && validatorFn(type, value[1]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[2]}:${type}-${value[2]}`
+          ] = value[2] && validatorFn(type, value[2]);
+          break;
+        case 2:
+          // add base/sm
+          classesObject[`${BASE_CLASS_NAME}--${type}-${value[0]}`] =
+            value[0] && validatorFn(type, value[0]);
+          classesObject[
+            `${BASE_CLASS_NAME}--${BREAKPOINTS[1]}:${type}-${value[1]}`
+          ] = value[1] && validatorFn(type, value[1]);
+          break;
+        default:
+          console.log(`Invalid array prop length: ${value.length}`);
+      }
+    }
+    return classesObject;
+  },
+  (type, value) => [type, value],
+);
+
 export default function Box({
   padding,
   paddingTop,
@@ -182,56 +246,57 @@ export default function Box({
   className,
   backgroundColor,
 }) {
-  const boxClassName = classnames('box', className, {
-    // ---Borders---
-    // if borderWidth or borderColor is supplied w/o style, default to solid
-    'box--border-style-solid':
-      !borderStyle && (Boolean(borderWidth) || Boolean(borderColor)),
-    // if borderColor supplied w/o width, default to 1
-    'box--border-size-1': !borderWidth && Boolean(borderColor),
-    [`box--border-color-${borderColor}`]: Boolean(borderColor),
-    [`box--rounded-${borderRadius}`]: Boolean(borderRadius),
-    [`box--border-style-${borderStyle}`]: Boolean(borderStyle),
-    [`box--border-size-${borderWidth}`]: Boolean(borderWidth),
+  const boxClassName = classnames(
+    BASE_CLASS_NAME,
+    className,
     // Margin
-    ...generateSizeClasses(
-      'box',
-      'margin',
-      margin,
-      marginTop,
-      marginRight,
-      marginBottom,
-      marginLeft,
-    ),
+    margin && generateClassNames('margin', margin, isValidSize),
+    marginTop && generateClassNames('margin-top', marginTop, isValidSize),
+    marginRight && generateClassNames('margin-right', marginRight, isValidSize),
+    marginBottom &&
+      generateClassNames('margin-bottom', marginBottom, isValidSize),
+    marginLeft && generateClassNames('margin-left', marginLeft, isValidSize),
     // Padding
-    ...generateSizeClasses(
-      'box',
-      'padding',
-      padding,
-      paddingTop,
-      paddingRight,
-      paddingBottom,
-      paddingLeft,
-    ),
-    // ---Flex/Grid alignment---
-    // if justifyContent or alignItems supplied w/o display, default to flex
-    'box--display-flex':
-      !display && (Boolean(justifyContent) || Boolean(alignItems)),
-    [`box--justify-content-${justifyContent}`]: Boolean(justifyContent),
-    [`box--align-items-${alignItems}`]: Boolean(alignItems),
-    [`box--flex-direction-${flexDirection}`]: Boolean(flexDirection),
-    [`box--flex-wrap-${flexWrap}`]: Boolean(flexWrap),
-    // text align
-    [`box--text-align-${textAlign}`]: Boolean(textAlign),
-    // display
-    [`box--display-${display}`]: Boolean(display),
-    // width & height
-    [`box--width-${width}`]: Boolean(width),
-    [`box--height-${height}`]: Boolean(height),
-    // background
-    [`box--background-color-${backgroundColor}`]: Boolean(backgroundColor),
-    ...generateSizeClasses('box', 'gap', gap),
-  });
+    padding && generateClassNames('padding', padding, isValidSize),
+    paddingTop && generateClassNames('padding-top', paddingTop, isValidSize),
+    paddingRight &&
+      generateClassNames('padding-right', paddingRight, isValidSize),
+    paddingBottom &&
+      generateClassNames('padding-bottom', paddingBottom, isValidSize),
+    paddingLeft && generateClassNames('padding-left', paddingLeft, isValidSize),
+    display && generateClassNames('display', display, isValidString),
+    gap && generateClassNames('gap', gap, isValidSize),
+    flexDirection &&
+      generateClassNames('flex-direction', flexDirection, isValidString),
+    flexWrap && generateClassNames('flex-wrap', flexWrap, isValidString),
+    justifyContent &&
+      generateClassNames('justify-content', justifyContent, isValidString),
+    alignItems && generateClassNames('align-items', alignItems, isValidString),
+    textAlign && generateClassNames('text-align', textAlign, isValidString),
+    width && generateClassNames('width', width, isValidString),
+    height && generateClassNames('height', height, isValidString),
+    backgroundColor &&
+      generateClassNames('background-color', backgroundColor, isValidString),
+    borderRadius && generateClassNames('rounded', borderRadius, isValidString),
+    borderStyle &&
+      generateClassNames('border-style', borderStyle, isValidString),
+    borderColor &&
+      generateClassNames('border-color', borderColor, isValidString),
+    borderWidth && generateClassNames('border-width', borderWidth, isValidSize),
+    {
+      // Auto applied classes
+      // ---Borders---
+      // if borderWidth or borderColor is supplied w/o style, default to solid
+      'box--border-style-solid':
+        !borderStyle && (Boolean(borderWidth) || Boolean(borderColor)),
+      // if borderColor supplied w/o width, default to 1
+      'box--border-width-1': !borderWidth && Boolean(borderColor),
+      // ---Flex/Grid alignment---
+      // if justifyContent or alignItems supplied w/o display, default to flex
+      'box--display-flex':
+        !display && (Boolean(justifyContent) || Boolean(alignItems)),
+    },
+  );
   // Apply Box styles to any other component using function pattern
   if (typeof children === 'function') {
     return children(boxClassName);
@@ -241,29 +306,62 @@ export default function Box({
 
 Box.propTypes = {
   children: PropTypes.oneOfType([PropTypes.node, PropTypes.func]),
-  flexDirection: PropTypes.oneOf(Object.values(FLEX_DIRECTION)),
-  flexWrap: PropTypes.oneOf(Object.values(FLEX_WRAP)),
-  gap: ValidSize,
-  margin: MultipleSizes,
-  marginTop: ValidSize,
-  marginBottom: ValidSize,
-  marginRight: ValidSize,
-  marginLeft: ValidSize,
+  flexDirection: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(FLEX_DIRECTION)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(FLEX_DIRECTION))),
+  ]),
+  flexWrap: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(FLEX_WRAP)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(FLEX_WRAP))),
+  ]),
+  gap: MultipleSizes,
+  margin: MultipleSizesAndAuto,
+  marginTop: MultipleSizesAndAuto,
+  marginBottom: MultipleSizesAndAuto,
+  marginRight: MultipleSizesAndAuto,
+  marginLeft: MultipleSizesAndAuto,
   padding: MultipleSizes,
-  paddingTop: ValidSize,
-  paddingBottom: ValidSize,
-  paddingRight: ValidSize,
-  paddingLeft: ValidSize,
-  borderColor: PropTypes.oneOf(Object.values(ValidBorderColors)),
-  borderWidth: PropTypes.number,
-  borderRadius: PropTypes.oneOf(Object.values(SIZES)),
-  borderStyle: PropTypes.oneOf(Object.values(BORDER_STYLE)),
-  alignItems: PropTypes.oneOf(Object.values(ALIGN_ITEMS)),
-  justifyContent: PropTypes.oneOf(Object.values(JUSTIFY_CONTENT)),
-  textAlign: PropTypes.oneOf(Object.values(TEXT_ALIGN)),
-  display: PropTypes.oneOf(Object.values(DISPLAY)),
-  width: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
-  height: PropTypes.oneOf(Object.values(BLOCK_SIZES)),
-  backgroundColor: PropTypes.oneOf(Object.values(ValidBackgroundColors)),
+  paddingTop: MultipleSizes,
+  paddingBottom: MultipleSizes,
+  paddingRight: MultipleSizes,
+  paddingLeft: MultipleSizes,
+  borderColor: MultipleBorderColors,
+  borderWidth: PropTypes.oneOfType([
+    PropTypes.number,
+    PropTypes.arrayOf(PropTypes.number),
+  ]),
+  borderRadius: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(SIZES)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(SIZES))),
+  ]),
+  borderStyle: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(BORDER_STYLE)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BORDER_STYLE))),
+  ]),
+  alignItems: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(ALIGN_ITEMS)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(ALIGN_ITEMS))),
+  ]),
+  justifyContent: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(JUSTIFY_CONTENT)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(JUSTIFY_CONTENT))),
+  ]),
+  textAlign: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(TEXT_ALIGN)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(TEXT_ALIGN))),
+  ]),
+  display: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(DISPLAY)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(DISPLAY))),
+  ]),
+  width: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(BLOCK_SIZES)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BLOCK_SIZES))),
+  ]),
+  height: PropTypes.oneOfType([
+    PropTypes.oneOf(Object.values(BLOCK_SIZES)),
+    PropTypes.arrayOf(PropTypes.oneOf(Object.values(BLOCK_SIZES))),
+  ]),
+  backgroundColor: MultipleBackgroundColors,
   className: PropTypes.string,
 };
diff --git a/ui/components/ui/box/box.scss b/ui/components/ui/box/box.scss
index e15c4979e753..edafb9fcbbf8 100644
--- a/ui/components/ui/box/box.scss
+++ b/ui/components/ui/box/box.scss
@@ -15,6 +15,16 @@ $attributesToApplyExtraProperties: margin;
         #{$attribute}: utilities.get-spacing($size);
       }
     }
+    // breakpoint classes
+    @each $breakpoint, $min-width in $screen-sizes-map {
+      @each $size in design-system.$sizes-numeric {
+        @media screen and (min-width: $min-width) {
+          &--#{$breakpoint}\:#{$attribute}-#{$size} {
+            #{$attribute}: utilities.get-spacing($size);
+          }
+        }
+      }
+    }
 
     @each $size in design-system.$sizes-numeric {
       @each $direction in design-system.$directions {
@@ -22,6 +32,16 @@ $attributesToApplyExtraProperties: margin;
           #{$attribute}-#{$direction}: utilities.get-spacing($size);
         }
       }
+      // breakpoint classes
+      @each $breakpoint, $min-width in $screen-sizes-map {
+        @each $direction in design-system.$directions {
+          @media screen and (min-width: $min-width) {
+            &--#{$breakpoint}\:#{$attribute}-#{$direction}-#{$size} {
+              #{$attribute}-#{$direction}: utilities.get-spacing($size);
+            }
+          }
+        }
+      }
     }
 
     @if list.index($attributesToApplyExtraProperties, $attribute) {
@@ -29,34 +49,85 @@ $attributesToApplyExtraProperties: margin;
         &--#{$attribute}-#{$property} {
           #{$attribute}: $property;
         }
+      }
 
+      @each $property in $extraProperties {
         @each $direction in design-system.$directions {
           &--#{$attribute}-#{$direction}-#{$property} {
             #{$attribute}-#{$direction}: $property;
           }
         }
       }
+
+      // breakpoint classes
+      @each $breakpoint, $min-width in $screen-sizes-map {
+        @each $property in $extraProperties {
+          @media screen and (min-width: $min-width) {
+            &--#{$breakpoint}\:#{$attribute}-#{$property} {
+              #{$attribute}: $property;
+            }
+          }
+
+          @each $direction in design-system.$directions {
+            @media screen and (min-width: $min-width) {
+              &--#{$breakpoint}\:#{$attribute}-#{$direction}-#{$property} {
+                #{$attribute}-#{$direction}: $property;
+              }
+            }
+          }
+        }
+      }
     }
   }
 
   // Borders
   @each $size in design-system.$sizes-numeric {
-    &--border-size-#{$size} {
+    &--border-width-#{$size} {
       border-width: #{$size}px;
     }
   }
-
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $size in design-system.$sizes-numeric {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:border-width-#{$size} {
+          border-width: #{$size}px;
+        }
+      }
+    }
+  }
+  // border-color
   @each $variant, $color in design-system.$color-map {
     &--border-color-#{$variant} {
       border-color: var($color);
     }
   }
-
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $variant, $color in design-system.$color-map {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:border-color-#{$variant} {
+          border-color: var($color);
+        }
+      }
+    }
+  }
+  // border-style
   @each $border-style in design-system.$border-style {
     &--border-style-#{$border-style} {
       border-style: $border-style;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $border-style in design-system.$border-style {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:border-style-#{$border-style} {
+          border-style: $border-style;
+        }
+      }
+    }
+  }
 
   &--rounded-none {
     border-radius: 0;
@@ -82,45 +153,140 @@ $attributesToApplyExtraProperties: margin;
     border-radius: 0.75rem;
   }
 
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:rounded-none {
+        border-radius: 0;
+      }
+
+      &--#{$breakpoint}\:rounded-xs {
+        border-radius: 0.125rem;
+      }
+
+      &--#{$breakpoint}\:rounded-sm {
+        border-radius: 0.25rem;
+      }
+
+      &--#{$breakpoint}\:rounded-md {
+        border-radius: 0.375rem;
+      }
+
+      &--#{$breakpoint}\:rounded-lg {
+        border-radius: 0.5rem;
+      }
+
+      &--#{$breakpoint}\:rounded-xl {
+        border-radius: 0.75rem;
+      }
+    }
+  }
+
   // Display and Flex/Grid alignment
   @each $display in design-system.$display {
     &--display-#{$display} {
       display: $display;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $display in design-system.$display {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:display-#{$display} {
+          display: $display;
+        }
+      }
+    }
+  }
 
   @each $alignment in design-system.$align-items {
     &--align-items-#{$alignment} {
       align-items: $alignment;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $alignment in design-system.$align-items {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:align-items-#{$alignment} {
+          align-items: $alignment;
+        }
+      }
+    }
+  }
 
   @each $justification in design-system.$justify-content {
     &--justify-content-#{$justification} {
       justify-content: $justification;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $justification in design-system.$justify-content {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:justify-content-#{$justification} {
+          justify-content: $justification;
+        }
+      }
+    }
+  }
 
   @each $direction in design-system.$flex-direction {
     &--flex-direction-#{$direction} {
       flex-direction: $direction;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $direction in design-system.$flex-direction {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:flex-direction-#{$direction} {
+          flex-direction: $direction;
+        }
+      }
+    }
+  }
 
   @each $wrap in design-system.$flex-wrap {
     &--flex-wrap-#{$wrap} {
       flex-wrap: $wrap;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $wrap in design-system.$flex-wrap {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:flex-wrap-#{$wrap} {
+          flex-wrap: $wrap;
+        }
+      }
+    }
+  }
 
   // Width and Height
   &--width-full {
     width: 100%;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:width-full {
+        width: 100%;
+      }
+    }
+  }
 
   &--height-full {
     height: 100%;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:height-full {
+        height: 100%;
+      }
+    }
+  }
 
   @each $fraction, $value in design-system.$fractions {
     &--width-#{$fraction} {
@@ -131,30 +297,91 @@ $attributesToApplyExtraProperties: margin;
       height: $value;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $fraction, $value in design-system.$fractions {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:width-#{$fraction} {
+          width: $value;
+        }
+        &--#{$breakpoint}\:height-#{$fraction} {
+          height: $value;
+        }
+      }
+    }
+  }
 
   &--height-screen {
     height: 100vh;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:height-screen {
+        height: 100vh;
+      }
+    }
+  }
 
   &--width-screen {
     width: 100vw;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:width-screen {
+        width: 100vw;
+      }
+    }
+  }
 
   &--height-max {
     height: max-content;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:height-max {
+        height: max-content;
+      }
+    }
+  }
 
   &--width-max {
     width: max-content;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:height-max {
+        height: max-content;
+      }
+    }
+  }
 
   &--height-min {
     height: min-content;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:height-min {
+        height: min-content;
+      }
+    }
+  }
 
   &--width-min {
     width: min-content;
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @media screen and (min-width: $min-width) {
+      &--#{$breakpoint}\:width-min {
+        width: min-content;
+      }
+    }
+  }
 
   // text
   @each $alignment in design-system.$text-align {
@@ -162,6 +389,16 @@ $attributesToApplyExtraProperties: margin;
       text-align: $alignment;
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $alignment in design-system.$text-align {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\:text-align-#{$alignment} {
+          text-align: $alignment;
+        }
+      }
+    }
+  }
 
   // background
   @each $variant, $color in design-system.$color-map {
@@ -169,4 +406,14 @@ $attributesToApplyExtraProperties: margin;
       background-color: var($color);
     }
   }
+  // breakpoint classes
+  @each $breakpoint, $min-width in $screen-sizes-map {
+    @each $variant, $color in design-system.$color-map {
+      @media screen and (min-width: $min-width) {
+        &--#{$breakpoint}\background-color-#{$variant} {
+          background-color: var($color);
+        }
+      }
+    }
+  }
 }
diff --git a/ui/components/ui/box/box.stories.js b/ui/components/ui/box/box.stories.js
index 7044e48e721a..e30e97db8a50 100644
--- a/ui/components/ui/box/box.stories.js
+++ b/ui/components/ui/box/box.stories.js
@@ -6,15 +6,17 @@ import {
   COLORS,
   DISPLAY,
   JUSTIFY_CONTENT,
+  SIZES,
   TEXT_ALIGN,
+  FLEX_DIRECTION,
+  FLEX_WRAP,
 } from '../../../helpers/constants/design-system';
 
 import Typography from '../typography';
 
-import Box from './box';
+import Box, { BackgroundColors, BorderColors } from './box';
 
 import README from './README.mdx';
-import { ValidBackgroundColors, ValidBorderColors } from '.';
 
 const sizeKnobOptions = [undefined, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
 const marginSizeKnobOptions = [...sizeKnobOptions, 'auto'];
@@ -58,18 +60,44 @@ export default {
       table: { category: 'display' },
     },
     backgroundColor: {
-      options: ValidBackgroundColors,
+      options: BackgroundColors,
       control: 'select',
       table: {
         category: 'background',
       },
     },
+    borderStyle: {
+      options: Object.values(BORDER_STYLE),
+      control: 'select',
+      defaultValue: BORDER_STYLE.DASHED,
+      table: { category: 'border' },
+    },
+    borderWidth: {
+      options: sizeKnobOptions,
+      control: 'number',
+      table: { category: 'border' },
+    },
     borderColor: {
-      options: ValidBorderColors,
+      options: BorderColors,
       control: 'select',
       defaultValue: COLORS.BORDER_DEFAULT,
       table: { category: 'border' },
     },
+    borderRadius: {
+      options: Object.values(SIZES),
+      control: 'select',
+      table: { category: 'border' },
+    },
+    flexWrap: {
+      options: Object.values(FLEX_WRAP),
+      control: 'select',
+      table: { category: 'display' },
+    },
+    flexDirection: {
+      options: Object.values(FLEX_DIRECTION),
+      control: 'select',
+      table: { category: 'display' },
+    },
     justifyContent: {
       options: Object.values(JUSTIFY_CONTENT),
       control: 'select',
@@ -86,7 +114,7 @@ export default {
       options: Object.values(TEXT_ALIGN),
       control: 'select',
       defaultValue: TEXT_ALIGN.LEFT,
-      table: { category: 'left' },
+      table: { category: 'text' },
     },
     margin: {
       options: marginSizeKnobOptions,
@@ -138,18 +166,6 @@ export default {
       control: 'select',
       table: { category: 'padding' },
     },
-    borderStyle: {
-      options: Object.values(BORDER_STYLE),
-      control: 'select',
-      defaultValue: BORDER_STYLE.DASHED,
-      table: { category: 'border' },
-    },
-    borderWidth: {
-      options: sizeKnobOptions,
-      control: 'number',
-      defaultValue: 1,
-      table: { category: 'border' },
-    },
   },
 };
 
@@ -158,7 +174,7 @@ export const DefaultStory = (args) => {
   const children = [];
   for (let $i = 0; $i < items; $i++) {
     children.push(
-      <img width={size} height={size} src="./images/eth_logo.svg" />,
+      <img key={$i} width={size} height={size} src="./images/eth_logo.svg" />,
     );
   }
   return <Box {...rest}>{children}</Box>;
@@ -166,6 +182,50 @@ export const DefaultStory = (args) => {
 
 DefaultStory.storyName = 'Default';
 
+export const Margin = () => {
+  return (
+    <Box borderColor={COLORS.BORDER_MUTED}>
+      <Box
+        margin={2}
+        padding={4}
+        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+        borderColor={COLORS.BORDER_MUTED}
+      >
+        Static margin
+      </Box>
+      <Box
+        margin={[2, 4, 8, 12]}
+        padding={[4]}
+        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+        borderColor={COLORS.BORDER_MUTED}
+      >
+        Responsive margin changes based on breakpoint
+      </Box>
+    </Box>
+  );
+};
+
+export const Padding = () => {
+  return (
+    <Box borderColor={COLORS.BORDER_MUTED}>
+      <Box
+        padding={4}
+        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+        borderColor={COLORS.BORDER_MUTED}
+      >
+        Static padding
+      </Box>
+      <Box
+        padding={[4, 8, 12]}
+        backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+        borderColor={COLORS.BORDER_MUTED}
+      >
+        Responsive padding changes based on breakpoint
+      </Box>
+    </Box>
+  );
+};
+
 export const BackgroundColor = () => {
   return (
     <>
@@ -303,3 +363,46 @@ export const BorderColor = () => {
     </>
   );
 };
+
+export const ResponsiveProps = () => {
+  return (
+    <>
+      <Typography boxProps={{ marginBottom: 4 }}>
+        Responsive props example. Stacks vertically on small screens and aligns
+        horizontally on large screens. Padding is also adjusted between small
+        and large screens
+      </Typography>
+      <Box
+        marginTop="auto"
+        marginBottom={[0]}
+        padding={[2, 4]}
+        gap={[2, 4]}
+        display={['flex', null, null, 'none']}
+        flexDirection={['column', 'row']}
+        borderColor={COLORS.BORDER_DEFAULT}
+      >
+        <Box
+          padding={[4, 8]}
+          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+          borderColor={COLORS.BORDER_MUTED}
+        >
+          responsive
+        </Box>
+        <Box
+          padding={[4, 8]}
+          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+          borderColor={COLORS.BORDER_MUTED}
+        >
+          props
+        </Box>
+        <Box
+          padding={[4, 8]}
+          backgroundColor={COLORS.BACKGROUND_ALTERNATIVE}
+          borderColor={COLORS.BORDER_MUTED}
+        >
+          example
+        </Box>
+      </Box>
+    </>
+  );
+};
diff --git a/ui/components/ui/box/box.test.js b/ui/components/ui/box/box.test.js
new file mode 100644
index 000000000000..aabb49c32fa9
--- /dev/null
+++ b/ui/components/ui/box/box.test.js
@@ -0,0 +1,732 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import {
+  BORDER_STYLE,
+  COLORS,
+  DISPLAY,
+  FLEX_DIRECTION,
+  FLEX_WRAP,
+  ALIGN_ITEMS,
+  JUSTIFY_CONTENT,
+  TEXT_ALIGN,
+  SIZES,
+  BLOCK_SIZES,
+} from '../../../helpers/constants/design-system';
+import Box from '.';
+
+describe('Box', () => {
+  it('should render the Box without crashing', () => {
+    const { getByText } = render(<Box>Box content</Box>);
+
+    expect(getByText('Box content')).toBeDefined();
+  });
+  describe('margin', () => {
+    it('should render the Box with the margin class', () => {
+      const { getByText } = render(<Box margin={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-1');
+    });
+    it('should render the Box with the margin auto class', () => {
+      const { getByText } = render(<Box margin="auto">Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-auto');
+    });
+    it('should render the Box with the responsive margin classes', () => {
+      const { getByText } = render(
+        <Box margin={[1, 'auto', 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--margin-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:margin-auto');
+      expect(getByText('Box content')).toHaveClass('box--md:margin-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:margin-4');
+    });
+    it('should render the Box with the marginTop class', () => {
+      const { getByText } = render(<Box marginTop={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-top-1');
+    });
+    it('should render the Box with the marginTop auto class', () => {
+      const { getByText } = render(<Box marginTop="auto">Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-top-auto');
+    });
+    it('should render the Box with the responsive marginTop classes', () => {
+      const { getByText } = render(
+        <Box marginTop={[1, 'auto', 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--margin-top-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:margin-top-auto');
+      expect(getByText('Box content')).toHaveClass('box--md:margin-top-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:margin-top-4');
+    });
+    it('should render the Box with the marginRight class', () => {
+      const { getByText } = render(<Box marginRight={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-right-1');
+    });
+    it('should render the Box with the marginRight auto class', () => {
+      const { getByText } = render(<Box marginRight="auto">Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-right-auto');
+    });
+    it('should render the Box with the responsive marginRight classes', () => {
+      const { getByText } = render(
+        <Box marginRight={[1, 'auto', 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--margin-right-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:margin-right-auto');
+      expect(getByText('Box content')).toHaveClass('box--md:margin-right-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:margin-right-4');
+    });
+    it('should render the Box with the marginBottom class', () => {
+      const { getByText } = render(<Box marginBottom={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-bottom-1');
+    });
+    it('should render the Box with the responsive marginBottom classes', () => {
+      const { getByText } = render(
+        <Box marginBottom={[1, 'auto', 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--margin-bottom-1');
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:margin-bottom-auto',
+      );
+      expect(getByText('Box content')).toHaveClass('box--md:margin-bottom-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:margin-bottom-4');
+    });
+    it('should render the Box with the marginLeft class', () => {
+      const { getByText } = render(<Box marginLeft={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--margin-left-1');
+    });
+    it('should render the Box with the responsive marginLeft classes', () => {
+      const { getByText } = render(
+        <Box marginLeft={[1, 'auto', 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--margin-left-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:margin-left-auto');
+      expect(getByText('Box content')).toHaveClass('box--md:margin-left-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:margin-left-4');
+    });
+  });
+
+  describe('padding', () => {
+    it('should render the Box with the padding class with singular value prop or one item array prop', () => {
+      const { getByText } = render(
+        <>
+          <Box padding={1}>Box content</Box>
+          <Box padding={[1]}>Box content one item array</Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--padding-1');
+      expect(getByText('Box content one item array')).toHaveClass(
+        'box--padding-1',
+      );
+    });
+    it('should render the Box with the responsive padding classes', () => {
+      const { getByText } = render(
+        <Box padding={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--padding-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:padding-2');
+      expect(getByText('Box content')).toHaveClass('box--md:padding-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:padding-4');
+    });
+    it('should render the Box with the paddingTop class', () => {
+      const { getByText } = render(<Box paddingTop={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--padding-top-1');
+    });
+    it('should render the Box with the responsive paddingTop classes', () => {
+      const { getByText } = render(
+        <Box paddingTop={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--padding-top-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:padding-top-2');
+      expect(getByText('Box content')).toHaveClass('box--md:padding-top-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:padding-top-4');
+    });
+    it('should render the Box with the paddingRight class', () => {
+      const { getByText } = render(<Box paddingRight={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--padding-right-1');
+    });
+    it('should render the Box with the responsive paddingRight classes', () => {
+      const { getByText } = render(
+        <Box paddingRight={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--padding-right-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:padding-right-2');
+      expect(getByText('Box content')).toHaveClass('box--md:padding-right-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:padding-right-4');
+    });
+    it('should render the Box with the paddingBottom class', () => {
+      const { getByText } = render(<Box paddingBottom={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--padding-bottom-1');
+    });
+    it('should render the Box with the responsive paddingBottom classes', () => {
+      const { getByText } = render(
+        <Box paddingBottom={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--padding-bottom-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:padding-bottom-2');
+      expect(getByText('Box content')).toHaveClass('box--md:padding-bottom-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:padding-bottom-4');
+    });
+    it('should render the Box with the paddingLeft class', () => {
+      const { getByText } = render(<Box paddingLeft={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--padding-left-1');
+    });
+    it('should render the Box with the responsive paddingLeft classes', () => {
+      const { getByText } = render(
+        <Box paddingLeft={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--padding-left-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:padding-left-2');
+      expect(getByText('Box content')).toHaveClass('box--md:padding-left-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:padding-left-4');
+    });
+  });
+  describe('border', () => {
+    it('should render the Box with the borderWidth class', () => {
+      const { getByText } = render(<Box borderWidth={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--border-width-1');
+    });
+    it('should render the Box with the responsive borderWidth classes', () => {
+      const { getByText } = render(
+        <Box borderWidth={[1, 2, 3, 4]}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--border-width-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:border-width-2');
+      expect(getByText('Box content')).toHaveClass('box--md:border-width-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:border-width-4');
+    });
+    it('should render the Box with the borderColor class', () => {
+      const { getByText } = render(
+        <Box borderColor={COLORS.BORDER_DEFAULT}>Box content</Box>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--border-color-border-default',
+      );
+    });
+    it('should render the Box with the responsive borderColor classes', () => {
+      const { getByText } = render(
+        <Box
+          borderColor={[
+            COLORS.BORDER_DEFAULT,
+            COLORS.ERROR_DEFAULT,
+            COLORS.INFO_DEFAULT,
+            COLORS.WARNING_DEFAULT,
+          ]}
+        >
+          Box content
+        </Box>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--border-color-border-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:border-color-error-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--md:border-color-info-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:border-color-warning-default',
+      );
+    });
+    it('should render the Box with a borderStyle class', () => {
+      const { getByText } = render(
+        <Box borderStyle={BORDER_STYLE.SOLID}>Box content</Box>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--border-style-solid');
+    });
+    it('should render the Box with the responsive borderStyle classes', () => {
+      const { getByText } = render(
+        <Box
+          borderStyle={[
+            BORDER_STYLE.SOLID,
+            BORDER_STYLE.DASHED,
+            BORDER_STYLE.NONE,
+            BORDER_STYLE.DOTTED,
+          ]}
+        >
+          Box content
+        </Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--border-style-solid');
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:border-style-dashed',
+      );
+      expect(getByText('Box content')).toHaveClass('box--md:border-style-none');
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:border-style-dotted',
+      );
+    });
+    it('should render the Box with the borderRadius class', () => {
+      const { getByText } = render(
+        <Box borderRadius={SIZES.XS}>Box content</Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--rounded-xs');
+    });
+    it('should render the Box with the responsive borderRadius classes', () => {
+      const { getByText } = render(
+        <Box borderRadius={[SIZES.XS, SIZES.SM, SIZES.MD, SIZES.LG]}>
+          Box content
+        </Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--rounded-xs');
+      expect(getByText('Box content')).toHaveClass('box--sm:rounded-sm');
+      expect(getByText('Box content')).toHaveClass('box--md:rounded-md');
+      expect(getByText('Box content')).toHaveClass('box--lg:rounded-lg');
+    });
+  });
+  describe('display, gap, flexDirection, flexWrap, alignItems, justifyContent', () => {
+    it('should render the Box with the display classes', () => {
+      const { getByText } = render(
+        <>
+          <Box display={DISPLAY.BLOCK}>Box display-block</Box>
+          <Box display={DISPLAY.FLEX}>Box display-flex</Box>
+          <Box display={DISPLAY.GRID}>Box display-grid</Box>
+          <Box display={DISPLAY.INLINE}>Box display-inline</Box>
+          <Box display={DISPLAY.INLINE_BLOCK}>Box display-inline-block</Box>
+          <Box display={DISPLAY.INLINE_FLEX}>Box display-inline-flex</Box>
+          <Box display={DISPLAY.INLINE_GRID}>Box display-inline-grid</Box>
+          <Box display={DISPLAY.LIST_ITEM}>Box display-list-item</Box>
+          <Box display={DISPLAY.NONE}>Box display-none</Box>
+        </>,
+      );
+
+      expect(getByText('Box display-block')).toHaveClass('box--display-block');
+      expect(getByText('Box display-flex')).toHaveClass('box--display-flex');
+      expect(getByText('Box display-grid')).toHaveClass('box--display-grid');
+      expect(getByText('Box display-inline')).toHaveClass(
+        'box--display-inline',
+      );
+      expect(getByText('Box display-inline-block')).toHaveClass(
+        'box--display-inline-block',
+      );
+      expect(getByText('Box display-inline-flex')).toHaveClass(
+        'box--display-inline-flex',
+      );
+      expect(getByText('Box display-inline-grid')).toHaveClass(
+        'box--display-inline-grid',
+      );
+      expect(getByText('Box display-list-item')).toHaveClass(
+        'box--display-list-item',
+      );
+    });
+    it('should render the Box with the responsive display classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            display={[DISPLAY.BLOCK, DISPLAY.FLEX, DISPLAY.GRID, DISPLAY.NONE]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--display-block');
+      expect(getByText('Box content')).toHaveClass('box--sm:display-flex');
+      expect(getByText('Box content')).toHaveClass('box--md:display-grid');
+      expect(getByText('Box content')).toHaveClass('box--lg:display-none');
+    });
+    it('should render the Box with the gap class', () => {
+      const { getByText } = render(<Box gap={1}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--gap-1');
+    });
+    it('should render the Box with the responsive gap classes', () => {
+      const { getByText } = render(<Box gap={[1, 2, 3, 4]}>Box content</Box>);
+
+      expect(getByText('Box content')).toHaveClass('box--gap-1');
+      expect(getByText('Box content')).toHaveClass('box--sm:gap-2');
+      expect(getByText('Box content')).toHaveClass('box--md:gap-3');
+      expect(getByText('Box content')).toHaveClass('box--lg:gap-4');
+    });
+    it('should render the Box with the flexDirection classes', () => {
+      const { getByText } = render(
+        <>
+          <Box flexDirection={FLEX_DIRECTION.ROW}>Box flex-direction-row</Box>
+          <Box flexDirection={FLEX_DIRECTION.ROW_REVERSE}>
+            Box flex-direction-row-reverse
+          </Box>
+          <Box flexDirection={FLEX_DIRECTION.COLUMN}>
+            Box flex-direction-column
+          </Box>
+          <Box flexDirection={FLEX_DIRECTION.COLUMN_REVERSE}>
+            Box flex-direction-column-reverse
+          </Box>
+        </>,
+      );
+
+      expect(getByText('Box flex-direction-row')).toHaveClass(
+        'box--flex-direction-row',
+      );
+      expect(getByText('Box flex-direction-row-reverse')).toHaveClass(
+        'box--flex-direction-row-reverse',
+      );
+      expect(getByText('Box flex-direction-column')).toHaveClass(
+        'box--flex-direction-column',
+      );
+      expect(getByText('Box flex-direction-column-reverse')).toHaveClass(
+        'box--flex-direction-column-reverse',
+      );
+    });
+    it('should render the Box with the responsive flexDirection classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            flexDirection={[
+              FLEX_DIRECTION.ROW,
+              FLEX_DIRECTION.ROW_REVERSE,
+              FLEX_DIRECTION.COLUMN,
+              FLEX_DIRECTION.COLUMN_REVERSE,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--flex-direction-row');
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:flex-direction-row-reverse',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--md:flex-direction-column',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:flex-direction-column-reverse',
+      );
+    });
+    it('should render the Box with the flexWrap classes', () => {
+      const { getByText } = render(
+        <>
+          <Box flexWrap={FLEX_WRAP.WRAP}>Box flex-wrap-wrap</Box>
+          <Box flexWrap={FLEX_WRAP.WRAP_REVERSE}>
+            Box flex-wrap-wrap-reverse
+          </Box>
+          <Box flexWrap={FLEX_WRAP.NO_WRAP}>Box flex-wrap-nowrap</Box>
+        </>,
+      );
+
+      expect(getByText('Box flex-wrap-wrap')).toHaveClass(
+        'box--flex-wrap-wrap',
+      );
+      expect(getByText('Box flex-wrap-wrap-reverse')).toHaveClass(
+        'box--flex-wrap-wrap-reverse',
+      );
+      expect(getByText('Box flex-wrap-nowrap')).toHaveClass(
+        'box--flex-wrap-nowrap',
+      );
+    });
+    it('should render the Box with the responsive flexWrap classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            flexWrap={[
+              FLEX_WRAP.WRAP,
+              FLEX_WRAP.WRAP_REVERSE,
+              FLEX_WRAP.NO_WRAP,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--flex-wrap-wrap');
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:flex-wrap-wrap-reverse',
+      );
+      expect(getByText('Box content')).toHaveClass('box--md:flex-wrap-nowrap');
+    });
+    it('should render the Box with the alignItems classes', () => {
+      const { getByText } = render(
+        <>
+          <Box alignItems={ALIGN_ITEMS.FLEX_START}>
+            Box align-items-flex-start
+          </Box>
+          <Box alignItems={ALIGN_ITEMS.FLEX_END}>Box align-items-flex-end</Box>
+          <Box alignItems={ALIGN_ITEMS.CENTER}>Box align-items-center</Box>
+          <Box alignItems={ALIGN_ITEMS.BASELINE}>Box align-items-baseline</Box>
+          <Box alignItems={ALIGN_ITEMS.STRETCH}>Box align-items-stretch</Box>
+        </>,
+      );
+
+      expect(getByText('Box align-items-flex-start')).toHaveClass(
+        'box--align-items-flex-start',
+      );
+      expect(getByText('Box align-items-flex-end')).toHaveClass(
+        'box--align-items-flex-end',
+      );
+      expect(getByText('Box align-items-center')).toHaveClass(
+        'box--align-items-center',
+      );
+      expect(getByText('Box align-items-baseline')).toHaveClass(
+        'box--align-items-baseline',
+      );
+      expect(getByText('Box align-items-stretch')).toHaveClass(
+        'box--align-items-stretch',
+      );
+    });
+    it('should render the Box with the responsive alignItems classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            alignItems={[
+              ALIGN_ITEMS.FLEX_START,
+              ALIGN_ITEMS.FLEX_END,
+              ALIGN_ITEMS.CENTER,
+              ALIGN_ITEMS.BASELINE,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--align-items-flex-start',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:align-items-flex-end',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--md:align-items-center',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:align-items-baseline',
+      );
+    });
+    it('should render the Box with the justifyContent classes', () => {
+      const { getByText } = render(
+        <>
+          <Box justifyContent={JUSTIFY_CONTENT.FLEX_START}>
+            Box justify-content-flex-start
+          </Box>
+          <Box justifyContent={JUSTIFY_CONTENT.FLEX_END}>
+            Box justify-content-flex-end
+          </Box>
+          <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
+            Box justify-content-center
+          </Box>
+          <Box justifyContent={JUSTIFY_CONTENT.SPACE_AROUND}>
+            Box justify-content-space-around
+          </Box>
+          <Box justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}>
+            Box justify-content-space-between
+          </Box>
+          <Box justifyContent={JUSTIFY_CONTENT.SPACE_EVENLY}>
+            Box justify-content-space-evenly
+          </Box>
+        </>,
+      );
+
+      expect(getByText('Box justify-content-flex-start')).toHaveClass(
+        'box--justify-content-flex-start',
+      );
+      expect(getByText('Box justify-content-flex-end')).toHaveClass(
+        'box--justify-content-flex-end',
+      );
+      expect(getByText('Box justify-content-center')).toHaveClass(
+        'box--justify-content-center',
+      );
+      expect(getByText('Box justify-content-space-around')).toHaveClass(
+        'box--justify-content-space-around',
+      );
+      expect(getByText('Box justify-content-space-between')).toHaveClass(
+        'box--justify-content-space-between',
+      );
+    });
+    it('should render the Box with the responsive justifyContent classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            justifyContent={[
+              JUSTIFY_CONTENT.FLEX_START,
+              JUSTIFY_CONTENT.FLEX_END,
+              JUSTIFY_CONTENT.CENTER,
+              JUSTIFY_CONTENT.SPACE_AROUND,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--justify-content-flex-start',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:justify-content-flex-end',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--md:justify-content-center',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:justify-content-space-around',
+      );
+    });
+  });
+  describe('textAlign', () => {
+    it('should render the Box with the textAlign auto class', () => {
+      const { getByText } = render(
+        <>
+          <Box textAlign={TEXT_ALIGN.LEFT}>Box left</Box>
+          <Box textAlign={TEXT_ALIGN.CENTER}>Box center</Box>
+          <Box textAlign={TEXT_ALIGN.RIGHT}>Box right</Box>
+          <Box textAlign={TEXT_ALIGN.JUSTIFY}>Box justify</Box>
+          <Box textAlign={TEXT_ALIGN.END}>Box end</Box>
+        </>,
+      );
+
+      expect(getByText('Box left')).toHaveClass('box--text-align-left');
+      expect(getByText('Box center')).toHaveClass('box--text-align-center');
+      expect(getByText('Box right')).toHaveClass('box--text-align-right');
+      expect(getByText('Box justify')).toHaveClass('box--text-align-justify');
+      expect(getByText('Box end')).toHaveClass('box--text-align-end');
+    });
+    it('should render the Box with the responsive textAlign classes', () => {
+      const { getByText } = render(
+        <Box
+          textAlign={[
+            TEXT_ALIGN.LEFT,
+            TEXT_ALIGN.CENTER,
+            TEXT_ALIGN.RIGHT,
+            TEXT_ALIGN.JUSTIFY,
+          ]}
+        >
+          Box content
+        </Box>,
+      );
+
+      expect(getByText('Box content')).toHaveClass('box--text-align-left');
+      expect(getByText('Box content')).toHaveClass('box--sm:text-align-center');
+      expect(getByText('Box content')).toHaveClass('box--md:text-align-right');
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:text-align-justify',
+      );
+    });
+  });
+  describe('background', () => {
+    it('should render the Box with the backgroundColor class', () => {
+      const { getByText } = render(
+        <Box backgroundColor={COLORS.BACKGROUND_DEFAULT}>Box content</Box>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--background-color-background-default',
+      );
+    });
+    it('should render the Box with the responsive backgroundColor classes', () => {
+      const { getByText } = render(
+        <Box
+          backgroundColor={[
+            COLORS.BACKGROUND_DEFAULT,
+            COLORS.ERROR_DEFAULT,
+            COLORS.INFO_DEFAULT,
+            COLORS.WARNING_DEFAULT,
+          ]}
+        >
+          Box content
+        </Box>,
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--background-color-background-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--sm:background-color-error-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--md:background-color-info-default',
+      );
+      expect(getByText('Box content')).toHaveClass(
+        'box--lg:background-color-warning-default',
+      );
+    });
+  });
+  describe('width, height', () => {
+    it('should render the Box with the width class', () => {
+      const { getByText } = render(
+        <>
+          <Box width={BLOCK_SIZES.HALF}>Box half</Box>
+          <Box width={BLOCK_SIZES.ONE_FOURTH}>Box one fourth</Box>
+          <Box width={BLOCK_SIZES.MAX}>Box max</Box>
+          <Box width={BLOCK_SIZES.MIN}>Box min</Box>
+        </>,
+      );
+      expect(getByText('Box half')).toHaveClass('box--width-1/2');
+      expect(getByText('Box one fourth')).toHaveClass('box--width-1/4');
+      expect(getByText('Box max')).toHaveClass('box--width-max');
+      expect(getByText('Box min')).toHaveClass('box--width-min');
+    });
+    it('should render the Box with the responsive width classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            width={[
+              BLOCK_SIZES.HALF,
+              BLOCK_SIZES.ONE_FOURTH,
+              BLOCK_SIZES.MAX,
+              BLOCK_SIZES.MIN,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--width-1/2');
+      expect(getByText('Box content')).toHaveClass('box--sm:width-1/4');
+      expect(getByText('Box content')).toHaveClass('box--md:width-max');
+      expect(getByText('Box content')).toHaveClass('box--lg:width-min');
+    });
+    it('should render the Box with the height class', () => {
+      const { getByText } = render(
+        <>
+          <Box height={BLOCK_SIZES.HALF}>Box half</Box>
+          <Box height={BLOCK_SIZES.ONE_FOURTH}>Box one fourth</Box>
+          <Box height={BLOCK_SIZES.MAX}>Box max</Box>
+          <Box height={BLOCK_SIZES.MIN}>Box min</Box>
+        </>,
+      );
+      expect(getByText('Box half')).toHaveClass('box--height-1/2');
+      expect(getByText('Box one fourth')).toHaveClass('box--height-1/4');
+      expect(getByText('Box max')).toHaveClass('box--height-max');
+      expect(getByText('Box min')).toHaveClass('box--height-min');
+    });
+    it('should render the Box with the responsive height classes', () => {
+      const { getByText } = render(
+        <>
+          <Box
+            height={[
+              BLOCK_SIZES.HALF,
+              BLOCK_SIZES.ONE_FOURTH,
+              BLOCK_SIZES.MAX,
+              BLOCK_SIZES.MIN,
+            ]}
+          >
+            Box content
+          </Box>
+        </>,
+      );
+      expect(getByText('Box content')).toHaveClass('box--height-1/2');
+      expect(getByText('Box content')).toHaveClass('box--sm:height-1/4');
+      expect(getByText('Box content')).toHaveClass('box--md:height-max');
+      expect(getByText('Box content')).toHaveClass('box--lg:height-min');
+    });
+  });
+});
diff --git a/ui/components/ui/box/index.js b/ui/components/ui/box/index.js
index e599a9a98022..89a9055ffee7 100644
--- a/ui/components/ui/box/index.js
+++ b/ui/components/ui/box/index.js
@@ -1,6 +1 @@
-export {
-  default,
-  MultipleSizes,
-  ValidBackgroundColors,
-  ValidBorderColors,
-} from './box';
+export { default, MultipleSizes, MultipleSizesAndAuto } from './box';
diff --git a/ui/components/ui/breadcrumbs/README.mdx b/ui/components/ui/breadcrumbs/README.mdx
new file mode 100644
index 000000000000..4c33afd0994d
--- /dev/null
+++ b/ui/components/ui/breadcrumbs/README.mdx
@@ -0,0 +1,16 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import Breadcrumbs from './breadcrumbs.component';
+
+
+# Breadcrumbs
+
+Breadcrumbs element is used to represent the current index out of total.
+
+<Canvas>
+  <Story id="ui-components-ui-breadcrumbs-breadcrumbs-stories-js--default-breadcrumbs" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={Breadcrumbs} />
\ No newline at end of file
diff --git a/ui/components/ui/breadcrumbs/breadcrumbs.stories.js b/ui/components/ui/breadcrumbs/breadcrumbs.stories.js
new file mode 100644
index 000000000000..2478e82b109a
--- /dev/null
+++ b/ui/components/ui/breadcrumbs/breadcrumbs.stories.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import README from './README.mdx';
+import Breadcrumbs from './breadcrumbs.component';
+
+export default {
+  title: 'Components/UI/Breadcrumbs ',
+  id: __filename,
+  component: Breadcrumbs,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    currentIndex: {
+      control: 'number',
+    },
+    total: {
+      control: 'number',
+    },
+    className: { control: 'text' },
+  },
+};
+
+export const DefaultBreadcrumbs = (args) => {
+  return <Breadcrumbs {...args} />;
+};
+
+DefaultBreadcrumbs.storyName = 'Default';
+DefaultBreadcrumbs.args = {
+  currentIndex: 1,
+  total: 3,
+};
diff --git a/ui/components/ui/button-group/index.scss b/ui/components/ui/button-group/index.scss
index bb77fc9f81a0..00e0bd8cdfdb 100644
--- a/ui/components/ui/button-group/index.scss
+++ b/ui/components/ui/button-group/index.scss
@@ -61,7 +61,7 @@
     }
 
     &:hover {
-      box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
     };
   }
 
diff --git a/ui/components/ui/button/buttons.scss b/ui/components/ui/button/buttons.scss
index e0ea6dcfadf2..b0be64bb77b3 100644
--- a/ui/components/ui/button/buttons.scss
+++ b/ui/components/ui/button/buttons.scss
@@ -194,7 +194,7 @@
 .btn-raised {
   color: var(--color-primary-default);
   background-color: var(--color-background-default);
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.08);
+  box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
   padding: 6px;
   height: initial;
   min-height: initial;
@@ -214,12 +214,16 @@ input[type="submit"][disabled] {
   transition: box-shadow cubic-bezier(0.6, -0.28, 0.735, 0.045) 200ms;
 
   &:hover {
-    box-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
   }
 
   &.btn-secondary {
     border: 1px solid var(--color-primary-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-primary-shadow);
+    }
+
     &--disabled,
     &[disabled] {
       border-color: var(--color-primary-disabled);
@@ -234,6 +238,10 @@ input[type="submit"][disabled] {
   &.btn-default {
     border: 1px solid var(--color-icon-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    }
+
     &--disabled,
     &[disabled] {
       border-color: var(--color-border-muted);
@@ -248,6 +256,10 @@ input[type="submit"][disabled] {
   &.btn-danger {
     border: 1px solid var(--color-error-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-error-shadow);
+    }
+
     &--disabled,
     &[disabled] {
       border-color: var(--color-error-disabled);
@@ -262,6 +274,10 @@ input[type="submit"][disabled] {
   &.btn-warning {
     border: 1px solid var(--color-warning-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
+    }
+
     &--disabled,
     &[disabled] {
       border-color: var(--color-warning-alternative);
@@ -276,6 +292,10 @@ input[type="submit"][disabled] {
   &.btn-primary {
     background-color: var(--color-primary-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-primary-shadow);
+    }
+
     &--disabled,
     &[disabled] {
       background-color: var(--color-primary-disabled);
@@ -289,6 +309,10 @@ input[type="submit"][disabled] {
   &.btn-danger-primary {
     background-color: var(--color-error-default);
 
+    &:hover {
+      box-shadow: var(--shadow-size-sm) var(--color-error-shadow);
+    }
+
     &--disabled,
     &[disabled] {
       background-color: var(--color-error-disabled);
diff --git a/ui/components/ui/callout/callout.scss b/ui/components/ui/callout/callout.scss
index ae19d830470a..91f061324742 100644
--- a/ui/components/ui/callout/callout.scss
+++ b/ui/components/ui/callout/callout.scss
@@ -15,7 +15,7 @@
 
   &--dismissible {
     &#{$self}--first {
-      box-shadow: 0 -5px 5px -5px var(--color-overlay-default);
+      box-shadow: 0 -5px 5px -5px var(--color-shadow-default);
     }
   }
 
diff --git a/ui/components/ui/callout/callout.stories.js b/ui/components/ui/callout/callout.stories.js
index 94ec67d92cf5..e631c71020ce 100644
--- a/ui/components/ui/callout/callout.stories.js
+++ b/ui/components/ui/callout/callout.stories.js
@@ -22,7 +22,7 @@ export default {
 };
 
 export const PersistentCallout = (args) => (
-  <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
+  <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
     <Box margin={2}>
       <Typography variant={TYPOGRAPHY.H4}>This is your private key:</Typography>
       <Typography variant={TYPOGRAPHY.H6}>
@@ -36,7 +36,7 @@ export const PersistentCallout = (args) => (
 export const DismissibleCallout = (args) => {
   const [dismissed, setDismissed] = useState(false);
   return (
-    <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
+    <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
       <Box margin={2}>
         <Typography variant={TYPOGRAPHY.H4}>
           This is your private key:
@@ -81,7 +81,7 @@ export const MultipleDismissibleCallouts = () => {
   };
 
   return (
-    <Box borderColor={COLORS.BORDER_DEFAULT} padding={[8, 0, 0, 0]}>
+    <Box borderColor={COLORS.BORDER_DEFAULT} paddingTop={8}>
       <Box margin={2}>
         <Typography variant={TYPOGRAPHY.H4}>
           This is your private key:
diff --git a/ui/components/ui/chip/chip.js b/ui/components/ui/chip/chip.js
index 21b4fe13f4ef..fa217e31d565 100644
--- a/ui/components/ui/chip/chip.js
+++ b/ui/components/ui/chip/chip.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { omit } from 'lodash';
 import Typography from '../typography';
+import UrlIcon from '../url-icon';
 import { COLORS, TYPOGRAPHY } from '../../../helpers/constants/design-system';
 
 export default function Chip({
@@ -14,9 +15,11 @@ export default function Chip({
   label,
   labelProps = {},
   leftIcon,
+  leftIconUrl = '',
   rightIcon,
   onClick,
   maxContent = true,
+  displayInlineBlock = false,
 }) {
   const onKeyPress = (event) => {
     if (event.key === 'Enter' && onClick) {
@@ -37,11 +40,17 @@ export default function Chip({
         [`chip--border-color-${borderColor}`]: true,
         [`chip--background-color-${backgroundColor}`]: true,
         'chip--max-content': maxContent,
+        'chip--display-inline-block': displayInlineBlock,
       })}
       role={isInteractive ? 'button' : undefined}
       tabIndex={isInteractive ? 0 : undefined}
     >
-      {leftIcon ? <div className="chip__left-icon">{leftIcon}</div> : null}
+      {leftIcon && !leftIconUrl ? (
+        <div className="chip__left-icon">{leftIcon}</div>
+      ) : null}
+      {leftIconUrl ? (
+        <UrlIcon className="chip__left-url-icon" url={leftIconUrl} />
+      ) : null}
       {children ?? (
         <Typography
           className="chip__label"
@@ -106,4 +115,12 @@ Chip.propTypes = {
    * max-content can overflow the parent's width and break designs
    */
   maxContent: PropTypes.bool,
+  /**
+   * Icon location
+   */
+  leftIconUrl: PropTypes.string,
+  /**
+   * Display or not the inline block
+   */
+  displayInlineBlock: PropTypes.bool,
 };
diff --git a/ui/components/ui/chip/chip.scss b/ui/components/ui/chip/chip.scss
index 7eba44619616..b0a430819037 100644
--- a/ui/components/ui/chip/chip.scss
+++ b/ui/components/ui/chip/chip.scss
@@ -16,6 +16,10 @@
     align-items: center;
   }
 
+  &__left-url-icon {
+    margin-right: 8px;
+  };
+
   @each $variant, $color in design-system.$color-map {
     &--border-color-#{$variant} {
       border-color: var($color);
@@ -67,4 +71,8 @@
   &--max-content {
     width: max-content;
   }
+
+  &--display-inline-block {
+    display: inline-block;
+  }
 }
diff --git a/ui/components/ui/color-indicator/color-indicator.js b/ui/components/ui/color-indicator/color-indicator.js
index 00cf3932dc42..455f7d53fa4b 100644
--- a/ui/components/ui/color-indicator/color-indicator.js
+++ b/ui/components/ui/color-indicator/color-indicator.js
@@ -6,7 +6,7 @@ import { COLORS, SIZES } from '../../../helpers/constants/design-system';
 export default function ColorIndicator({
   size = SIZES.SM,
   type = 'outlined',
-  color = COLORS.ICON_DEFAULT,
+  color = COLORS.ICON_MUTED,
   borderColor,
   iconClassName,
 }) {
diff --git a/ui/components/ui/confusable/README.mdx b/ui/components/ui/confusable/README.mdx
new file mode 100644
index 000000000000..126753ec20b1
--- /dev/null
+++ b/ui/components/ui/confusable/README.mdx
@@ -0,0 +1,25 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import Confusable from './confusable.component';
+
+# Confusable
+
+Confusable allows to filter out any characters that look very similar to English language characters.
+
+<Canvas>
+  <Story id="ui-components-ui-confusable-confusable-stories-js--default-confusable" />
+</Canvas>
+
+## Component API
+
+| Name  | Description | Default |
+| ----- | ----------- | ------- |
+| input | string      | -       |
+
+## NonConfusable
+
+Not to detect emojis
+
+<Canvas>
+  <Story id="ui-components-ui-confusable-confusable-stories-js--non-confusable" />
+</Canvas>
diff --git a/ui/components/ui/confusable/confusable.stories.js b/ui/components/ui/confusable/confusable.stories.js
new file mode 100644
index 000000000000..e609f286f468
--- /dev/null
+++ b/ui/components/ui/confusable/confusable.stories.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import README from './README.mdx';
+import Confusable from './confusable.component';
+
+export default {
+  title: 'Components/UI/Confusable',
+  id: __filename,
+  component: Confusable,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    input: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultConfusable = (args) => {
+  return <Confusable {...args} />;
+};
+
+export const NonConfusable = (args) => {
+  return <Confusable {...args} />;
+};
+
+DefaultConfusable.storyName = 'Default';
+DefaultConfusable.args = {
+  input: 'vita‍lik.eth',
+};
+
+NonConfusable.storyName = 'NonConfusable';
+NonConfusable.args = {
+  input: '👻.eth',
+};
diff --git a/ui/components/ui/definition-list/definition-list.js b/ui/components/ui/definition-list/definition-list.js
index 05ca7b912417..2d156081459a 100644
--- a/ui/components/ui/definition-list/definition-list.js
+++ b/ui/components/ui/definition-list/definition-list.js
@@ -7,6 +7,7 @@ import {
   SIZES,
   TYPOGRAPHY,
   FONT_WEIGHT,
+  OVERFLOW_WRAP,
 } from '../../../helpers/constants/design-system';
 import Tooltip from '../tooltip';
 
@@ -60,6 +61,7 @@ export default function DefinitionList({
               marginBottom: MARGIN_MAP[gapSize],
             }}
             className="definition-list__definition"
+            overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
             tag="dd"
           >
             {definition}
diff --git a/ui/components/ui/definition-list/definition-list.stories.js b/ui/components/ui/definition-list/definition-list.stories.js
index e2d351b01b3b..702598ff5b48 100644
--- a/ui/components/ui/definition-list/definition-list.stories.js
+++ b/ui/components/ui/definition-list/definition-list.stories.js
@@ -1,5 +1,4 @@
 import React from 'react';
-import { object, select } from '@storybook/addon-knobs';
 import {
   COLORS,
   SIZES,
@@ -7,11 +6,6 @@ import {
 } from '../../../helpers/constants/design-system';
 import DefinitionList from './definition-list';
 
-export default {
-  title: 'Components/UI/DefinitionList',
-  id: __filename,
-};
-
 const basic = {
   term:
     'a word or phrase used to describe a thing or to express a concept, especially in a particular kind of language or branch of study.',
@@ -34,39 +28,91 @@ const tooltips = {
   Ticker: 'The currency symbol of the primary currency for this network',
 };
 
-export const DefaultStory = () => (
-  <DefinitionList
-    dictionary={object('dictionary', basic)}
-    gapSize={select('gapSize', SIZES, SIZES.SM)}
-  />
+export default {
+  title: 'Components/UI/DefinitionList',
+  id: __filename,
+  argTypes: {
+    dictionary: { control: 'object', name: 'Dictionary' },
+    gapSize: {
+      control: 'select',
+      name: 'Gap Size',
+      options: Object.values(SIZES),
+    },
+  },
+  args: {
+    dictionary: basic,
+    gapSize: SIZES.SM,
+  },
+};
+
+export const DefaultStory = (args) => (
+  <DefinitionList dictionary={args.dictionary} gapSize={args.gapSize} />
 );
 
 DefaultStory.storyName = 'Default';
 
-export const WithTooltips = () => (
+export const WithTooltips = (args) => (
   <DefinitionList
-    dictionary={object('dictionary', advanced)}
-    tooltips={object('tooltips', tooltips)}
-    gapSize={select('gapSize', SIZES, SIZES.SM)}
+    dictionary={args.dictionary}
+    tooltips={args.tooltips}
+    gapSize={args.gapSize}
   />
 );
 
-export const WithTypographyControl = () => (
+WithTooltips.args = {
+  dictionary: advanced,
+  tooltips,
+};
+WithTooltips.argTypes = {
+  tooltips: { control: 'object', name: 'Tooltips' },
+};
+
+export const WithTypographyControl = (args) => (
   <DefinitionList
-    dictionary={object('dictionary', advanced)}
-    tooltips={object('tooltips', tooltips)}
-    gapSize={select('gapSize', SIZES, SIZES.SM)}
+    dictionary={args.dictionary}
+    tooltips={args.tooltips}
+    gapSize={args.gapSize}
     termTypography={{
-      variant: select('termTypography.variant', TYPOGRAPHY, TYPOGRAPHY.H6),
-      color: select('termTypography.color', COLORS, COLORS.TEXT_DEFAULT),
+      variant: args.termTypographyVariant,
+      color: args.termTypographyColor,
+      children: <div></div>,
     }}
     definitionTypography={{
-      variant: select(
-        'definitionTypography.variant',
-        TYPOGRAPHY,
-        TYPOGRAPHY.H6,
-      ),
-      color: select('definitionTypography.color', COLORS, COLORS.TEXT_DEFAULT),
+      variant: args.definitionTypographyVariant,
+      color: args.definitionTypographyColor,
+      children: <div></div>,
     }}
   />
 );
+
+WithTypographyControl.args = {
+  dictionary: advanced,
+  termTypographyVariant: TYPOGRAPHY.H6,
+  termTypographyColor: COLORS.TEXT_DEFAULT,
+  definitionTypographyVariant: TYPOGRAPHY.H6,
+  definitionTypographyColor: COLORS.TEXT_DEFAULT,
+};
+
+WithTypographyControl.argTypes = {
+  tooltips,
+  termTypographyVariant: {
+    control: 'select',
+    name: 'Term Variant',
+    options: Object.values(TYPOGRAPHY),
+  },
+  termTypographyColor: {
+    control: 'select',
+    name: 'Term Color',
+    options: Object.values(COLORS),
+  },
+  definitionTypographyVariant: {
+    control: 'select',
+    name: 'Definition Variant',
+    options: Object.values(TYPOGRAPHY),
+  },
+  definitionTypographyColor: {
+    control: 'select',
+    name: 'Definition Color',
+    options: Object.values(COLORS),
+  },
+};
diff --git a/ui/components/ui/dialog/README.mdx b/ui/components/ui/dialog/README.mdx
new file mode 100644
index 000000000000..6b21aa8407ce
--- /dev/null
+++ b/ui/components/ui/dialog/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import Dialog from '.';
+
+# Dialog
+
+Dialog element is to create popup dialogs
+
+<Canvas>
+  <Story id="ui-components-ui-dialog-dialog-stories-js--default-dialog" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={Dialog} />
diff --git a/ui/components/ui/dialog/dialog.stories.js b/ui/components/ui/dialog/dialog.stories.js
new file mode 100644
index 000000000000..574c94f4fa4a
--- /dev/null
+++ b/ui/components/ui/dialog/dialog.stories.js
@@ -0,0 +1,30 @@
+import React from 'react';
+import README from './README.mdx';
+import Dialog from '.';
+
+export default {
+  title: 'Components/UI/Dialog',
+  id: __filename,
+  component: Dialog,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    children: {
+      control: 'text',
+    },
+    type: { control: 'text' },
+  },
+};
+
+export const DefaultDialog = (args) => {
+  return <Dialog {...args} />;
+};
+
+DefaultDialog.storyName = 'Default';
+DefaultDialog.args = {
+  type: 'error',
+  children: 'Dialog Box',
+};
diff --git a/ui/components/ui/dropdown/dropdown.scss b/ui/components/ui/dropdown/dropdown.scss
index 7311bbac0386..11d50976b2c4 100644
--- a/ui/components/ui/dropdown/dropdown.scss
+++ b/ui/components/ui/dropdown/dropdown.scss
@@ -1,6 +1,7 @@
 .dropdown {
   position: relative;
   display: inline-block;
+  height: 36px;
 
   &__select {
     appearance: none;
diff --git a/ui/components/ui/error-message/error-message.component.js b/ui/components/ui/error-message/error-message.component.js
index dd1e16c5c3bc..db8ce1da4885 100644
--- a/ui/components/ui/error-message/error-message.component.js
+++ b/ui/components/ui/error-message/error-message.component.js
@@ -1,6 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
+/**
+ * @deprecated - Please use ActionableMessage type danger
+ * @see ActionableMessage
+ * @param {Object} props
+ * @param {string} props.errorMessage
+ * @param {string} props.errorKey
+ * @param {Object} context
+ */
 const ErrorMessage = (props, context) => {
   const { errorMessage, errorKey } = props;
   const error = errorKey ? context.t(errorKey) : errorMessage;
diff --git a/ui/components/ui/export-text-container/README.mdx b/ui/components/ui/export-text-container/README.mdx
new file mode 100644
index 000000000000..bd57310b0283
--- /dev/null
+++ b/ui/components/ui/export-text-container/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import ExportTextContainer from '.';
+
+# ExportTextContainer
+
+The ExportTextContainer component enables to copy the input text or save it as a CSV File
+
+<Canvas>
+  <Story id="ui-components-ui-export-text-container-export-text-stories-js--default-export-text-container" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={ExportTextContainer} />
diff --git a/ui/components/ui/export-text-container/export-text.stories.js b/ui/components/ui/export-text-container/export-text.stories.js
new file mode 100644
index 000000000000..2dfb4c257542
--- /dev/null
+++ b/ui/components/ui/export-text-container/export-text.stories.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import README from './README.mdx';
+import ExportTextContainer from '.';
+
+export default {
+  title: 'Components/UI/ExportTextContainer',
+  id: __filename,
+  component: ExportTextContainer,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    text: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultExportTextContainer = (args) => {
+  return <ExportTextContainer {...args} />;
+};
+
+DefaultExportTextContainer.storyName = 'Default';
+
+DefaultExportTextContainer.args = {
+  text: ' Lorem ipsum dolor sit amet, consectetur adipiscing elit.',
+};
diff --git a/ui/components/ui/form-field/form-field.stories.js b/ui/components/ui/form-field/form-field.stories.js
index 0c7d0c36f904..230ea00366ba 100644
--- a/ui/components/ui/form-field/form-field.stories.js
+++ b/ui/components/ui/form-field/form-field.stories.js
@@ -57,7 +57,7 @@ export const FormFieldWithTitleDetail = (args) => {
       <button
         style={{
           backgroundColor: clicked
-            ? 'var(--color-secondary-default)'
+            ? 'var(--color-warning-default)'
             : 'var(--color-background-alternative)',
         }}
         onClick={() => setClicked(!clicked)}
diff --git a/ui/components/ui/form-field/index.scss b/ui/components/ui/form-field/index.scss
index c281b9034141..224d82ad4222 100644
--- a/ui/components/ui/form-field/index.scss
+++ b/ui/components/ui/form-field/index.scss
@@ -39,10 +39,10 @@
     border-radius: 6px;
     background-color: var(--color-background-default);
     color: var(--color-text-default);
-    border: 2px solid var(--color-border-default);
+    border: 1px solid var(--color-border-default);
 
     &:focus {
-      border: solid 2px var(--color-primary-default);
+      border: solid 1px var(--color-primary-default);
     }
 
     &--error {
diff --git a/ui/components/ui/hex-to-decimal/README.mdx b/ui/components/ui/hex-to-decimal/README.mdx
new file mode 100644
index 000000000000..7f3748f66b93
--- /dev/null
+++ b/ui/components/ui/hex-to-decimal/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import HexToDecimal from './hex-to-decimal.component';
+
+# HexToDecimal
+
+The HexToDecimal component renders hex as a decimal
+
+<Canvas>
+  <Story id="ui-components-ui-hex-to-decimal-hex-to-decimal-stories-js--default-hex-to-decimal" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={HexToDecimal} />
diff --git a/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js b/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
new file mode 100644
index 000000000000..c2e5c8881f16
--- /dev/null
+++ b/ui/components/ui/hex-to-decimal/hex-to-decimal.stories.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import README from './README.mdx';
+import HexToDecimal from './hex-to-decimal.component';
+
+export default {
+  title: 'Components/UI/HexToDecimal',
+  id: __filename,
+  component: HexToDecimal,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argsTypes: {
+    text: {
+      control: 'text',
+    },
+    className: {
+      value: 'text',
+    },
+  },
+};
+
+export const DefaultHexToDecimal = (args) => {
+  return <HexToDecimal {...args} />;
+};
+
+DefaultHexToDecimal.storyName = 'Default';
+
+DefaultHexToDecimal.args = {
+  value: '0x3039',
+};
diff --git a/ui/components/ui/i18n-value/i18n-value.component.js b/ui/components/ui/i18n-value/i18n-value.component.js
deleted file mode 100644
index d321df7e9722..000000000000
--- a/ui/components/ui/i18n-value/i18n-value.component.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import PropTypes from 'prop-types';
-
-import { useI18nContext } from '../../../hooks/useI18nContext';
-
-const I18nValue = ({ messageKey, options }) => {
-  const t = useI18nContext();
-  return t(messageKey, options);
-};
-
-I18nValue.propTypes = {
-  messageKey: PropTypes.string.isRequired,
-  options: PropTypes.array,
-};
-
-export default I18nValue;
diff --git a/ui/components/ui/i18n-value/index.js b/ui/components/ui/i18n-value/index.js
deleted file mode 100644
index 190d57ab0987..000000000000
--- a/ui/components/ui/i18n-value/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './i18n-value.component';
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.scss b/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
index 975404af0053..cdbecf676e82 100644
--- a/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.scss
@@ -1,5 +1,5 @@
 .icon-with-fallback {
   &__fallback {
-    color: var(--color-icon-default);
+    color: var(--color-icon-alternative);
   }
 }
diff --git a/ui/components/ui/icon/icon.stories.js b/ui/components/ui/icon/icon.stories.js
index 2a2d5b3b684a..263ddd11b91e 100644
--- a/ui/components/ui/icon/icon.stories.js
+++ b/ui/components/ui/icon/icon.stories.js
@@ -38,13 +38,15 @@ import IconPlus from './icon-plus';
 import IconEye from './icon-eye';
 import IconEyeSlash from './icon-eye-slash';
 import IconTokenSearch from './icon-token-search';
+import SearchIcon from './search-icon';
 
 const validColors = [
   'var(--color-icon-default)',
+  'var(--color-icon-alternative)',
   'var(--color-icon-muted)',
   'var(--color-overlay-inverse)',
   'var(--color-primary-default)',
-  'var(--color-secondary-default)',
+  'var(--color-warning-default)',
   'var(--color-error-default)',
   'var(--color-warning-default)',
   'var(--color-success-default)',
@@ -126,6 +128,7 @@ export const DefaultStory = (args) => (
         <IconItem Component={<IconSpeechBubbles {...args} />} />
         <IconItem Component={<IconCog {...args} />} />
         <IconItem Component={<IconTokenSearch {...args} />} />
+        <IconItem Component={<SearchIcon {...args} />} />
       </div>
     </Box>
     <Typography
diff --git a/ui/components/ui/icon/search-icon.js b/ui/components/ui/icon/search-icon.js
new file mode 100644
index 000000000000..a8d4c48bef46
--- /dev/null
+++ b/ui/components/ui/icon/search-icon.js
@@ -0,0 +1,42 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const SearchIcon = ({
+  size = 24,
+  color = 'currentColor',
+  ariaLabel,
+  className,
+}) => (
+  <svg
+    width={size}
+    height={size}
+    fill={color}
+    className={className}
+    aria-label={ariaLabel}
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 512 512"
+  >
+    <path d="m235 427c-51 0-100-21-136-57-36-36-56-84-56-135 0-26 5-51 14-74 10-23 24-44 42-62 18-18 39-32 62-42 23-9 48-14 74-14 25 0 50 5 73 14 23 10 45 24 62 42 18 18 32 39 42 62 10 23 15 48 15 74 0 43-15 86-42 119l78 79c2 2 4 4 5 7 1 2 1 5 1 8 0 3 0 6-1 8-1 3-3 5-5 7-2 2-4 4-7 5-2 1-5 1-8 1-3 0-6 0-8-1-3-1-5-3-7-5l-79-78c-33 27-76 42-119 42z m0-43c82 0 149-67 149-149 0-83-67-150-149-150-83 0-150 67-150 150 0 82 67 149 150 149z" />
+  </svg>
+);
+
+SearchIcon.propTypes = {
+  /**
+   * The size of the Icon follows an 8px grid 2 = 16px, 3 = 24px etc
+   */
+  size: PropTypes.number,
+  /**
+   * The color of the icon accepts design token css variables
+   */
+  color: PropTypes.string,
+  /**
+   * An additional className to assign the Icon
+   */
+  className: PropTypes.string,
+  /**
+   * The aria-label of the icon for accessibility purposes
+   */
+  ariaLabel: PropTypes.string,
+};
+
+export default SearchIcon;
diff --git a/ui/components/ui/info-tooltip/index.scss b/ui/components/ui/info-tooltip/index.scss
index 28beeebfc208..7b4ed32fbed7 100644
--- a/ui/components/ui/info-tooltip/index.scss
+++ b/ui/components/ui/info-tooltip/index.scss
@@ -11,58 +11,10 @@
   }
 }
 
-.tippy-popper[x-placement^=top] .tippy-tooltip-info-theme [x-arrow],
-.tippy-popper[x-placement^=top] .tippy-tooltip-wideInfo-theme [x-arrow] {
-  border-top-color: var(--color-background-default);
-}
-
-.tippy-popper[x-placement^=right] .tippy-tooltip-info-theme [x-arrow],
-.tippy-popper[x-placement^=right] .tippy-tooltip-wideInfo-theme [x-arrow] {
-  border-right-color: var(--color-background-default);
-}
-
-.tippy-popper[x-placement^=left] .tippy-tooltip-info-theme [x-arrow],
-.tippy-popper[x-placement^=left] .tippy-tooltip-wideInfo-theme [x-arrow] {
-  border-left-color: var(--color-background-default);
-}
-
-.tippy-popper[x-placement^=bottom] .tippy-tooltip-info-theme [x-arrow],
-.tippy-popper[x-placement^=bottom] .tippy-tooltip-wideInfo-theme [x-arrow] {
-  border-bottom-color: var(--color-background-default);
-}
-
 .tippy-tooltip {
-  &#{&}-info-theme,
-  &#{&}-wideInfo-theme {
-    background: var(--color-background-default);
-    color: var(--color-text-default);
-    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
-    border-radius: 8px;
-    max-width: 203px;
+  &#{&}-info-theme {
+    max-width: 200px;
     padding: 16px;
-    padding-bottom: 15px;
-
-    .tippy-tooltip-content {
-      @include H7;
-
-      text-align: left;
-      color: var(--color-text-alternative);
-
-      a {
-        color: var(--color-primary-default);
-      }
-
-      p {
-        margin-bottom: 12px;
-
-        &:last-child {
-          margin-bottom: 0;
-        }
-      }
-    }
-  }
-
-  &#{&}-wideInfo-theme {
-    max-width: 260px;
+    padding-bottom: 16px;
   }
 }
diff --git a/ui/components/ui/info-tooltip/info-tooltip.js b/ui/components/ui/info-tooltip/info-tooltip.js
index eaf9e568f048..0294636d001f 100644
--- a/ui/components/ui/info-tooltip/info-tooltip.js
+++ b/ui/components/ui/info-tooltip/info-tooltip.js
@@ -16,8 +16,7 @@ export default function InfoTooltip({
   position = '',
   containerClassName,
   wrapperClassName,
-  wide,
-  iconFillColor = 'var(--color-icon-default)',
+  iconFillColor = 'var(--color-icon-alternative)',
 }) {
   return (
     <div className="info-tooltip">
@@ -32,7 +31,7 @@ export default function InfoTooltip({
         tooltipInnerClassName="info-tooltip__tooltip-content"
         tooltipArrowClassName={positionArrowClassMap[position]}
         html={contentText}
-        theme={wide ? 'tippy-tooltip-wideInfo' : 'tippy-tooltip-info'}
+        theme="tippy-tooltip-info"
       >
         <InfoTooltipIcon fillColor={iconFillColor} />
       </Tooltip>
@@ -49,10 +48,6 @@ InfoTooltip.propTypes = {
    * Shows position of the tooltip
    */
   position: PropTypes.oneOf(['top', 'left', 'bottom', 'right']),
-  /**
-   * Set if the tooltip wide
-   */
-  wide: PropTypes.bool,
   /**
    * Add custom CSS class for container
    */
diff --git a/ui/components/ui/info-tooltip/info-tooltip.stories.js b/ui/components/ui/info-tooltip/info-tooltip.stories.js
index c77580bf6ff1..c7c050e9b888 100644
--- a/ui/components/ui/info-tooltip/info-tooltip.stories.js
+++ b/ui/components/ui/info-tooltip/info-tooltip.stories.js
@@ -17,7 +17,6 @@ export default {
       control: 'select',
       options: ['top', 'left', 'bottom', 'right'],
     },
-    wide: { control: 'boolean' },
     containerClassName: { control: 'text' },
     wrapperClassName: { control: 'text' },
     iconFillColor: { control: 'text' },
diff --git a/ui/components/ui/jazzicon/jazzicon.component.js b/ui/components/ui/jazzicon/jazzicon.component.js
index f5261f832499..f495d6c0d6b0 100644
--- a/ui/components/ui/jazzicon/jazzicon.component.js
+++ b/ui/components/ui/jazzicon/jazzicon.component.js
@@ -15,7 +15,6 @@ export default class Jazzicon extends PureComponent {
     className: PropTypes.string,
     diameter: PropTypes.number,
     style: PropTypes.object,
-    useTokenDetection: PropTypes.bool,
     tokenList: PropTypes.object,
   };
 
@@ -48,13 +47,8 @@ export default class Jazzicon extends PureComponent {
   }
 
   appendJazzicon() {
-    const { address, diameter, useTokenDetection, tokenList } = this.props;
-    const image = iconFactory.iconForAddress(
-      address,
-      diameter,
-      useTokenDetection,
-      tokenList,
-    );
+    const { address, diameter, tokenList } = this.props;
+    const image = iconFactory.iconForAddress(address, diameter, tokenList);
     this.container.current.appendChild(image);
   }
 
diff --git a/ui/components/ui/loading-screen/index.scss b/ui/components/ui/loading-screen/index.scss
index f3bcd65bca88..753d8a06e80d 100644
--- a/ui/components/ui/loading-screen/index.scss
+++ b/ui/components/ui/loading-screen/index.scss
@@ -1,4 +1,5 @@
 .loading-overlay {
+  top: 0;
   left: 0;
   z-index: 51;
   position: fixed;
@@ -20,11 +21,12 @@
 
   &__container {
     position: absolute;
-    top: 33%;
+    top: 50%;
     display: flex;
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    transform: translateY(-50%);
   }
 
   &__error-screen {
diff --git a/ui/components/ui/loading-screen/loading-screen.component.js b/ui/components/ui/loading-screen/loading-screen.component.js
index 3d8ad9298b9c..08869b9fabe2 100644
--- a/ui/components/ui/loading-screen/loading-screen.component.js
+++ b/ui/components/ui/loading-screen/loading-screen.component.js
@@ -35,7 +35,7 @@ class LoadingScreen extends Component {
         <div className="loading-overlay__container">
           {this.props.showLoadingSpinner && (
             <Spinner
-              color="var(--color-secondary-default)"
+              color="var(--color-warning-default)"
               className="loading-overlay__spinner"
             />
           )}
diff --git a/ui/components/ui/logo/logo-coinbasepay.js b/ui/components/ui/logo/logo-coinbasepay.js
new file mode 100644
index 000000000000..2b23e7391a7c
--- /dev/null
+++ b/ui/components/ui/logo/logo-coinbasepay.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+const LogoCoinbasePay = ({
+  width = '100%',
+  className,
+  ariaLabel,
+  color = 'var(--color-text-default)',
+}) => {
+  return (
+    <svg
+      width={width}
+      viewBox="0 0 125 24"
+      xmlns="http://www.w3.org/2000/svg"
+      fill="none"
+      className={`logo-coinbasepay ${className}`}
+      aria-label={ariaLabel}
+    >
+      <path
+        d="M28.4278 4.10732C28.2105 4.09956 27.9938 4.13626 27.7911 4.21515C27.5885 4.29405 27.404 4.41349 27.2491 4.56615C27.0942 4.71882 26.9721 4.9015 26.8903 5.103C26.8085 5.3045 26.7686 5.52059 26.7732 5.73803C26.7913 6.1643 26.9734 6.56711 27.2815 6.86233C27.5895 7.15755 27.9996 7.32237 28.4263 7.32237C28.853 7.32237 29.2631 7.15755 29.5712 6.86233C29.8792 6.56711 30.0613 6.1643 30.0794 5.73803C30.0844 5.52074 30.0449 5.30471 29.9634 5.10322C29.8819 4.90172 29.7601 4.71901 29.6055 4.5663C29.4508 4.41359 29.2666 4.2941 29.064 4.21517C28.8615 4.13625 28.645 4.09955 28.4278 4.10732ZM84.799 8.47177C81.4928 8.47177 79.0661 10.9611 79.0661 14.2433C79.0661 17.7015 81.6657 19.997 84.8407 19.997C87.5238 19.997 89.6285 18.408 90.1651 16.1543H87.482C87.0945 17.141 86.1494 17.7015 84.8854 17.7015C83.2309 17.7015 81.9877 16.67 81.7075 14.8664H90.2277V13.8737C90.2277 10.6957 87.9113 8.47177 84.799 8.47177ZM81.8565 13.0211C82.265 11.4768 83.4246 10.7255 84.7542 10.7255C86.215 10.7255 87.33 11.5603 87.5894 13.0211H81.8565ZM19.0102 8.47177C18.2476 8.45519 17.4894 8.59283 16.7812 8.87644C16.0731 9.16005 15.4295 9.58378 14.8891 10.1222C14.3487 10.6607 13.9227 11.3027 13.6365 12.0099C13.3503 12.717 13.2099 13.4747 13.2238 14.2374C13.2238 17.5435 15.6922 19.9911 18.9983 19.9911C19.7652 20.0134 20.5287 19.8797 21.2423 19.5982C21.956 19.3166 22.6051 18.8929 23.1501 18.3529C23.6951 17.8129 24.1247 17.1678 24.4129 16.4568C24.7011 15.7458 24.8418 14.9836 24.8265 14.2165C24.8265 10.9551 22.3581 8.47177 19.0102 8.47177ZM19.0311 17.6151C17.1858 17.6151 15.8323 16.1751 15.8323 14.2433C15.8323 12.3115 17.1649 10.8567 19.0102 10.8567C20.8556 10.8567 22.2299 12.3145 22.2299 14.2463C22.2299 16.1781 20.8765 17.6091 19.0311 17.6091V17.6151ZM37.7917 8.47177C36.1163 8.47177 35.0222 9.15744 34.3782 10.1233V8.68045H31.8234V19.7764H34.3902V13.7455C34.3902 12.0492 35.4723 10.8567 37.0732 10.8567C38.5638 10.8567 39.4761 11.9091 39.4761 13.4325V19.7764H42.0518V13.2417C42.0399 10.4394 40.6029 8.47177 37.7917 8.47177ZM6.75461 10.8567C7.38882 10.8516 8.0076 11.0523 8.51819 11.4285C9.02879 11.8047 9.4037 12.3363 9.58673 12.9435H12.3115C11.8196 10.2813 9.62847 8.47177 6.77548 8.47177C6.0138 8.45681 5.25693 8.59565 4.55016 8.87999C3.84338 9.16433 3.20123 9.58832 2.66212 10.1266C2.12302 10.6649 1.69803 11.3064 1.4126 12.0127C1.12716 12.719 0.987147 13.4757 1.00093 14.2374C1.00093 17.5435 3.46935 19.9911 6.77548 19.9911C9.56586 19.9911 11.7988 18.2023 12.2907 15.5193H9.58673C9.41182 16.1287 9.04244 16.6642 8.5349 17.0442C8.02735 17.4242 7.40949 17.6278 6.77548 17.624C4.90628 17.624 3.59754 16.1841 3.59754 14.2523C3.59754 12.3205 4.87646 10.8567 6.75461 10.8567ZM25.5361 10.9849H27.1459V19.7764H29.7216V8.68045H25.548L25.5361 10.9849ZM66.2322 12.4755C66.2322 10.0727 64.7714 8.46283 61.6799 8.46283C58.7613 8.46283 57.1306 9.95342 56.8087 12.2191H59.3635C59.4917 11.3248 60.1774 10.6093 61.6382 10.6093C62.9469 10.6093 63.5908 11.1876 63.5908 11.8971C63.5908 12.8183 62.3984 13.0538 60.9525 13.2059C58.976 13.4205 56.5284 14.1002 56.5284 16.6819C56.5284 18.6793 58.019 19.9612 60.3712 19.9612C62.2165 19.9612 63.3762 19.1891 63.9486 17.9639C64.0321 19.0579 64.8429 19.7675 65.9877 19.7675H67.4783V17.472H66.2113L66.2322 12.4755ZM63.6982 15.2659C63.6982 16.7565 62.4103 17.8416 60.8452 17.8416C59.8793 17.8416 59.0565 17.4332 59.0565 16.5746C59.0565 15.4805 60.3652 15.1794 61.5666 15.0512C62.768 14.923 63.3553 14.6875 63.6922 14.1927L63.6982 15.2659ZM74.4751 13.1612L72.5851 12.8839C71.6907 12.7557 71.0408 12.4546 71.0408 11.7451C71.0408 10.973 71.8755 10.5854 73.0144 10.5854C74.2605 10.5854 75.0535 11.122 75.2264 12.0045H77.7157C77.4354 9.77157 75.7183 8.46283 73.0799 8.46283C70.3522 8.46283 68.5485 9.85802 68.5485 11.8316C68.5485 13.7216 69.741 14.8127 72.126 15.1586L74.0131 15.4388C74.9372 15.567 75.453 15.9307 75.453 16.6313C75.453 17.5107 74.5586 17.8744 73.3065 17.8744C71.7801 17.8744 70.9216 17.2514 70.7934 16.3093H68.2624C68.4979 18.4766 70.1942 20 73.2827 20C76.0969 20 77.9631 18.7121 77.9631 16.5001C77.9512 14.5176 76.5977 13.4861 74.4751 13.1642V13.1612ZM50.0265 8.47177C49.36 8.4623 48.6998 8.60194 48.0943 8.88048C47.4887 9.15901 46.9531 9.5694 46.5266 10.0816V4H43.9508V19.7764H46.4848V18.3097C46.9093 18.8394 47.4488 19.2656 48.0624 19.5559C48.676 19.8462 49.3477 19.993 50.0265 19.9851C53.1179 19.9851 55.4552 17.5375 55.4552 14.2314C55.4552 10.9253 53.0732 8.47177 50.0265 8.47177ZM49.6389 17.6151C47.7936 17.6151 46.4401 16.1751 46.4401 14.2433C46.4401 12.3115 47.8055 10.8567 49.6598 10.8567C51.5141 10.8567 52.8377 12.2936 52.8377 14.2463C52.8377 16.199 51.4843 17.6091 49.6389 17.6091V17.6151Z"
+        fill="#0052FF"
+      />
+      <path
+        d="M97.314 8.67746H102.111C104.496 8.67746 105.846 10.016 105.846 11.9568C105.846 13.8975 104.508 15.2689 102.111 15.2689H98.9864V19.7794H97.314V8.67746ZM104.15 11.8792C104.15 10.7911 103.455 10.1114 102.063 10.1114H98.9864V13.8379H102.063C103.449 13.8379 104.15 13.1582 104.15 12.0492V11.8792Z"
+        fill={color}
+      />
+      <path
+        d="M113.025 17.1172H108.055L107.077 19.7675H105.342L109.602 8.66556H111.51L115.815 19.7675H114.026L113.025 17.1172ZM108.577 15.6833H112.497L110.541 10.4483H110.509L108.577 15.6833Z"
+        fill={color}
+      />
+      <path
+        d="M118.543 15.4269L114.602 8.67746H116.429L119.381 13.7872H119.41L122.362 8.67746H124.174L120.215 15.4269V19.7794H118.543V15.4269Z"
+        fill={color}
+      />
+    </svg>
+  );
+};
+
+LogoCoinbasePay.propTypes = {
+  /**
+   * The width of the logo. Defaults to 100%
+   */
+  width: PropTypes.string,
+  /**
+   * The color of the logo defaults to var(--color-text-default)
+   */
+  color: PropTypes.string,
+  /**
+   * Additional className to add to the root svg
+   */
+  className: PropTypes.string,
+  /**
+   * Aria label to add to the logo component
+   */
+  ariaLabel: PropTypes.string,
+};
+
+export default LogoCoinbasePay;
diff --git a/ui/components/ui/logo/logo-coinbasepay.scss b/ui/components/ui/logo/logo-coinbasepay.scss
new file mode 100644
index 000000000000..23f372dc8cec
--- /dev/null
+++ b/ui/components/ui/logo/logo-coinbasepay.scss
@@ -0,0 +1,3 @@
+[data-theme=dark] .logo-coinbasepay path {
+  fill: var(--color-text-default);
+}
diff --git a/ui/components/ui/logo/logo-wyre.js b/ui/components/ui/logo/logo-wyre.js
index fd8d22d6525c..860a56bd4a74 100644
--- a/ui/components/ui/logo/logo-wyre.js
+++ b/ui/components/ui/logo/logo-wyre.js
@@ -1,28 +1,34 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 
-const LogoWyre = ({
-  width = '100%',
-  color = 'var(--color-text-default)',
-  className,
-  ariaLabel,
-}) => {
+const LogoWyre = ({ width = '100%', color = 'var(--color-text-default)' }) => {
   return (
     <svg
       width={width}
-      fill={color}
-      className={className}
-      aria-label={ariaLabel}
-      viewBox="0 0 72 24"
+      viewBox="0 0 261 61"
+      fill="none"
       xmlns="http://www.w3.org/2000/svg"
     >
-      <path d="M14.797 0.229002L10.8 9.895C10.5262 10.5518 10.0638 11.1126 9.47122 11.5065C8.87863 11.9004 8.18256 12.1098 7.47098 12.108H0.0669861L4.06198 2.442C4.33585 1.78506 4.7984 1.22413 5.39117 0.830201C5.98395 0.436268 6.68027 0.227042 7.392 0.229002H14.797Z" />
-      <path d="M40.245 20.496C42.452 20.803 43.795 20.403 44.837 19.373C45.49 18.727 45.987 17.97 46.425 17.174C48.201 13.955 52.474 6.179 52.474 6.179H49.396L46.196 12.549L45.196 6.179H41.926V6.327L43.601 15.147C43.686 15.593 43.774 16.739 42.961 17.481C42.505 17.895 41.848 18.24 40.716 18.056L40.245 20.496Z" />
-      <path d="M37.793 6.179L34.817 12.868L34.737 12.861L34.334 6.345H31.093L27.934 12.869L27.853 12.842L27.718 6.179H24.617L25.234 16.864H28.59L31.842 9.892L31.918 9.905L32.434 16.864H35.812L40.698 6.179H37.793Z" />
-      <path d="M55.73 16.864H52.474C52.8223 15.1331 53.1632 13.4302 53.5038 11.7287C53.8722 9.8883 54.2403 8.04958 54.617 6.179H57.142V8.145C57.48 7.333 57.942 6.576 58.724 6.245C59.491 5.919 60.677 5.935 61.887 6.304C61.6525 6.75282 61.4456 7.17747 61.2344 7.61075L61.2333 7.61303L61.2325 7.61467C61.0148 8.06153 60.7925 8.51765 60.531 9.019C60.3778 8.98937 60.2298 8.9568 60.0849 8.92492C59.7898 8.85999 59.5073 8.79783 59.221 8.769C58.265 8.676 57.569 9.054 57.243 9.953C57.015 10.58 56.873 11.245 56.735 11.901C56.5068 12.9847 56.2899 14.0701 56.0714 15.1636L56.0711 15.165C55.9584 15.7289 55.8453 16.2949 55.73 16.864Z" />
-      <path d="M70.31 14.208H70.201C68.954 14.682 67.571 14.806 66.617 14.538C65.563 14.242 64.956 13.334 65.147 12.308C68.287 12.57 69.62 11.978 70.336 11.554C72.274 10.406 72.767 7.332 70.238 6.422C68.016 5.622 64.92 6.002 63.458 7.758C62.125 9.357 61.734 11.115 61.938 13.073C62.091 14.545 63.111 16.656 66.442 16.986C68.457 17.185 69.746 16.672 69.84 16.634L70.31 14.208ZM66.142 8.72C66.608 8.16 67.446 7.85 68.069 8.043C68.828 8.278 69.077 9.112 68.538 9.693C68.3444 9.89534 68.1074 10.0512 67.845 10.149C67.061 10.441 66.251 10.432 65.398 10.286C65.542 9.666 65.77 9.168 66.142 8.72Z" />
-      <path d="M4.97699 23.996H12.382C13.842 23.996 15.158 23.121 15.712 21.783L19.706 12.117L15.223 17.765C14.543 18.661 13.515 19.245 12.305 19.245H6.94098L4.97699 23.996Z" />
-      <path d="M2.52197 18.055H9.92697C11.387 18.055 12.703 17.18 13.257 15.842L17.251 6.177L12.768 11.824C12.088 12.72 11.06 13.304 9.84998 13.304H4.48596L2.52197 18.055Z" />
+      <path
+        d="M126.836 10.6396L122.859 29.3287C122.696 30.0922 122.614 30.8707 122.614 31.6514V40.6187H118.34V32.1939C118.34 31.1775 118.2 30.1659 117.924 29.1875L112.714 10.6396H102.145L96.9868 29.0463C96.7113 30.0247 96.5712 31.0363 96.5706 32.0527V40.6001H92.2969V31.8223C92.2964 31.0419 92.2155 30.2635 92.0554 29.4997L88.0342 10.6396H77.3464V11.7545L87.2391 50.032H99.4284L104.739 31.1497C105.014 30.1662 105.155 29.1497 105.155 28.1284V20.1644H109.429V28.1061C109.428 29.1251 109.568 30.1394 109.845 31.1199L115.155 50.032H127.315L137.241 11.7545V10.6396H126.836Z"
+        fill={color}
+      />
+      <path
+        d="M260.142 28.8865C260.142 16.7752 252.917 9.73291 240.914 9.73291C230.88 9.73291 223.611 14.408 221.385 23.7692C221.277 24.2073 221.271 24.6642 221.366 25.1053C221.461 25.5464 221.655 25.96 221.933 26.3149C222.212 26.6698 222.568 26.9566 222.974 27.1536C223.38 27.3506 223.825 27.4527 224.276 27.452H229.137V31.7257H223.983C223.551 31.7254 223.125 31.819 222.733 32C222.341 32.181 221.994 32.4451 221.714 32.774C221.435 33.1028 221.23 33.4886 221.115 33.9044C221 34.3202 220.976 34.7561 221.047 35.1819C222.782 45.6803 230.337 50.9351 241.021 50.9351C253.255 50.9351 258.146 43.9374 259.387 38.5228V37.4079H249.755C249.156 39.816 246.745 42.789 240.836 42.789C234.849 42.789 231.385 38.7272 231.24 33.3832H260.138L260.142 28.8865ZM231.352 25.8429C231.805 21.5097 234.89 17.786 240.758 17.786C246.819 17.786 249.718 21.3982 249.792 25.8429H231.352Z"
+        fill={color}
+      />
+      <path
+        d="M212.172 10.4834C207.293 10.4834 203.87 15.203 202.138 20.1828H197.53C197.53 20.1828 201.51 15.2105 201.904 10.6395H191.164V50.0318H202.228V29.4884C202.228 22.5278 205.234 19.5176 211.332 19.5176H216.977V10.4834H212.172Z"
+        fill={color}
+      />
+      <path
+        d="M173.761 10.6396L166.488 31.0791C166.06 32.2803 165.842 33.5461 165.842 34.8213V40.6261H161.568V34.8176C161.568 33.5512 161.35 32.2942 160.925 31.1014L153.671 10.6619H142.151V11.7768L156.153 46.364L160.316 46.4049L158.424 51.4702L146.16 51.4367V60.876H157.989C160.087 60.8757 162.137 60.2515 163.878 59.0829C165.62 57.9142 166.975 56.2539 167.77 54.3131L185.014 11.7545V10.6396H173.761Z"
+        fill={color}
+      />
+      <path
+        d="M51.4405 30.2466L54.681 22.4759V14.4897H43.7478L46.442 8.0011V0H16.1769L6.10352e-05 39.0988V46.5313H11.1078L8.23898 53.4361V60.5862L34.2045 60.471H42.9711L61.5896 36.5828V30.2652L51.4405 30.2466ZM51.8938 21.9185L48.4228 30.2466H33.595L15.5191 53.4955H11.2343L26.2813 17.2769H51.8976L51.8938 21.9185ZM18.0424 2.78719H43.6548V7.44739L40.7301 14.4897L24.4306 14.5083L7.2542 39.1619H2.99158L18.0424 2.78719Z"
+        fill={color}
+      />
     </svg>
   );
 };
@@ -36,14 +42,6 @@ LogoWyre.propTypes = {
    * The color of the logo defaults to var(--color-text-default)
    */
   color: PropTypes.string,
-  /**
-   * Additional className to add to the root svg
-   */
-  className: PropTypes.string,
-  /**
-   * Aria label to add to the logo component
-   */
-  ariaLabel: PropTypes.string,
 };
 
 export default LogoWyre;
diff --git a/ui/components/ui/logo/logo.stories.js b/ui/components/ui/logo/logo.stories.js
index 1867676ae002..9ee9001a3dbf 100644
--- a/ui/components/ui/logo/logo.stories.js
+++ b/ui/components/ui/logo/logo.stories.js
@@ -7,6 +7,7 @@ import Card from '../card';
 import Box from '../box';
 import Typography from '../typography';
 
+import LogoCoinbasePay from './logo-coinbasepay';
 import LogoMoonPay from './logo-moonpay';
 import LogoWyre from './logo-wyre';
 import LogoTransak from './logo-transak';
@@ -68,6 +69,7 @@ export const DefaultStory = (args) => (
       gridTemplateColumns: 'repeat(auto-fill, 176px)',
     }}
   >
+    <LogoItem Component={<LogoCoinbasePay {...args} />} />
     <LogoItem Component={<LogoWyre {...args} />} />
     <LogoItem Component={<LogoTransak {...args} />} />
     <LogoItem Component={<LogoDepositEth {...args} />} />
diff --git a/ui/components/ui/menu/menu.scss b/ui/components/ui/menu/menu.scss
index 221f26feb83d..17e457d0cd30 100644
--- a/ui/components/ui/menu/menu.scss
+++ b/ui/components/ui/menu/menu.scss
@@ -3,7 +3,7 @@
     @include H6;
 
     background: var(--color-background-default);
-    box-shadow: 0 2px 10px rgba(0, 0, 0, 0.214);
+    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
     border-radius: 8px;
     width: 225px;
     color: var(--color-text-default);
@@ -43,6 +43,6 @@
   &__icon {
     margin-right: 8px;
     grid-row: 1 / span 2;
-    color: var(--color-icon-default);
+    color: var(--color-icon-alternative);
   }
 }
diff --git a/ui/components/ui/metafox-logo/horizontal-logo.js b/ui/components/ui/metafox-logo/horizontal-logo.js
index 920f5d274b08..83940ef7414a 100644
--- a/ui/components/ui/metafox-logo/horizontal-logo.js
+++ b/ui/components/ui/metafox-logo/horizontal-logo.js
@@ -6,7 +6,7 @@ const LOGO_HEIGHT = 30;
 const TEXT_COLOR = 'var(--color-text-default)';
 const FLASK_PILL_BACKGROUND = 'var(--color-overlay-alternative)';
 const FLASK_PILL_TEXT = 'var(--color-overlay-inverse)';
-const BETA_PILL_BACKGROUND = 'var(--color-secondary-default)';
+const BETA_PILL_BACKGROUND = 'var(--color-warning-default)';
 const BETA_PIL_TEXT = 'var(--color-secondary-inverse)';
 
 export default function MetaFoxHorizontalLogo({ className }) {
diff --git a/ui/components/ui/nickname-popover/nickname-popover.stories.js b/ui/components/ui/nickname-popover/nickname-popover.stories.js
index 9cf1921da0fc..c0d7fb04110f 100644
--- a/ui/components/ui/nickname-popover/nickname-popover.stories.js
+++ b/ui/components/ui/nickname-popover/nickname-popover.stories.js
@@ -1,33 +1,54 @@
 import React, { useState } from 'react';
-import { action } from '@storybook/addon-actions';
-import { text } from '@storybook/addon-knobs';
 import Button from '../button';
 import NicknamePopover from '.';
 
 export default {
   title: 'Components/UI/NicknamePopover',
   id: __filename,
+  argTypes: {
+    address: {
+      control: { type: 'text' },
+      name: 'Address',
+    },
+    onClosePopover: {
+      action: 'Close Nickname Popover',
+    },
+    onAdd: {
+      action: 'Add Nickname Popover',
+    },
+    onOpenPopover: {
+      action: 'Open Nickname Popover',
+    },
+  },
+  args: {
+    address: '0x5e6DaAD1BE117e26590F9eEcD509336ABFBe5966',
+  },
 };
 
-export const DefaultStory = () => {
+export const DefaultStory = (args) => {
   const [showNicknamePopover, setShowNicknamePopover] = useState(false);
 
   return (
-    <div>
-      <Button onClick={() => setShowNicknamePopover(true)}>
+    <>
+      <Button
+        onClick={() => {
+          args.onOpenPopover();
+          setShowNicknamePopover(true);
+        }}
+      >
         Open Nickname Popover
       </Button>
       {showNicknamePopover && (
         <NicknamePopover
-          address={text(
-            'Address',
-            '0x5e6DaAD1BE117e26590F9eEcD509336ABFBe5966',
-          )}
-          onClose={() => setShowNicknamePopover(false)}
-          onAdd={action('add NicknamePopover')}
+          address={args.address}
+          onClose={() => {
+            args.onClosePopover();
+            setShowNicknamePopover(false);
+          }}
+          onAdd={args.onAdd}
         />
       )}
-    </div>
+    </>
   );
 };
 
diff --git a/ui/components/ui/page-container/index.scss b/ui/components/ui/page-container/index.scss
index 0128b1d598be..c15941abb660 100644
--- a/ui/components/ui/page-container/index.scss
+++ b/ui/components/ui/page-container/index.scss
@@ -1,7 +1,7 @@
 .page-container {
   width: 408px;
   background-color: var(--color-background-default);
-  box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   z-index: 25;
   display: flex;
   flex-flow: column;
diff --git a/ui/components/ui/page-container/page-container.component.js b/ui/components/ui/page-container/page-container.component.js
index a7bee1fe6bb4..d360bbc1b111 100644
--- a/ui/components/ui/page-container/page-container.component.js
+++ b/ui/components/ui/page-container/page-container.component.js
@@ -74,9 +74,7 @@ export default class PageContainer extends PureComponent {
     children = children.filter(Boolean);
     const { activeTabIndex } = this.state;
 
-    return children[activeTabIndex]
-      ? children[activeTabIndex].props.children
-      : children.props.children;
+    return (children[activeTabIndex] || children[0]).props.children;
   }
 
   renderContent() {
diff --git a/ui/components/ui/page-container/page-container.stories.js b/ui/components/ui/page-container/page-container.stories.js
new file mode 100644
index 000000000000..a18cf7f5d72e
--- /dev/null
+++ b/ui/components/ui/page-container/page-container.stories.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import PageContainer from '.';
+
+export default {
+  title: 'Components/UI/PageContainer',
+  id: __filename,
+  argTypes: {
+    backButtonString: {
+      control: 'text',
+    },
+    backButtonStyles: {
+      control: 'object',
+    },
+    headerCloseText: {
+      control: 'text',
+    },
+    onBackButtonClick: {
+      action: 'onBackButtonClick',
+    },
+    onClose: {
+      action: 'onClose',
+    },
+    showBackButton: {
+      control: 'boolean',
+    },
+    subtitle: {
+      control: 'text',
+    },
+    title: {
+      control: 'text',
+    },
+    defaultActiveTabIndex: {
+      control: 'number',
+    },
+    tabsComponent: {
+      control: 'node',
+    },
+    contentComponent: {
+      control: 'node',
+    },
+    cancelText: {
+      control: 'text',
+    },
+    disabled: {
+      control: 'boolean',
+    },
+    hideCancel: {
+      control: 'boolean',
+    },
+    onCancel: {
+      action: 'onCancel',
+    },
+    onSubmit: {
+      action: 'onSubmit',
+    },
+    submitText: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultStory = (args) => (
+  <PageContainer {...args}>Page container</PageContainer>
+);
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/popover/index.scss b/ui/components/ui/popover/index.scss
index d51d02a31824..99077d5dfacf 100644
--- a/ui/components/ui/popover/index.scss
+++ b/ui/components/ui/popover/index.scss
@@ -15,7 +15,7 @@
     position: absolute;
     width: 328px;
     max-height: 94vh;
-    box-shadow: 0 4px 30px rgba(0, 0, 0, 0.25);
+    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
     border-radius: 10px;
     background: var(--color-background-default);
   }
@@ -104,6 +104,6 @@
     background: var(--color-background-default);
     position: absolute;
     transform: rotate(45deg);
-    box-shadow: 0 4px 30px rgba(0, 0, 0, 0.25);
+    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
   }
 }
diff --git a/ui/components/ui/search-icon/index.js b/ui/components/ui/search-icon/index.js
deleted file mode 100644
index 7583cbf6b4e7..000000000000
--- a/ui/components/ui/search-icon/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './search-icon.component';
diff --git a/ui/components/ui/search-icon/search-icon.component.js b/ui/components/ui/search-icon/search-icon.component.js
deleted file mode 100644
index fd3d78081090..000000000000
--- a/ui/components/ui/search-icon/search-icon.component.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-
-export default function SearchIcon({ color }) {
-  return (
-    <svg height="20" width="20" xmlns="http://www.w3.org/2000/svg" fill={color}>
-      <g clipRule="evenodd" fillRule="evenodd">
-        <path d="M9.167 3.333a5.833 5.833 0 100 11.667 5.833 5.833 0 000-11.667zm-7.5 5.834a7.5 7.5 0 1115 0 7.5 7.5 0 01-15 0z" />
-        <path d="M13.286 13.286a.833.833 0 011.178 0l3.625 3.625a.833.833 0 11-1.178 1.178l-3.625-3.625a.833.833 0 010-1.178z" />
-      </g>
-    </svg>
-  );
-}
-
-SearchIcon.propTypes = {
-  /**
-   * Color of the icon should be a valid design system color and is required
-   */
-  color: PropTypes.string.isRequired,
-};
diff --git a/ui/components/ui/sender-to-recipient/index.scss b/ui/components/ui/sender-to-recipient/index.scss
index e00d34c4cc1a..9473f6ba29ad 100644
--- a/ui/components/ui/sender-to-recipient/index.scss
+++ b/ui/components/ui/sender-to-recipient/index.scss
@@ -27,7 +27,7 @@
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
-        border: 1px solid var(--color-border-default);
+        border-bottom: 1px solid var(--color-border-muted);
 
         &--sender {
           padding-right: 30px;
@@ -107,7 +107,7 @@
         justify-content: center;
         flex: 1;
         border-radius: 4px;
-        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.08);
+        box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
         padding: 6px;
         background: var(--color-background-default);
         cursor: pointer;
diff --git a/ui/components/ui/site-icon/site-icon.test.js b/ui/components/ui/site-icon/site-icon.test.js
index 5c4efa156ba7..f1e793c3ba51 100644
--- a/ui/components/ui/site-icon/site-icon.test.js
+++ b/ui/components/ui/site-icon/site-icon.test.js
@@ -4,6 +4,7 @@ import SiteIcon from '.';
 
 describe('SiteIcon', () => {
   const args = {
+    size: 32,
     name: 'Snap name',
     icon: './images/eth_logo.svg',
     className: 'classname-test',
@@ -11,7 +12,7 @@ describe('SiteIcon', () => {
   };
 
   it('should render without crashing', () => {
-    const { getByText } = render(<SiteIcon name={args.name} />);
+    const { getByText } = render(<SiteIcon size={32} name={args.name} />);
     expect(getByText('S')).toBeDefined();
   });
 
diff --git a/ui/components/ui/site-origin/index.scss b/ui/components/ui/site-origin/index.scss
index 2f0016e76e5f..895e0f2ef5cd 100644
--- a/ui/components/ui/site-origin/index.scss
+++ b/ui/components/ui/site-origin/index.scss
@@ -1,12 +1,13 @@
 .site-origin {
+  overflow: hidden;
   max-width: 100%;
 
   .chip {
     max-width: 100%;
-  }
 
-  .chip__left-icon {
-    padding: 4px 0 4px 8px;
+    &__left-icon {
+      padding: 4px 0 4px 8px;
+    }
   }
 
   span {
@@ -17,5 +18,6 @@
 
     /*rtl:ignore*/
     direction: rtl;
+    max-width: 100%;
   }
 }
diff --git a/ui/components/ui/site-origin/site-origin.js b/ui/components/ui/site-origin/site-origin.js
index 2dc545a68133..78fee0e6bf9a 100644
--- a/ui/components/ui/site-origin/site-origin.js
+++ b/ui/components/ui/site-origin/site-origin.js
@@ -1,22 +1,60 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import classnames from 'classnames';
 import Chip from '../chip';
 import IconWithFallback from '../icon-with-fallback';
 
-export default function SiteOrigin({ siteOrigin, iconSrc, iconName }) {
+export default function SiteOrigin({
+  siteOrigin,
+  iconSrc,
+  iconName,
+  chip,
+  className,
+  title,
+}) {
   return (
-    <div className="site-origin">
-      <Chip
-        label={siteOrigin}
-        maxContent={false}
-        leftIcon={<IconWithFallback icon={iconSrc} name={iconName} size={32} />}
-      />
+    <div className={classnames('site-origin', className)} title={title}>
+      {chip ? (
+        <Chip
+          label={siteOrigin}
+          maxContent={false}
+          leftIcon={
+            <IconWithFallback icon={iconSrc} name={iconName} size={32} />
+          }
+        />
+      ) : (
+        <span>{siteOrigin}</span>
+      )}
     </div>
   );
 }
 
 SiteOrigin.propTypes = {
+  /**
+   * The origin of the site generally the URL
+   */
   siteOrigin: PropTypes.string.isRequired,
+  /**
+   * Icon name is used for the fallback icon and will display the first letter of the string
+   * when iconSrc errors or is not provided.
+   */
   iconName: PropTypes.string,
+  /**
+   * The image src of the icon
+   */
   iconSrc: PropTypes.string,
+  /**
+   * Additional className added to the root html element
+   */
+  className: PropTypes.string,
+  /**
+   * title specifies extra information and is added to a title attribute added to the root html element
+   * It is most often shown as a tooltip text when the mouse moves over the element.
+   */
+  title: PropTypes.string,
+  /**
+   * Whether the SiteOrigin is displayed as a chip or plain text.
+   * if false iconSrc and iconName props will not be used.
+   */
+  chip: PropTypes.bool,
 };
diff --git a/ui/components/ui/site-origin/site-origin.stories.js b/ui/components/ui/site-origin/site-origin.stories.js
index 53a11c190e7b..2604b5704526 100644
--- a/ui/components/ui/site-origin/site-origin.stories.js
+++ b/ui/components/ui/site-origin/site-origin.stories.js
@@ -16,6 +16,12 @@ export default {
     iconName: {
       control: 'text',
     },
+    title: {
+      control: 'text',
+    },
+    chip: {
+      control: 'boolean',
+    },
   },
 };
 
@@ -25,6 +31,8 @@ DefaultStory.storyName = 'Default';
 
 DefaultStory.args = {
   siteOrigin: 'https://metamask.io',
+  title: 'https://metamask.io',
   iconName: 'MetaMask',
   iconSrc: './metamark.svg',
+  chip: true,
 };
diff --git a/ui/components/ui/slider/slider.component.js b/ui/components/ui/slider/slider.component.js
index 9061dee58bab..7861859a0ace 100644
--- a/ui/components/ui/slider/slider.component.js
+++ b/ui/components/ui/slider/slider.component.js
@@ -35,13 +35,13 @@ const styles = {
     backgroundColor: 'var(--color-primary-default)',
     border: '1px solid var(--color-border-muted)',
     boxSizing: 'border-box',
-    boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
+    boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
     '&:focus, &$active': {
       height: 20,
       width: 20,
       marginTop: -7,
       marginLeft: -7,
-      boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
+      boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
     },
     '&:hover': {
       height: 22,
@@ -49,7 +49,7 @@ const styles = {
       marginTop: -8,
       marginLeft: -8,
       border: 'none',
-      boxShadow: '0px 0px 14px 0px rgba(0, 0, 0, 0.18)',
+      boxShadow: 'var(--shadow-size-md) var(--color-shadow-default)',
     },
   },
 };
diff --git a/ui/components/ui/spinner/spinner.stories.js b/ui/components/ui/spinner/spinner.stories.js
new file mode 100644
index 000000000000..a66074e1e708
--- /dev/null
+++ b/ui/components/ui/spinner/spinner.stories.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import Spinner from '.';
+
+export default {
+  title: 'Components/UI/Spinner',
+  id: __filename,
+  argTypes: {
+    className: {
+      control: 'text',
+    },
+    color: {
+      control: 'text',
+    },
+  },
+  args: {
+    color: 'var(--color-warning-default)',
+  },
+};
+
+export const DefaultStory = (args) => (
+  <div style={{ width: 100, height: 100 }}>
+    <Spinner {...args} />
+  </div>
+);
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/tabs/index.scss b/ui/components/ui/tabs/index.scss
index fd579d15d765..96ccf695c2af 100644
--- a/ui/components/ui/tabs/index.scss
+++ b/ui/components/ui/tabs/index.scss
@@ -12,6 +12,6 @@
     background-color: var(--color-background-default);
     position: sticky;
     top: 0;
-    z-index: 1;
+    z-index: 2;
   }
 }
diff --git a/ui/components/ui/tabs/tabs.stories.js b/ui/components/ui/tabs/tabs.stories.js
index cefd21b73898..0266eec6c5d7 100644
--- a/ui/components/ui/tabs/tabs.stories.js
+++ b/ui/components/ui/tabs/tabs.stories.js
@@ -1,35 +1,48 @@
 import React from 'react';
-import { text } from '@storybook/addon-knobs';
 import Tab from './tab/tab.component';
 import Tabs from './tabs.component';
 
 export default {
   title: 'Components/UI/Tabs',
   id: __filename,
+  argTypes: {
+    tabs: {
+      control: 'object',
+      name: 'Tabs',
+    },
+    defaultActiveTabName: {
+      control: {
+        type: 'text',
+      },
+    },
+    onTabClick: { action: 'onTabClick' },
+  },
+  args: {
+    tabs: [
+      { name: 'Tab A', content: 'Tab A Content' },
+      { name: 'Tab B', content: 'Tab B Content' },
+      { name: 'Tab C', content: 'Tab C Content' },
+    ],
+  },
 };
 
-function renderTab(id) {
+function renderTab({ name, content }, index) {
   return (
-    <Tab name={text(`Tab ${id} Name`, `Tab ${id}`)} key={id}>
-      {text(`Tab ${id} Contents`, `Contents of Tab ${id}`)}
+    <Tab name={name} key={name + index}>
+      {content}
     </Tab>
   );
 }
 
-export const TwoTabs = () => {
-  return <Tabs>{['A', 'B'].map(renderTab)}</Tabs>;
-};
-
-export const ManyTabs = () => {
-  return <Tabs>{['A', 'B', 'C', 'D', 'E'].map(renderTab)}</Tabs>;
-};
-
-export const SingleTab = () => {
+export const DefaultStory = (args) => {
   return (
-    <Tabs>
-      <Tab name={text('Name', 'Single A')}>
-        {text('Contents', 'Contents of tab')}
-      </Tab>
+    <Tabs
+      defaultActiveTabName={args.defaultActiveTabName}
+      onTabClick={args.onTabClick}
+    >
+      {args.tabs.map((tabProps, i) => renderTab(tabProps, i))}
     </Tabs>
   );
 };
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/ui/text-field/index.scss b/ui/components/ui/text-field/index.scss
index a33cf5630034..2626c345bf7a 100644
--- a/ui/components/ui/text-field/index.scss
+++ b/ui/components/ui/text-field/index.scss
@@ -2,3 +2,9 @@
 .MuiInputBase-input {
   color: var(--color-text-default) !important;
 }
+
+.MuiFormHelperText-root.Mui-error {
+  @include H7;
+
+  color: var(--color-error-default) !important;
+}
diff --git a/ui/components/ui/textarea/textarea.js b/ui/components/ui/textarea/textarea.js
index e20f450522bc..f08a01f8f008 100644
--- a/ui/components/ui/textarea/textarea.js
+++ b/ui/components/ui/textarea/textarea.js
@@ -38,7 +38,7 @@ const TextArea = ({
       borderColor={COLORS.BORDER_DEFAULT}
       borderRadius={SIZES.SM}
       borderStyle={BORDER_STYLE.SOLID}
-      padding={[4, 4]}
+      padding={4}
       width={BLOCK_SIZES.FULL}
       {...boxProps}
     >
diff --git a/ui/components/ui/token-input/token-input.component.js b/ui/components/ui/token-input/token-input.component.js
index 3b8d2eefbe49..5f2cab05622c 100644
--- a/ui/components/ui/token-input/token-input.component.js
+++ b/ui/components/ui/token-input/token-input.component.js
@@ -11,6 +11,7 @@ import {
 
 import { ETH } from '../../../helpers/constants/common';
 import { addHexPrefix } from '../../../../app/scripts/lib/util';
+import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 
 /**
  * Component that allows user to enter token values as a number, and props receive a converted
@@ -34,6 +35,7 @@ export default class TokenInput extends PureComponent {
       symbol: PropTypes.string,
     }).isRequired,
     tokenExchangeRates: PropTypes.object,
+    tokens: PropTypes.array.isRequired,
   };
 
   constructor(props) {
@@ -108,10 +110,15 @@ export default class TokenInput extends PureComponent {
       currentCurrency,
       hideConversion,
       token,
+      tokens,
     } = this.props;
     const { decimalValue } = this.state;
 
-    const tokenExchangeRate = tokenExchangeRates?.[token.address] || 0;
+    const existingToken = tokens.find(({ address }) =>
+      isEqualCaseInsensitive(address, token.address),
+    );
+
+    const tokenExchangeRate = tokenExchangeRates?.[existingToken?.address] ?? 0;
     let currency, numberOfDecimals;
 
     if (hideConversion) {
diff --git a/ui/components/ui/token-input/token-input.component.test.js b/ui/components/ui/token-input/token-input.component.test.js
index ac8d55fe871e..a7245c54eb23 100644
--- a/ui/components/ui/token-input/token-input.component.test.js
+++ b/ui/components/ui/token-input/token-input.component.test.js
@@ -28,6 +28,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
           />
         </Provider>,
         {
@@ -66,6 +75,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -101,6 +119,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -138,6 +165,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -177,6 +213,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             hideConversion
@@ -229,6 +274,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
           />
         </Provider>,
@@ -273,6 +327,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -319,6 +382,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
           />
@@ -365,6 +437,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
@@ -404,6 +485,15 @@ describe('TokenInput Component', () => {
               decimals: 4,
               symbol: 'ABC',
             }}
+            tokens={[
+              {
+                address: '0x1',
+                decimals: 4,
+                symbol: 'ABC',
+                image: null,
+                isERC721: false,
+              },
+            ]}
             tokenExchangeRates={{ '0x1': 2 }}
             showFiat
             currentCurrency="usd"
diff --git a/ui/components/ui/token-input/token-input.container.js b/ui/components/ui/token-input/token-input.container.js
index 9f964feec655..98082a3db387 100644
--- a/ui/components/ui/token-input/token-input.container.js
+++ b/ui/components/ui/token-input/token-input.container.js
@@ -5,13 +5,14 @@ import TokenInput from './token-input.component';
 
 const mapStateToProps = (state) => {
   const {
-    metamask: { currentCurrency },
+    metamask: { currentCurrency, tokens },
   } = state;
 
   return {
     currentCurrency,
     tokenExchangeRates: getTokenExchangeRates(state),
     hideConversion: !getShouldShowFiat(state),
+    tokens,
   };
 };
 
diff --git a/ui/components/ui/tooltip/index.scss b/ui/components/ui/tooltip/index.scss
index fe1e5819a2c9..8ae602e33f7b 100644
--- a/ui/components/ui/tooltip/index.scss
+++ b/ui/components/ui/tooltip/index.scss
@@ -1,30 +1,44 @@
-.tippy-tooltip.white-theme {
-  background: var(--color-background-default);
-  color: var(--color-text-default);
-  box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
-  padding: 12px 16px;
-  padding-bottom: 11px;
-
-  .tippy-tooltip-content {
-    @include H7;
-
-    text-align: left;
-    color: var(--color-text-alternative);
+.tippy-popper {
+  .tippy-tooltip.tippy-tooltip--mm-custom-theme {
+    background: var(--color-background-default);
+    color: var(--color-text-default);
+    box-shadow: var(--shadow-size-md) var(--color-shadow-default);
+    padding: 12px 16px;
+    padding-bottom: 11px;
+
+    .tippy-tooltip-content {
+      @include H7;
+
+      text-align: left;
+      color: var(--color-text-alternative);
+
+      a {
+        color: var(--color-primary-default);
+      }
+
+      p {
+        margin-bottom: 16px;
+
+        &:last-child {
+          margin-bottom: 0;
+        }
+      }
+    }
   }
-}
 
-.tippy-popper[x-placement^=top] .white-theme [x-arrow] {
-  border-top-color: var(--color-background-default);
-}
+  &[x-placement^=top] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+    border-top-color: var(--color-background-default);
+  }
 
-.tippy-popper[x-placement^=right] .white-theme [x-arrow] {
-  border-right-color: var(--color-background-default);
-}
+  &[x-placement^=right] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+    border-right-color: var(--color-background-default);
+  }
 
-.tippy-popper[x-placement^=left] .white-theme [x-arrow] {
-  border-left-color: var(--color-background-default);
-}
+  &[x-placement^=left] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+    border-left-color: var(--color-background-default);
+  }
 
-.tippy-popper[x-placement^=bottom] .white-theme [x-arrow] {
-  border-bottom-color: var(--color-background-default);
+  &[x-placement^=bottom] .tippy-tooltip.tippy-tooltip--mm-custom-theme [x-arrow] {
+    border-bottom-color: var(--color-background-default);
+  }
 }
diff --git a/ui/components/ui/tooltip/tooltip.js b/ui/components/ui/tooltip/tooltip.js
index 84afe57ed13e..b05a0acf1922 100644
--- a/ui/components/ui/tooltip/tooltip.js
+++ b/ui/components/ui/tooltip/tooltip.js
@@ -82,7 +82,7 @@ export default class Tooltip extends PureComponent {
         style={style}
         title={disabled ? '' : title}
         trigger={trigger}
-        theme={theme}
+        theme={`tippy-tooltip--mm-custom ${theme}`} // Required for correct theming
         tabIndex={tabIndex || 0}
         tag={tag}
       >
diff --git a/ui/components/ui/tooltip/tooltip.stories.js b/ui/components/ui/tooltip/tooltip.stories.js
new file mode 100644
index 000000000000..cd60685a440f
--- /dev/null
+++ b/ui/components/ui/tooltip/tooltip.stories.js
@@ -0,0 +1,92 @@
+import React from 'react';
+import Box from '../box/box';
+import Typography from '../typography/typography';
+import Tooltip from '.';
+
+export default {
+  title: 'Components/UI/Tooltip',
+  id: __filename,
+  argTypes: {
+    containerClassName: {
+      control: 'text',
+    },
+    disabled: {
+      control: 'boolean',
+    },
+    html: {
+      control: 'html',
+    },
+    interactive: {
+      control: 'boolean',
+    },
+    onHidden: {
+      action: 'onHidden',
+    },
+    position: {
+      control: 'select',
+      options: ['top', 'right', 'bottom', 'left'],
+    },
+    size: {
+      control: 'select',
+      options: ['small', 'regular', 'big'],
+    },
+    title: {
+      control: 'text',
+    },
+    trigger: {
+      control: 'any',
+    },
+    wrapperClassName: {
+      control: 'text',
+    },
+    style: {
+      control: 'object',
+    },
+    tabIndex: {
+      control: 'number',
+    },
+    tag: {
+      control: 'text',
+    },
+  },
+  args: {
+    position: 'top',
+    title: 'Title of the tooltip',
+    trigger: 'mouseenter',
+  },
+};
+
+export const DefaultStory = (args) => (
+  <Box display="flex">
+    <Typography>Hover over the info icon to see the tooltip</Typography>
+    <Tooltip {...args}>
+      <i
+        className="fa fa-sm fa-info-circle"
+        style={{ color: 'var(--color-icon-alternative)' }}
+      />
+    </Tooltip>
+  </Box>
+);
+
+DefaultStory.storyName = 'Default';
+
+export const HTML = (args) => (
+  <Box display="flex">
+    <Typography>This tooltips content is html</Typography>
+    <Tooltip {...args}>
+      <i
+        className="fa fa-sm fa-info-circle"
+        style={{ color: 'var(--color-icon-alternative)' }}
+      />
+    </Tooltip>
+  </Box>
+);
+
+HTML.args = {
+  interactive: true,
+  html: (
+    <Box>
+      And includes a <a href="#">link</a>
+    </Box>
+  ),
+};
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index 55224a2953e8..d3342e4cb36c 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -9,7 +9,7 @@ import {
   TYPOGRAPHY,
   OVERFLOW_WRAP,
 } from '../../../helpers/constants/design-system';
-import Box, { MultipleSizes } from '../box';
+import Box, { MultipleSizesAndAuto } from '../box';
 
 const { H6, H7, H8, H9 } = TYPOGRAPHY;
 
@@ -58,7 +58,11 @@ export default function Typography({
   overflowWrap,
   title,
   tag,
-  margin = [1, 0],
+  margin,
+  marginTop = 1,
+  marginRight,
+  marginBottom = 1,
+  marginLeft,
   boxProps = {},
   className,
   children,
@@ -90,7 +94,16 @@ export default function Typography({
   }
 
   return (
-    <Box margin={margin} {...boxProps}>
+    <Box
+      {...{
+        margin,
+        marginTop,
+        marginRight,
+        marginBottom,
+        marginLeft,
+        ...boxProps,
+      }}
+    >
       {(boxClassName) => (
         <Tag
           className={classnames(boxClassName, computedClassName)}
@@ -138,10 +151,13 @@ Typography.propTypes = {
    */
   tag: PropTypes.oneOf(ValidTags),
   /**
-   * Adds margin to the Typography component should use valid sizes
-   * 1,2,4,6,8 or an array of those values
+   * Adds margin to the Typography component should use valid size
    */
-  margin: MultipleSizes,
+  margin: MultipleSizesAndAuto,
+  marginTop: MultipleSizesAndAuto,
+  marginBottom: MultipleSizesAndAuto,
+  marginRight: MultipleSizesAndAuto,
+  marginLeft: MultipleSizesAndAuto,
   /**
    * Used to pass any valid Box component props such as margin or padding
    * to the Typography component
diff --git a/ui/components/ui/ui-components.scss b/ui/components/ui/ui-components.scss
index 52c0a8e95b1f..24cb6ddec9f6 100644
--- a/ui/components/ui/ui-components.scss
+++ b/ui/components/ui/ui-components.scss
@@ -30,6 +30,7 @@
 @import 'list-item/index';
 @import 'loading-heartbeat/index';
 @import 'loading-indicator/loading-indicator';
+@import 'logo/logo-coinbasepay.scss';
 @import 'loading-screen/index';
 @import 'menu/menu';
 @import 'numeric-input/numeric-input';
diff --git a/ui/components/ui/update-nickname-popover/index.scss b/ui/components/ui/update-nickname-popover/index.scss
index a3684a68ffba..21a7736f4c07 100644
--- a/ui/components/ui/update-nickname-popover/index.scss
+++ b/ui/components/ui/update-nickname-popover/index.scss
@@ -24,7 +24,7 @@
   }
 
   &__content {
-    padding: 0 20px 20px 20px;
+    padding: 0 18px 20px 18px;
     position: relative;
 
     &__indenticon {
diff --git a/ui/components/ui/update-nickname-popover/update-nickname-popover.js b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
index 3396d4fdce70..dc9804635685 100644
--- a/ui/components/ui/update-nickname-popover/update-nickname-popover.js
+++ b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
@@ -12,16 +12,18 @@ import Identicon from '../identicon/identicon.component';
 import { getUseTokenDetection, getTokenList } from '../../../selectors';
 
 export default function UpdateNicknamePopover({
-  nickname,
   address,
+  nickname = '',
+  memo = '',
   onAdd,
-  memo,
   onClose,
 }) {
   const t = useContext(I18nContext);
 
-  const [nicknameInput, setNicknameInput] = useState(nickname);
-  const [memoInput, setMemoInput] = useState(memo);
+  const [nicknameInput, setNicknameInput] = useState(
+    nickname === null ? '' : nickname,
+  );
+  const [memoInput, setMemoInput] = useState(memo === null ? '' : memo);
 
   const handleNicknameChange = (event) => {
     setNicknameInput(event.target.value);
diff --git a/ui/components/ui/url-icon/index.scss b/ui/components/ui/url-icon/index.scss
index 7753d667eddb..3e4a2a11a069 100644
--- a/ui/components/ui/url-icon/index.scss
+++ b/ui/components/ui/url-icon/index.scss
@@ -4,7 +4,7 @@
   background-position: center;
   border-radius: 50%;
   background-color: var(--color-background-default);
-  box-shadow: 0 2px 4px 0 rgba($black, 0.24);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   flex: 0 0 auto;
   -moz-animation: fadein 1s;
 
diff --git a/ui/css/base-styles.scss b/ui/css/base-styles.scss
index 3935c6dc1260..23e946a0fa21 100644
--- a/ui/css/base-styles.scss
+++ b/ui/css/base-styles.scss
@@ -124,4 +124,3 @@ input.form-control {
 * {
   font-family: $font-family;
 }
-
diff --git a/ui/css/design-system/attributes.scss b/ui/css/design-system/attributes.scss
index 3062fdb6e009..fb8c14451e3d 100644
--- a/ui/css/design-system/attributes.scss
+++ b/ui/css/design-system/attributes.scss
@@ -38,11 +38,11 @@ $fractions: (
 
 $sizes-numeric: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12;
 
-$sizes-strings: xs, sm, md, lg, xl, none;
+$sizes-strings: xs, sm, md, lg, xl;
 
 $border-style: solid, double, none, dashed, dotted;
 $directions: top, right, bottom, left;
-$display: block, grid, flex, inline-block, inline-grid, inline-flex, list-item;
+$display: block, flex, grid, inline-block, inline-grid, inline-flex, list-item, none;
 $text-align: left, right, center, justify, end;
 $overflow-wrap: normal, break-word;
 $font-weight: bold, normal, 100, 200, 300, 400, 500, 600, 700, 800, 900;
diff --git a/ui/css/design-system/breakpoints.scss b/ui/css/design-system/breakpoints.scss
index 80a4176b0e57..e911a0d68c24 100644
--- a/ui/css/design-system/breakpoints.scss
+++ b/ui/css/design-system/breakpoints.scss
@@ -1,6 +1,73 @@
+@use "sass:map";
+
 /*
-Responsive Breakpoints
+Responsive breakpoints
+*/
+
+// Screen sizes
+$screen-sizes-map: (
+  'sm':  576px,
+  'md': 768px,
+  'lg': 1280px,
+);
+
+// Max width screen size
+$screen-sm-max: calc(#{map.get($screen-sizes-map, "sm")} - 1px);
+$screen-md-max: calc(#{map.get($screen-sizes-map, "md")} - 1px);
+$screen-lg-max: calc(#{map.get($screen-sizes-map, "lg")} - 1px);
+
+// Min width screen size
+$screen-sm-min: map.get($screen-sizes-map, "sm");
+$screen-md-min: map.get($screen-sizes-map, "md");
+$screen-lg-min: map.get($screen-sizes-map, "lg");
+
+// Max width media query mixins
+@mixin screen-sm-max {
+  @media screen and (max-width: $screen-sm-max) {
+    @content;
+  };
+}
+
+@mixin screen-md-max {
+  @media screen and (max-width: $screen-md-max) {
+    @content;
+  };
+}
+
+@mixin screen-lg-max {
+  @media screen and (max-width: $screen-lg-max) {
+    @content;
+  };
+}
+
+// Min width media query mixins
+@mixin screen-sm-min {
+  @media screen and (min-width: $screen-sm-min) {
+    @content;
+  };
+}
+
+@mixin screen-md-min {
+  @media screen and (min-width: $screen-md-min) {
+    @content;
+  };
+}
+
+@mixin screen-lg-min {
+  @media screen and (min-width: $screen-lg-min) {
+    @content;
+  };
+}
+
+/*
+DEPRECATED
 */
 $break-small: 575px;
 $break-midpoint: 780px;
 $break-large: 576px;
+
+$screen-sizes-map: (
+  'sm':  576px,
+  'md': 768px,
+  'lg': 1280px,
+);
diff --git a/ui/css/errors.scss b/ui/css/errors.scss
new file mode 100644
index 000000000000..14daf4262ca0
--- /dev/null
+++ b/ui/css/errors.scss
@@ -0,0 +1,44 @@
+.critical-error {
+  padding: 16px;
+  max-width: 600px;
+  margin: 0 auto;
+
+  &__alert {
+    color: var(--color-text-default);
+    background-color: var(--color-error-muted);
+    border: 1px solid var(--color-error-default);
+    border-radius: 8px;
+    padding: 16px;
+    display: flex;
+    flex-direction: column;
+    margin-bottom: 16px;
+
+    &__message {
+      margin-bottom: 16px;
+    }
+
+    &__button {
+      height: 40px;
+      border-radius: 20px;
+      padding-left: 16px;
+      padding-right: 16px;
+      background-color: var(--color-primary-default);
+      color: var(--color-primary-inverse);
+      border: 1px solid var(--color-primary-default);
+      margin: 0 auto;
+    }
+  }
+
+  &__paragraph {
+    color: var(--color-text-default);
+    text-align: center;
+
+    &__link {
+      color: var(--color-primary-default);
+
+      &:hover {
+        color: var(--color-primary-alternative);
+      }
+    }
+  }
+}
diff --git a/ui/css/index.scss b/ui/css/index.scss
index bf9249706825..4e3df4d23c45 100644
--- a/ui/css/index.scss
+++ b/ui/css/index.scss
@@ -11,6 +11,8 @@
 @import '../components/app/app-components';
 @import '../components/ui/ui-components';
 @import '../pages/pages';
+@import './errors.scss';
+@import './loading.scss';
 
 /*
   ITCSS
diff --git a/ui/css/itcss/components/newui-sections.scss b/ui/css/itcss/components/newui-sections.scss
index 28416809353f..43ef900a94ac 100644
--- a/ui/css/itcss/components/newui-sections.scss
+++ b/ui/css/itcss/components/newui-sections.scss
@@ -63,7 +63,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
     width: 85vw;
     margin-bottom: 10vh;
     min-height: 90vh;
-    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 }
 
@@ -71,7 +71,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
   .main-container {
     width: 80vw;
     min-height: 82vh;
-    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 }
 
@@ -79,7 +79,7 @@ $sub-mid-size-breakpoint-range: "screen and (min-width: #{$break-large}) and (ma
   .main-container {
     width: 62vw;
     min-height: 82vh;
-    box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 }
 
diff --git a/ui/css/itcss/components/send.scss b/ui/css/itcss/components/send.scss
index 787dd05bf5aa..bd02111adf82 100644
--- a/ui/css/itcss/components/send.scss
+++ b/ui/css/itcss/components/send.scss
@@ -15,7 +15,7 @@
 
 .send-screen-card {
   background-color: var(--color-background-default);
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   padding: 46px 40.5px 26px;
   position: relative;
   align-items: center;
@@ -49,7 +49,7 @@
   width: 70px;
   height: 70px;
   border: 1px solid var(--color-border-muted);
-  box-shadow: 0 0 4px 0 rgba(0, 0, 0, 0.2);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   position: absolute;
   top: -35px;
   z-index: 25;
@@ -184,7 +184,7 @@
   height: 307px;
   background-color: var(--color-background-default);
   opacity: 1;
-  box-shadow: var(--color-border-muted) 0 0 5px;
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   z-index: 1050;
   padding: 13px 19px;
   border-radius: 4px;
@@ -200,7 +200,7 @@
   transform: rotate(45deg);
   left: 107px;
   top: 294px;
-  box-shadow: 2px 2px 2px var(--color-border-muted);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
 }
 
 .customize-gas-tooltip-container input[type='number']::-webkit-inner-spin-button {
@@ -326,7 +326,7 @@
     width: 498px;
     height: 605px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     padding: 46px 40.5px 26px;
     position: relative;
     align-items: center;
@@ -406,7 +406,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -440,16 +440,6 @@
     background-color: var(--color-background-default);
   }
 
-  &__send-arrow-icon {
-    @include H4;
-
-    color: var(--color-secondary-default);
-    transform: rotate(-45deg);
-    position: absolute;
-    top: -2px;
-    left: 0;
-  }
-
   &__arrow-background {
     background-color: var(--color-background-default);
     height: 14px;
@@ -529,7 +519,7 @@
     @include H7;
 
     left: 8px;
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
   }
 
   &__error-border {
@@ -627,7 +617,7 @@
       border: 1px solid var(--color-border-muted);
       border-radius: 4px;
       background-color: var(--color-background-default);
-      box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11);
+      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
       margin-top: 11px;
       margin-left: -1px;
       overflow-y: scroll;
@@ -651,7 +641,7 @@
     }
 
     &__caret {
-      color: var(--color-text-muted);
+      color: var(--color-icon-default);
       padding: 0 10px;
     }
 
@@ -715,7 +705,7 @@
       border: 1px solid var(--color-border-muted);
       border-radius: 4px;
       background-color: var(--color-background-default);
-      box-shadow: 0 3px 6px 0 rgba(0, 0, 0, 0.11);
+      box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
       top: 65px;
       left: 0;
       box-sizing: content-box;
@@ -874,7 +864,7 @@
     border: 1px solid var(--color-border-muted);
     border-radius: 4px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.14);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     display: flex;
     flex-flow: column;
 
diff --git a/ui/css/loading.scss b/ui/css/loading.scss
new file mode 100644
index 000000000000..250be117cc19
--- /dev/null
+++ b/ui/css/loading.scss
@@ -0,0 +1,13 @@
+.loading-logo {
+  width: 10rem;
+  height: 10rem;
+  align-self: center;
+  margin: 10rem 0 0 0;
+}
+
+.loading-spinner {
+  width: 2rem;
+  height: 2rem;
+  align-self: center;
+  margin-top: 1rem;
+}
diff --git a/ui/css/utilities/colors.scss b/ui/css/utilities/colors.scss
index 2d99683d901d..21f7c44310c5 100644
--- a/ui/css/utilities/colors.scss
+++ b/ui/css/utilities/colors.scss
@@ -6,10 +6,10 @@
   --kovan: #9064ff;
   --rinkeby: #f6c343;
   --goerli: #3099f2;
-  --localhost: #29b6af;
+  --localhost: #bbc0c5;
   --flask-purple: #8b45b6;
 
   // DO NOT CHANGE
   // Required for the QR reader to work properly
-  --qr-code-white-background: '#fff';
+  --qr-code-white-background: #fff;
 }
diff --git a/ui/ducks/app/app.js b/ui/ducks/app/app.js
index 93267bd27993..94c3bb6f203c 100644
--- a/ui/ducks/app/app.js
+++ b/ui/ducks/app/app.js
@@ -60,6 +60,7 @@ export default function reduceApp(state = {}, action) {
     newCollectibleAddedMessage: '',
     sendInputCurrencySwitched: false,
     newTokensImported: '',
+    newCustomNetworkAdded: {},
     ...state,
   };
 
@@ -393,6 +394,11 @@ export default function reduceApp(state = {}, action) {
         ...appState,
         sendInputCurrencySwitched: !appState.sendInputCurrencySwitched,
       };
+    case actionConstants.SET_NEW_CUSTOM_NETWORK_ADDED:
+      return {
+        ...appState,
+        newCustomNetworkAdded: action.value,
+      };
     default:
       return appState;
   }
@@ -444,3 +450,7 @@ export function getLedgerTransportStatus(state) {
 export function toggleCurrencySwitch() {
   return { type: actionConstants.TOGGLE_CURRENCY_INPUT_SWITCH };
 }
+
+export function setNewCustomNetworkAdded(value) {
+  return { type: actionConstants.SET_NEW_CUSTOM_NETWORK_ADDED, value };
+}
diff --git a/ui/ducks/ens.js b/ui/ducks/ens.js
index d2786f1d7ac4..c091dd1ba240 100644
--- a/ui/ducks/ens.js
+++ b/ui/ducks/ens.js
@@ -1,14 +1,15 @@
 import { createSlice } from '@reduxjs/toolkit';
-import ENS from 'ethjs-ens';
 import log from 'loglevel';
 import networkMap from 'ethereum-ens-network-map';
 import { isConfusing } from 'unicode-confusables';
 import { isHexString } from 'ethereumjs-util';
+import { ethers } from 'ethers';
 
 import { getCurrentChainId } from '../selectors';
 import {
   CHAIN_ID_TO_NETWORK_ID_MAP,
   MAINNET_NETWORK_ID,
+  NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP,
 } from '../../shared/constants/network';
 import {
   CONFUSING_ENS_ERROR,
@@ -42,7 +43,7 @@ export const ensInitialState = initialState;
 
 const name = 'ENS';
 
-let ens = null;
+let provider = null;
 
 const slice = createSlice({
   name,
@@ -81,6 +82,8 @@ const slice = createSlice({
         if (isValidDomainName(address) && isConfusing(address)) {
           state.warning = CONFUSING_ENS_ERROR;
         }
+      } else {
+        state.error = ENS_NO_ADDRESS_FOR_NAME;
       }
     },
     enableEnsLookup: (state, action) => {
@@ -112,7 +115,7 @@ const slice = createSlice({
     builder.addCase(CHAIN_CHANGED, (state, action) => {
       if (action.payload !== state.currentChainId) {
         state.stage = 'UNINITIALIZED';
-        ens = null;
+        provider = null;
       }
     });
   },
@@ -135,12 +138,18 @@ export function initializeEnsSlice() {
     const state = getState();
     const chainId = getCurrentChainId(state);
     const network = CHAIN_ID_TO_NETWORK_ID_MAP[chainId];
-    const networkIsSupported = Boolean(networkMap[network]);
+    const networkName = NETWORK_ID_TO_ETHERS_NETWORK_NAME_MAP[network];
+    const ensAddress = networkMap[network];
+    const networkIsSupported = Boolean(ensAddress);
     if (networkIsSupported) {
-      ens = new ENS({ provider: global.ethereumProvider, network });
+      provider = new ethers.providers.Web3Provider(global.ethereumProvider, {
+        chainId: parseInt(network, 10),
+        name: networkName,
+        ensAddress,
+      });
       dispatch(enableEnsLookup(network));
     } else {
-      ens = null;
+      provider = null;
       dispatch(disableEnsLookup());
     }
   };
@@ -168,7 +177,7 @@ export function lookupEnsName(ensName) {
       let address;
       let error;
       try {
-        address = await ens.lookup(trimmedEnsName);
+        address = await provider.resolveName(trimmedEnsName);
       } catch (err) {
         error = err;
       }
diff --git a/ui/ducks/send/helpers.js b/ui/ducks/send/helpers.js
new file mode 100644
index 000000000000..43d556c22c8c
--- /dev/null
+++ b/ui/ducks/send/helpers.js
@@ -0,0 +1,294 @@
+import { addHexPrefix } from 'ethereumjs-util';
+import abi from 'human-standard-token-abi';
+import { GAS_LIMITS, MIN_GAS_LIMIT_HEX } from '../../../shared/constants/gas';
+import { CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../../../shared/constants/network';
+import {
+  ASSET_TYPES,
+  TRANSACTION_ENVELOPE_TYPES,
+} from '../../../shared/constants/transaction';
+import { readAddressAsContract } from '../../../shared/modules/contract-utils';
+import {
+  conversionUtil,
+  multiplyCurrencies,
+} from '../../../shared/modules/conversion.utils';
+import { ETH, GWEI } from '../../helpers/constants/common';
+import { calcTokenAmount } from '../../helpers/utils/token-util';
+import {
+  addGasBuffer,
+  generateERC20TransferData,
+  generateERC721TransferData,
+  getAssetTransferData,
+} from '../../pages/send/send.utils';
+import { getGasPriceInHexWei } from '../../selectors';
+import { estimateGas } from '../../store/actions';
+
+export async function estimateGasLimitForSend({
+  selectedAddress,
+  value,
+  gasPrice,
+  sendToken,
+  to,
+  data,
+  isNonStandardEthChain,
+  chainId,
+  gasLimit,
+  ...options
+}) {
+  let isSimpleSendOnNonStandardNetwork = false;
+
+  // blockGasLimit may be a falsy, but defined, value when we receive it from
+  // state, so we use logical or to fall back to MIN_GAS_LIMIT_HEX. Some
+  // network implementations check the gas parameter supplied to
+  // eth_estimateGas for validity. For this reason, we set token sends
+  // blockGasLimit default to a higher number. Note that the current gasLimit
+  // on a BLOCK is 15,000,000 and will be 30,000,000 on mainnet after London.
+  // Meanwhile, MIN_GAS_LIMIT_HEX is 0x5208.
+  let blockGasLimit = MIN_GAS_LIMIT_HEX;
+  if (options.blockGasLimit) {
+    blockGasLimit = options.blockGasLimit;
+  } else if (sendToken) {
+    blockGasLimit = GAS_LIMITS.BASE_TOKEN_ESTIMATE;
+  }
+
+  // The parameters below will be sent to our background process to estimate
+  // how much gas will be used for a transaction. That background process is
+  // located in tx-gas-utils.js in the transaction controller folder.
+  const paramsForGasEstimate = { from: selectedAddress, value, gasPrice };
+
+  if (sendToken) {
+    if (!to) {
+      // If no to address is provided, we cannot generate the token transfer
+      // hexData. hexData in a transaction largely dictates how much gas will
+      // be consumed by a transaction. We must use our best guess, which is
+      // represented in the gas shared constants.
+      return GAS_LIMITS.BASE_TOKEN_ESTIMATE;
+    }
+    paramsForGasEstimate.value = '0x0';
+
+    // We have to generate the erc20/erc721 contract call to transfer tokens in
+    // order to get a proper estimate for gasLimit.
+    paramsForGasEstimate.data = getAssetTransferData({
+      sendToken,
+      fromAddress: selectedAddress,
+      toAddress: to,
+      amount: value,
+    });
+
+    paramsForGasEstimate.to = sendToken.address;
+  } else {
+    if (!data) {
+      // eth.getCode will return the compiled smart contract code at the
+      // address. If this returns 0x, 0x0 or a nullish value then the address
+      // is an externally owned account (NOT a contract account). For these
+      // types of transactions the gasLimit will always be 21,000 or 0x5208
+      const { isContractAddress } = to
+        ? await readAddressAsContract(global.eth, to)
+        : {};
+      if (!isContractAddress && !isNonStandardEthChain) {
+        return GAS_LIMITS.SIMPLE;
+      } else if (!isContractAddress && isNonStandardEthChain) {
+        isSimpleSendOnNonStandardNetwork = true;
+      }
+    }
+
+    paramsForGasEstimate.data = data;
+
+    if (to) {
+      paramsForGasEstimate.to = to;
+    }
+
+    if (!value || value === '0') {
+      // TODO: Figure out what's going on here. According to eth_estimateGas
+      // docs this value can be zero, or undefined, yet we are setting it to a
+      // value here when the value is undefined or zero. For more context:
+      // https://github.com/MetaMask/metamask-extension/pull/6195
+      paramsForGasEstimate.value = '0xff';
+    }
+  }
+
+  if (!isSimpleSendOnNonStandardNetwork) {
+    // If we do not yet have a gasLimit, we must call into our background
+    // process to get an estimate for gasLimit based on known parameters.
+
+    paramsForGasEstimate.gas = addHexPrefix(
+      multiplyCurrencies(blockGasLimit, 0.95, {
+        multiplicandBase: 16,
+        multiplierBase: 10,
+        roundDown: '0',
+        toNumericBase: 'hex',
+      }),
+    );
+  }
+
+  // The buffer multipler reduces transaction failures by ensuring that the
+  // estimated gas is always sufficient. Without the multiplier, estimates
+  // for contract interactions can become inaccurate over time. This is because
+  // gas estimation is non-deterministic. The gas required for the exact same
+  // transaction call can change based on state of a contract or changes in the
+  // contracts environment (blockchain data or contracts it interacts with).
+  // Applying the 1.5 buffer has proven to be a useful guard against this non-
+  // deterministic behaviour.
+  //
+  // Gas estimation of simple sends should, however, be deterministic. As such
+  // no buffer is needed in those cases.
+  let bufferMultiplier = 1.5;
+  if (isSimpleSendOnNonStandardNetwork) {
+    bufferMultiplier = 1;
+  } else if (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId]) {
+    bufferMultiplier = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId];
+  }
+
+  try {
+    // Call into the background process that will simulate transaction
+    // execution on the node and return an estimate of gasLimit
+    const estimatedGasLimit = await estimateGas(paramsForGasEstimate);
+    const estimateWithBuffer = addGasBuffer(
+      estimatedGasLimit,
+      blockGasLimit,
+      bufferMultiplier,
+    );
+    return addHexPrefix(estimateWithBuffer);
+  } catch (error) {
+    const simulationFailed =
+      error.message.includes('Transaction execution error.') ||
+      error.message.includes(
+        'gas required exceeds allowance or always failing transaction',
+      ) ||
+      (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId] &&
+        error.message.includes('gas required exceeds allowance'));
+    if (simulationFailed) {
+      const estimateWithBuffer = addGasBuffer(
+        paramsForGasEstimate?.gas ?? gasLimit,
+        blockGasLimit,
+        bufferMultiplier,
+      );
+      return addHexPrefix(estimateWithBuffer);
+    }
+    throw error;
+  }
+}
+
+/**
+ * Generates a txParams from the send slice.
+ *
+ * @param {import('.').SendState} sendState - the state of the send slice
+ * @returns {import(
+ *  '../../../shared/constants/transaction'
+ * ).TxParams} A txParams object that can be used to create a transaction or
+ *  update an existing transaction.
+ */
+export function generateTransactionParams(sendState) {
+  const draftTransaction =
+    sendState.draftTransactions[sendState.currentTransactionUUID];
+  const txParams = {
+    // If the fromAccount has been specified we use that, if not we use the
+    // selected account.
+    from:
+      draftTransaction.fromAccount?.address ||
+      sendState.selectedAccount.address,
+    // gasLimit always needs to be set regardless of the asset being sent
+    // or the type of transaction.
+    gas: draftTransaction.gas.gasLimit,
+  };
+  switch (draftTransaction.asset.type) {
+    case ASSET_TYPES.TOKEN:
+      // When sending a token the to address is the contract address of
+      // the token being sent. The value is set to '0x0' and the data
+      // is generated from the recipient address, token being sent and
+      // amount.
+      txParams.to = draftTransaction.asset.details.address;
+      txParams.value = '0x0';
+      txParams.data = generateERC20TransferData({
+        toAddress: draftTransaction.recipient.address,
+        amount: draftTransaction.amount.value,
+        sendToken: draftTransaction.asset.details,
+      });
+      break;
+    case ASSET_TYPES.COLLECTIBLE:
+      // When sending a token the to address is the contract address of
+      // the token being sent. The value is set to '0x0' and the data
+      // is generated from the recipient address, token being sent and
+      // amount.
+      txParams.to = draftTransaction.asset.details.address;
+      txParams.value = '0x0';
+      txParams.data = generateERC721TransferData({
+        toAddress: draftTransaction.recipient.address,
+        fromAddress:
+          draftTransaction.fromAccount?.address ??
+          sendState.selectedAccount.address,
+        tokenId: draftTransaction.asset.details.tokenId,
+      });
+      break;
+    case ASSET_TYPES.NATIVE:
+    default:
+      // When sending native currency the to and value fields use the
+      // recipient and amount values and the data key is either null or
+      // populated with the user input provided in hex field.
+      txParams.to = draftTransaction.recipient.address;
+      txParams.value = draftTransaction.amount.value;
+      txParams.data = draftTransaction.userInputHexData ?? undefined;
+  }
+
+  // We need to make sure that we only include the right gas fee fields
+  // based on the type of transaction the network supports. We will also set
+  // the type param here.
+  if (sendState.eip1559support) {
+    txParams.type = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
+
+    txParams.maxFeePerGas = draftTransaction.gas.maxFeePerGas;
+    txParams.maxPriorityFeePerGas = draftTransaction.gas.maxPriorityFeePerGas;
+
+    if (!txParams.maxFeePerGas || txParams.maxFeePerGas === '0x0') {
+      txParams.maxFeePerGas = draftTransaction.gas.gasPrice;
+    }
+
+    if (
+      !txParams.maxPriorityFeePerGas ||
+      txParams.maxPriorityFeePerGas === '0x0'
+    ) {
+      txParams.maxPriorityFeePerGas = txParams.maxFeePerGas;
+    }
+  } else {
+    txParams.gasPrice = draftTransaction.gas.gasPrice;
+    txParams.type = TRANSACTION_ENVELOPE_TYPES.LEGACY;
+  }
+
+  return txParams;
+}
+
+/**
+ * This method is used to keep the original logic from the gas.duck.js file
+ * after receiving a gasPrice from eth_gasPrice. First, the returned gasPrice
+ * was converted to GWEI, then it was converted to a Number, then in the send
+ * duck (here) we would use getGasPriceInHexWei to get back to hexWei. Now that
+ * we receive a GWEI estimate from the controller, we still need to do this
+ * weird conversion to get the proper rounding.
+ *
+ * @param {string} gasPriceEstimate
+ * @returns {string}
+ */
+export function getRoundedGasPrice(gasPriceEstimate) {
+  const gasPriceInDecGwei = conversionUtil(gasPriceEstimate, {
+    numberOfDecimals: 9,
+    toDenomination: GWEI,
+    fromNumericBase: 'dec',
+    toNumericBase: 'dec',
+    fromCurrency: ETH,
+    fromDenomination: GWEI,
+  });
+  const gasPriceAsNumber = Number(gasPriceInDecGwei);
+  return getGasPriceInHexWei(gasPriceAsNumber);
+}
+
+export async function getERC20Balance(token, accountAddress) {
+  const contract = global.eth.contract(abi).at(token.address);
+  const usersToken = (await contract.balanceOf(accountAddress)) ?? null;
+  if (!usersToken) {
+    return '0x0';
+  }
+  const amount = calcTokenAmount(
+    usersToken.balance.toString(),
+    token.decimals,
+  ).toString(16);
+  return addHexPrefix(amount);
+}
diff --git a/ui/ducks/send/helpers.test.js b/ui/ducks/send/helpers.test.js
new file mode 100644
index 000000000000..90b1bcb557cc
--- /dev/null
+++ b/ui/ducks/send/helpers.test.js
@@ -0,0 +1,163 @@
+import { ethers } from 'ethers';
+import { GAS_LIMITS } from '../../../shared/constants/gas';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+  TRANSACTION_ENVELOPE_TYPES,
+} from '../../../shared/constants/transaction';
+import { BURN_ADDRESS } from '../../../shared/modules/hexstring-utils';
+import { getInitialSendStateWithExistingTxState } from '../../../test/jest/mocks';
+import {
+  generateERC20TransferData,
+  generateERC721TransferData,
+} from '../../pages/send/send.utils';
+import { generateTransactionParams } from './helpers';
+
+describe('Send Slice Helpers', () => {
+  describe('generateTransactionParams', () => {
+    it('should generate a txParams for a token transfer', () => {
+      const tokenDetails = {
+        address: '0xToken',
+        symbol: 'SYMB',
+        decimals: 18,
+      };
+      const txParams = generateTransactionParams(
+        getInitialSendStateWithExistingTxState({
+          fromAccount: {
+            address: '0x00',
+          },
+          amount: {
+            value: '0x1',
+          },
+          asset: {
+            type: ASSET_TYPES.TOKEN,
+            balance: '0xaf',
+            details: tokenDetails,
+          },
+          recipient: {
+            address: BURN_ADDRESS,
+          },
+        }),
+      );
+      expect(txParams).toStrictEqual({
+        from: '0x00',
+        data: generateERC20TransferData({
+          toAddress: BURN_ADDRESS,
+          amount: '0x1',
+          sendToken: tokenDetails,
+        }),
+        to: '0xToken',
+        type: '0x0',
+        value: '0x0',
+        gas: '0x0',
+        gasPrice: '0x0',
+      });
+    });
+
+    it('should generate a txParams for a collectible transfer', () => {
+      const txParams = generateTransactionParams(
+        getInitialSendStateWithExistingTxState({
+          fromAccount: {
+            address: '0x00',
+          },
+          amount: {
+            value: '0x1',
+          },
+          asset: {
+            type: ASSET_TYPES.COLLECTIBLE,
+            balance: '0xaf',
+            details: {
+              address: '0xToken',
+              standard: TOKEN_STANDARDS.ERC721,
+              tokenId: ethers.BigNumber.from(15000).toString(),
+            },
+          },
+          recipient: {
+            address: BURN_ADDRESS,
+          },
+        }),
+      );
+      expect(txParams).toStrictEqual({
+        from: '0x00',
+        data: generateERC721TransferData({
+          toAddress: BURN_ADDRESS,
+          fromAddress: '0x00',
+          tokenId: ethers.BigNumber.from(15000).toString(),
+        }),
+        to: '0xToken',
+        type: '0x0',
+        value: '0x0',
+        gas: '0x0',
+        gasPrice: '0x0',
+      });
+    });
+
+    it('should generate a txParams for a native legacy transaction', () => {
+      const txParams = generateTransactionParams(
+        getInitialSendStateWithExistingTxState({
+          fromAccount: {
+            address: '0x00',
+          },
+          amount: {
+            value: '0x1',
+          },
+          asset: {
+            type: ASSET_TYPES.NATIVE,
+            balance: '0xaf',
+            details: null,
+          },
+          recipient: {
+            address: BURN_ADDRESS,
+          },
+        }),
+      );
+      expect(txParams).toStrictEqual({
+        from: '0x00',
+        data: undefined,
+        to: BURN_ADDRESS,
+        type: '0x0',
+        value: '0x1',
+        gas: '0x0',
+        gasPrice: '0x0',
+      });
+    });
+
+    it('should generate a txParams for a native fee market transaction', () => {
+      const txParams = generateTransactionParams({
+        ...getInitialSendStateWithExistingTxState({
+          fromAccount: {
+            address: '0x00',
+          },
+          amount: {
+            value: '0x1',
+          },
+          asset: {
+            type: ASSET_TYPES.NATIVE,
+            balance: '0xaf',
+            details: null,
+          },
+          recipient: {
+            address: BURN_ADDRESS,
+          },
+          gas: {
+            maxFeePerGas: '0x2',
+            maxPriorityFeePerGas: '0x1',
+            gasLimit: GAS_LIMITS.SIMPLE,
+          },
+          transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
+        }),
+        eip1559support: true,
+      });
+      expect(txParams).toStrictEqual({
+        from: '0x00',
+        data: undefined,
+        to: BURN_ADDRESS,
+        type: '0x2',
+        value: '0x1',
+        gas: GAS_LIMITS.SIMPLE,
+        maxFeePerGas: '0x2',
+        maxPriorityFeePerGas: '0x1',
+      });
+    });
+  });
+});
diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
index a812e34a1b18..c90521e27b04 100644
--- a/ui/ducks/send/send.js
+++ b/ui/ducks/send/send.js
@@ -1,8 +1,8 @@
 import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
-import abi from 'human-standard-token-abi';
 import BigNumber from 'bignumber.js';
 import { addHexPrefix } from 'ethereumjs-util';
 import { debounce } from 'lodash';
+import { v4 as uuidv4 } from 'uuid';
 import {
   conversionGreaterThan,
   conversionUtil,
@@ -17,26 +17,19 @@ import {
   INVALID_RECIPIENT_ADDRESS_ERROR,
   INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR,
   KNOWN_RECIPIENT_ADDRESS_WARNING,
-  MIN_GAS_LIMIT_HEX,
   NEGATIVE_ETH_ERROR,
 } from '../../pages/send/send.constants';
 
 import {
-  addGasBuffer,
   calcGasTotal,
-  generateERC20TransferData,
-  generateERC721TransferData,
-  getAssetTransferData,
   isBalanceSufficient,
   isTokenBalanceSufficient,
 } from '../../pages/send/send.utils';
 import {
-  getAddressBookEntry,
   getAdvancedInlineGasShown,
   getCurrentChainId,
   getGasPriceInHexWei,
   getIsMainnet,
-  getSelectedAddress,
   getTargetAccount,
   getIsNonStandardEthChain,
   checkNetworkAndAccountSupports1559,
@@ -44,11 +37,13 @@ import {
   getTokenList,
   getAddressBookEntryOrAccountName,
   getIsMultiLayerFeeNetwork,
+  getEnsResolutionByAddress,
+  getSelectedAccount,
+  getSelectedAddress,
 } from '../../selectors';
 import {
   disconnectGasFeeEstimatePoller,
   displayWarning,
-  estimateGas,
   getGasFeeEstimatesAndStartPolling,
   hideLoadingIndication,
   showLoadingIndication,
@@ -74,6 +69,8 @@ import {
   calcTokenAmount,
   getTokenAddressParam,
   getTokenValueParam,
+  getTokenMetadata,
+  getTokenIdParam,
 } from '../../helpers/utils/token-util';
 import {
   checkExistingAddresses,
@@ -91,262 +88,395 @@ import { resetEnsResolution } from '../ens';
 import {
   isBurnAddress,
   isValidHexAddress,
+  toChecksumHexAddress,
 } from '../../../shared/modules/hexstring-utils';
-import { sumHexes } from '../../helpers/utils/transactions.util';
+import {
+  isSmartContractAddress,
+  sumHexes,
+} from '../../helpers/utils/transactions.util';
 import fetchEstimatedL1Fee from '../../helpers/utils/optimism/fetchEstimatedL1Fee';
 
-import { CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP } from '../../../shared/constants/network';
-import {
-  ERC20,
-  ERC721,
-  ERC1155,
-  ETH,
-  GWEI,
-} from '../../helpers/constants/common';
+import { ETH } from '../../helpers/constants/common';
 import {
   ASSET_TYPES,
+  TOKEN_STANDARDS,
   TRANSACTION_ENVELOPE_TYPES,
   TRANSACTION_TYPES,
 } from '../../../shared/constants/transaction';
-import { readAddressAsContract } from '../../../shared/modules/contract-utils';
 import { INVALID_ASSET_TYPE } from '../../helpers/constants/error-keys';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getValueFromWeiHex } from '../../helpers/utils/confirm-tx.util';
-// typedefs
+import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
+import {
+  estimateGasLimitForSend,
+  generateTransactionParams,
+  getRoundedGasPrice,
+} from './helpers';
+// typedef import statements
 /**
- * @typedef {import('@reduxjs/toolkit').PayloadAction} PayloadAction
+ * @typedef {(
+ *  import('immer/dist/internal').WritableDraft<SendState>
+ * )} SendStateDraft
+ * @typedef {(
+ *  import('../../../shared/constants/transaction').AssetTypesString
+ * )} AssetTypesString
+ * @typedef {(
+ *  import( '../../helpers/constants/common').TokenStandardStrings
+ * )} TokenStandardStrings
+ * @typedef {(
+ *  import( '../../../shared/constants/tokens').TokenDetails
+ * )} TokenDetails
+ * @typedef {(
+ *  import('../../../shared/constants/transaction').TransactionTypeString
+ * )} TransactionTypeString
+ * @typedef {(
+ *  import('@metamask/controllers').LegacyGasPriceEstimate
+ * )} LegacyGasPriceEstimate
+ * @typedef {(
+ *  import('@metamask/controllers').GasFeeEstimates
+ * )} GasFeeEstimates
+ * @typedef {(
+ *  import('@metamask/controllers').EthGasPriceEstimate
+ * )} EthGasPriceEstimate
+ * @typedef {(
+ *  import('@metamask/controllers').GasEstimateType
+ * )} GasEstimateType
+ * @typedef {(
+ *  import('redux').AnyAction
+ * )} AnyAction
  */
 
-const name = 'send';
+/**
+ * @template R - Return type of the async function
+ * @typedef {(
+ *  import('redux-thunk').ThunkAction<R, MetaMaskState, unknown, AnyAction>
+ * )} ThunkAction<R>
+ */
+
+/**
+ * This type will take a typical constant string mapped object and turn it into
+ * a union type of the values.
+ *
+ * @template O - The object to make strings out of
+ * @typedef {O[keyof O]} MapValuesToUnion<O>
+ */
+
+/**
+ * @typedef {Object} SendStateStages
+ * @property {'ADD_RECIPIENT'} ADD_RECIPIENT - The user is selecting which
+ *  address to send an asset to.
+ * @property {'DRAFT'} DRAFT - The send form is shown for a transaction yet to
+ *  be sent to the Transaction Controller.
+ * @property {'EDIT'} EDIT - The send form is shown for a transaction already
+ *  submitted to the Transaction Controller but not yet confirmed. This happens
+ *  when a confirmation is shown for a transaction and the 'edit' button in the
+ *  header is clicked.
+ * @property {'INACTIVE'} INACTIVE - The send state is idle, and hasn't yet
+ *  fetched required data for gasPrice and gasLimit estimations, etc.
+ */
 
 /**
  * The Stages that the send slice can be in
- * 1. INACTIVE - The send state is idle, and hasn't yet fetched required
- *  data for gasPrice and gasLimit estimations, etc.
- * 2. ADD_RECIPIENT - The user is selecting which address to send an asset to
- * 3. DRAFT - The send form is shown for a transaction yet to be sent to the
- *  Transaction Controller.
- * 4. EDIT - The send form is shown for a transaction already submitted to the
- *  Transaction Controller but not yet confirmed. This happens when a
- *  confirmation is shown for a transaction and the 'edit' button in the header
- *  is clicked.
+ *
+ * @type {SendStateStages}
  */
 export const SEND_STAGES = {
-  INACTIVE: 'INACTIVE',
   ADD_RECIPIENT: 'ADD_RECIPIENT',
   DRAFT: 'DRAFT',
   EDIT: 'EDIT',
+  INACTIVE: 'INACTIVE',
 };
 
 /**
- * The status that the send slice can be in is either
- * 1. VALID - the transaction is valid and can be submitted
- * 2. INVALID - the transaction is invalid and cannot be submitted
+ * @typedef {Object} DraftTxStatus
+ * @property {'INVALID'} INVALID - The transaction is invalid and cannot be
+ *  submitted. There are a number of cases that would result in an invalid
+ *  send state:
+ *  1. The recipient is not yet defined
+ *  2. The amount + gasTotal is greater than the user's balance when sending
+ *     native currency
+ *  3. The gasTotal is greater than the user's *native* balance
+ *  4. The amount of sent asset is greater than the user's *asset* balance
+ *  5. Gas price estimates failed to load entirely
+ *  6. The gasLimit is less than 21000 (0x5208)
+ * @property {'VALID'} VALID - The transaction is valid and can be submitted.
+ */
+
+/**
+ * The status of the send slice
  *
- * A number of cases would result in an invalid form
- * 1. The recipient is not yet defined
- * 2. The amount + gasTotal is greater than the user's balance when sending
- *  native currency
- * 3. The gasTotal is greater than the user's *native* balance
- * 4. The amount of sent asset is greater than the user's *asset* balance
- * 5. Gas price estimates failed to load entirely
- * 6. The gasLimit is less than 21000 (0x5208)
+ * @type {DraftTxStatus}
  */
 export const SEND_STATUSES = {
-  VALID: 'VALID',
   INVALID: 'INVALID',
+  VALID: 'VALID',
 };
 
+/**
+ * @typedef {Object} SendStateGasModes
+ * @property {'BASIC'} BASIC - Shows the basic estimate slow/avg/fast buttons
+ *  when on mainnet and the metaswaps API request is successful.
+ * @property {'CUSTOM'} CUSTOM - Shows GasFeeDisplay component that is a read
+ *  only display of the values the user has set in the advanced gas modal
+ *  (stored in the gas duck under the customData key).
+ * @property {'INLINE'} INLINE - Shows inline gasLimit/gasPrice fields when on
+ *  any other network or metaswaps API fails and we use eth_gasPrice.
+ */
+
 /**
  * Controls what is displayed in the send-gas-row component.
- * 1. BASIC - Shows the basic estimate slow/avg/fast buttons when on mainnet
- *  and the metaswaps API request is successful.
- * 2. INLINE - Shows inline gasLimit/gasPrice fields when on any other network
- *  or metaswaps API fails and we use eth_gasPrice
- * 3. CUSTOM - Shows GasFeeDisplay component that is a read only display of the
- *  values the user has set in the advanced gas modal (stored in the gas duck
- *  under the customData key).
+ *
+ * @type {SendStateGasModes}
  */
 export const GAS_INPUT_MODES = {
   BASIC: 'BASIC',
-  INLINE: 'INLINE',
   CUSTOM: 'CUSTOM',
+  INLINE: 'INLINE',
 };
 
+/**
+ * @typedef {Object} SendStateAmountModes
+ * @property {'INPUT'} INPUT - the user provides the amount by typing in the
+ *  field.
+ * @property {'MAX'} MAX - The user selects the MAX button and amount is
+ *  calculated based on balance - (amount + gasTotal).
+ */
+
 /**
  * The modes that the amount field can be set by
- * 1. INPUT - the user provides the amount by typing in the field
- * 2. MAX - The user selects the MAX button and amount is calculated based on
- *  balance - (amount + gasTotal)
+ *
+ * @type {SendStateAmountModes}
  */
 export const AMOUNT_MODES = {
   INPUT: 'INPUT',
   MAX: 'MAX',
 };
 
+/**
+ * @typedef {Object} SendStateRecipientModes
+ * @property {'CONTACT_LIST'} CONTACT_LIST - The user is displayed a list of
+ *  their contacts and addresses they have recently send to.
+ * @property {'MY_ACCOUNTS'} MY_ACCOUNTS - the user is displayed a list of
+ *  their own accounts to send to.
+ */
+
+/**
+ * The type of recipient list that is displayed to user
+ *
+ * @type {SendStateRecipientModes}
+ */
 export const RECIPIENT_SEARCH_MODES = {
-  MY_ACCOUNTS: 'MY_ACCOUNTS',
   CONTACT_LIST: 'CONTACT_LIST',
+  MY_ACCOUNTS: 'MY_ACCOUNTS',
 };
 
-async function estimateGasLimitForSend({
-  selectedAddress,
-  value,
-  gasPrice,
-  sendToken,
-  to,
-  data,
-  isNonStandardEthChain,
-  chainId,
-  gasLimit,
-  ...options
-}) {
-  let isSimpleSendOnNonStandardNetwork = false;
-
-  // blockGasLimit may be a falsy, but defined, value when we receive it from
-  // state, so we use logical or to fall back to MIN_GAS_LIMIT_HEX. Some
-  // network implementations check the gas parameter supplied to
-  // eth_estimateGas for validity. For this reason, we set token sends
-  // blockGasLimit default to a higher number. Note that the current gasLimit
-  // on a BLOCK is 15,000,000 and will be 30,000,000 on mainnet after London.
-  // Meanwhile, MIN_GAS_LIMIT_HEX is 0x5208.
-  let blockGasLimit = MIN_GAS_LIMIT_HEX;
-  if (options.blockGasLimit) {
-    blockGasLimit = options.blockGasLimit;
-  } else if (sendToken) {
-    blockGasLimit = GAS_LIMITS.BASE_TOKEN_ESTIMATE;
-  }
+/**
+ * @typedef {Object} Account
+ * @property {string} address - The hex address of the account.
+ * @property {string} balance - Hex string representing the native asset
+ *  balance of the account the transaction will be sent from.
+ */
 
-  // The parameters below will be sent to our background process to estimate
-  // how much gas will be used for a transaction. That background process is
-  // located in tx-gas-utils.js in the transaction controller folder.
-  const paramsForGasEstimate = { from: selectedAddress, value, gasPrice };
-
-  if (sendToken) {
-    if (!to) {
-      // if no to address is provided, we cannot generate the token transfer
-      // hexData. hexData in a transaction largely dictates how much gas will
-      // be consumed by a transaction. We must use our best guess, which is
-      // represented in the gas shared constants.
-      return GAS_LIMITS.BASE_TOKEN_ESTIMATE;
-    }
-    paramsForGasEstimate.value = '0x0';
-
-    // We have to generate the erc20/erc721 contract call to transfer tokens in
-    // order to get a proper estimate for gasLimit.
-    paramsForGasEstimate.data = getAssetTransferData({
-      sendToken,
-      fromAddress: selectedAddress,
-      toAddress: to,
-      amount: value,
-    });
+/**
+ * @typedef {Object} Amount
+ * @property {string} [error] - Error to display for the amount field.
+ * @property {string} value - A hex string representing the amount of the
+ *  selected currency to send.
+ */
 
-    paramsForGasEstimate.to = sendToken.address;
-  } else {
-    if (!data) {
-      // eth.getCode will return the compiled smart contract code at the
-      // address. If this returns 0x, 0x0 or a nullish value then the address
-      // is an externally owned account (NOT a contract account). For these
-      // types of transactions the gasLimit will always be 21,000 or 0x5208
-      const { isContractAddress } = to
-        ? await readAddressAsContract(global.eth, to)
-        : {};
-      if (!isContractAddress && !isNonStandardEthChain) {
-        return GAS_LIMITS.SIMPLE;
-      } else if (!isContractAddress && isNonStandardEthChain) {
-        isSimpleSendOnNonStandardNetwork = true;
-      }
-    }
+/**
+ * @typedef {Object} Asset
+ * @property {string} balance - A hex string representing the balance
+ *  that the user holds of the asset that they are attempting to send.
+ * @property {TokenDetails} [details] - An object that describes the
+ *  selected asset in the case that the user is sending a token or collectibe.
+ *  Will be null when asset.type is 'NATIVE'.
+ * @property {string} [error] - Error to display when there is an issue
+ *  with the asset.
+ * @property {AssetTypesString} type - The type of asset that the user
+ *  is attempting to send. Defaults to 'NATIVE' which represents the native
+ *  asset of the chain. Can also be 'TOKEN' or 'COLLECTIBLE'.
+ */
 
-    paramsForGasEstimate.data = data;
+/**
+ * @typedef {Object} GasFees
+ * @property {string} [error] - error to display for gas fields.
+ * @property {string} gasLimit - maximum gas needed for tx.
+ * @property {string} gasPrice - price in wei to pay per gas.
+ * @property {string} gasTotal - maximum total price in wei to pay.
+ * @property {string} maxFeePerGas - Maximum price in wei to pay per gas.
+ * @property {string} maxPriorityFeePerGas - Maximum priority fee in wei to pay
+ *  per gas.
+ */
 
-    if (to) {
-      paramsForGasEstimate.to = to;
-    }
+/**
+ * An object that describes the intended recipient of a transaction.
+ *
+ * @typedef {Object} Recipient
+ * @property {string} address - The fully qualified address of the recipient.
+ *  This is set after the recipient.userInput is validated, the userInput field
+ *  is quickly updated to avoid delay between keystrokes and seeing the input
+ *  field updated. After a debounce the address typed is validated and then the
+ *  address field is updated. The address field is also set when the user
+ *  selects a contact or account from the list, or an ENS resolution when
+ *  typing ENS names.
+ * @property {string} [error] - Error to display on the address field.
+ * @property {string} nickname - The nickname that the user has added to their
+ *  address book for the recipient.address.
+ * @property {string} [warning] - Warning to display on the address field.
+ */
 
-    if (!value || value === '0') {
-      // TODO: Figure out what's going on here. According to eth_estimateGas
-      // docs this value can be zero, or undefined, yet we are setting it to a
-      // value here when the value is undefined or zero. For more context:
-      // https://github.com/MetaMask/metamask-extension/pull/6195
-      paramsForGasEstimate.value = '0xff';
-    }
-  }
+/**
+ * @typedef {Object} DraftTransaction
+ * @property {Amount} amount - An object containing information about the
+ *  amount of currency to send.
+ * @property {Asset} asset - An object that describes the asset that the user
+ *  has selected to send.
+ * @property {Account} [fromAccount] - The send flow is usually only relative to
+ *  the currently selected account. When editing a transaction, however, the
+ *  account may differ. In that case, the details of that account will be
+ *  stored in this object within the draftTransaction.
+ * @property {GasFees} gas - Details about the current gas settings
+ * @property {Array<{event: string, timestamp: number}>} history - An array of
+ *  entries that describe the user's journey through the send flow. This is
+ *  sent to the controller for attaching to state logs for troubleshooting and
+ *  support.
+ * @property {string} [id] - If the transaction has already been added to the
+ *  TransactionController this field will be populated with its id from the
+ *  TransactionController state. This is required to be able to update the
+ *  transaction in the controller.
+ * @property {Recipient} recipient - An object that describes the intended
+ *  recipient of the transaction.
+ * @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
+ *  submission.
+ * @property {string} transactionType - Determines type of transaction being
+ *  sent, defaulted to 0x0 (legacy).
+ * @property {string} [userInputHexData] - When a user has enabled custom hex
+ *  data field in advanced options, they can supply data to the field which is
+ *  stored under this key.
+ */
 
-  if (!isSimpleSendOnNonStandardNetwork) {
-    // If we do not yet have a gasLimit, we must call into our background
-    // process to get an estimate for gasLimit based on known parameters.
+/**
+ * @type {DraftTransaction}
+ */
+export const draftTransactionInitialState = {
+  amount: {
+    error: null,
+    value: '0x0',
+  },
+  asset: {
+    balance: '0x0',
+    details: null,
+    error: null,
+    type: ASSET_TYPES.NATIVE,
+  },
+  fromAccount: null,
+  gas: {
+    error: null,
+    gasLimit: '0x0',
+    gasPrice: '0x0',
+    gasTotal: '0x0',
+    maxFeePerGas: '0x0',
+    maxPriorityFeePerGas: '0x0',
+  },
+  history: [],
+  id: null,
+  recipient: {
+    address: '',
+    error: null,
+    nickname: '',
+    warning: null,
+    recipientWarningAcknowledged: false,
+  },
+  status: SEND_STATUSES.VALID,
+  transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+  userInputHexData: null,
+};
 
-    paramsForGasEstimate.gas = addHexPrefix(
-      multiplyCurrencies(blockGasLimit, 0.95, {
-        multiplicandBase: 16,
-        multiplierBase: 10,
-        roundDown: '0',
-        toNumericBase: 'hex',
-      }),
-    );
-  }
+/**
+ * Describes the state tree of the send slice
+ *
+ * @typedef {Object} SendState
+ * @property {MapValuesToUnion<SendStateAmountModes>} amountMode - Describe
+ *  whether the user has manually input an amount or if they have selected max
+ *  to send the maximum amount of the selected currency.
+ * @property {string} currentTransactionUUID - The UUID of the transaction
+ *  currently being modified by the send flow. This UUID is generated upon
+ *  initialization of the send flow, any previous UUIDs are discarded at
+ *  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 {Object.<string, DraftTransaction>} draftTransactions - An object keyed
+ *  by UUID with draftTransactions as the values.
+ * @property {boolean} eip1559support - tracks whether the current network
+ *  supports EIP 1559 transactions.
+ * @property {boolean} gasEstimateIsLoading - Indicates whether the gas
+ *  estimate is loading.
+ * @property {string} [gasEstimatePollToken] - String token identifying a
+ *  listener for polling on the gasFeeController
+ * @property {boolean} gasIsSetInModal - true if the user set custom gas in the
+ *  custom gas modal
+ * @property {string} gasLimitMinimum - minimum supported gasLimit.
+ * @property {string} gasPriceEstimate - Expected price in wei necessary to
+ *  pay per gas used for a transaction to be included in a reasonable timeframe.
+ *  Comes from the GasFeeController.
+ * @property {string} gasTotalForLayer1 -  Layer 1 gas fee total on multi-layer
+ *  fee networks
+ * @property {string} recipientInput - The user input of the recipient
+ *  which is updated quickly to avoid delays in the UI reflecting manual entry
+ *  of addresses.
+ * @property {MapValuesToUnion<SendStateRecipientModes>} recipientMode -
+ *  Describes which list of recipients the user is shown on the add recipient
+ *  screen. When this key is set to 'MY_ACCOUNTS' the user is shown the list of
+ *  accounts they own. When it is 'CONTACT_LIST' the user is shown the list of
+ *  contacts they have saved in MetaMask and any addresses they have recently
+ *  sent to.
+ * @property {Account} selectedAccount - The currently selected account in
+ *  MetaMask. Native balance and address will be pulled from this account if a
+ *  fromAccount is not specified in the draftTransaction object. During an edit
+ *  the fromAccount is specified.
+ * @property {MapValuesToUnion<SendStateStages>} stage - The stage of the
+ *  send flow that the user has progressed to. Defaults to 'INACTIVE' which
+ *  results in the send screen not being shown.
+ */
 
-  // The buffer multipler reduces transaction failures by ensuring that the
-  // estimated gas is always sufficient. Without the multiplier, estimates
-  // for contract interactions can become inaccurate over time. This is because
-  // gas estimation is non-deterministic. The gas required for the exact same
-  // transaction call can change based on state of a contract or changes in the
-  // contracts environment (blockchain data or contracts it interacts with).
-  // Applying the 1.5 buffer has proven to be a useful guard against this non-
-  // deterministic behaviour.
-  //
-  // Gas estimation of simple sends should, however, be deterministic. As such
-  // no buffer is needed in those cases.
-  let bufferMultiplier = 1.5;
-  if (isSimpleSendOnNonStandardNetwork) {
-    bufferMultiplier = 1;
-  } else if (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId]) {
-    bufferMultiplier = CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId];
-  }
+/**
+ * @type {SendState}
+ */
+export const initialState = {
+  amountMode: AMOUNT_MODES.INPUT,
+  currentTransactionUUID: null,
+  draftTransactions: {},
+  eip1559support: false,
+  gasEstimateIsLoading: true,
+  gasEstimatePollToken: null,
+  gasIsSetInModal: false,
+  gasPriceEstimate: '0x0',
+  gasLimitMinimum: GAS_LIMITS.SIMPLE,
+  gasTotalForLayer1: '0x0',
+  recipientMode: RECIPIENT_SEARCH_MODES.CONTACT_LIST,
+  recipientInput: '',
+  selectedAccount: {
+    address: null,
+    balance: '0x0',
+  },
+  stage: SEND_STAGES.INACTIVE,
+};
 
-  try {
-    // call into the background process that will simulate transaction
-    // execution on the node and return an estimate of gasLimit
-    const estimatedGasLimit = await estimateGas(paramsForGasEstimate);
-    const estimateWithBuffer = addGasBuffer(
-      estimatedGasLimit,
-      blockGasLimit,
-      bufferMultiplier,
-    );
-    return addHexPrefix(estimateWithBuffer);
-  } catch (error) {
-    const simulationFailed =
-      error.message.includes('Transaction execution error.') ||
-      error.message.includes(
-        'gas required exceeds allowance or always failing transaction',
-      ) ||
-      (CHAIN_ID_TO_GAS_LIMIT_BUFFER_MAP[chainId] &&
-        error.message.includes('gas required exceeds allowance'));
-    if (simulationFailed) {
-      const estimateWithBuffer = addGasBuffer(
-        paramsForGasEstimate?.gas ?? gasLimit,
-        blockGasLimit,
-        bufferMultiplier,
-      );
-      return addHexPrefix(estimateWithBuffer);
-    }
-    throw error;
-  }
-}
+/**
+ * TODO: We really need to start creating the metamask state type, and the
+ * entire state tree of redux. Would be *extremely* valuable in future
+ * typescript conversions. The metamask key is typed as an object on purpose
+ * here because I cannot go so far in this work as to type that entire object.
+ *
+ * @typedef {Object} MetaMaskState
+ * @property {SendState} send - The state of the send flow.
+ * @property {Object} metamask - The state of the metamask store.
+ */
 
-export async function getERC20Balance(token, accountAddress) {
-  const contract = global.eth.contract(abi).at(token.address);
-  const usersToken = (await contract.balanceOf(accountAddress)) ?? null;
-  if (!usersToken) {
-    return '0x0';
-  }
-  const amount = calcTokenAmount(
-    usersToken.balance.toString(),
-    token.decimals,
-  ).toString(16);
-  return addHexPrefix(amount);
-}
+const name = 'send';
 
 // After modification of specific fields in specific circumstances we must
 // recompute the gasLimit estimate to be as accurate as possible. the cases
@@ -370,25 +500,27 @@ export const computeEstimatedGasLimit = createAsyncThunk(
   async (_, thunkApi) => {
     const state = thunkApi.getState();
     const { send, metamask } = state;
+    const draftTransaction =
+      send.draftTransactions[send.currentTransactionUUID];
     const unapprovedTxs = getUnapprovedTxs(state);
     const isMultiLayerFeeNetwork = getIsMultiLayerFeeNetwork(state);
-    const transaction = unapprovedTxs[send.draftTransaction.id];
+    const transaction = unapprovedTxs[draftTransaction.id];
     const isNonStandardEthChain = getIsNonStandardEthChain(state);
     const chainId = getCurrentChainId(state);
 
-    let layer1GasTotal;
+    let gasTotalForLayer1;
     if (isMultiLayerFeeNetwork) {
-      layer1GasTotal = await fetchEstimatedL1Fee(global.eth, {
+      gasTotalForLayer1 = await fetchEstimatedL1Fee(global.eth, {
         txParams: {
-          gasPrice: send.gas.gasPrice,
-          gas: send.gas.gasLimit,
-          to: send.recipient.address?.toLowerCase(),
+          gasPrice: draftTransaction.gas.gasPrice,
+          gas: draftTransaction.gas.gasLimit,
+          to: draftTransaction.recipient.address?.toLowerCase(),
           value:
-            send.amount.mode === 'MAX'
-              ? send.account.balance
+            send.amountMode === AMOUNT_MODES.MAX
+              ? send.selectedAccount.balance
               : send.amount.value,
-          from: send.account.address,
-          data: send.draftTransaction.userInputHexData,
+          from: send.selectedAccount.address,
+          data: draftTransaction.userInputHexData,
           type: '0x0',
         },
       });
@@ -400,21 +532,21 @@ export const computeEstimatedGasLimit = createAsyncThunk(
       !transaction.userEditedGasLimit
     ) {
       const gasLimit = await estimateGasLimitForSend({
-        gasPrice: send.gas.gasPrice,
+        gasPrice: draftTransaction.gas.gasPrice,
         blockGasLimit: metamask.currentBlockGasLimit,
         selectedAddress: metamask.selectedAddress,
-        sendToken: send.asset.details,
-        to: send.recipient.address?.toLowerCase(),
-        value: send.amount.value,
-        data: send.draftTransaction.userInputHexData,
+        sendToken: draftTransaction.asset.details,
+        to: draftTransaction.recipient.address?.toLowerCase(),
+        value: draftTransaction.amount.value,
+        data: draftTransaction.userInputHexData,
         isNonStandardEthChain,
         chainId,
-        gasLimit: send.gas.gasLimit,
+        gasLimit: draftTransaction.gas.gasLimit,
       });
       await thunkApi.dispatch(setCustomGasLimit(gasLimit));
       return {
         gasLimit,
-        layer1GasTotal,
+        gasTotalForLayer1,
       };
     }
     return null;
@@ -422,28 +554,18 @@ export const computeEstimatedGasLimit = createAsyncThunk(
 );
 
 /**
- * This method is used to keep the original logic from the gas.duck.js file
- * after receiving a gasPrice from eth_gasPrice. First, the returned gasPrice
- * was converted to GWEI, then it was converted to a Number, then in the send
- * duck (here) we would use getGasPriceInHexWei to get back to hexWei. Now that
- * we receive a GWEI estimate from the controller, we still need to do this
- * weird conversion to get the proper rounding.
- *
- * @param {T} gasPriceEstimate
- * @returns
- */
-function getRoundedGasPrice(gasPriceEstimate) {
-  const gasPriceInDecGwei = conversionUtil(gasPriceEstimate, {
-    numberOfDecimals: 9,
-    toDenomination: GWEI,
-    fromNumericBase: 'dec',
-    toNumericBase: 'dec',
-    fromCurrency: ETH,
-    fromDenomination: GWEI,
-  });
-  const gasPriceAsNumber = Number(gasPriceInDecGwei);
-  return getGasPriceInHexWei(gasPriceAsNumber);
-}
+ * @typedef {Object} Asset
+ * @property {AssetTypesString} type - The type of asset that the user
+ *  is attempting to send. Defaults to 'NATIVE' which represents the native
+ *  asset of the chain. Can also be 'TOKEN' or 'COLLECTIBLE'.
+ * @property {string} balance - A hex string representing the balance
+ *  that the user holds of the asset that they are attempting to send.
+ * @property {TokenDetails} [details] - An object that describes the
+ *  selected asset in the case that the user is sending a token or collectibe.
+ *  Will be null when asset.type is 'NATIVE'.
+ * @property {string} [error] - Error to display when there is an issue
+ *  with the asset.
+ */
 
 /**
  * Responsible for initializing required state for the send slice.
@@ -457,34 +579,43 @@ function getRoundedGasPrice(gasPriceEstimate) {
  */
 export const initializeSendState = createAsyncThunk(
   'send/initializeSendState',
-  async (_, thunkApi) => {
+  async ({ chainHasChanged = false } = {}, thunkApi) => {
+    /**
+     * @typedef {Object} ReduxState
+     * @property {Object} metamask - Half baked type for the MetaMask object
+     * @property {SendState} send - the send state
+     */
+
+    /**
+     * @type {ReduxState}
+     */
     const state = thunkApi.getState();
     const isNonStandardEthChain = getIsNonStandardEthChain(state);
     const chainId = getCurrentChainId(state);
     const eip1559support = checkNetworkAndAccountSupports1559(state);
-    const {
-      send: { asset, stage, recipient, amount, draftTransaction },
-      metamask,
-    } = state;
-
-    // First determine the correct from address. For new sends this is always
-    // the currently selected account and switching accounts switches the from
-    // address. If editing an existing transaction (by clicking 'edit' on the
-    // send page), the fromAddress is always the address from the txParams.
-    const fromAddress =
-      stage === SEND_STAGES.EDIT
-        ? draftTransaction.txParams.from
-        : metamask.selectedAddress;
-    // We need the account's balance which is calculated from cachedBalances in
-    // the getMetaMaskAccounts selector. getTargetAccount consumes this
-    // selector and returns the account at the specified address.
-    const account = getTargetAccount(state, fromAddress);
+    const account = getSelectedAccount(state);
+    const { send: sendState, metamask } = state;
+    const draftTransaction =
+      sendState.draftTransactions[sendState.currentTransactionUUID];
+
+    // If the draft transaction is not present, then this action has been
+    // dispatched out of sync with the intended flow. This is not always a bug.
+    // For instance, in the actions.js file we dispatch this action anytime the
+    // chain changes.
+    if (!draftTransaction) {
+      thunkApi.rejectWithValue(
+        'draftTransaction not found, possibly not on send flow',
+      );
+    }
 
     // Default gasPrice to 1 gwei if all estimation fails, this is only used
     // for gasLimit estimation and won't be set directly in state. Instead, we
     // will return the gasFeeEstimates and gasEstimateType so that the reducer
     // can set the appropriate gas fees in state.
-    let gasPrice = '0x1';
+    let gasPrice =
+      sendState.stage === SEND_STAGES.EDIT
+        ? draftTransaction.gas.gasPrice
+        : '0x1';
     let gasEstimatePollToken = null;
 
     // Instruct the background process that polling for gas prices should begin
@@ -496,83 +627,62 @@ export const initializeSendState = createAsyncThunk(
       metamask: { gasFeeEstimates, gasEstimateType },
     } = thunkApi.getState();
 
-    // Because we are only interested in getting a gasLimit estimation we only
-    // need to worry about gasPrice. So we use maxFeePerGas as gasPrice if we
-    // have a fee market estimation.
-    if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
-      gasPrice = getGasPriceInHexWei(gasFeeEstimates.medium);
-    } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
-      gasPrice = getRoundedGasPrice(gasFeeEstimates.gasPrice);
-    } else if (gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET) {
-      gasPrice = getGasPriceInHexWei(
-        gasFeeEstimates.medium.suggestedMaxFeePerGas,
-      );
-    } else {
-      gasPrice = gasFeeEstimates.gasPrice
-        ? getRoundedGasPrice(gasFeeEstimates.gasPrice)
-        : '0x0';
+    if (sendState.stage !== SEND_STAGES.EDIT) {
+      // Because we are only interested in getting a gasLimit estimation we only
+      // need to worry about gasPrice. So we use maxFeePerGas as gasPrice if we
+      // have a fee market estimation.
+      if (gasEstimateType === GAS_ESTIMATE_TYPES.LEGACY) {
+        gasPrice = getGasPriceInHexWei(gasFeeEstimates.medium);
+      } else if (gasEstimateType === GAS_ESTIMATE_TYPES.ETH_GASPRICE) {
+        gasPrice = getRoundedGasPrice(gasFeeEstimates.gasPrice);
+      } else if (gasEstimateType === GAS_ESTIMATE_TYPES.FEE_MARKET) {
+        gasPrice = getGasPriceInHexWei(
+          gasFeeEstimates.medium.suggestedMaxFeePerGas,
+        );
+      } else {
+        gasPrice = gasFeeEstimates.gasPrice
+          ? getRoundedGasPrice(gasFeeEstimates.gasPrice)
+          : '0x0';
+      }
     }
 
     // Set a basic gasLimit in the event that other estimation fails
-    let gasLimit =
-      asset.type === ASSET_TYPES.TOKEN || asset.type === ASSET_TYPES.COLLECTIBLE
-        ? GAS_LIMITS.BASE_TOKEN_ESTIMATE
-        : GAS_LIMITS.SIMPLE;
+    let { gasLimit } = draftTransaction.gas;
     if (
       gasEstimateType !== GAS_ESTIMATE_TYPES.NONE &&
-      stage !== SEND_STAGES.EDIT &&
-      recipient.address
+      sendState.stage !== SEND_STAGES.EDIT &&
+      draftTransaction.recipient.address
     ) {
+      gasLimit =
+        draftTransaction.asset.type === ASSET_TYPES.TOKEN ||
+        draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
+          ? GAS_LIMITS.BASE_TOKEN_ESTIMATE
+          : GAS_LIMITS.SIMPLE;
       // Run our estimateGasLimit logic to get a more accurate estimation of
       // required gas. If this value isn't nullish, set it as the new gasLimit
       const estimatedGasLimit = await estimateGasLimitForSend({
         gasPrice,
         blockGasLimit: metamask.currentBlockGasLimit,
-        selectedAddress: fromAddress,
-        sendToken: asset.details,
-        to: recipient.address.toLowerCase(),
-        value: amount.value,
+        selectedAddress:
+          draftTransaction.fromAccount?.address ??
+          sendState.selectedAccount.address,
+        sendToken: draftTransaction.asset.details,
+        to: draftTransaction.recipient.address.toLowerCase(),
+        value: draftTransaction.amount.value,
         data: draftTransaction.userInputHexData,
         isNonStandardEthChain,
         chainId,
       });
       gasLimit = estimatedGasLimit || gasLimit;
     }
-    // We have to keep the gas slice in sync with the draft send transaction
+    // We have to keep the gas slice in sync with the send slice state
     // so that it'll be initialized correctly if the gas modal is opened.
     await thunkApi.dispatch(setCustomGasLimit(gasLimit));
-    // We must determine the balance of the asset that the transaction will be
-    // sending. This is done by referencing the native balance on the account
-    // for native assets, and calling the balanceOf method on the ERC20
-    // contract for token sends.
-    let { balance } = account;
-    if (asset.type === ASSET_TYPES.TOKEN) {
-      if (asset.details === null) {
-        // If we're sending a token but details have not been provided we must
-        // abort and set the send slice into invalid status.
-        throw new Error(
-          'Send slice initialized as token send without token details',
-        );
-      }
-      balance = await getERC20Balance(asset.details, fromAddress);
-    }
-
-    if (asset.type === ASSET_TYPES.COLLECTIBLE) {
-      if (asset.details === null) {
-        // If we're sending a collectible but details have not been provided we must
-        // abort and set the send slice into invalid status.
-        throw new Error(
-          'Send slice initialized as collectibles send without token details',
-        );
-      }
-      balance = '0x1';
-    }
     return {
-      address: fromAddress,
-      nativeBalance: account.balance,
-      assetBalance: balance,
+      account,
       chainId: getCurrentChainId(state),
       tokens: getTokens(state),
+      chainHasChanged,
       gasFeeEstimates,
       gasEstimateType,
       gasLimit,
@@ -585,243 +695,145 @@ export const initializeSendState = createAsyncThunk(
   },
 );
 
-export const initialState = {
-  // which stage of the send flow is the user on
-  stage: SEND_STAGES.INACTIVE,
-  // status of the send slice, either VALID or INVALID
-  status: SEND_STATUSES.VALID,
-  // Determines type of transaction being sent, defaulted to 0x0 (legacy)
-  transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
-  // tracks whether the current network supports EIP 1559 transactions
-  eip1559support: false,
-  account: {
-    // from account address, defaults to selected account. will be the account
-    // the original transaction was sent from in the case of the EDIT stage
-    address: null,
-    // balance of the from account
-    balance: '0x0',
-  },
-  gas: {
-    // indicate whether the gas estimate is loading
-    isGasEstimateLoading: true,
-    // String token identifying a listener for polling on the gasFeeController
-    gasEstimatePollToken: null,
-    // has the user set custom gas in the custom gas modal
-    isCustomGasSet: false,
-    // maximum gas needed for tx
-    gasLimit: '0x0',
-    // price in wei to pay per gas
-    gasPrice: '0x0',
-    // maximum price in wei to pay per gas
-    maxFeePerGas: '0x0',
-    // maximum priority fee in wei to pay per gas
-    maxPriorityFeePerGas: '0x0',
-    // expected price in wei necessary to pay per gas used for a transaction
-    // to be included in a reasonable timeframe. Comes from GasFeeController.
-    gasPriceEstimate: '0x0',
-    // maximum total price in wei to pay
-    gasTotal: '0x0',
-    // minimum supported gasLimit
-    minimumGasLimit: GAS_LIMITS.SIMPLE,
-    // error to display for gas fields
-    error: null,
-  },
-  amount: {
-    // The mode to use when determining new amounts. For INPUT mode the
-    // provided payload is always used. For MAX it is calculated based on avail
-    // asset balance
-    mode: AMOUNT_MODES.INPUT,
-    // Current value of the transaction, how much of the asset are we sending
-    value: '0x0',
-    // error to display for amount field
-    error: null,
-  },
-  asset: {
-    // type can be either NATIVE such as ETH or TOKEN for ERC20 tokens
-    type: ASSET_TYPES.NATIVE,
-    // the balance the user holds at the from address for this asset
-    balance: '0x0',
-    // In the case of tokens, the address, decimals and symbol of the token
-    // will be included in details
-    details: null,
-    // error to display when there is an issue with the asset
-    error: null,
-  },
-  draftTransaction: {
-    // The metamask internal id of the transaction. Only populated in the EDIT
-    // stage.
-    id: null,
-    // The hex encoded data provided by the user who has enabled hex data field
-    // in advanced settings
-    userInputHexData: null,
-    // The txParams that should be submitted to the network once this
-    // transaction is confirmed. This object is computed on every write to the
-    // slice of fields that would result in the txParams changing
-    txParams: {
-      to: '',
-      from: '',
-      data: undefined,
-      value: '0x0',
-      gas: '0x0',
-      gasPrice: '0x0',
-      type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
-    },
-  },
-  recipient: {
-    // Defines which mode to use for searching for matches in the input field
-    mode: RECIPIENT_SEARCH_MODES.CONTACT_LIST,
-    // Partial, not yet validated, entry into the address field. Used to share
-    // user input amongst the AddRecipient and EnsInput components.
-    userInput: '',
-    // The address of the recipient
-    address: '',
-    // The nickname stored in the user's address book for the recipient address
-    nickname: '',
-    // Error to display on the address field
-    error: null,
-    // Warning to display on the address field
-    warning: null,
-  },
-  multiLayerFees: {
-    // Layer 1 gas fee total on multi-layer fee networks
-    layer1GasTotal: '0x0',
-  },
-  history: [],
-};
+// Action Payload Typedefs
+/**
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<string>
+ * )} SimpleStringPayload
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<MapValuesToUnion<SendStateAmountModes>>
+ * )} SendStateAmountModePayload
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction['asset']>
+ * )} UpdateAssetPayload
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<Partial<
+ *   Pick<DraftTransaction['recipient'], 'address' | 'nickname'>>
+ *  >
+ * )} updateRecipientPayload
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<SendState['recipientMode']>
+ * )} UpdateRecipientModePayload
+ */
+
+/**
+ * @typedef {Object} GasFeeUpdateParams
+ * @property {TransactionTypeString} transactionType - The transaction type
+ * @property {string} [maxFeePerGas] - The maximum amount in hex wei to pay
+ *  per gas on a FEE_MARKET transaction.
+ * @property {string} [maxPriorityFeePerGas] - The maximum amount in hex
+ *  wei to pay per gas as an incentive to miners on a FEE_MARKET
+ *  transaction.
+ * @property {string} [gasPrice] - The amount in hex wei to pay per gas on
+ *  a LEGACY transaction.
+ * @property {boolean} [isAutomaticUpdate] - true if the update is the
+ *  result of a gas estimate update from the controller.
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<GasFeeUpdateParams>
+ * )} GasFeeUpdatePayload
+ */
+
+/**
+ * @typedef {Object} GasEstimateUpdateParams
+ * @property {GasEstimateType} gasEstimateType - The type of gas estimation
+ *  provided by the controller.
+ * @property {(
+ *  EthGasPriceEstimate | LegacyGasPriceEstimate | GasFeeEstimates
+ * )} gasFeeEstimates - The gas fee estimates provided by the controller.
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<GasEstimateUpdateParams>
+ * )} GasEstimateUpdatePayload
+ */
+
+/**
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction['asset']>
+ * )} UpdateAssetPayload
+ * @typedef {(
+ *  import('@reduxjs/toolkit').PayloadAction<DraftTransaction>
+ * )} DraftTransactionPayload
+ */
 
 const slice = createSlice({
   name,
   initialState,
   reducers: {
-    addHistoryEntry: (state, action) => {
-      state.history.push({
-        entry: action.payload,
-        timestamp: Date.now(),
-      });
-    },
-    /**
-     * update current amount.value in state and run post update validation of
-     * the amount field and the send state. Recomputes the draftTransaction
-     *
-     * @param state
-     * @param action
-     */
-    updateSendAmount: (state, action) => {
-      state.amount.value = addHexPrefix(action.payload);
-      // Once amount has changed, validate the field
-      slice.caseReducers.validateAmountField(state);
-      if (state.asset.type === ASSET_TYPES.NATIVE) {
-        // if sending the native asset the amount being sent will impact the
-        // gas field as well because the gas validation takes into
-        // consideration the available balance minus amount sent before
-        // checking if there is enough left to cover the gas fee.
-        slice.caseReducers.validateGasField(state);
-      }
-      // validate send state
-      slice.caseReducers.validateSendState(state);
-    },
     /**
-     * computes the maximum amount of asset that can be sent and then calls
-     * the updateSendAmount action above with the computed value, which will
-     * revalidate the field and form and recomputes the draftTransaction
+     * Adds a new draft transaction to state, first generating a new UUID for
+     * the transaction and setting that as the currentTransactionUUID. If the
+     * draft has an id property set, the stage is set to EDIT.
      *
-     * @param state
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {DraftTransactionPayload} action - An action with payload that is
+     *  a new draft transaction that will be added to state.
+     * @returns {void}
      */
-    updateAmountToMax: (state) => {
-      let amount = '0x0';
-      if (state.asset.type === ASSET_TYPES.TOKEN) {
-        const decimals = state.asset.details?.decimals ?? 0;
-        const multiplier = Math.pow(10, Number(decimals));
-
-        amount = multiplyCurrencies(state.asset.balance, multiplier, {
-          toNumericBase: 'hex',
-          multiplicandBase: 16,
-          multiplierBase: 10,
-        });
+    addNewDraft: (state, action) => {
+      state.currentTransactionUUID = uuidv4();
+      state.draftTransactions[state.currentTransactionUUID] = action.payload;
+      if (action.payload.id) {
+        state.stage = SEND_STAGES.EDIT;
       } else {
-        const _gasTotal = sumHexes(
-          state.gas.gasTotal || '0x0',
-          state.multiLayerFees?.layer1GasTotal || '0x0',
-        );
-        amount = subtractCurrencies(
-          addHexPrefix(state.asset.balance),
-          addHexPrefix(_gasTotal),
-          {
-            toNumericBase: 'hex',
-            aBase: 16,
-            bBase: 16,
-          },
-        );
+        state.stage = SEND_STAGES.ADD_RECIPIENT;
       }
-      slice.caseReducers.updateSendAmount(state, {
-        payload: amount,
-      });
-      // draftTransaction update happens in updateSendAmount
     },
     /**
-     * updates the draftTransaction.userInputHexData state key and then
-     * recomputes the draftTransaction if the user is currently sending the
-     * native asset. When sending ERC20 assets, this is unnecessary because the
-     * hex data used in the transaction will be that for interacting with the
-     * ERC20 contract
+     * Adds an entry, with timestamp, to the draftTransaction history.
      *
-     * @param state
-     * @param action
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - An action with payload that is
+     *  a string to be added to the history of the draftTransaction
+     * @returns {void}
      */
-    updateUserInputHexData: (state, action) => {
-      state.draftTransaction.userInputHexData = action.payload;
-      if (state.asset.type === ASSET_TYPES.NATIVE) {
-        slice.caseReducers.updateDraftTransaction(state);
+    addHistoryEntry: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      if (draftTransaction) {
+        draftTransaction.history.push({
+          entry: action.payload,
+          timestamp: Date.now(),
+        });
       }
     },
-    /**
-     * Initiates the edit transaction flow by setting the stage to 'EDIT' and
-     * then pulling the details of the previously submitted transaction from
-     * the action payload. It also computes a new draftTransaction that will be
-     * used when updating the transaction in the provider
-     *
-     * @param state
-     * @param action
-     */
-    editTransaction: (state, action) => {
-      state.stage = SEND_STAGES.EDIT;
-      state.gas.gasLimit = action.payload.gasLimit;
-      state.gas.gasPrice = action.payload.gasPrice;
-      state.amount.value = action.payload.amount;
-      state.gas.error = null;
-      state.amount.error = null;
-      state.asset.error = null;
-      state.recipient.address = action.payload.address;
-      state.recipient.nickname = action.payload.nickname;
-      state.draftTransaction.id = action.payload.id;
-      state.draftTransaction.txParams.from = action.payload.from;
-      state.draftTransaction.userInputHexData = action.payload.data;
-      slice.caseReducers.updateDraftTransaction(state);
-    },
     /**
      * gasTotal is computed based on gasPrice and gasLimit and set in state
      * recomputes the maximum amount if the current amount mode is 'MAX' and
      * sending the native token. ERC20 assets max amount is unaffected by
      * gasTotal so does not need to be recomputed. Finally, validates the gas
-     * field and send state, then updates the draft transaction.
+     * field and send state.
      *
-     * @param state
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
      */
     calculateGasTotal: (state) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
       // use maxFeePerGas as the multiplier if working with a FEE_MARKET transaction
       // otherwise use gasPrice
-      if (state.transactionType === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET) {
-        state.gas.gasTotal = addHexPrefix(
-          calcGasTotal(state.gas.gasLimit, state.gas.maxFeePerGas),
+      if (
+        draftTransaction.transactionType ===
+        TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
+      ) {
+        draftTransaction.gas.gasTotal = addHexPrefix(
+          calcGasTotal(
+            draftTransaction.gas.gasLimit,
+            draftTransaction.gas.maxFeePerGas,
+          ),
         );
       } else {
-        state.gas.gasTotal = addHexPrefix(
-          calcGasTotal(state.gas.gasLimit, state.gas.gasPrice),
+        draftTransaction.gas.gasTotal = addHexPrefix(
+          calcGasTotal(
+            draftTransaction.gas.gasLimit,
+            draftTransaction.gas.gasPrice,
+          ),
         );
       }
       if (
-        state.amount.mode === AMOUNT_MODES.MAX &&
-        state.asset.type === ASSET_TYPES.NATIVE
+        state.amountMode === AMOUNT_MODES.MAX &&
+        draftTransaction.asset.type === ASSET_TYPES.NATIVE
       ) {
         slice.caseReducers.updateAmountToMax(state);
       }
@@ -831,57 +843,133 @@ const slice = createSlice({
       slice.caseReducers.validateSendState(state);
     },
     /**
-     * sets the provided gasLimit in state and then recomputes the gasTotal.
+     * Clears all drafts from send state and drops the currentTransactionUUID.
+     * This is an important first step before adding a new draft transaction to
+     * avoid possible collision.
      *
-     * @param state
-     * @param action
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
      */
-    updateGasLimit: (state, action) => {
-      state.gas.gasLimit = addHexPrefix(action.payload);
-      slice.caseReducers.calculateGasTotal(state);
+    clearPreviousDrafts: (state) => {
+      state.currentTransactionUUID = null;
+      state.draftTransactions = {};
     },
     /**
-     * Sets the appropriate gas fees in state and determines and sets the
-     * appropriate transactionType based on gas fee fields received.
+     * Clears the send state by setting it to the initial value
      *
-     * @param state
-     * @param action
+     * @returns {SendState}
      */
-    updateGasFees: (state, action) => {
-      if (
-        action.payload.transactionType === TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
-      ) {
-        state.gas.maxFeePerGas = addHexPrefix(action.payload.maxFeePerGas);
-        state.gas.maxPriorityFeePerGas = addHexPrefix(
-          action.payload.maxPriorityFeePerGas,
-        );
-        state.transactionType = TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
-      } else {
-        // Until we remove the old UI we don't want to automatically update
-        // gasPrice if the user has already manually changed the field value.
-        // When receiving a new estimate the isAutomaticUpdate property will be
-        // on the payload (and set to true). If isAutomaticUpdate is true,
-        // then we check if the previous estimate was '0x0' or if the previous
-        // gasPrice equals the previous gasEstimate. if either of those cases
-        // are true then we update the gasPrice otherwise we skip it because
-        // it indicates the user has ejected from the estimates by modifying
-        // the field.
-        if (
-          action.payload.isAutomaticUpdate !== true ||
-          state.gas.gasPriceEstimate === '0x0' ||
-          state.gas.gasPrice === state.gas.gasPriceEstimate
-        ) {
-          state.gas.gasPrice = addHexPrefix(action.payload.gasPrice);
-        }
-        state.transactionType = TRANSACTION_ENVELOPE_TYPES.LEGACY;
-      }
-      slice.caseReducers.calculateGasTotal(state);
-    },
+    resetSendState: () => initialState,
+    /**
+     * sets the amount mode to the provided value as long as it is one of the
+     * supported modes (MAX|INPUT)
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SendStateAmountModePayload} action - The amount mode
+     *  to set the state to.
+     * @returns {void}
+     */
+    updateAmountMode: (state, action) => {
+      if (Object.values(AMOUNT_MODES).includes(action.payload)) {
+        state.amountMode = action.payload;
+      }
+    },
+    /**
+     * computes the maximum amount of asset that can be sent and then calls
+     * the updateSendAmount action above with the computed value, which will
+     * revalidate the field and form.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
+    updateAmountToMax: (state) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      let amount = '0x0';
+      if (draftTransaction.asset.type === ASSET_TYPES.TOKEN) {
+        const decimals = draftTransaction.asset.details?.decimals ?? 0;
+        const multiplier = Math.pow(10, Number(decimals));
+
+        amount = multiplyCurrencies(
+          draftTransaction.asset.balance,
+          multiplier,
+          {
+            toNumericBase: 'hex',
+            multiplicandBase: 16,
+            multiplierBase: 10,
+          },
+        );
+      } else {
+        const _gasTotal = sumHexes(
+          draftTransaction.gas.gasTotal || '0x0',
+          state.gasTotalForLayer1 || '0x0',
+        );
+        amount = subtractCurrencies(
+          addHexPrefix(draftTransaction.asset.balance),
+          addHexPrefix(_gasTotal),
+          {
+            toNumericBase: 'hex',
+            aBase: 16,
+            bBase: 16,
+          },
+        );
+      }
+      slice.caseReducers.updateSendAmount(state, {
+        payload: amount,
+      });
+    },
+    /**
+     * Updates the currently selected asset
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {UpdateAssetPayload} action - The asset to set in the
+     *  draftTransaction.
+     * @returns {void}
+     */
+    updateAsset: (state, action) => {
+      const { asset, initialAssetSet } = action.payload;
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+
+      draftTransaction.asset.type = asset.type;
+      draftTransaction.asset.balance = asset.balance;
+      draftTransaction.asset.error = asset.error;
+
+      if (
+        draftTransaction.asset.type === ASSET_TYPES.TOKEN ||
+        draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
+      ) {
+        draftTransaction.asset.details = asset.details;
+      } else {
+        // clear the details object when sending native currency
+        draftTransaction.asset.details = null;
+        if (draftTransaction.recipient.error === CONTRACT_ADDRESS_ERROR) {
+          // Errors related to sending tokens to their own contract address
+          // are no longer valid when sending native currency.
+          draftTransaction.recipient.error = null;
+        }
+      }
+      // 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);
+      } else if (initialAssetSet === false) {
+        slice.caseReducers.updateSendAmount(state, { payload: '0x0' });
+      }
+      // validate send state
+      slice.caseReducers.validateSendState(state);
+    },
     /**
      * Sets the appropriate gas fees in state after receiving new estimates.
      *
-     * @param state
-     * @param action
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {GasEstimateUpdatePayload)} action - The gas fee update payload
+     * @returns {void}
      */
     updateGasFeeEstimates: (state, action) => {
       const { gasFeeEstimates, gasEstimateType } = action.payload;
@@ -925,385 +1013,434 @@ const slice = createSlice({
           break;
       }
       // Record the latest gasPriceEstimate for future comparisons
-      state.gas.gasPriceEstimate = addHexPrefix(gasPriceEstimate);
+      state.gasPriceEstimate = addHexPrefix(gasPriceEstimate);
     },
     /**
-     * sets the layer 1 fees total (for a multi-layer fee network)
+     * Sets the appropriate gas fees in state and determines and sets the
+     * appropriate transactionType based on gas fee fields received.
      *
-     * @param state
-     * @param action
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {GasFeeUpdatePayload} action - The gas fees to update with
+     * @returns {void}
      */
-    updateLayer1Fees: (state, action) => {
-      state.multiLayerFees.layer1GasTotal = action.payload;
-      if (
-        state.amount.mode === AMOUNT_MODES.MAX &&
-        state.asset.type === ASSET_TYPES.NATIVE
-      ) {
-        slice.caseReducers.updateAmountToMax(state);
+    updateGasFees: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      if (draftTransaction) {
+        if (
+          action.payload.transactionType ===
+          TRANSACTION_ENVELOPE_TYPES.FEE_MARKET
+        ) {
+          draftTransaction.gas.maxFeePerGas = addHexPrefix(
+            action.payload.maxFeePerGas,
+          );
+          draftTransaction.gas.maxPriorityFeePerGas = addHexPrefix(
+            action.payload.maxPriorityFeePerGas,
+          );
+          draftTransaction.transactionType =
+            TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
+        } else {
+          // Until we remove the old UI we don't want to automatically update
+          // gasPrice if the user has already manually changed the field value.
+          // When receiving a new estimate the isAutomaticUpdate property will be
+          // on the payload (and set to true). If isAutomaticUpdate is true,
+          // then we check if the previous estimate was '0x0' or if the previous
+          // gasPrice equals the previous gasEstimate. if either of those cases
+          // are true then we update the gasPrice otherwise we skip it because
+          // it indicates the user has ejected from the estimates by modifying
+          // the field.
+          if (
+            action.payload.isAutomaticUpdate !== true ||
+            state.gasPriceEstimate === '0x0' ||
+            draftTransaction.gas.gasPrice === state.gasPriceEstimate
+          ) {
+            draftTransaction.gas.gasPrice = addHexPrefix(
+              action.payload.gasPrice,
+            );
+          }
+          draftTransaction.transactionType = TRANSACTION_ENVELOPE_TYPES.LEGACY;
+        }
+        slice.caseReducers.calculateGasTotal(state);
       }
     },
     /**
-     * sets the amount mode to the provided value as long as it is one of the
-     * supported modes (MAX|INPUT)
+     * sets the provided gasLimit in state and then recomputes the gasTotal.
      *
-     * @param state
-     * @param action
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - The
+     *  gasLimit in hex to set in state.
+     * @returns {void}
      */
-    updateAmountMode: (state, action) => {
-      if (Object.values(AMOUNT_MODES).includes(action.payload)) {
-        state.amount.mode = action.payload;
+    updateGasLimit: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      if (draftTransaction) {
+        draftTransaction.gas.gasLimit = addHexPrefix(action.payload);
+        slice.caseReducers.calculateGasTotal(state);
       }
     },
-    updateAsset: (state, action) => {
-      state.asset.type = action.payload.type;
-      state.asset.balance = action.payload.balance;
-      state.asset.error = action.payload.error;
+    /**
+     * sets the layer 1 fees total (for a multi-layer fee network)
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - the
+     *  gasTotalForLayer1 to set in hex wei.
+     * @returns {void}
+     */
+    updateLayer1Fees: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      state.gasTotalForLayer1 = action.payload;
       if (
-        state.asset.type === ASSET_TYPES.TOKEN ||
-        state.asset.type === ASSET_TYPES.COLLECTIBLE
+        state.amountMode === AMOUNT_MODES.MAX &&
+        draftTransaction.asset.type === ASSET_TYPES.NATIVE
       ) {
-        state.asset.details = action.payload.details;
-      } else {
-        // clear the details object when sending native currency
-        state.asset.details = null;
-        if (state.recipient.error === CONTRACT_ADDRESS_ERROR) {
-          // Errors related to sending tokens to their own contract address
-          // are no longer valid when sending native currency.
-          state.recipient.error = null;
-        }
-
-        if (state.recipient.warning === KNOWN_RECIPIENT_ADDRESS_WARNING) {
-          // Warning related to sending tokens to a known contract address
-          // are no longer valid when sending native currency.
-          state.recipient.warning = null;
-        }
-      }
-      // 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.amount.mode === AMOUNT_MODES.MAX) {
         slice.caseReducers.updateAmountToMax(state);
-      } else {
-        slice.caseReducers.updateSendAmount(state, { payload: '0x0' });
       }
-      // validate send state
-      slice.caseReducers.validateSendState(state);
     },
+    /**
+     * Updates the recipient of the draftTransaction
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {updateRecipientPayload} action - The recipient to set in the
+     *  draftTransaction.
+     * @returns {void}
+     */
     updateRecipient: (state, action) => {
-      state.recipient.error = null;
-      state.recipient.userInput = '';
-      state.recipient.address = action.payload.address ?? '';
-      state.recipient.nickname = action.payload.nickname ?? '';
-
-      if (state.recipient.address === '') {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.recipient.error = null;
+      state.recipientInput = '';
+      draftTransaction.recipient.address = action.payload.address ?? '';
+      draftTransaction.recipient.nickname = action.payload.nickname ?? '';
+
+      if (draftTransaction.recipient.address === '') {
         // If address is null we are clearing the recipient and must return
         // to the ADD_RECIPIENT stage.
         state.stage = SEND_STAGES.ADD_RECIPIENT;
       } else {
-        // if and address is provided and an id exists on the draft transaction,
-        // we progress to the EDIT stage, otherwise we progress to the DRAFT
-        // stage. We also reset the search mode for recipient search.
+        // if an address is provided and an id exists, we progress to the EDIT
+        // stage, otherwise we progress to the DRAFT stage. We also reset the
+        // search mode for recipient search.
         state.stage =
-          state.draftTransaction.id === null
-            ? SEND_STAGES.DRAFT
-            : SEND_STAGES.EDIT;
-        state.recipient.mode = RECIPIENT_SEARCH_MODES.CONTACT_LIST;
+          draftTransaction.id === null ? SEND_STAGES.DRAFT : SEND_STAGES.EDIT;
+        state.recipientMode = RECIPIENT_SEARCH_MODES.CONTACT_LIST;
       }
 
       // validate send state
       slice.caseReducers.validateSendState(state);
     },
-    updateDraftTransaction: (state) => {
-      // We keep a copy of txParams in state that could be submitted to the
-      // network if the form state is valid.
-      if (state.status === SEND_STATUSES.VALID) {
-        // We don't/shouldn't modify the from address when editing an
-        // existing transaction.
-        if (state.stage !== SEND_STAGES.EDIT) {
-          state.draftTransaction.txParams.from = state.account.address;
-        }
-
-        // gasLimit always needs to be set regardless of the asset being sent
-        // or the type of transaction.
-        state.draftTransaction.txParams.gas = state.gas.gasLimit;
-        switch (state.asset.type) {
-          case ASSET_TYPES.TOKEN:
-            // When sending a token the to address is the contract address of
-            // the token being sent. The value is set to '0x0' and the data
-            // is generated from the recipient address, token being sent and
-            // amount.
-            state.draftTransaction.txParams.to = state.asset.details.address;
-            state.draftTransaction.txParams.value = '0x0';
-            state.draftTransaction.txParams.data = generateERC20TransferData({
-              toAddress: state.recipient.address,
-              amount: state.amount.value,
-              sendToken: state.asset.details,
-            });
-            break;
-          case ASSET_TYPES.COLLECTIBLE:
-            // When sending a token the to address is the contract address of
-            // the token being sent. The value is set to '0x0' and the data
-            // is generated from the recipient address, token being sent and
-            // amount.
-            state.draftTransaction.txParams.to = state.asset.details.address;
-            state.draftTransaction.txParams.value = '0x0';
-            state.draftTransaction.txParams.data = generateERC721TransferData({
-              toAddress: state.recipient.address,
-              fromAddress: state.account.address,
-              tokenId: state.asset.details.tokenId,
-            });
-            break;
-          case ASSET_TYPES.NATIVE:
-          default:
-            // When sending native currency the to and value fields use the
-            // recipient and amount values and the data key is either null or
-            // populated with the user input provided in hex field.
-            state.draftTransaction.txParams.to = state.recipient.address;
-            state.draftTransaction.txParams.value = state.amount.value;
-            state.draftTransaction.txParams.data =
-              state.draftTransaction.userInputHexData ?? undefined;
-        }
-
-        // We need to make sure that we only include the right gas fee fields
-        // based on the type of transaction the network supports. We will also set
-        // the type param here. We must delete the opposite fields to avoid
-        // stale data in txParams.
-        if (state.eip1559support) {
-          state.draftTransaction.txParams.type =
-            TRANSACTION_ENVELOPE_TYPES.FEE_MARKET;
-
-          state.draftTransaction.txParams.maxFeePerGas = state.gas.maxFeePerGas;
-          state.draftTransaction.txParams.maxPriorityFeePerGas =
-            state.gas.maxPriorityFeePerGas;
-
-          if (
-            !state.draftTransaction.txParams.maxFeePerGas ||
-            state.draftTransaction.txParams.maxFeePerGas === '0x0'
-          ) {
-            state.draftTransaction.txParams.maxFeePerGas = state.gas.gasPrice;
-          }
-
-          if (
-            !state.draftTransaction.txParams.maxPriorityFeePerGas ||
-            state.draftTransaction.txParams.maxPriorityFeePerGas === '0x0'
-          ) {
-            state.draftTransaction.txParams.maxPriorityFeePerGas =
-              state.draftTransaction.txParams.maxFeePerGas;
-          }
-
-          delete state.draftTransaction.txParams.gasPrice;
-        } else {
-          delete state.draftTransaction.txParams.maxFeePerGas;
-          delete state.draftTransaction.txParams.maxPriorityFeePerGas;
+    /**
+     * Clears the user input and changes the recipient search mode to the
+     * specified value
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {UpdateRecipientModePayload} action - The mode to set the
+     *  recipient search to
+     * @returns {void}
+     */
+    updateRecipientSearchMode: (state, action) => {
+      state.recipientInput = '';
+      state.recipientMode = action.payload;
+    },
 
-          state.draftTransaction.txParams.gasPrice = state.gas.gasPrice;
-          state.draftTransaction.txParams.type =
-            TRANSACTION_ENVELOPE_TYPES.LEGACY;
-        }
-      }
+    updateRecipientWarning: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.recipient.warning = action.payload;
     },
-    useDefaultGas: (state) => {
-      // Show the default gas price/limit fields in the send page
-      state.gas.isCustomGasSet = false;
+
+    updateDraftTransactionStatus: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.status = action.payload;
     },
-    useCustomGas: (state) => {
-      // Show the gas fees set in the custom gas modal (state.gas.customData)
-      state.gas.isCustomGasSet = true;
+
+    acknowledgeRecipientWarning: (state) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.recipient.recipientWarningAcknowledged = true;
+      slice.caseReducers.validateSendState(state);
     },
+
+    /**
+     * Updates the value of the recipientInput key with what the user has
+     * typed into the recipient input field in the UI.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - the value the user has typed into
+     *  the recipient field.
+     * @returns {void}
+     */
     updateRecipientUserInput: (state, action) => {
       // Update the value in state to match what the user is typing into the
       // input field
-      state.recipient.userInput = action.payload;
+      state.recipientInput = action.payload;
     },
-    validateRecipientUserInput: (state, action) => {
-      const { asset, recipient } = state;
-
-      if (
-        recipient.mode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS ||
-        recipient.userInput === '' ||
-        recipient.userInput === null
-      ) {
-        recipient.error = null;
-        recipient.warning = null;
-      } else {
-        const isSendingToken =
-          asset.type === ASSET_TYPES.TOKEN ||
-          asset.type === ASSET_TYPES.COLLECTIBLE;
-        const { chainId, tokens, tokenAddressList } = action.payload;
-        if (
-          isBurnAddress(recipient.userInput) ||
-          (!isValidHexAddress(recipient.userInput, {
-            mixedCaseUseChecksum: true,
-          }) &&
-            !isValidDomainName(recipient.userInput))
-        ) {
-          recipient.error = isDefaultMetaMaskChain(chainId)
-            ? INVALID_RECIPIENT_ADDRESS_ERROR
-            : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;
-        } else if (
-          isSendingToken &&
-          isOriginContractAddress(recipient.userInput, asset.details.address)
-        ) {
-          recipient.error = CONTRACT_ADDRESS_ERROR;
-        } else {
-          recipient.error = null;
-        }
-        if (
-          isSendingToken &&
-          isValidHexAddress(recipient.userInput) &&
-          (tokenAddressList.find((address) =>
-            isEqualCaseInsensitive(address, recipient.userInput),
-          ) ||
-            checkExistingAddresses(recipient.userInput, tokens))
-        ) {
-          recipient.warning = KNOWN_RECIPIENT_ADDRESS_WARNING;
-        } else {
-          recipient.warning = null;
-        }
+    /**
+     * update current amount.value in state and run post update validation of
+     * the amount field and the send state.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - The hex string to be set as the
+     *  amount value.
+     * @returns {void}
+     */
+    updateSendAmount: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.amount.value = addHexPrefix(action.payload);
+      // Once amount has changed, validate the field
+      slice.caseReducers.validateAmountField(state);
+      if (draftTransaction.asset.type === ASSET_TYPES.NATIVE) {
+        // if sending the native asset the amount being sent will impact the
+        // gas field as well because the gas validation takes into
+        // consideration the available balance minus amount sent before
+        // checking if there is enough left to cover the gas fee.
+        slice.caseReducers.validateGasField(state);
       }
+      // validate send state
+      slice.caseReducers.validateSendState(state);
     },
-    updateRecipientSearchMode: (state, action) => {
-      state.recipient.userInput = '';
-      state.recipient.mode = action.payload;
+    /**
+     * updates the userInputHexData state key
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @param {SimpleStringPayload} action - The hex string to be set as the
+     *  userInputHexData value.
+     * @returns {void}
+     */
+    updateUserInputHexData: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+      draftTransaction.userInputHexData = action.payload;
     },
-    resetSendState: () => initialState,
+    /**
+     * Updates the gasIsSetInModal property to true which results in showing
+     * the gas fees from the custom gas modal in the send page.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
+    useCustomGas: (state) => {
+      state.gasIsSetInModal = true;
+    },
+    /**
+     * Updates the gasIsSetInModal property to false which results in showing
+     * the default gas price/limit fields in the send page.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
+    useDefaultGas: (state) => {
+      state.gasIsSetInModal = false;
+    },
+    /**
+     * Checks for the validity of the draftTransactions selected amount to send
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
     validateAmountField: (state) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
       switch (true) {
         // set error to INSUFFICIENT_FUNDS_ERROR if the account balance is lower
         // than the total price of the transaction inclusive of gas fees.
-        case state.asset.type === ASSET_TYPES.NATIVE &&
+        case draftTransaction.asset.type === ASSET_TYPES.NATIVE &&
           !isBalanceSufficient({
-            amount: state.amount.value,
-            balance: state.asset.balance,
-            gasTotal: state.gas.gasTotal ?? '0x0',
+            amount: draftTransaction.amount.value,
+            balance: draftTransaction.asset.balance,
+            gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
           }):
-          state.amount.error = INSUFFICIENT_FUNDS_ERROR;
+          draftTransaction.amount.error = INSUFFICIENT_FUNDS_ERROR;
           break;
         // set error to INSUFFICIENT_FUNDS_ERROR if the token balance is lower
         // than the amount of token the user is attempting to send.
-        case state.asset.type === ASSET_TYPES.TOKEN &&
+        case draftTransaction.asset.type === ASSET_TYPES.TOKEN &&
           !isTokenBalanceSufficient({
-            tokenBalance: state.asset.balance ?? '0x0',
-            amount: state.amount.value,
-            decimals: state.asset.details.decimals,
+            tokenBalance: draftTransaction.asset.balance ?? '0x0',
+            amount: draftTransaction.amount.value,
+            decimals: draftTransaction.asset.details.decimals,
           }):
-          state.amount.error = INSUFFICIENT_TOKENS_ERROR;
+          draftTransaction.amount.error = INSUFFICIENT_TOKENS_ERROR;
           break;
         // if the amount is negative, set error to NEGATIVE_ETH_ERROR
         // TODO: change this to NEGATIVE_ERROR and remove the currency bias.
         case conversionGreaterThan(
           { value: 0, fromNumericBase: 'dec' },
-          { value: state.amount.value, fromNumericBase: 'hex' },
+          { value: draftTransaction.amount.value, fromNumericBase: 'hex' },
         ):
-          state.amount.error = NEGATIVE_ETH_ERROR;
+          draftTransaction.amount.error = NEGATIVE_ETH_ERROR;
           break;
         // If none of the above are true, set error to null
         default:
-          state.amount.error = null;
+          draftTransaction.amount.error = null;
       }
     },
+    /**
+     * Checks if the user has enough funds to cover the cost of gas, always
+     * uses the native currency and does not take into account the amount
+     * being sent. If the user has enough to cover cost of gas but not gas
+     * + amount then the error will be displayed on the amount field.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
     validateGasField: (state) => {
-      // Checks if the user has enough funds to cover the cost of gas, always
-      // uses the native currency and does not take into account the amount
-      // being sent. If the user has enough to cover cost of gas but not gas
-      // + amount then the error will be displayed on the amount field.
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
       const insufficientFunds = !isBalanceSufficient({
         amount:
-          state.asset.type === ASSET_TYPES.NATIVE ? state.amount.value : '0x0',
-        balance: state.account.balance,
-        gasTotal: state.gas.gasTotal ?? '0x0',
+          draftTransaction.asset.type === ASSET_TYPES.NATIVE
+            ? draftTransaction.amount.value
+            : '0x0',
+        balance:
+          draftTransaction.fromAccount?.balance ??
+          state.selectedAccount.balance,
+        gasTotal: draftTransaction.gas.gasTotal ?? '0x0',
       });
 
-      state.gas.error = insufficientFunds ? INSUFFICIENT_FUNDS_ERROR : null;
+      draftTransaction.gas.error = insufficientFunds
+        ? INSUFFICIENT_FUNDS_ERROR
+        : null;
+    },
+    validateRecipientUserInput: (state, action) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
+
+      if (draftTransaction) {
+        if (
+          state.recipientMode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS ||
+          state.recipientInput === '' ||
+          state.recipientInput === null
+        ) {
+          draftTransaction.recipient.error = null;
+          draftTransaction.recipient.warning = null;
+        } else {
+          const {
+            chainId,
+            tokens,
+            tokenAddressList,
+            isProbablyAnAssetContract,
+          } = action.payload;
+
+          if (
+            isBurnAddress(state.recipientInput) ||
+            (!isValidHexAddress(state.recipientInput, {
+              mixedCaseUseChecksum: true,
+            }) &&
+              !isValidDomainName(state.recipientInput))
+          ) {
+            draftTransaction.recipient.error = isDefaultMetaMaskChain(chainId)
+              ? INVALID_RECIPIENT_ADDRESS_ERROR
+              : INVALID_RECIPIENT_ADDRESS_NOT_ETH_NETWORK_ERROR;
+          } else if (
+            isOriginContractAddress(
+              state.recipientInput,
+              draftTransaction.asset?.details?.address,
+            )
+          ) {
+            draftTransaction.recipient.error = CONTRACT_ADDRESS_ERROR;
+          } else {
+            draftTransaction.recipient.error = null;
+          }
+          if (
+            (isValidHexAddress(state.recipientInput) &&
+              (tokenAddressList.find((address) =>
+                isEqualCaseInsensitive(address, state.recipientInput),
+              ) ||
+                checkExistingAddresses(state.recipientInput, tokens))) ||
+            isProbablyAnAssetContract
+          ) {
+            draftTransaction.recipient.warning = KNOWN_RECIPIENT_ADDRESS_WARNING;
+          } else {
+            draftTransaction.recipient.warning = null;
+          }
+        }
+      }
+      slice.caseReducers.validateSendState(state);
     },
+    /**
+     * Checks if the draftTransaction is currently valid. The following list of
+     * cases from the switch statement in this function describe when the
+     * transaction is invalid. Please keep this comment updated.
+     *
+     * case 1: State is invalid when amount field has an error.
+     * case 2: State is invalid when gas field has an error.
+     * case 3: State is invalid when asset field has an error.
+     * case 4: State is invalid if asset type is a token and the token details
+     *  are unknown.
+     * case 5: State is invalid if no recipient has been added.
+     * case 6: State is invalid if the send state is uninitialized.
+     * case 7: State is invalid if gas estimates are loading.
+     * case 8: State is invalid if gasLimit is less than the gasLimitMinimum.
+     *
+     * @param {SendStateDraft} state - A writable draft of the send state to be
+     *  updated.
+     * @returns {void}
+     */
     validateSendState: (state) => {
+      const draftTransaction =
+        state.draftTransactions[state.currentTransactionUUID];
       switch (true) {
-        // 1 + 2. State is invalid when either gas or amount or asset fields have errors
-        // 3. State is invalid if asset type is a token and the token details
-        //  are unknown.
-        // 4. State is invalid if no recipient has been added
-        // 5. State is invalid if the send state is uninitialized
-        // 6. State is invalid if gas estimates are loading
-        // 7. State is invalid if gasLimit is less than the minimumGasLimit
-        // 8. State is invalid if the selected asset is a ERC721
-        case Boolean(state.amount.error):
-        case Boolean(state.gas.error):
-        case Boolean(state.asset.error):
-        case state.asset.type === ASSET_TYPES.TOKEN &&
-          state.asset.details === null:
+        case Boolean(draftTransaction.amount.error):
+        case Boolean(draftTransaction.gas.error):
+        case Boolean(draftTransaction.asset.error):
+        case draftTransaction.asset.type === ASSET_TYPES.TOKEN &&
+          draftTransaction.asset.details === null:
         case state.stage === SEND_STAGES.ADD_RECIPIENT:
         case state.stage === SEND_STAGES.INACTIVE:
-        case state.gas.isGasEstimateLoading:
-        case new BigNumber(state.gas.gasLimit, 16).lessThan(
-          new BigNumber(state.gas.minimumGasLimit),
+        case state.gasEstimateIsLoading:
+        case new BigNumber(draftTransaction.gas.gasLimit, 16).lessThan(
+          new BigNumber(state.gasLimitMinimum),
         ):
-          state.status = SEND_STATUSES.INVALID;
+          draftTransaction.status = SEND_STATUSES.INVALID;
+          break;
+        case draftTransaction.recipient.warning === 'loading':
+        case draftTransaction.recipient.warning ===
+          KNOWN_RECIPIENT_ADDRESS_WARNING &&
+          draftTransaction.recipient.recipientWarningAcknowledged === false:
+          draftTransaction.status = SEND_STATUSES.INVALID;
           break;
         default:
-          state.status = SEND_STATUSES.VALID;
-          // Recompute the draftTransaction object
-          slice.caseReducers.updateDraftTransaction(state);
+          draftTransaction.status = SEND_STATUSES.VALID;
       }
     },
   },
   extraReducers: (builder) => {
     builder
-      .addCase(QR_CODE_DETECTED, (state, action) => {
-        // When data is received from the QR Code Scanner we set the recipient
-        // as long as a valid address can be pulled from the data. If an
-        // address is pulled but it is invalid, we display an error.
-        const qrCodeData = action.value;
-        if (qrCodeData) {
-          if (qrCodeData.type === 'address') {
-            const scannedAddress = qrCodeData.values.address.toLowerCase();
-            if (
-              isValidHexAddress(scannedAddress, { allowNonPrefixed: false })
-            ) {
-              if (state.recipient.address !== scannedAddress) {
-                slice.caseReducers.updateRecipient(state, {
-                  payload: { address: scannedAddress },
-                });
-              }
-            } else {
-              state.recipient.error = INVALID_RECIPIENT_ADDRESS_ERROR;
-            }
-          }
-        }
-      })
-      .addCase(SELECTED_ACCOUNT_CHANGED, (state, action) => {
-        // If we are on the edit flow the account we are keyed into will be the
-        // original 'from' account, which may differ from the selected account
-        if (state.stage !== SEND_STAGES.EDIT) {
-          // This event occurs when the user selects a new account from the
-          // account menu, or the currently active account's balance updates.
-          state.account.balance = action.payload.account.balance;
-          state.account.address = action.payload.account.address;
-          // We need to update the asset balance if the asset is the native
-          // network asset. Once we update the balance we recompute error state.
-          if (state.asset.type === ASSET_TYPES.NATIVE) {
-            state.asset.balance = action.payload.account.balance;
-          }
-          slice.caseReducers.validateAmountField(state);
-          slice.caseReducers.validateGasField(state);
-          slice.caseReducers.validateSendState(state);
-        }
-      })
       .addCase(ACCOUNT_CHANGED, (state, action) => {
         // If we are on the edit flow then we need to watch for changes to the
         // current account.address in state and keep balance updated
         // appropriately
         if (
           state.stage === SEND_STAGES.EDIT &&
-          action.payload.account.address === state.account.address
+          action.payload.account.address === state.selectedAccount.address
         ) {
           // This event occurs when the user's account details update due to
           // background state changes. If the account that is being updated is
           // the current from account on the edit flow we need to update
           // the balance for the account and revalidate the send state.
-          state.account.balance = action.payload.account.balance;
+          state.selectedAccount.balance = action.payload.account.balance;
           // We need to update the asset balance if the asset is the native
           // network asset. Once we update the balance we recompute error state.
-          if (state.asset.type === ASSET_TYPES.NATIVE) {
-            state.asset.balance = action.payload.account.balance;
+          const draftTransaction =
+            state.draftTransactions[state.currentTransactionUUID];
+          if (draftTransaction?.asset.type === ASSET_TYPES.NATIVE) {
+            draftTransaction.asset.balance = action.payload.account.balance;
           }
           slice.caseReducers.validateAmountField(state);
           slice.caseReducers.validateGasField(state);
@@ -1315,35 +1452,87 @@ const slice = createSlice({
         // to check to see if an entry exists for the current address or if the
         // entry changed.
         const { addressBook } = action.payload;
-        if (addressBook[state.recipient.address]?.name) {
-          state.recipient.nickname = addressBook[state.recipient.address].name;
+        const draftTransaction =
+          state.draftTransactions[state.currentTransactionUUID];
+        if (
+          draftTransaction &&
+          addressBook[draftTransaction.recipient.address]?.name
+        ) {
+          draftTransaction.recipient.nickname =
+            addressBook[draftTransaction.recipient.address].name;
         }
       })
-      .addCase(initializeSendState.pending, (state) => {
-        // when we begin initializing state, which can happen when switching
-        // chains even after loading the send flow, we set
-        // gas.isGasEstimateLoading as initialization will trigger a fetch
-        // for gasPrice estimates.
-        state.gas.isGasEstimateLoading = true;
+      .addCase(computeEstimatedGasLimit.pending, (state) => {
+        // When we begin to fetch gasLimit we should indicate we are loading
+        // a gas estimate.
+        state.gasEstimateIsLoading = true;
+      })
+      .addCase(computeEstimatedGasLimit.fulfilled, (state, action) => {
+        // When we receive a new gasLimit from the computeEstimatedGasLimit
+        // thunk we need to update our gasLimit in the slice. We call into the
+        // caseReducer updateGasLimit to tap into the appropriate follow up
+        // checks and gasTotal calculation. First set gasEstimateIsLoading to
+        // false.
+        state.gasEstimateIsLoading = false;
+        if (action.payload?.gasLimit) {
+          slice.caseReducers.updateGasLimit(state, {
+            payload: action.payload.gasLimit,
+          });
+        }
+        if (action.payload?.gasTotalForLayer1) {
+          slice.caseReducers.updateLayer1Fees(state, {
+            payload: action.payload.gasTotalForLayer1,
+          });
+        }
+      })
+      .addCase(computeEstimatedGasLimit.rejected, (state) => {
+        // If gas estimation fails, we should set the loading state to false,
+        // because it is no longer loading
+        state.gasEstimateIsLoading = false;
+      })
+      .addCase(GAS_FEE_ESTIMATES_UPDATED, (state, action) => {
+        // When the gasFeeController updates its gas fee estimates we need to
+        // update and validate state based on those new values
+        slice.caseReducers.updateGasFeeEstimates(state, {
+          payload: action.payload,
+        });
+      })
+      .addCase(initializeSendState.pending, (state) => {
+        // when we begin initializing state, which can happen when switching
+        // chains even after loading the send flow, we set gasEstimateIsLoading
+        // as initialization will trigger a fetch for gasPrice estimates.
+        state.gasEstimateIsLoading = true;
       })
       .addCase(initializeSendState.fulfilled, (state, action) => {
         // writes the computed initialized state values into the slice and then
         // calculates slice validity using the caseReducers.
         state.eip1559support = action.payload.eip1559support;
-        state.account.address = action.payload.address;
-        state.account.balance = action.payload.nativeBalance;
-        state.asset.balance = action.payload.assetBalance;
-        state.gas.gasLimit = action.payload.gasLimit;
+        state.selectedAccount.address = action.payload.account.address;
+        state.selectedAccount.balance = action.payload.account.balance;
+        const draftTransaction =
+          state.draftTransactions[state.currentTransactionUUID];
+        draftTransaction.gas.gasLimit = action.payload.gasLimit;
         slice.caseReducers.updateGasFeeEstimates(state, {
           payload: {
             gasFeeEstimates: action.payload.gasFeeEstimates,
             gasEstimateType: action.payload.gasEstimateType,
           },
         });
-        state.gas.gasTotal = action.payload.gasTotal;
-        state.gas.gasEstimatePollToken = action.payload.gasEstimatePollToken;
+        draftTransaction.gas.gasTotal = action.payload.gasTotal;
+        state.gasEstimatePollToken = action.payload.gasEstimatePollToken;
+        if (action.payload.chainHasChanged) {
+          // If the state was reinitialized as a result of the user changing
+          // the network from the network dropdown, then the selected asset is
+          // no longer valid and should be set to the native asset for the
+          // network.
+          draftTransaction.asset.type = ASSET_TYPES.NATIVE;
+          draftTransaction.asset.balance =
+            draftTransaction.fromAccount?.balance ??
+            state.selectedAccount.balance;
+          draftTransaction.asset.details = null;
+        }
         if (action.payload.gasEstimatePollToken) {
-          state.gas.isGasEstimateLoading = false;
+          state.gasEstimateIsLoading = false;
         }
         if (state.stage !== SEND_STAGES.INACTIVE) {
           slice.caseReducers.validateRecipientUserInput(state, {
@@ -1355,48 +1544,59 @@ const slice = createSlice({
             },
           });
         }
-        state.stage =
-          state.stage === SEND_STAGES.INACTIVE
-            ? SEND_STAGES.ADD_RECIPIENT
-            : state.stage;
         slice.caseReducers.validateAmountField(state);
         slice.caseReducers.validateGasField(state);
         slice.caseReducers.validateSendState(state);
       })
-      .addCase(computeEstimatedGasLimit.pending, (state) => {
-        // When we begin to fetch gasLimit we should indicate we are loading
-        // a gas estimate.
-        state.gas.isGasEstimateLoading = true;
-      })
-      .addCase(computeEstimatedGasLimit.fulfilled, (state, action) => {
-        // When we receive a new gasLimit from the computeEstimatedGasLimit
-        // thunk we need to update our gasLimit in the slice. We call into the
-        // caseReducer updateGasLimit to tap into the appropriate follow up
-        // checks and gasTotal calculation. First set isGasEstimateLoading to
-        // false.
-        state.gas.isGasEstimateLoading = false;
-        if (action.payload?.gasLimit) {
-          slice.caseReducers.updateGasLimit(state, {
-            payload: action.payload.gasLimit,
-          });
-        }
-        if (action.payload?.layer1GasTotal) {
-          slice.caseReducers.updateLayer1Fees(state, {
-            payload: action.payload.layer1GasTotal,
-          });
+      .addCase(SELECTED_ACCOUNT_CHANGED, (state, action) => {
+        // If we are on the edit flow the account we are keyed into will be the
+        // original 'from' account, which may differ from the selected account
+        if (state.stage !== SEND_STAGES.EDIT) {
+          // This event occurs when the user selects a new account from the
+          // account menu, or the currently active account's balance updates.
+          state.selectedAccount.balance = action.payload.account.balance;
+          state.selectedAccount.address = action.payload.account.address;
+          const draftTransaction =
+            state.draftTransactions[state.currentTransactionUUID];
+          // This action will occur even when we aren't on the send flow, which
+          // is okay as it keeps the selectedAccount details up to date. We do
+          // not need to validate anything if there isn't a current draft
+          // transaction. If there is, we need to update the asset balance if
+          // the asset is set to the native network asset, and then validate
+          // the transaction.
+          if (draftTransaction) {
+            if (draftTransaction?.asset.type === ASSET_TYPES.NATIVE) {
+              draftTransaction.asset.balance = action.payload.account.balance;
+            }
+            slice.caseReducers.validateAmountField(state);
+            slice.caseReducers.validateGasField(state);
+            slice.caseReducers.validateSendState(state);
+          }
         }
       })
-      .addCase(computeEstimatedGasLimit.rejected, (state) => {
-        // If gas estimation fails, we should set the loading state to false,
-        // because it is no longer loading
-        state.gas.isGasEstimateLoading = false;
-      })
-      .addCase(GAS_FEE_ESTIMATES_UPDATED, (state, action) => {
-        // When the gasFeeController updates its gas fee estimates we need to
-        // update and validate state based on those new values
-        slice.caseReducers.updateGasFeeEstimates(state, {
-          payload: action.payload,
-        });
+      .addCase(QR_CODE_DETECTED, (state, action) => {
+        // When data is received from the QR Code Scanner we set the recipient
+        // as long as a valid address can be pulled from the data. If an
+        // address is pulled but it is invalid, we display an error.
+        const qrCodeData = action.value;
+        const draftTransaction =
+          state.draftTransactions[state.currentTransactionUUID];
+        if (qrCodeData && draftTransaction) {
+          if (qrCodeData.type === 'address') {
+            const scannedAddress = qrCodeData.values.address.toLowerCase();
+            if (
+              isValidHexAddress(scannedAddress, { allowNonPrefixed: false })
+            ) {
+              if (draftTransaction.recipient.address !== scannedAddress) {
+                slice.caseReducers.updateRecipient(state, {
+                  payload: { address: scannedAddress },
+                });
+              }
+            } else {
+              draftTransaction.recipient.error = INVALID_RECIPIENT_ADDRESS_ERROR;
+            }
+          }
+        }
       });
   },
 });
@@ -1412,12 +1612,161 @@ const {
   validateRecipientUserInput,
   updateRecipientSearchMode,
   addHistoryEntry,
+  acknowledgeRecipientWarning,
 } = actions;
 
-export { useDefaultGas, useCustomGas, updateGasLimit, addHistoryEntry };
+export {
+  useDefaultGas,
+  useCustomGas,
+  updateGasLimit,
+  addHistoryEntry,
+  acknowledgeRecipientWarning,
+};
 
 // Action Creators
 
+/**
+ * This method is for usage when validating user input so that validation
+ * is only run after a delay in typing of 300ms. Usage at callsites requires
+ * passing in both the dispatch method and the payload to dispatch, which makes
+ * it only applicable for use within action creators.
+ */
+const debouncedValidateRecipientUserInput = debounce(
+  (dispatch, payload, resolve) => {
+    dispatch(
+      addHistoryEntry(
+        `sendFlow - user typed ${payload.userInput} into recipient input field`,
+      ),
+    );
+    dispatch(validateRecipientUserInput(payload));
+    resolve();
+  },
+  300,
+);
+
+/**
+ * Begins a new draft transaction, derived from the txParams of an existing
+ * transaction in the TransactionController. This action will first clear out
+ * the previous draft transactions and currentTransactionUUID from state. This
+ * action is one of the two entry points into the send flow. NOTE: You must
+ * route to the send page *after* dispatching this action resolves to ensure
+ * that the draftTransaction is properly created.
+ *
+ * @param {AssetTypesString} assetType - The type of asset the transaction
+ *  being edited was sending. The details of the asset will be retrieved from
+ *  the transaction data in state.
+ * @param {string} transactionId - The id of the transaction being edited.
+ * @returns {ThunkAction<void>}
+ */
+export function editExistingTransaction(assetType, transactionId) {
+  return async (dispatch, getState) => {
+    await dispatch(actions.clearPreviousDrafts());
+    const state = getState();
+    const unapprovedTransactions = getUnapprovedTxs(state);
+    const transaction = unapprovedTransactions[transactionId];
+    const account = getTargetAccount(state, transaction.txParams.from);
+
+    if (assetType === ASSET_TYPES.NATIVE) {
+      await dispatch(
+        actions.addNewDraft({
+          ...draftTransactionInitialState,
+          id: transactionId,
+          fromAccount: account,
+          gas: {
+            ...draftTransactionInitialState.gas,
+            gasLimit: transaction.txParams.gas,
+            gasPrice: transaction.txParams.gasPrice,
+          },
+          userInputHexData: transaction.txParams.data,
+          recipient: {
+            ...draftTransactionInitialState.recipient,
+            address: transaction.txParams.to,
+            nickname:
+              getAddressBookEntryOrAccountName(state, transaction.txParams.to)
+                ?.name ?? '',
+          },
+          amount: {
+            ...draftTransactionInitialState.amount,
+            value: transaction.txParams.value,
+          },
+          history: [
+            `sendFlow - user clicked edit on transaction with id ${transactionId}`,
+          ],
+        }),
+      );
+      await dispatch(
+        updateSendAsset(
+          { type: ASSET_TYPES.NATIVE },
+          { initialAssetSet: true },
+        ),
+      );
+    } else {
+      const tokenData = parseStandardTokenTransactionData(
+        transaction.txParams.data,
+      );
+      const tokenAmountInDec =
+        assetType === ASSET_TYPES.TOKEN ? getTokenValueParam(tokenData) : '1';
+      const address = getTokenAddressParam(tokenData);
+      const nickname =
+        getAddressBookEntryOrAccountName(state, address)?.name ?? '';
+
+      const tokenAmountInHex = addHexPrefix(
+        conversionUtil(tokenAmountInDec, {
+          fromNumericBase: 'dec',
+          toNumericBase: 'hex',
+        }),
+      );
+
+      await dispatch(
+        actions.addNewDraft({
+          ...draftTransactionInitialState,
+          id: transactionId,
+          fromAccount: account,
+          gas: {
+            ...draftTransactionInitialState.gas,
+            gasLimit: transaction.txParams.gas,
+            gasPrice: transaction.txParams.gasPrice,
+          },
+          userInputHexData: transaction.txParams.data,
+          recipient: {
+            ...draftTransactionInitialState.recipient,
+            address,
+            nickname,
+          },
+          amount: {
+            ...draftTransactionInitialState.amount,
+            value: tokenAmountInHex,
+          },
+          history: [
+            `sendFlow - user clicked edit on transaction with id ${transactionId}`,
+          ],
+        }),
+      );
+
+      await dispatch(
+        updateSendAsset(
+          {
+            type: assetType,
+            details: {
+              address: transaction.txParams.to,
+              ...(assetType === ASSET_TYPES.COLLECTIBLE
+                ? {
+                    tokenId:
+                      getTokenIdParam(tokenData) ??
+                      getTokenValueParam(tokenData),
+                  }
+                : {}),
+            },
+          },
+          { initialAssetSet: true },
+        ),
+      );
+    }
+
+    await dispatch(initializeSendState());
+  };
+}
+
 /**
  * This method is a temporary placeholder to support the old UI in both the
  * gas modal and the send flow. Soon we won't need to modify gasPrice from the
@@ -1428,6 +1777,7 @@ export { useDefaultGas, useCustomGas, updateGasLimit, addHistoryEntry };
  *
  * @deprecated - don't extend the usage of this temporary method
  * @param {string} gasPrice - new gas price in hex wei
+ * @returns {ThunkAction<void>}
  */
 export function updateGasPrice(gasPrice) {
   return (dispatch) => {
@@ -1443,45 +1793,137 @@ export function updateGasPrice(gasPrice) {
   };
 }
 
-export function resetSendState() {
+/**
+ * Updates the recipient in state based on the input provided, and then will
+ * recompute gas limit when sending a TOKEN asset type. Changing the recipient
+ * address results in hex data changing because the recipient address is
+ * encoded in the data instead of being in the 'to' field. The to field in a
+ * token send will always be the token contract address.
+ * If no nickname is provided, the address book state will be checked to see if
+ * a nickname for the passed address has already been saved. This ensures the
+ * (temporary) send state recipient nickname is consistent with the address book
+ * nickname which has already been persisted to state.
+ *
+ * @param {Object} recipient - Recipient information
+ * @param {string} recipient.address - hex address to send the transaction to
+ * @param {string} [recipient.nickname] - Alias for the address to display
+ *  to the user
+ * @returns {ThunkAction<void>}
+ */
+export function updateRecipient({ address, nickname }) {
   return async (dispatch, getState) => {
+    // Do not addHistoryEntry here as this is called from a number of places
+    // each with significance to the user and transaction history.
     const state = getState();
-    dispatch(actions.resetSendState());
+    const nicknameFromAddressBookEntryOrAccountName =
+      getAddressBookEntryOrAccountName(state, address) ?? '';
+    await dispatch(
+      actions.updateRecipient({
+        address,
+        nickname: nickname || nicknameFromAddressBookEntryOrAccountName,
+      }),
+    );
+    await dispatch(computeEstimatedGasLimit());
+  };
+}
 
-    if (state[name].gas.gasEstimatePollToken) {
-      await disconnectGasFeeEstimatePoller(
-        state[name].gas.gasEstimatePollToken,
-      );
-      removePollingTokenFromAppState(state[name].gas.gasEstimatePollToken);
+/**
+ * This method is called to update the user's input into the ENS input field.
+ * Once the field is updated, the field will be validated using a debounced
+ * version of the validateRecipientUserInput action. This way validation only
+ * occurs once the user has stopped typing.
+ *
+ * @param {string} userInput - the value that the user is typing into the field
+ */
+export function updateRecipientUserInput(userInput) {
+  return async (dispatch, getState) => {
+    dispatch(actions.updateRecipientWarning('loading'));
+    dispatch(actions.updateDraftTransactionStatus(SEND_STATUSES.INVALID));
+    await dispatch(actions.updateRecipientUserInput(userInput));
+    const state = getState();
+    const draftTransaction =
+      state[name].draftTransactions[state[name].currentTransactionUUID];
+    const sendingAddress =
+      draftTransaction.fromAccount?.address ??
+      state[name].selectedAccount.address ??
+      getSelectedAddress(state);
+    const chainId = getCurrentChainId(state);
+    const tokens = getTokens(state);
+    const useTokenDetection = getUseTokenDetection(state);
+    const tokenMap = getTokenList(state);
+    const tokenAddressList = Object.keys(tokenMap);
+
+    const inputIsValidHexAddress = isValidHexAddress(userInput);
+    let isProbablyAnAssetContract = false;
+    if (inputIsValidHexAddress) {
+      const smartContractAddress = await isSmartContractAddress(userInput);
+      if (smartContractAddress) {
+        const { symbol, decimals } =
+          getTokenMetadata(userInput, tokenMap) || {};
+
+        isProbablyAnAssetContract = symbol && decimals !== undefined;
+
+        if (!isProbablyAnAssetContract) {
+          try {
+            const { standard } = await getTokenStandardAndDetails(
+              userInput,
+              sendingAddress,
+            );
+            isProbablyAnAssetContract = Boolean(standard);
+          } catch (e) {
+            console.log(e);
+          }
+        }
+      }
     }
+
+    return new Promise((resolve) => {
+      debouncedValidateRecipientUserInput(
+        dispatch,
+        {
+          userInput,
+          chainId,
+          tokens,
+          useTokenDetection,
+          tokenAddressList,
+          isProbablyAnAssetContract,
+        },
+        resolve,
+      );
+    });
   };
 }
+
 /**
  * Updates the amount the user intends to send and performs side effects.
  * 1. If the current mode is MAX change to INPUT
  * 2. If sending a token, recompute the gasLimit estimate
  *
  * @param {string} amount - hex string representing value
+ * @returns {ThunkAction<void>}
  */
 export function updateSendAmount(amount) {
   return async (dispatch, getState) => {
     const state = getState();
+    const { metamask } = state;
+    const draftTransaction =
+      state[name].draftTransactions[state[name].currentTransactionUUID];
     let logAmount = amount;
-    if (state[name].asset.type === ASSET_TYPES.TOKEN) {
+    if (draftTransaction.asset.type === ASSET_TYPES.TOKEN) {
       const multiplier = Math.pow(
         10,
-        Number(state[name].asset.details?.decimals || 0),
+        Number(draftTransaction.asset.details?.decimals || 0),
       );
       const decimalValueString = conversionUtil(addHexPrefix(amount), {
         fromNumericBase: 'hex',
         toNumericBase: 'dec',
-        toCurrency: state[name].asset.details?.symbol,
+        toCurrency: draftTransaction.asset.details?.symbol,
         conversionRate: multiplier,
         invertConversionRate: true,
       });
 
       logAmount = `${Number(decimalValueString) ? decimalValueString : ''} ${
-        state[name].asset.details?.symbol
+        draftTransaction.asset.details?.symbol
       }`;
     } else {
       const ethValue = getValueFromWeiHex({
@@ -1489,28 +1931,19 @@ export function updateSendAmount(amount) {
         toCurrency: ETH,
         numberOfDecimals: 8,
       });
-      logAmount = `${ethValue} ${ETH}`;
+      logAmount = `${ethValue} ${metamask?.provider?.ticker || ETH}`;
     }
     await dispatch(
       addHistoryEntry(`sendFlow - user set amount to ${logAmount}`),
     );
     await dispatch(actions.updateSendAmount(amount));
-    if (state.send.amount.mode === AMOUNT_MODES.MAX) {
+    if (state[name].amountMode === AMOUNT_MODES.MAX) {
       await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
     }
     await dispatch(computeEstimatedGasLimit());
   };
 }
 
-/**
- * Defines the shape for the details input parameter for updateSendAsset
- *
- * @typedef {Object} TokenDetails
- * @property {string} address - The contract address for the ERC20 token.
- * @property {string} decimals - The number of token decimals.
- * @property {string} symbol - The asset symbol to display.
- */
-
 /**
  * updates the asset to send to one of NATIVE or TOKEN and ensures that the
  * asset balance is set. If sending a TOKEN also updates the asset details
@@ -1520,154 +1953,178 @@ export function updateSendAmount(amount) {
  * @param {Object} payload - action payload
  * @param {string} payload.type - type of asset to send
  * @param {TokenDetails} [payload.details] - ERC20 details if sending TOKEN asset
+ * @returns {ThunkAction<void>}
  */
-export function updateSendAsset({ type, details }) {
+export function updateSendAsset(
+  { type, details: providedDetails },
+  { initialAssetSet = false } = {},
+) {
   return async (dispatch, getState) => {
-    dispatch(addHistoryEntry(`sendFlow - user set asset type to ${type}`));
-    dispatch(
-      addHistoryEntry(
-        `sendFlow - user set asset symbol to ${details?.symbol ?? 'undefined'}`,
-      ),
-    );
-    dispatch(
-      addHistoryEntry(
-        `sendFlow - user set asset address to ${
-          details?.address ?? 'undefined'
-        }`,
-      ),
-    );
     const state = getState();
-    let { balance, error } = state.send.asset;
-    const userAddress = state.send.account.address ?? getSelectedAddress(state);
-    if (type === ASSET_TYPES.TOKEN) {
-      if (details) {
-        if (details.standard === undefined) {
-          await dispatch(showLoadingIndication());
-          const { standard } = await getTokenStandardAndDetails(
-            details.address,
-            userAddress,
-          );
-          if (
-            process.env.COLLECTIBLES_V1 &&
-            (standard === ERC721 || standard === ERC1155)
-          ) {
-            await dispatch(hideLoadingIndication());
-            dispatch(
-              showModal({
-                name: 'CONVERT_TOKEN_TO_NFT',
-                tokenAddress: details.address,
-              }),
-            );
-            error = INVALID_ASSET_TYPE;
-            throw new Error(error);
-          }
-          details.standard = standard;
-        }
+    const draftTransaction =
+      state[name].draftTransactions[state[name].currentTransactionUUID];
+    const sendingAddress =
+      draftTransaction.fromAccount?.address ??
+      state[name].selectedAccount.address ??
+      getSelectedAddress(state);
+    const account = getTargetAccount(state, sendingAddress);
+    if (type === ASSET_TYPES.NATIVE) {
+      const unapprovedTxs = getUnapprovedTxs(state);
+      const unapprovedTx = unapprovedTxs?.[draftTransaction.id];
 
-        // if changing to a token, get the balance from the network. The asset
-        // overview page and asset list on the wallet overview page contain
-        // send buttons that call this method before initialization occurs.
-        // When this happens we don't yet have an account.address so default to
-        // the currently active account. In addition its possible for the balance
-        // check to take a decent amount of time, so we display a loading
-        // indication so that that immediate feedback is displayed to the user.
-        if (details.standard === ERC20) {
-          error = null;
-          balance = await getERC20Balance(details, userAddress);
-        }
-        await dispatch(hideLoadingIndication());
-      }
-    } else if (type === ASSET_TYPES.COLLECTIBLE) {
-      let isCurrentOwner = true;
-      try {
-        isCurrentOwner = await isCollectibleOwner(
-          getSelectedAddress(state),
-          details.address,
-          details.tokenId,
-        );
-      } catch (err) {
-        if (err.message.includes('Unable to verify ownership.')) {
-          // this would indicate that either our attempts to verify ownership failed because of network issues,
-          // or, somehow a token has been added to collectibles state with an incorrect chainId.
-        } else {
-          // Any other error is unexpected and should be surfaced.
-          dispatch(displayWarning(err.message));
-        }
+      await dispatch(
+        addHistoryEntry(
+          `sendFlow - user set asset of type ${
+            ASSET_TYPES.NATIVE
+          } with symbol ${state.metamask.provider?.ticker ?? ETH}`,
+        ),
+      );
+      await dispatch(
+        actions.updateAsset({
+          asset: {
+            type,
+            details: null,
+            balance: account.balance,
+            error: null,
+          },
+          initialAssetSet,
+        }),
+      );
+
+      // This is meant to handle cases where we are editing an unapprovedTx from the background state
+      // and its type is a token method. In such a case, the hex data will be the necessary hex data
+      // for calling the contract transfer method.
+      // Now that we are updating the transaction to be a send of a native asset type, we should
+      // set the hex data of the transaction being editing to be empty.
+      // then the user will not want to send any hex data now that they have change the
+      if (
+        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
+        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
+        unapprovedTx?.type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
+      ) {
+        await dispatch(actions.updateUserInputHexData(''));
       }
+    } else {
+      await dispatch(showLoadingIndication());
+      const details = {
+        ...providedDetails,
+        ...(await getTokenStandardAndDetails(
+          providedDetails.address,
+          sendingAddress,
+          providedDetails.tokenId,
+        )),
+      };
+      await dispatch(hideLoadingIndication());
+
+      const asset = {
+        type,
+        details,
+        error: null,
+      };
 
-      if (details.standard === undefined) {
-        const { standard } = await getTokenStandardAndDetails(
-          details.address,
-          userAddress,
+      if (details.standard === TOKEN_STANDARDS.ERC20) {
+        asset.balance = addHexPrefix(
+          calcTokenAmount(details.balance, details.decimals).toString(16),
         );
-        details.standard = standard;
-      }
 
-      if (details.standard === ERC1155) {
+        await dispatch(
+          addHistoryEntry(
+            `sendFlow - user set asset to ERC20 token with symbol ${details.symbol} and address ${details.address}`,
+          ),
+        );
+      } else if (
+        details.standard === TOKEN_STANDARDS.ERC1155 &&
+        type === ASSET_TYPES.COLLECTIBLE
+      ) {
         throw new Error('Sends of ERC1155 tokens are not currently supported');
-      }
+      } else if (
+        details.standard === TOKEN_STANDARDS.ERC1155 ||
+        details.standard === TOKEN_STANDARDS.ERC721
+      ) {
+        if (type === ASSET_TYPES.TOKEN && process.env.COLLECTIBLES_V1) {
+          dispatch(
+            showModal({
+              name: 'CONVERT_TOKEN_TO_NFT',
+              tokenAddress: details.address,
+            }),
+          );
+          asset.error = INVALID_ASSET_TYPE;
+          throw new Error(INVALID_ASSET_TYPE);
+        } else {
+          let isCurrentOwner = true;
+          try {
+            isCurrentOwner = await isCollectibleOwner(
+              sendingAddress,
+              details.address,
+              details.tokenId,
+            );
+          } catch (err) {
+            if (err.message.includes('Unable to verify ownership.')) {
+              // this would indicate that either our attempts to verify ownership failed because of network issues,
+              // or, somehow a token has been added to collectibles state with an incorrect chainId.
+            } else {
+              // Any other error is unexpected and should be surfaced.
+              dispatch(displayWarning(err.message));
+            }
+          }
 
-      if (isCurrentOwner) {
-        error = null;
-        balance = '0x1';
-      } else {
-        throw new Error(
-          'Send slice initialized as collectible send with a collectible not currently owned by the select account',
-        );
+          if (isCurrentOwner) {
+            asset.error = null;
+            asset.balance = '0x1';
+          } else {
+            throw new Error(
+              'Send slice initialized as collectible send with a collectible not currently owned by the select account',
+            );
+          }
+          await dispatch(
+            addHistoryEntry(
+              `sendFlow - user set asset to NFT with tokenId ${details.tokenId} and address ${details.address}`,
+            ),
+          );
+        }
       }
-    } else {
-      error = null;
-      // if changing to native currency, get it from the account key in send
-      // state which is kept in sync when accounts change.
-      balance = state.send.account.balance;
+
+      await dispatch(actions.updateAsset({ asset, initialAssetSet }));
+    }
+    if (initialAssetSet === false) {
+      await dispatch(computeEstimatedGasLimit());
     }
-    // update the asset in state which will re-run amount and gas validation
-    await dispatch(actions.updateAsset({ type, details, balance, error }));
-    await dispatch(computeEstimatedGasLimit());
   };
 }
 
 /**
- * This method is for usage when validating user input so that validation
- * is only run after a delay in typing of 300ms. Usage at callsites requires
- * passing in both the dispatch method and the payload to dispatch, which makes
- * it only applicable for use within action creators.
- */
-const debouncedValidateRecipientUserInput = debounce((dispatch, payload) => {
-  dispatch(
-    addHistoryEntry(
-      `sendFlow - user typed ${payload.userInput} into recipient input field`,
-    ),
-  );
-  dispatch(validateRecipientUserInput(payload));
-}, 300);
-
-/**
- * This method is called to update the user's input into the ENS input field.
- * Once the field is updated, the field will be validated using a debounced
- * version of the validateRecipientUserInput action. This way validation only
- * occurs once the user has stopped typing.
+ * When a user has enabled hex data field in advanced settings they will be
+ * able to supply hex data on a transaction. This method updates the user
+ * supplied data. Note, when sending native assets this will result in
+ * recomputing estimated gasLimit. When sending a ERC20 asset this is not done
+ * because the data sent in the transaction will be determined by the asset,
+ * recipient and value, NOT what the user has supplied.
  *
- * @param {string} userInput - the value that the user is typing into the field
+ * @param {string} hexData - hex encoded string representing transaction data.
+ * @returns {ThunkAction<void>}
  */
-export function updateRecipientUserInput(userInput) {
+export function updateSendHexData(hexData) {
   return async (dispatch, getState) => {
-    await dispatch(actions.updateRecipientUserInput(userInput));
+    await dispatch(
+      addHistoryEntry(`sendFlow - user added custom hexData ${hexData}`),
+    );
+
+    await dispatch(actions.updateUserInputHexData(hexData));
     const state = getState();
-    const chainId = getCurrentChainId(state);
-    const tokens = getTokens(state);
-    const useTokenDetection = getUseTokenDetection(state);
-    const tokenAddressList = Object.keys(getTokenList(state));
-    debouncedValidateRecipientUserInput(dispatch, {
-      userInput,
-      chainId,
-      tokens,
-      useTokenDetection,
-      tokenAddressList,
-    });
+    const draftTransaction =
+      state[name].draftTransactions[state[name].currentTransactionUUID];
+    if (draftTransaction.asset.type === ASSET_TYPES.NATIVE) {
+      await dispatch(computeEstimatedGasLimit());
+    }
   };
 }
 
+/**
+ * Sets the recipient search mode to show a list of the user's contacts and
+ * recently interacted with addresses.
+ *
+ * @returns {ThunkAction<void>}
+ */
 export function useContactListForRecipientSearch() {
   return (dispatch) => {
     dispatch(
@@ -1679,6 +2136,11 @@ export function useContactListForRecipientSearch() {
   };
 }
 
+/**
+ * Sets the recipient search mode to show a list of the user's own accounts.
+ *
+ * @returns {ThunkAction<void>}
+ */
 export function useMyAccountsForRecipientSearch() {
   return (dispatch) => {
     dispatch(
@@ -1690,41 +2152,10 @@ export function useMyAccountsForRecipientSearch() {
   };
 }
 
-/**
- * Updates the recipient in state based on the input provided, and then will
- * recompute gas limit when sending a TOKEN asset type. Changing the recipient
- * address results in hex data changing because the recipient address is
- * encoded in the data instead of being in the 'to' field. The to field in a
- * token send will always be the token contract address.
- * If no nickname is provided, the address book state will be checked to see if
- * a nickname for the passed address has already been saved. This ensures the
- * (temporary) send state recipient nickname is consistent with the address book
- * nickname which has already been persisted to state.
- *
- * @param {Object} recipient - Recipient information
- * @param {string} recipient.address - hex address to send the transaction to
- * @param {string} [recipient.nickname] - Alias for the address to display
- *  to the user
- */
-export function updateRecipient({ address, nickname }) {
-  return async (dispatch, getState) => {
-    // Do not addHistoryEntry here as this is called from a number of places
-    // each with significance to the user and transaction history.
-    const state = getState();
-    const nicknameFromAddressBookEntryOrAccountName =
-      getAddressBookEntryOrAccountName(state, address) ?? '';
-    await dispatch(
-      actions.updateRecipient({
-        address,
-        nickname: nickname || nicknameFromAddressBookEntryOrAccountName,
-      }),
-    );
-    await dispatch(computeEstimatedGasLimit());
-  };
-}
-
 /**
  * Clears out the recipient user input, ENS resolution and recipient validation.
+ *
+ * @returns {ThunkAction<void>}
  */
 export function resetRecipientInput() {
   return async (dispatch) => {
@@ -1737,47 +2168,20 @@ export function resetRecipientInput() {
 }
 
 /**
- * When a user has enabled hex data field in advanced settings they will be
- * able to supply hex data on a transaction. This method updates the user
- * supplied data. Note, when sending native assets this will result in
- * recomputing estimated gasLimit. When sending a ERC20 asset this is not done
- * because the data sent in the transaction will be determined by the asset,
- * recipient and value, NOT what the user has supplied.
+ * Resets the entire send state tree to the initial state. It also disconnects
+ * polling from the gas controller if the token is present in state.
  *
- * @param {string} hexData - hex encoded string representing transaction data.
+ * @returns {ThunkAction<void>}
  */
-export function updateSendHexData(hexData) {
+export function resetSendState() {
   return async (dispatch, getState) => {
-    await dispatch(
-      addHistoryEntry(`sendFlow - user added custom hexData ${hexData}`),
-    );
-    await dispatch(actions.updateUserInputHexData(hexData));
     const state = getState();
-    if (state.send.asset.type === ASSET_TYPES.NATIVE) {
-      await dispatch(computeEstimatedGasLimit());
-    }
-  };
-}
+    dispatch(actions.resetSendState());
 
-/**
- * Toggles the amount.mode between INPUT and MAX modes.
- * As a result, the amount.value will change to either '0x0' when moving from
- * MAX to INPUT, or to the maximum allowable amount based on current asset when
- * moving from INPUT to MAX.
- */
-export function toggleSendMaxMode() {
-  return async (dispatch, getState) => {
-    const state = getState();
-    if (state.send.amount.mode === AMOUNT_MODES.MAX) {
-      await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
-      await dispatch(actions.updateSendAmount('0x0'));
-      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode off`));
-    } else {
-      await dispatch(actions.updateAmountMode(AMOUNT_MODES.MAX));
-      await dispatch(actions.updateAmountToMax());
-      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode on`));
+    if (state[name].gasEstimatePollToken) {
+      await disconnectGasFeeEstimatePoller(state[name].gasEstimatePollToken);
+      removePollingTokenFromAppState(state[name].gasEstimatePollToken);
     }
-    await dispatch(computeEstimatedGasLimit());
   };
 }
 
@@ -1788,16 +2192,16 @@ export function toggleSendMaxMode() {
  * will create the transaction in state (by way of the various global provider
  * constructs) which will eventually (and fairly quickly from user perspective)
  * result in a confirmation window being displayed for the transaction.
+ *
+ * @returns {ThunkAction<void>}
  */
 export function signTransaction() {
   return async (dispatch, getState) => {
     const state = getState();
-    const {
-      asset,
-      stage,
-      draftTransaction: { id, txParams },
-      eip1559support,
-    } = state[name];
+    const { stage, eip1559support } = state[name];
+    const txParams = generateTransactionParams(state[name]);
+    const draftTransaction =
+      state[name].draftTransactions[state[name].currentTransactionUUID];
     if (stage === SEND_STAGES.EDIT) {
       // When dealing with the edit flow there is already a transaction in
       // state that we must update, this branch is responsible for that logic.
@@ -1805,7 +2209,7 @@ export function signTransaction() {
       // merge in the modified txParams. Once the transaction has been modified
       // we can send that to the background to update the transaction in state.
       const unapprovedTxs = getUnapprovedTxs(state);
-      const unapprovedTx = unapprovedTxs[id];
+      const unapprovedTx = unapprovedTxs[draftTransaction.id];
       // We only update the tx params that can be changed via the edit flow UX
       const eip1559OnlyTxParamsToUpdate = {
         data: txParams.data,
@@ -1824,20 +2228,30 @@ export function signTransaction() {
           eip1559support ? eip1559OnlyTxParamsToUpdate : txParams,
         ),
       };
+
       await dispatch(
         addHistoryEntry(
           `sendFlow - user clicked next and transaction should be updated in controller`,
         ),
       );
-      await dispatch(updateTransactionSendFlowHistory(id, state[name].history));
-      dispatch(updateEditableParams(id, editingTx.txParams));
-      dispatch(updateTransactionGasFees(id, editingTx.txParams));
+      await dispatch(
+        updateTransactionSendFlowHistory(
+          draftTransaction.id,
+          draftTransaction.history,
+        ),
+      );
+      await dispatch(
+        updateEditableParams(draftTransaction.id, editingTx.txParams),
+      );
+      await dispatch(
+        updateTransactionGasFees(draftTransaction.id, editingTx.txParams),
+      );
     } else {
       let transactionType = TRANSACTION_TYPES.SIMPLE_SEND;
 
-      if (asset.type !== ASSET_TYPES.NATIVE) {
+      if (draftTransaction.asset.type !== ASSET_TYPES.NATIVE) {
         transactionType =
-          asset.type === ASSET_TYPES.COLLECTIBLE
+          draftTransaction.asset.type === ASSET_TYPES.COLLECTIBLE
             ? TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM
             : TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER;
       }
@@ -1851,155 +2265,168 @@ export function signTransaction() {
         addUnapprovedTransactionAndRouteToConfirmationPage(
           txParams,
           transactionType,
-          state[name].history,
+          draftTransaction.history,
         ),
       );
     }
   };
 }
 
-export function editTransaction(
-  assetType,
-  transactionId,
-  tokenData,
-  assetDetails,
-) {
+/**
+ * Toggles the amount.mode between INPUT and MAX modes.
+ * As a result, the amount.value will change to either '0x0' when moving from
+ * MAX to INPUT, or to the maximum allowable amount based on current asset when
+ * moving from INPUT to MAX.
+ *
+ * @returns {ThunkAction<void>}
+ */
+export function toggleSendMaxMode() {
   return async (dispatch, getState) => {
     const state = getState();
+    if (state[name].amountMode === AMOUNT_MODES.MAX) {
+      await dispatch(actions.updateAmountMode(AMOUNT_MODES.INPUT));
+      await dispatch(actions.updateSendAmount('0x0'));
+      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode off`));
+    } else {
+      await dispatch(actions.updateAmountMode(AMOUNT_MODES.MAX));
+      await dispatch(actions.updateAmountToMax());
+      await dispatch(addHistoryEntry(`sendFlow - user toggled max mode on`));
+    }
+    await dispatch(computeEstimatedGasLimit());
+  };
+}
+
+/**
+ * Begins a new draft transaction, clearing out the previous draft transactions
+ * from state, and clearing the currentTransactionUUID. This action is one of
+ * the two entry points into the send flow. NOTE: You must route to the send
+ * page *after* dispatching this action resolves to ensure that the
+ * draftTransaction is properly created.
+ *
+ * @param {Pick<Asset, 'type' | 'details'>} asset - A partial asset
+ *  object containing at least the asset type. If specifying a non-native asset
+ *  then the asset details must be included with at least the address.
+ * @returns {ThunkAction<void>}
+ */
+export function startNewDraftTransaction(asset) {
+  return async (dispatch) => {
+    await dispatch(actions.clearPreviousDrafts());
+
     await dispatch(
-      addHistoryEntry(
-        `sendFlow - user clicked edit on transaction with id ${transactionId}`,
-      ),
+      actions.addNewDraft({
+        ...draftTransactionInitialState,
+        history: [`sendFlow - User started new draft transaction`],
+      }),
     );
-    const unapprovedTransactions = getUnapprovedTxs(state);
-    const transaction = unapprovedTransactions[transactionId];
-    const { txParams } = transaction;
-    if (assetType === ASSET_TYPES.NATIVE) {
-      const {
-        data,
-        from,
-        gas: gasLimit,
-        gasPrice,
-        to: address,
-        value: amount,
-      } = txParams;
-      const nickname = getAddressBookEntry(state, address)?.name ?? '';
-      await dispatch(
-        actions.editTransaction({
-          data,
-          id: transactionId,
-          gasLimit,
-          gasPrice,
-          from,
-          amount,
-          address,
-          nickname,
-        }),
-      );
-    } else if (!tokenData || !assetDetails) {
-      throw new Error(
-        `send/editTransaction dispatched with assetType 'TOKEN' but missing assetData or assetDetails parameter`,
-      );
-    } else if (assetType === ASSET_TYPES.TOKEN) {
-      const {
-        data,
-        from,
-        to: tokenAddress,
-        gas: gasLimit,
-        gasPrice,
-      } = txParams;
-      const tokenAmountInDec = getTokenValueParam(tokenData);
-      const address = getTokenAddressParam(tokenData);
-      const nickname = getAddressBookEntry(state, address)?.name ?? '';
 
-      const tokenAmountInHex = addHexPrefix(
-        conversionUtil(tokenAmountInDec, {
-          fromNumericBase: 'dec',
-          toNumericBase: 'hex',
-        }),
-      );
+    await dispatch(
+      updateSendAsset({
+        type: asset.type ?? ASSET_TYPES.NATIVE,
+        details: asset.details,
+      }),
+    );
 
-      await dispatch(
-        updateSendAsset({
-          type: ASSET_TYPES.TOKEN,
-          details: { ...assetDetails, address: tokenAddress },
-        }),
-      );
+    await dispatch(initializeSendState());
+  };
+}
 
-      await dispatch(
-        actions.editTransaction({
-          data,
-          id: transactionId,
-          gasLimit,
-          gasPrice,
-          from,
-          amount: tokenAmountInHex,
-          address,
-          nickname,
-        }),
-      );
-    } else if (assetType === ASSET_TYPES.COLLECTIBLE) {
-      const {
-        data,
-        from,
-        to: tokenAddress,
-        gas: gasLimit,
-        gasPrice,
-      } = txParams;
-      const address = getTokenAddressParam(tokenData);
-      const nickname = getAddressBookEntry(state, address)?.name ?? '';
+// Selectors
+/**
+ * The following typedef is a shortcut for typing selectors below. It uses a
+ * generic type, T, so that each selector can specify it's return type.
+ *
+ * @template T
+ * @typedef {(state: MetaMaskState) => T} Selector
+ */
 
-      await dispatch(
-        updateSendAsset({
-          type: ASSET_TYPES.COLLECTIBLE,
-          details: { ...assetDetails, address: tokenAddress },
-        }),
-      );
+/**
+ * Selector that returns the current draft transaction's UUID.
+ *
+ * @type {Selector<string>}
+ */
+export function getCurrentTransactionUUID(state) {
+  return state[name].currentTransactionUUID;
+}
 
-      await dispatch(
-        actions.editTransaction({
-          data,
-          id: transactionId,
-          gasLimit,
-          gasPrice,
-          from,
-          amount: '0x1',
-          address,
-          nickname,
-        }),
-      );
-    }
-  };
+/**
+ * Selector that returns the current draft transaction.
+ *
+ * @type {Selector<DraftTransaction>}
+ */
+export function getCurrentDraftTransaction(state) {
+  return state[name].draftTransactions[getCurrentTransactionUUID(state)] ?? {};
 }
 
-// Selectors
+/**
+ * Selector that returns true if a draft transaction exists.
+ *
+ * @type {Selector<boolean>}
+ */
+export function getDraftTransactionExists(state) {
+  const draftTransaction = getCurrentDraftTransaction(state);
+  if (Object.keys(draftTransaction).length === 0) {
+    return false;
+  }
+  return true;
+}
 
 // Gas selectors
+
+/**
+ * Selector that returns the current draft transaction's gasLimit.
+ *
+ * @type {Selector<?string>}
+ */
 export function getGasLimit(state) {
-  return state[name].gas.gasLimit;
+  return getCurrentDraftTransaction(state).gas?.gasLimit;
 }
 
+/**
+ * Selector that returns the current draft transaction's gasPrice.
+ *
+ * @type {Selector<?string>}
+ */
 export function getGasPrice(state) {
-  return state[name].gas.gasPrice;
+  return getCurrentDraftTransaction(state).gas?.gasPrice;
 }
 
+/**
+ * Selector that returns the current draft transaction's gasTotal.
+ *
+ * @type {Selector<?string>}
+ */
 export function getGasTotal(state) {
-  return state[name].gas.gasTotal;
+  return getCurrentDraftTransaction(state).gas?.gasTotal;
 }
 
+/**
+ * Selector that returns the error, if present, for the gas fields.
+ *
+ * @type {Selector<?string>}
+ */
 export function gasFeeIsInError(state) {
-  return Boolean(state[name].gas.error);
+  return Boolean(getCurrentDraftTransaction(state).gas?.error);
 }
 
+/**
+ * Selector that returns the minimum gasLimit for the current network.
+ *
+ * @type {Selector<string>}
+ */
 export function getMinimumGasLimitForSend(state) {
-  return state[name].gas.minimumGasLimit;
+  return state[name].gasLimitMinimum;
 }
 
+/**
+ * Selector that returns the current draft transaction's gasLimit.
+ *
+ * @type {Selector<MapValuesToUnion<SendStateGasModes>>}
+ */
 export function getGasInputMode(state) {
   const isMainnet = getIsMainnet(state);
   const gasEstimateType = getGasEstimateType(state);
   const showAdvancedGasFields = getAdvancedInlineGasShown(state);
-  if (state[name].gas.isCustomGasSet) {
+  if (state[name].gasIsSetInModal) {
     return GAS_INPUT_MODES.CUSTOM;
   }
   if ((!isMainnet && !process.env.IN_TEST) || showAdvancedGasFields) {
@@ -2019,84 +2446,207 @@ export function getGasInputMode(state) {
 }
 
 // Asset Selectors
+/**
+ * Selector that returns the asset the current draft transaction is sending.
+ *
+ * @type {Selector<?Asset>}
+ */
 export function getSendAsset(state) {
-  return state[name].asset;
+  return getCurrentDraftTransaction(state).asset;
 }
 
+/**
+ * Selector that returns the contract address of the non-native asset that
+ * the current transaction is sending, if it exists.
+ *
+ * @type {Selector<?string>}
+ */
 export function getSendAssetAddress(state) {
   return getSendAsset(state)?.details?.address;
 }
 
+/**
+ * Selector that returns a boolean value describing whether the currently
+ * selected asset is sendable, based upon the standard of the token.
+ *
+ * @type {Selector<boolean>}
+ */
 export function getIsAssetSendable(state) {
-  if (state[name].asset.type === ASSET_TYPES.NATIVE) {
+  if (getSendAsset(state)?.type === ASSET_TYPES.NATIVE) {
     return true;
   }
-  return state[name].asset.details.isERC721 === false;
+  return getSendAsset(state)?.details?.isERC721 === false;
 }
 
+/**
+ * Selector that returns the asset error if it exists.
+ *
+ * @type {Selector<?string>}
+ */
 export function getAssetError(state) {
-  return state[name].asset.error;
+  return getSendAsset(state).error;
 }
 
 // Amount Selectors
+/**
+ * Selector that returns the amount that current draft transaction is sending.
+ *
+ * @type {Selector<?string>}
+ */
 export function getSendAmount(state) {
-  return state[name].amount.value;
+  return getCurrentDraftTransaction(state).amount?.value;
 }
 
+/**
+ * Selector that returns true if the user has enough native asset balance to
+ * cover the cost of the transaction.
+ *
+ * @type {Selector<boolean>}
+ */
 export function getIsBalanceInsufficient(state) {
-  return state[name].gas.error === INSUFFICIENT_FUNDS_ERROR;
+  return (
+    getCurrentDraftTransaction(state).gas?.error === INSUFFICIENT_FUNDS_ERROR
+  );
 }
+
+/**
+ * Selector that returns the amoung send mode, either MAX or INPUT.
+ *
+ * @type {Selector<boolean>}
+ */
 export function getSendMaxModeState(state) {
-  return state[name].amount.mode === AMOUNT_MODES.MAX;
+  return state[name].amountMode === AMOUNT_MODES.MAX;
 }
 
+/**
+ * Selector that returns the current draft transaction's data field.
+ *
+ * @type {Selector<?string>}
+ */
 export function getSendHexData(state) {
-  return state[name].draftTransaction.userInputHexData;
+  return getCurrentDraftTransaction(state).userInputHexData;
 }
 
+/**
+ * Selector that returns the current draft transaction's id, if present.
+ *
+ * @type {Selector<?string>}
+ */
 export function getDraftTransactionID(state) {
-  return state[name].draftTransaction.id;
+  return getCurrentDraftTransaction(state).id;
 }
 
+/**
+ * Selector that returns true if there is an error on the amount field.
+ *
+ * @type {Selector<boolean>}
+ */
 export function sendAmountIsInError(state) {
-  return Boolean(state[name].amount.error);
+  return Boolean(getCurrentDraftTransaction(state).amount?.error);
 }
 
 // Recipient Selectors
+/**
+ * Selector that returns the current draft transaction's recipient.
+ *
+ * @type {Selector<DraftTransaction['recipient']>}
+ */
+export function getRecipient(state) {
+  const draft = getCurrentDraftTransaction(state);
+  if (!draft.recipient) {
+    return {
+      address: '',
+      nickname: '',
+      error: null,
+      warning: null,
+    };
+  }
+  const checksummedAddress = toChecksumHexAddress(draft.recipient.address);
+  if (state.metamask.ensResolutionsByAddress) {
+    return {
+      ...draft.recipient,
+      nickname:
+        draft.recipient.nickname ||
+        getEnsResolutionByAddress(state, checksummedAddress),
+    };
+  }
+  return draft.recipient;
+}
 
+/**
+ * Selector that returns the addres of the current draft transaction's
+ * recipient.
+ *
+ * @type {Selector<?string>}
+ */
 export function getSendTo(state) {
-  return state[name].recipient.address;
+  return getRecipient(state)?.address;
 }
 
+/**
+ * Selector that returns true if the current recipientMode is MY_ACCOUNTS
+ *
+ * @type {Selector<boolean>}
+ */
 export function getIsUsingMyAccountForRecipientSearch(state) {
-  return state[name].recipient.mode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS;
+  return state[name].recipientMode === RECIPIENT_SEARCH_MODES.MY_ACCOUNTS;
 }
 
+/**
+ * Selector that returns the value that the user has typed into the recipient
+ * input field.
+ *
+ * @type {Selector<?string>}
+ */
 export function getRecipientUserInput(state) {
-  return state[name].recipient.userInput;
+  return state[name].recipientInput;
 }
 
-export function getRecipient(state) {
-  return state[name].recipient;
+export function getRecipientWarningAcknowledgement(state) {
+  return (
+    getCurrentDraftTransaction(state).recipient?.recipientWarningAcknowledged ??
+    false
+  );
 }
 
 // Overall validity and stage selectors
 
+/**
+ * Selector that returns the gasFee and amount errors, if they exist.
+ *
+ * @type {Selector<{ gasFee?: string, amount?: string}>}
+ */
 export function getSendErrors(state) {
   return {
-    gasFee: state.send.gas.error,
-    amount: state.send.amount.error,
+    gasFee: getCurrentDraftTransaction(state).gas?.error,
+    amount: getCurrentDraftTransaction(state).amount?.error,
   };
 }
 
+/**
+ * Selector that returns true if the stage is anything except INACTIVE
+ *
+ * @type {Selector<boolean>}
+ */
 export function isSendStateInitialized(state) {
   return state[name].stage !== SEND_STAGES.INACTIVE;
 }
 
+/**
+ * Selector that returns true if the current draft transaction is valid and in
+ * a sendable state.
+ *
+ * @type {Selector<boolean>}
+ */
 export function isSendFormInvalid(state) {
-  return state[name].status === SEND_STATUSES.INVALID;
+  return getCurrentDraftTransaction(state).status === SEND_STATUSES.INVALID;
 }
 
+/**
+ * Selector that returns the current stage of the send flow
+ *
+ * @type {Selector<MapValuesToUnion<SendStateStages>>}
+ */
 export function getSendStage(state) {
   return state[name].stage;
 }
diff --git a/ui/ducks/send/send.test.js b/ui/ducks/send/send.test.js
index a8466753bbda..9dd31a67c2bf 100644
--- a/ui/ducks/send/send.test.js
+++ b/ui/ducks/send/send.test.js
@@ -17,11 +17,20 @@ import {
 import { GAS_ESTIMATE_TYPES, GAS_LIMITS } from '../../../shared/constants/gas';
 import {
   ASSET_TYPES,
+  TOKEN_STANDARDS,
   TRANSACTION_ENVELOPE_TYPES,
-  TRANSACTION_TYPES,
 } from '../../../shared/constants/transaction';
 import * as Actions from '../../store/actions';
 import { setBackgroundConnection } from '../../../test/jest';
+import {
+  generateERC20TransferData,
+  generateERC721TransferData,
+} from '../../pages/send/send.utils';
+import { BURN_ADDRESS } from '../../../shared/modules/hexstring-utils';
+import {
+  getInitialSendStateWithExistingTxState,
+  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+} from '../../../test/jest/mocks';
 import sendReducer, {
   initialState,
   initializeSendState,
@@ -39,7 +48,6 @@ import sendReducer, {
   SEND_STAGES,
   AMOUNT_MODES,
   RECIPIENT_SEARCH_MODES,
-  editTransaction,
   getGasLimit,
   getGasPrice,
   getGasTotal,
@@ -66,6 +74,7 @@ import sendReducer, {
   getSendStage,
   updateGasPrice,
 } from './send';
+import { draftTransactionInitialState, editExistingTransaction } from '.';
 
 const mockStore = createMockStore([thunk]);
 
@@ -78,6 +87,11 @@ jest.mock('./send', () => {
   };
 });
 
+jest.mock('lodash', () => ({
+  ...jest.requireActual('lodash'),
+  debounce: (fn) => fn,
+}));
+
 setBackgroundConnection({
   addPollingTokenToAppState: jest.fn(),
   addUnapprovedTransaction: jest.fn((_w, _x, _y, _z, cb) => {
@@ -86,13 +100,27 @@ setBackgroundConnection({
   updateTransactionSendFlowHistory: jest.fn((_x, _y, cb) => cb(null)),
 });
 
+const getTestUUIDTx = (state) => state.draftTransactions['test-uuid'];
+
 describe('Send Slice', () => {
   let getTokenStandardAndDetailsStub;
+  let addUnapprovedTransactionAndRouteToConfirmationPageStub;
   beforeEach(() => {
     jest.useFakeTimers();
     getTokenStandardAndDetailsStub = jest
       .spyOn(Actions, 'getTokenStandardAndDetails')
-      .mockImplementation(() => Promise.resolve({ standard: 'ERC20' }));
+      .mockImplementation(() =>
+        Promise.resolve({
+          standard: 'ERC20',
+          balance: '0x0',
+          symbol: 'SYMB',
+          decimals: 18,
+        }),
+      );
+    addUnapprovedTransactionAndRouteToConfirmationPageStub = jest.spyOn(
+      Actions,
+      'addUnapprovedTransactionAndRouteToConfirmationPage',
+    );
     jest
       .spyOn(Actions, 'estimateGas')
       .mockImplementation(() => Promise.resolve('0x0'));
@@ -114,11 +142,130 @@ describe('Send Slice', () => {
   });
 
   describe('Reducers', () => {
+    describe('addNewDraft', () => {
+      it('should add new draft transaction and set currentTransactionUUID', () => {
+        const action = {
+          type: 'send/addNewDraft',
+          payload: { ...draftTransactionInitialState, id: 4 },
+        };
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
+        const uuid = result.currentTransactionUUID;
+        const draft = result.draftTransactions[uuid];
+        expect(draft.id).toStrictEqual(4);
+      });
+    });
+    describe('addHistoryEntry', () => {
+      it('should append a history item to the current draft transaction, including timestamp', () => {
+        const action = {
+          type: 'send/addHistoryEntry',
+          payload: 'test entry',
+        };
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
+        const draft = getTestUUIDTx(result);
+        const latestHistory = draft.history[draft.history.length - 1];
+        expect(latestHistory.timestamp).toBeDefined();
+        expect(latestHistory.entry).toStrictEqual('test entry');
+      });
+    });
+    describe('calculateGasTotal', () => {
+      it('should set gasTotal to maxFeePerGax * gasLimit for FEE_MARKET transaction', () => {
+        const action = {
+          type: 'send/calculateGasTotal',
+        };
+        const result = sendReducer(
+          getInitialSendStateWithExistingTxState({
+            gas: {
+              gasPrice: '0x1',
+              maxFeePerGas: '0x2',
+              gasLimit: GAS_LIMITS.SIMPLE,
+            },
+            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
+          }),
+          action,
+        );
+        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
+        const draft = getTestUUIDTx(result);
+        expect(draft.gas.gasTotal).toStrictEqual(`0xa410`);
+      });
+
+      it('should set gasTotal to gasPrice * gasLimit for non FEE_MARKET transaction', () => {
+        const action = {
+          type: 'send/calculateGasTotal',
+        };
+        const result = sendReducer(
+          getInitialSendStateWithExistingTxState({
+            gas: {
+              gasPrice: '0x1',
+              maxFeePerGas: '0x2',
+              gasLimit: GAS_LIMITS.SIMPLE,
+            },
+          }),
+          action,
+        );
+        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
+        const draft = getTestUUIDTx(result);
+        expect(draft.gas.gasTotal).toStrictEqual(GAS_LIMITS.SIMPLE);
+      });
+
+      it('should call updateAmountToMax if amount mode is max', () => {
+        const action = {
+          type: 'send/calculateGasTotal',
+        };
+        const result = sendReducer(
+          {
+            ...getInitialSendStateWithExistingTxState({
+              asset: { balance: '0xffff' },
+              gas: {
+                gasPrice: '0x1',
+                gasLimit: GAS_LIMITS.SIMPLE,
+              },
+              recipient: {
+                address: '0x00',
+              },
+            }),
+            selectedAccount: {
+              balance: '0xffff',
+              address: '0x00',
+            },
+            gasEstimateIsLoading: false,
+            amountMode: AMOUNT_MODES.MAX,
+            stage: SEND_STAGES.DRAFT,
+          },
+          action,
+        );
+        expect(result.currentTransactionUUID).toStrictEqual('test-uuid');
+        const draft = getTestUUIDTx(result);
+        expect(draft.amount.value).toStrictEqual('0xadf7');
+        expect(draft.status).toStrictEqual(SEND_STATUSES.VALID);
+      });
+    });
+    describe('resetSendState', () => {
+      it('should set the state back to a blank slate matching the initialState object', () => {
+        const action = {
+          type: 'send/resetSendState',
+        };
+
+        const result = sendReducer({}, action);
+
+        expect(result).toStrictEqual(initialState);
+      });
+    });
     describe('updateSendAmount', () => {
       it('should', async () => {
         const action = { type: 'send/updateSendAmount', payload: '0x1' };
-        const result = sendReducer(initialState, action);
-        expect(result.amount.value).toStrictEqual('0x1');
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+        expect(getTestUUIDTx(result).amount.value).toStrictEqual('0x1');
       });
     });
 
@@ -132,17 +279,19 @@ describe('Send Slice', () => {
             balance: '0x56bc75e2d63100000', // 100000000000000000000
           },
           gas: {
-            gasLimit: '0x5208', // 21000
+            gasLimit: GAS_LIMITS.SIMPLE, // 21000
             gasTotal: '0x1319718a5000', // 21000000000000
-            minimumGasLimit: '0x5208',
+            minimumGasLimit: GAS_LIMITS.SIMPLE,
           },
         };
 
-        const state = { ...initialState, ...maxAmountState };
+        const state = getInitialSendStateWithExistingTxState(maxAmountState);
         const action = { type: 'send/updateAmountToMax' };
         const result = sendReducer(state, action);
 
-        expect(result.amount.value).toStrictEqual('0x56bc74b13f185b000'); // 99999979000000000000
+        expect(getTestUUIDTx(result).amount.value).toStrictEqual(
+          '0x56bc74b13f185b000',
+        ); // 99999979000000000000
       });
     });
 
@@ -156,17 +305,22 @@ describe('Send Slice', () => {
             maxPriorityFeePerGas: '0x1',
           },
         };
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+
+        const draftTransaction = getTestUUIDTx(result);
 
-        expect(result.gas.maxFeePerGas).toStrictEqual(
+        expect(draftTransaction.gas.maxFeePerGas).toStrictEqual(
           action.payload.maxFeePerGas,
         );
 
-        expect(result.gas.maxPriorityFeePerGas).toStrictEqual(
+        expect(draftTransaction.gas.maxPriorityFeePerGas).toStrictEqual(
           action.payload.maxPriorityFeePerGas,
         );
 
-        expect(result.transactionType).toBe(
+        expect(draftTransaction.transactionType).toBe(
           TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
         );
       });
@@ -179,10 +333,19 @@ describe('Send Slice', () => {
             gasPrice: '0x1',
           },
         };
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+
+        const draftTransaction = getTestUUIDTx(result);
 
-        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
-        expect(result.transactionType).toBe(TRANSACTION_ENVELOPE_TYPES.LEGACY);
+        expect(draftTransaction.gas.gasPrice).toStrictEqual(
+          action.payload.gasPrice,
+        );
+        expect(draftTransaction.transactionType).toBe(
+          TRANSACTION_ENVELOPE_TYPES.LEGACY,
+        );
       });
     });
 
@@ -192,59 +355,59 @@ describe('Send Slice', () => {
           type: 'send/updateUserInputHexData',
           payload: 'TestData',
         };
-        const result = sendReducer(initialState, action);
-
-        expect(result.draftTransaction.userInputHexData).toStrictEqual(
-          action.payload,
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
         );
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.userInputHexData).toStrictEqual(action.payload);
       });
     });
 
     describe('updateGasLimit', () => {
       const action = {
         type: 'send/updateGasLimit',
-        payload: '0x5208', // 21000
+        payload: GAS_LIMITS.SIMPLE, // 21000
       };
 
       it('should', () => {
         const result = sendReducer(
           {
-            ...initialState,
+            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
             stage: SEND_STAGES.DRAFT,
-            gas: { ...initialState.gas, isGasEstimateLoading: false },
+            gasEstimateIsLoading: false,
           },
           action,
         );
 
-        expect(result.gas.gasLimit).toStrictEqual(action.payload);
-        expect(result.draftTransaction.txParams.gas).toStrictEqual(
-          action.payload,
-        );
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.gas.gasLimit).toStrictEqual(action.payload);
       });
 
       it('should recalculate gasTotal', () => {
-        const gasState = {
-          ...initialState,
+        const gasState = getInitialSendStateWithExistingTxState({
           gas: {
             gasLimit: '0x0',
             gasPrice: '0x3b9aca00', // 1000000000
           },
-        };
+        });
 
         const result = sendReducer(gasState, action);
 
-        expect(result.gas.gasLimit).toStrictEqual(action.payload);
-        expect(result.gas.gasPrice).toStrictEqual(gasState.gas.gasPrice);
-        expect(result.gas.gasTotal).toStrictEqual('0x1319718a5000'); // 21000000000000
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.gas.gasLimit).toStrictEqual(action.payload);
+        expect(draftTransaction.gas.gasPrice).toStrictEqual('0x3b9aca00');
+        expect(draftTransaction.gas.gasTotal).toStrictEqual('0x1319718a5000'); // 21000000000000
       });
     });
 
     describe('updateAmountMode', () => {
       it('should change to INPUT amount mode', () => {
         const emptyAmountModeState = {
-          amount: {
-            mode: '',
-          },
+          amountMode: '',
         };
 
         const action = {
@@ -253,7 +416,7 @@ describe('Send Slice', () => {
         };
         const result = sendReducer(emptyAmountModeState, action);
 
-        expect(result.amount.mode).toStrictEqual(action.payload);
+        expect(result.amountMode).toStrictEqual(action.payload);
       });
 
       it('should change to MAX amount mode', () => {
@@ -261,9 +424,12 @@ describe('Send Slice', () => {
           type: 'send/updateAmountMode',
           payload: AMOUNT_MODES.MAX,
         };
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.amount.mode).toStrictEqual(action.payload);
+        expect(result.amountMode).toStrictEqual(action.payload);
       });
 
       it('should', () => {
@@ -271,104 +437,103 @@ describe('Send Slice', () => {
           type: 'send/updateAmountMode',
           payload: 'RANDOM',
         };
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.amount.mode).not.toStrictEqual(action.payload);
+        expect(result.amountMode).not.toStrictEqual(action.payload);
       });
     });
 
     describe('updateAsset', () => {
       it('should update asset type and balance from respective action payload', () => {
-        const updateAssetState = {
-          ...initialState,
+        const updateAssetState = getInitialSendStateWithExistingTxState({
           asset: {
             type: 'old type',
             balance: 'old balance',
           },
-        };
+        });
 
         const action = {
           type: 'send/updateAsset',
           payload: {
-            type: 'new type',
-            balance: 'new balance',
+            asset: {
+              type: 'new type',
+              balance: 'new balance',
+            },
           },
         };
 
         const result = sendReducer(updateAssetState, action);
 
-        expect(result.asset.type).toStrictEqual(action.payload.type);
-        expect(result.asset.balance).toStrictEqual(action.payload.balance);
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.asset.type).toStrictEqual(
+          action.payload.asset.type,
+        );
+        expect(draftTransaction.asset.balance).toStrictEqual(
+          action.payload.asset.balance,
+        );
       });
 
       it('should nullify old contract address error when asset types is not TOKEN', () => {
-        const recipientErrorState = {
-          ...initialState,
+        const recipientErrorState = getInitialSendStateWithExistingTxState({
           recipient: {
             error: CONTRACT_ADDRESS_ERROR,
           },
           asset: {
             type: ASSET_TYPES.TOKEN,
           },
-        };
+        });
 
         const action = {
           type: 'send/updateAsset',
           payload: {
-            type: 'New Type',
+            asset: {
+              type: 'New Type',
+            },
           },
         };
 
         const result = sendReducer(recipientErrorState, action);
 
-        expect(result.recipient.error).not.toStrictEqual(
-          recipientErrorState.recipient.error,
-        );
-        expect(result.recipient.error).toBeNull();
-      });
-
-      it('should nullify old known address error when asset types is not TOKEN', () => {
-        const recipientErrorState = {
-          ...initialState,
-          recipient: {
-            warning: KNOWN_RECIPIENT_ADDRESS_WARNING,
-          },
-          asset: {
-            type: ASSET_TYPES.TOKEN,
-          },
-        };
-
-        const action = {
-          type: 'send/updateAsset',
-          payload: {
-            type: 'New Type',
-          },
-        };
+        const draftTransaction = getTestUUIDTx(result);
 
-        const result = sendReducer(recipientErrorState, action);
-
-        expect(result.recipient.warning).not.toStrictEqual(
-          recipientErrorState.recipient.warning,
+        expect(draftTransaction.recipient.error).not.toStrictEqual(
+          CONTRACT_ADDRESS_ERROR,
         );
-        expect(result.recipient.warning).toBeNull();
+        expect(draftTransaction.recipient.error).toBeNull();
       });
 
       it('should update asset type and details to TOKEN payload', () => {
         const action = {
           type: 'send/updateAsset',
           payload: {
-            type: ASSET_TYPES.TOKEN,
-            details: {
-              address: '0xTokenAddress',
-              decimals: 0,
-              symbol: 'TKN',
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {
+                address: '0xTokenAddress',
+                decimals: 0,
+                symbol: 'TKN',
+              },
             },
           },
         };
 
-        const result = sendReducer(initialState, action);
-        expect(result.asset.type).toStrictEqual(action.payload.type);
-        expect(result.asset.details).toStrictEqual(action.payload.details);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.asset.type).toStrictEqual(
+          action.payload.asset.type,
+        );
+        expect(draftTransaction.asset.details).toStrictEqual(
+          action.payload.asset.details,
+        );
       });
     });
 
@@ -381,207 +546,17 @@ describe('Send Slice', () => {
           },
         };
 
-        const result = sendReducer(initialState, action);
-
-        expect(result.stage).toStrictEqual(SEND_STAGES.DRAFT);
-        expect(result.recipient.address).toStrictEqual(action.payload.address);
-      });
-    });
-
-    describe('updateDraftTransaction', () => {
-      describe('with LEGACY transactions', () => {
-        it('should properly set fields', () => {
-          const detailsForDraftTransactionState = {
-            ...initialState,
-            status: SEND_STATUSES.VALID,
-            transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
-            account: {
-              address: '0xCurrentAddress',
-            },
-            asset: {
-              type: '',
-            },
-            recipient: {
-              address: '0xRecipientAddress',
-            },
-            amount: {
-              value: '0x1',
-            },
-            gas: {
-              gasPrice: '0x3b9aca00', // 1000000000
-              gasLimit: '0x5208', // 21000
-            },
-          };
-
-          const action = {
-            type: 'send/updateDraftTransaction',
-          };
-
-          const result = sendReducer(detailsForDraftTransactionState, action);
-
-          expect(result.draftTransaction.txParams.to).toStrictEqual(
-            detailsForDraftTransactionState.recipient.address,
-          );
-          expect(result.draftTransaction.txParams.value).toStrictEqual(
-            detailsForDraftTransactionState.amount.value,
-          );
-          expect(result.draftTransaction.txParams.gas).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasLimit,
-          );
-          expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasPrice,
-          );
-        });
-
-        it('should update the draftTransaction txParams recipient to token address when asset is type TOKEN', () => {
-          const detailsForDraftTransactionState = {
-            ...initialState,
-            status: SEND_STATUSES.VALID,
-            transactionType: TRANSACTION_ENVELOPE_TYPES.LEGACY,
-            account: {
-              address: '0xCurrentAddress',
-            },
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {
-                address: '0xTokenAddress',
-              },
-            },
-            amount: {
-              value: '0x1',
-            },
-            gas: {
-              gasPrice: '0x3b9aca00', // 1000000000
-              gasLimit: '0x5208', // 21000
-            },
-          };
-
-          const action = {
-            type: 'send/updateDraftTransaction',
-          };
-
-          const result = sendReducer(detailsForDraftTransactionState, action);
-
-          expect(result.draftTransaction.txParams.to).toStrictEqual(
-            detailsForDraftTransactionState.asset.details.address,
-          );
-          expect(result.draftTransaction.txParams.value).toStrictEqual('0x0');
-          expect(result.draftTransaction.txParams.gas).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasLimit,
-          );
-          expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasPrice,
-          );
-          expect(result.draftTransaction.txParams.data).toStrictEqual(
-            '0xa9059cbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
-          );
-        });
-      });
-
-      describe('with FEE_MARKET transactions', () => {
-        it('should properly set fields', () => {
-          const detailsForDraftTransactionState = {
-            ...initialState,
-            status: SEND_STATUSES.VALID,
-            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
-            account: {
-              address: '0xCurrentAddress',
-            },
-            asset: {
-              type: '',
-            },
-            recipient: {
-              address: '0xRecipientAddress',
-            },
-            amount: {
-              value: '0x1',
-            },
-            gas: {
-              maxFeePerGas: '0x2540be400', // 10 GWEI
-              maxPriorityFeePerGas: '0x3b9aca00', // 1 GWEI
-              gasLimit: '0x5208', // 21000
-            },
-            eip1559support: true,
-          };
-
-          const action = {
-            type: 'send/updateDraftTransaction',
-          };
-
-          const result = sendReducer(detailsForDraftTransactionState, action);
-
-          expect(result.draftTransaction.txParams.to).toStrictEqual(
-            detailsForDraftTransactionState.recipient.address,
-          );
-          expect(result.draftTransaction.txParams.value).toStrictEqual(
-            detailsForDraftTransactionState.amount.value,
-          );
-          expect(result.draftTransaction.txParams.gas).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasLimit,
-          );
-          expect(result.draftTransaction.txParams.gasPrice).toBeUndefined();
-          expect(result.draftTransaction.txParams.maxFeePerGas).toStrictEqual(
-            detailsForDraftTransactionState.gas.maxFeePerGas,
-          );
-          expect(
-            result.draftTransaction.txParams.maxPriorityFeePerGas,
-          ).toStrictEqual(
-            detailsForDraftTransactionState.gas.maxPriorityFeePerGas,
-          );
-        });
-
-        it('should update the draftTransaction txParams recipient to token address when asset is type TOKEN', () => {
-          const detailsForDraftTransactionState = {
-            ...initialState,
-            status: SEND_STATUSES.VALID,
-            transactionType: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
-            account: {
-              address: '0xCurrentAddress',
-            },
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {
-                address: '0xTokenAddress',
-              },
-            },
-            amount: {
-              value: '0x1',
-            },
-            gas: {
-              maxFeePerGas: '0x2540be400', // 10 GWEI
-              maxPriorityFeePerGas: '0x3b9aca00', // 1 GWEI
-              gasLimit: '0x5208', // 21000
-            },
-            eip1559support: true,
-          };
-
-          const action = {
-            type: 'send/updateDraftTransaction',
-          };
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-          const result = sendReducer(detailsForDraftTransactionState, action);
+        const draftTransaction = getTestUUIDTx(result);
 
-          expect(result.draftTransaction.txParams.to).toStrictEqual(
-            detailsForDraftTransactionState.asset.details.address,
-          );
-          expect(result.draftTransaction.txParams.value).toStrictEqual('0x0');
-          expect(result.draftTransaction.txParams.gas).toStrictEqual(
-            detailsForDraftTransactionState.gas.gasLimit,
-          );
-
-          expect(result.draftTransaction.txParams.maxFeePerGas).toStrictEqual(
-            detailsForDraftTransactionState.gas.maxFeePerGas,
-          );
-          expect(
-            result.draftTransaction.txParams.maxPriorityFeePerGas,
-          ).toStrictEqual(
-            detailsForDraftTransactionState.gas.maxPriorityFeePerGas,
-          );
-          expect(result.draftTransaction.txParams.gasPrice).toBeUndefined();
-          expect(result.draftTransaction.txParams.data).toStrictEqual(
-            '0xa9059cbb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001',
-          );
-        });
+        expect(result.stage).toStrictEqual(SEND_STAGES.DRAFT);
+        expect(draftTransaction.recipient.address).toStrictEqual(
+          action.payload.address,
+        );
       });
     });
 
@@ -591,9 +566,12 @@ describe('Send Slice', () => {
           type: 'send/useDefaultGas',
         };
 
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.gas.isCustomGasSet).toStrictEqual(false);
+        expect(result.gasIsSetInModal).toStrictEqual(false);
       });
     });
 
@@ -603,9 +581,12 @@ describe('Send Slice', () => {
           type: 'send/useCustomGas',
         };
 
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.gas.isCustomGasSet).toStrictEqual(true);
+        expect(result.gasIsSetInModal).toStrictEqual(true);
       });
     });
 
@@ -616,21 +597,32 @@ describe('Send Slice', () => {
           payload: 'user input',
         };
 
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.recipient.userInput).toStrictEqual(action.payload);
+        expect(result.recipientInput).toStrictEqual(action.payload);
       });
     });
 
     describe('validateRecipientUserInput', () => {
       it('should set recipient error and warning to null when user input is', () => {
         const noUserInputState = {
-          recipient: {
-            mode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
-            userInput: '',
-            error: 'someError',
-            warning: 'someWarning',
-          },
+          ...getInitialSendStateWithExistingTxState({
+            recipient: {
+              error: 'someError',
+              warning: 'someWarning',
+            },
+            amount: {},
+            gas: {
+              gasLimit: '0x0',
+              minimumGasLimit: '0x0',
+            },
+            asset: {},
+          }),
+          recipientInput: '',
+          recipientMode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
         };
 
         const action = {
@@ -639,16 +631,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(noUserInputState, action);
 
-        expect(result.recipient.error).toBeNull();
-        expect(result.recipient.warning).toBeNull();
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.error).toBeNull();
+        expect(draftTransaction.recipient.warning).toBeNull();
       });
 
       it('should error with an invalid address error when user input is not a valid hex string', () => {
         const tokenAssetTypeState = {
-          ...initialState,
-          recipient: {
-            userInput: '0xValidateError',
-          },
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0xValidateError',
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -662,16 +654,18 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        expect(result.recipient.error).toStrictEqual('invalidAddressRecipient');
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.error).toStrictEqual(
+          'invalidAddressRecipient',
+        );
       });
 
       // TODO: Expectation might change in the future
       it('should error with an invalid network error when user input is not a valid hex string on a non default network', () => {
         const tokenAssetTypeState = {
-          ...initialState,
-          recipient: {
-            userInput: '0xValidateError',
-          },
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0xValidateError',
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -685,17 +679,17 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        expect(result.recipient.error).toStrictEqual(
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.error).toStrictEqual(
           'invalidAddressRecipientNotEthNetwork',
         );
       });
 
       it('should error with invalid address recipient when the user inputs the burn address', () => {
         const tokenAssetTypeState = {
-          ...initialState,
-          recipient: {
-            userInput: '0x0000000000000000000000000000000000000000',
-          },
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0x0000000000000000000000000000000000000000',
         };
         const action = {
           type: 'send/validateRecipientUserInput',
@@ -709,21 +703,24 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetTypeState, action);
 
-        expect(result.recipient.error).toStrictEqual('invalidAddressRecipient');
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.error).toStrictEqual(
+          'invalidAddressRecipient',
+        );
       });
 
       it('should error with same address recipient as a token', () => {
         const tokenAssetTypeState = {
-          ...initialState,
-          asset: {
-            type: ASSET_TYPES.TOKEN,
-            details: {
-              address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+          ...getInitialSendStateWithExistingTxState({
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {
+                address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+              },
             },
-          },
-          recipient: {
-            userInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
-          },
+          }),
+          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         };
 
         const action = {
@@ -737,40 +734,109 @@ describe('Send Slice', () => {
         };
 
         const result = sendReducer(tokenAssetTypeState, action);
+        const draftTransaction = getTestUUIDTx(result);
 
-        expect(result.recipient.error).toStrictEqual('contractAddressError');
+        expect(draftTransaction.recipient.error).toStrictEqual(
+          'contractAddressError',
+        );
       });
-    });
 
-    describe('updateRecipientSearchMode', () => {
-      it('should', () => {
+      it('should set a warning when sending to a token address in the token address list', () => {
+        const tokenAssetTypeState = {
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+        };
+
         const action = {
-          type: 'send/updateRecipientSearchMode',
-          payload: 'a-random-string',
+          type: 'send/validateRecipientUserInput',
+          payload: {
+            chainId: '0x4',
+            tokens: [],
+            useTokenDetection: true,
+            tokenAddressList: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
+          },
+        };
+
+        const result = sendReducer(tokenAssetTypeState, action);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.warning).toStrictEqual(
+          KNOWN_RECIPIENT_ADDRESS_WARNING,
+        );
+      });
+
+      it('should set a warning when sending to a token address in the token list', () => {
+        const tokenAssetTypeState = {
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
+        };
+
+        const action = {
+          type: 'send/validateRecipientUserInput',
+          payload: {
+            chainId: '0x4',
+            tokens: [{ address: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc' }],
+            useTokenDetection: true,
+            tokenAddressList: [],
+          },
+        };
+
+        const result = sendReducer(tokenAssetTypeState, action);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.warning).toStrictEqual(
+          KNOWN_RECIPIENT_ADDRESS_WARNING,
+        );
+      });
+
+      it('should set a warning when sending to an address that is probably a token contract', () => {
+        const tokenAssetTypeState = {
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          recipientInput: '0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc',
         };
 
-        const result = sendReducer(initialState, action);
+        const action = {
+          type: 'send/validateRecipientUserInput',
+          payload: {
+            chainId: '0x4',
+            tokens: [{ address: '0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' }],
+            useTokenDetection: true,
+            tokenAddressList: ['0xbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb'],
+            isProbablyAnAssetContract: true,
+          },
+        };
 
-        expect(result.recipient.mode).toStrictEqual(action.payload);
+        const result = sendReducer(tokenAssetTypeState, action);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.warning).toStrictEqual(
+          KNOWN_RECIPIENT_ADDRESS_WARNING,
+        );
       });
     });
 
-    describe('resetSendState', () => {
+    describe('updateRecipientSearchMode', () => {
       it('should', () => {
         const action = {
-          type: 'send/resetSendState',
+          type: 'send/updateRecipientSearchMode',
+          payload: 'a-random-string',
         };
 
-        const result = sendReducer({}, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result).toStrictEqual(initialState);
+        expect(result.recipientMode).toStrictEqual(action.payload);
       });
     });
 
     describe('validateAmountField', () => {
       it('should error with insufficient funds when amount asset value plust gas is higher than asset balance', () => {
-        const nativeAssetState = {
-          ...initialState,
+        const nativeAssetState = getInitialSendStateWithExistingTxState({
           amount: {
             value: '0x6fc23ac0', // 1875000000
           },
@@ -781,7 +847,7 @@ describe('Send Slice', () => {
           gas: {
             gasTotal: '0x8f0d180', // 150000000
           },
-        };
+        });
 
         const action = {
           type: 'send/validateAmountField',
@@ -789,12 +855,15 @@ describe('Send Slice', () => {
 
         const result = sendReducer(nativeAssetState, action);
 
-        expect(result.amount.error).toStrictEqual(INSUFFICIENT_FUNDS_ERROR);
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.amount.error).toStrictEqual(
+          INSUFFICIENT_FUNDS_ERROR,
+        );
       });
 
       it('should error with insufficient tokens when amount value of tokens is higher than asset balance of token', () => {
-        const tokenAssetState = {
-          ...initialState,
+        const tokenAssetState = getInitialSendStateWithExistingTxState({
           amount: {
             value: '0x77359400', // 2000000000
           },
@@ -805,7 +874,7 @@ describe('Send Slice', () => {
               decimals: 0,
             },
           },
-        };
+        });
 
         const action = {
           type: 'send/validateAmountField',
@@ -813,16 +882,19 @@ describe('Send Slice', () => {
 
         const result = sendReducer(tokenAssetState, action);
 
-        expect(result.amount.error).toStrictEqual(INSUFFICIENT_TOKENS_ERROR);
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.amount.error).toStrictEqual(
+          INSUFFICIENT_TOKENS_ERROR,
+        );
       });
 
       it('should error negative value amount', () => {
-        const negativeAmountState = {
-          ...initialState,
+        const negativeAmountState = getInitialSendStateWithExistingTxState({
           amount: {
             value: '-1',
           },
-        };
+        });
 
         const action = {
           type: 'send/validateAmountField',
@@ -830,12 +902,13 @@ describe('Send Slice', () => {
 
         const result = sendReducer(negativeAmountState, action);
 
-        expect(result.amount.error).toStrictEqual(NEGATIVE_ETH_ERROR);
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.amount.error).toStrictEqual(NEGATIVE_ETH_ERROR);
       });
 
       it('should not error for positive value amount', () => {
-        const otherState = {
-          ...initialState,
+        const otherState = getInitialSendStateWithExistingTxState({
           amount: {
             error: 'someError',
             value: '1',
@@ -843,119 +916,135 @@ describe('Send Slice', () => {
           asset: {
             type: '',
           },
-        };
+        });
 
         const action = {
           type: 'send/validateAmountField',
         };
 
         const result = sendReducer(otherState, action);
-        expect(result.amount.error).toBeNull();
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.amount.error).toBeNull();
       });
     });
 
     describe('validateGasField', () => {
       it('should error when total amount of gas is higher than account balance', () => {
-        const gasFieldState = {
-          ...initialState,
+        const gasFieldState = getInitialSendStateWithExistingTxState({
           account: {
             balance: '0x0',
           },
           gas: {
             gasTotal: '0x1319718a5000', // 21000000000000
           },
-        };
+        });
 
         const action = {
           type: 'send/validateGasField',
         };
 
         const result = sendReducer(gasFieldState, action);
-        expect(result.gas.error).toStrictEqual(INSUFFICIENT_FUNDS_ERROR);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.gas.error).toStrictEqual(
+          INSUFFICIENT_FUNDS_ERROR,
+        );
       });
     });
 
     describe('validateSendState', () => {
       it('should set `INVALID` send state status when amount error is present', () => {
-        const amountErrorState = {
-          ...initialState,
+        const amountErrorState = getInitialSendStateWithExistingTxState({
           amount: {
             error: 'Some Amount Error',
           },
-        };
+        });
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(amountErrorState, action);
-        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when gas error is present', () => {
-        const gasErrorState = {
-          ...initialState,
+        const gasErrorState = getInitialSendStateWithExistingTxState({
           gas: {
             error: 'Some Amount Error',
           },
-        };
+        });
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(gasErrorState, action);
-        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when asset type is `TOKEN` without token details present', () => {
-        const assetErrorState = {
-          ...initialState,
+        const assetErrorState = getInitialSendStateWithExistingTxState({
           asset: {
             type: ASSET_TYPES.TOKEN,
           },
-        };
+        });
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(assetErrorState, action);
-        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `INVALID` send state status when gasLimit is under the minimumGasLimit', () => {
-        const gasLimitErroState = {
-          ...initialState,
+        const gasLimitErroState = getInitialSendStateWithExistingTxState({
           gas: {
             gasLimit: '0x5207',
-            minimumGasLimit: '0x5208',
+            minimumGasLimit: GAS_LIMITS.SIMPLE,
           },
-        };
+        });
 
         const action = {
           type: 'send/validateSendState',
         };
 
         const result = sendReducer(gasLimitErroState, action);
-        expect(result.status).toStrictEqual(SEND_STATUSES.INVALID);
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.INVALID);
       });
 
       it('should set `VALID` send state status when conditionals have not been met', () => {
         const validSendStatusState = {
-          ...initialState,
-          stage: SEND_STAGES.DRAFT,
-          asset: {
-            type: ASSET_TYPES.TOKEN,
-            details: {
-              address: '0x000',
+          ...getInitialSendStateWithExistingTxState({
+            asset: {
+              type: ASSET_TYPES.TOKEN,
+              details: {
+                address: '0x000',
+              },
             },
-          },
-          gas: {
-            isGasEstimateLoading: false,
-            gasLimit: '0x5208',
-            minimumGasLimit: '0x5208',
-          },
+            gas: {
+              gasLimit: GAS_LIMITS.SIMPLE,
+            },
+          }),
+          stage: SEND_STAGES.DRAFT,
+          gasEstimateIsLoading: false,
+          minimumGasLimit: GAS_LIMITS.SIMPLE,
         };
 
         const action = {
@@ -964,19 +1053,20 @@ describe('Send Slice', () => {
 
         const result = sendReducer(validSendStatusState, action);
 
-        expect(result.status).toStrictEqual(SEND_STATUSES.VALID);
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.status).toStrictEqual(SEND_STATUSES.VALID);
       });
     });
   });
 
   describe('extraReducers/externalReducers', () => {
     describe('QR Code Detected', () => {
-      const qrCodestate = {
-        ...initialState,
+      const qrCodestate = getInitialSendStateWithExistingTxState({
         recipient: {
           address: '0xAddress',
         },
-      };
+      });
 
       it('should set the recipient address to the scanned address value if they are not equal', () => {
         const action = {
@@ -990,7 +1080,10 @@ describe('Send Slice', () => {
         };
 
         const result = sendReducer(qrCodestate, action);
-        expect(result.recipient.address).toStrictEqual(
+
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.address).toStrictEqual(
           action.value.values.address,
         );
       });
@@ -1008,10 +1101,10 @@ describe('Send Slice', () => {
 
         const result = sendReducer(qrCodestate, badQRAddressAction);
 
-        expect(result.recipient.address).toStrictEqual(
-          qrCodestate.recipient.address,
-        );
-        expect(result.recipient.error).toStrictEqual(
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.recipient.address).toStrictEqual('0xAddress');
+        expect(draftTransaction.recipient.error).toStrictEqual(
           INVALID_RECIPIENT_ADDRESS_ERROR,
         );
       });
@@ -1020,8 +1113,8 @@ describe('Send Slice', () => {
     describe('Selected Address Changed', () => {
       it('should update selected account address and balance on non-edit stages', () => {
         const olderState = {
-          ...initialState,
-          account: {
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          selectedAccount: {
             balance: '0x0',
             address: '0xAddress',
           },
@@ -1039,10 +1132,10 @@ describe('Send Slice', () => {
 
         const result = sendReducer(olderState, action);
 
-        expect(result.account.balance).toStrictEqual(
+        expect(result.selectedAccount.balance).toStrictEqual(
           action.payload.account.balance,
         );
-        expect(result.account.address).toStrictEqual(
+        expect(result.selectedAccount.address).toStrictEqual(
           action.payload.account.address,
         );
       });
@@ -1051,9 +1144,9 @@ describe('Send Slice', () => {
     describe('Account Changed', () => {
       it('should', () => {
         const accountsChangedState = {
-          ...initialState,
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           stage: SEND_STAGES.EDIT,
-          account: {
+          selectedAccount: {
             address: '0xAddress',
             balance: '0x0',
           },
@@ -1071,16 +1164,16 @@ describe('Send Slice', () => {
 
         const result = sendReducer(accountsChangedState, action);
 
-        expect(result.account.balance).toStrictEqual(
+        expect(result.selectedAccount.balance).toStrictEqual(
           action.payload.account.balance,
         );
       });
 
       it(`should not edit account balance if action payload address is not the same as state's address`, () => {
         const accountsChangedState = {
-          ...initialState,
+          ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           stage: SEND_STAGES.EDIT,
-          account: {
+          selectedAccount: {
             address: '0xAddress',
             balance: '0x0',
           },
@@ -1097,10 +1190,10 @@ describe('Send Slice', () => {
         };
 
         const result = sendReducer(accountsChangedState, action);
-        expect(result.account.address).not.toStrictEqual(
+        expect(result.selectedAccount.address).not.toStrictEqual(
           action.payload.account.address,
         );
-        expect(result.account.balance).not.toStrictEqual(
+        expect(result.selectedAccount.balance).not.toStrictEqual(
           action.payload.account.balance,
         );
       });
@@ -1173,7 +1266,7 @@ describe('Send Slice', () => {
               },
             },
           },
-          send: initialState,
+          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           gas: {
             basicEstimateStatus: 'LOADING',
             basicEstimatesStatus: {
@@ -1201,14 +1294,15 @@ describe('Send Slice', () => {
     describe('Set Basic Gas Estimate Data', () => {
       it('should recalculate gas based off of average basic estimate data', () => {
         const gasState = {
-          ...initialState,
-          gas: {
-            gasPrice: '0x0',
-            gasPriceEstimate: '0x0',
-            gasLimit: '0x5208',
-            gasTotal: '0x0',
-            minimumGasLimit: '0x5208',
-          },
+          ...getInitialSendStateWithExistingTxState({
+            gas: {
+              gasPrice: '0x0',
+              gasLimit: GAS_LIMITS.SIMPLE,
+              gasTotal: '0x0',
+            },
+          }),
+          minimumGasLimit: GAS_LIMITS.SIMPLE,
+          gasPriceEstimate: '0x0',
         };
 
         const action = {
@@ -1223,9 +1317,11 @@ describe('Send Slice', () => {
 
         const result = sendReducer(gasState, action);
 
-        expect(result.gas.gasPrice).toStrictEqual('0x3b9aca00'); // 1000000000
-        expect(result.gas.gasLimit).toStrictEqual(gasState.gas.gasLimit);
-        expect(result.gas.gasTotal).toStrictEqual('0x1319718a5000');
+        const draftTransaction = getTestUUIDTx(result);
+
+        expect(draftTransaction.gas.gasPrice).toStrictEqual('0x3b9aca00'); // 1000000000
+        expect(draftTransaction.gas.gasLimit).toStrictEqual(GAS_LIMITS.SIMPLE);
+        expect(draftTransaction.gas.gasTotal).toStrictEqual('0x1319718a5000');
       });
     });
   });
@@ -1234,11 +1330,11 @@ describe('Send Slice', () => {
     describe('updateGasPrice', () => {
       it('should update gas price and update draft transaction with validated state', async () => {
         const store = mockStore({
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasPrice: undefined,
             },
-          },
+          }),
         });
 
         const newGasPrice = '0x0';
@@ -1266,17 +1362,6 @@ describe('Send Slice', () => {
     });
 
     describe('UpdateSendAmount', () => {
-      const defaultSendAmountState = {
-        send: {
-          amount: {
-            mode: undefined,
-          },
-          asset: {
-            type: '',
-          },
-        },
-      };
-
       it('should create an action to update send amount', async () => {
         const sendState = {
           metamask: {
@@ -1286,8 +1371,7 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          ...defaultSendAmountState.send,
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             asset: {
               details: {},
             },
@@ -1300,10 +1384,8 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
-          },
+            userInputHexData: '',
+          }),
         };
         const store = mockStore(sendState);
 
@@ -1342,8 +1424,7 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          ...defaultSendAmountState.send,
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             asset: {
               details: {},
             },
@@ -1356,10 +1437,8 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
-          },
+            userInputHexData: '',
+          }),
         };
 
         const store = mockStore(sendState);
@@ -1397,8 +1476,7 @@ describe('Send Slice', () => {
               chainId: '0x1',
             },
           },
-          ...defaultSendAmountState.send,
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             asset: {
               type: ASSET_TYPES.TOKEN,
               details: {},
@@ -1412,10 +1490,8 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
-          },
+            userInputHexData: '',
+          }),
         };
 
         const store = mockStore(tokenAssetTypeSendState);
@@ -1442,28 +1518,38 @@ describe('Send Slice', () => {
           blockGasLimit: '',
           selectedAddress: '',
           provider: {
-            chainId: '0x1',
-          },
-        },
-        send: {
-          account: {
-            balance: '',
-          },
-          asset: {
-            type: '',
-            details: {},
-          },
-          gas: {
-            gasPrice: '',
+            chainId: RINKEBY_CHAIN_ID,
           },
-          recipient: {
-            address: '',
+          cachedBalances: {
+            [RINKEBY_CHAIN_ID]: {
+              '0xAddress': '0x0',
+            },
           },
-          amount: {
-            value: '',
+          accounts: {
+            '0xAddress': {
+              address: '0xAddress',
+            },
           },
-          draftTransaction: {
+        },
+        send: {
+          ...getInitialSendStateWithExistingTxState({
+            asset: {
+              type: '',
+              details: {},
+            },
+            gas: {
+              gasPrice: '',
+            },
+            recipient: {
+              address: '',
+            },
+            amount: {
+              value: '',
+            },
             userInputHexData: '',
+          }),
+          selectedAccount: {
+            address: '0xAddress',
           },
         },
       };
@@ -1472,48 +1558,47 @@ describe('Send Slice', () => {
         const store = mockStore(defaultSendAssetState);
 
         const newSendAsset = {
-          type: '',
-          details: {
-            address: '',
-            symbol: '',
-            decimals: '',
-          },
+          type: ASSET_TYPES.NATIVE,
         };
 
         await store.dispatch(updateSendAsset(newSendAsset));
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(6);
+        expect(actionResult).toHaveLength(4);
+
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset type to ',
-        });
-        expect(actionResult[1]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset symbol to ',
+          payload: 'sendFlow - user set asset of type NATIVE with symbol ETH',
         });
-        expect(actionResult[2]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset address to ',
-        });
-
-        expect(actionResult[3].type).toStrictEqual('send/updateAsset');
-        expect(actionResult[3].payload).toStrictEqual({
-          ...newSendAsset,
-          balance: '',
-          error: null,
+        expect(actionResult[1].type).toStrictEqual('send/updateAsset');
+        expect(actionResult[1].payload).toStrictEqual({
+          asset: {
+            type: ASSET_TYPES.NATIVE,
+            balance: '0x0',
+            error: null,
+            details: null,
+          },
+          initialAssetSet: false,
         });
 
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[2].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[5].type).toStrictEqual(
+        expect(actionResult[3].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
       });
 
       it('should create actions for updateSendAsset with tokens', async () => {
+        getTokenStandardAndDetailsStub.mockImplementation(() =>
+          Promise.resolve({
+            standard: 'ERC20',
+            balance: '0x0',
+            symbol: 'TokenSymbol',
+            decimals: 18,
+          }),
+        );
         global.eth = {
           contract: sinon.stub().returns({
             at: sinon.stub().returns({
@@ -1536,31 +1621,33 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(8);
-        expect(actionResult[0]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
-        });
-        expect(actionResult[1]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset symbol to tokenSymbol',
-        });
+        expect(actionResult).toHaveLength(6);
+        expect(actionResult[0].type).toStrictEqual('SHOW_LOADING_INDICATION');
+        expect(actionResult[1].type).toStrictEqual('HIDE_LOADING_INDICATION');
         expect(actionResult[2]).toMatchObject({
           type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset address to tokenAddress',
+          payload: `sendFlow - user set asset to ERC20 token with symbol TokenSymbol and address tokenAddress`,
         });
-        expect(actionResult[3].type).toStrictEqual('SHOW_LOADING_INDICATION');
-        expect(actionResult[4].type).toStrictEqual('HIDE_LOADING_INDICATION');
-        expect(actionResult[5].payload).toStrictEqual({
-          ...newSendAsset,
-          balance: '0x0',
-          error: null,
+        expect(actionResult[3].payload).toStrictEqual({
+          asset: {
+            type: ASSET_TYPES.TOKEN,
+            details: {
+              address: 'tokenAddress',
+              symbol: 'TokenSymbol',
+              decimals: 18,
+              standard: 'ERC20',
+              balance: '0x0',
+            },
+            balance: '0x0',
+            error: null,
+          },
+          initialAssetSet: false,
         });
 
-        expect(actionResult[6].type).toStrictEqual(
+        expect(actionResult[4].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[7].type).toStrictEqual(
+        expect(actionResult[5].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
       });
@@ -1568,7 +1655,7 @@ describe('Send Slice', () => {
       it('should show ConvertTokenToNFT modal and throw "invalidAssetType" error when token passed in props is an ERC721 or ERC1155', async () => {
         process.env.COLLECTIBLES_V1 = true;
         getTokenStandardAndDetailsStub.mockImplementation(() =>
-          Promise.resolve({ standard: 'ERC1155' }),
+          Promise.resolve({ standard: 'ERC1155', balance: '0x1' }),
         );
         const store = mockStore(defaultSendAssetState);
 
@@ -1585,22 +1672,10 @@ describe('Send Slice', () => {
           store.dispatch(updateSendAsset(newSendAsset)),
         ).rejects.toThrow('invalidAssetType');
         const actionResult = store.getActions();
-        expect(actionResult).toHaveLength(6);
-        expect(actionResult[0]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
-        });
-        expect(actionResult[1]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset symbol to tokenSymbol',
-        });
-        expect(actionResult[2]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset address to tokenAddress',
-        });
-        expect(actionResult[3].type).toStrictEqual('SHOW_LOADING_INDICATION');
-        expect(actionResult[4].type).toStrictEqual('HIDE_LOADING_INDICATION');
-        expect(actionResult[5]).toStrictEqual({
+        expect(actionResult).toHaveLength(3);
+        expect(actionResult[0].type).toStrictEqual('SHOW_LOADING_INDICATION');
+        expect(actionResult[1].type).toStrictEqual('HIDE_LOADING_INDICATION');
+        expect(actionResult[2]).toStrictEqual({
           payload: {
             name: 'CONVERT_TOKEN_TO_NFT',
             tokenAddress: 'tokenAddress',
@@ -1644,11 +1719,10 @@ describe('Send Slice', () => {
             },
           },
         },
+        send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
       };
 
       it('should create actions for updateRecipientUserInput and checks debounce for validation', async () => {
-        const clock = sinon.useFakeTimers();
-
         const store = mockStore(updateRecipientUserInputState);
         const newUserRecipientInput = 'newUserRecipientInput';
 
@@ -1656,29 +1730,35 @@ describe('Send Slice', () => {
 
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(1);
+        expect(actionResult).toHaveLength(5);
+
         expect(actionResult[0].type).toStrictEqual(
-          'send/updateRecipientUserInput',
+          'send/updateRecipientWarning',
         );
-        expect(actionResult[0].payload).toStrictEqual(newUserRecipientInput);
+        expect(actionResult[0].payload).toStrictEqual('loading');
 
-        clock.tick(300); // debounce
+        expect(actionResult[1].type).toStrictEqual(
+          'send/updateDraftTransactionStatus',
+        );
 
-        const actionResultAfterDebounce = store.getActions();
-        expect(actionResultAfterDebounce).toHaveLength(3);
+        expect(actionResult[2].type).toStrictEqual(
+          'send/updateRecipientUserInput',
+        );
+        expect(actionResult[2].payload).toStrictEqual(newUserRecipientInput);
 
-        expect(actionResultAfterDebounce[1]).toMatchObject({
+        expect(actionResult[3]).toMatchObject({
           type: 'send/addHistoryEntry',
           payload: `sendFlow - user typed ${newUserRecipientInput} into recipient input field`,
         });
 
-        expect(actionResultAfterDebounce[2].type).toStrictEqual(
+        expect(actionResult[4].type).toStrictEqual(
           'send/validateRecipientUserInput',
         );
-        expect(actionResultAfterDebounce[2].payload).toStrictEqual({
+        expect(actionResult[4].payload).toStrictEqual({
           chainId: '',
           tokens: [],
           useTokenDetection: true,
+          isProbablyAnAssetContract: false,
           userInput: newUserRecipientInput,
           tokenAddressList: ['0x514910771af9ca656af840dff83e8264ecf986ca'],
         });
@@ -1766,9 +1846,7 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
+            userInputHexData: '',
           },
         };
 
@@ -1827,9 +1905,7 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
+            userInputHexData: '',
           },
         };
 
@@ -1881,9 +1957,7 @@ describe('Send Slice', () => {
             amount: {
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
+            userInputHexData: '',
           },
         };
 
@@ -1941,22 +2015,7 @@ describe('Send Slice', () => {
               },
             },
           },
-          send: {
-            asset: {
-              type: '',
-            },
-            recipient: {
-              address: 'Address',
-              nickname: 'NickName',
-            },
-            gas: {
-              gasPrice: '0x1',
-            },
-            amount: {
-              value: '0x1',
-            },
-            draftTransaction: {},
-          },
+          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
         };
 
         const store = mockStore(updateRecipientState);
@@ -1964,24 +2023,36 @@ describe('Send Slice', () => {
         await store.dispatch(resetRecipientInput());
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(7);
+        expect(actionResult).toHaveLength(11);
         expect(actionResult[0]).toMatchObject({
           type: 'send/addHistoryEntry',
           payload: 'sendFlow - user cleared recipient input',
         });
         expect(actionResult[1].type).toStrictEqual(
-          'send/updateRecipientUserInput',
+          'send/updateRecipientWarning',
+        );
+        expect(actionResult[2].type).toStrictEqual(
+          'send/updateDraftTransactionStatus',
         );
-        expect(actionResult[1].payload).toStrictEqual('');
-        expect(actionResult[2].type).toStrictEqual('send/updateRecipient');
+
         expect(actionResult[3].type).toStrictEqual(
+          'send/updateRecipientUserInput',
+        );
+        expect(actionResult[4].payload).toStrictEqual(
+          'sendFlow - user typed  into recipient input field',
+        );
+        expect(actionResult[5].type).toStrictEqual(
+          'send/validateRecipientUserInput',
+        );
+        expect(actionResult[6].type).toStrictEqual('send/updateRecipient');
+        expect(actionResult[7].type).toStrictEqual(
           'send/computeEstimatedGasLimit/pending',
         );
-        expect(actionResult[4].type).toStrictEqual(
+        expect(actionResult[8].type).toStrictEqual(
           'send/computeEstimatedGasLimit/rejected',
         );
-        expect(actionResult[5].type).toStrictEqual('ENS/resetEnsResolution');
-        expect(actionResult[6].type).toStrictEqual(
+        expect(actionResult[9].type).toStrictEqual('ENS/resetEnsResolution');
+        expect(actionResult[10].type).toStrictEqual(
           'send/validateRecipientUserInput',
         );
       });
@@ -1989,11 +2060,11 @@ describe('Send Slice', () => {
 
     describe('UpdateSendHexData', () => {
       const sendHexDataState = {
-        send: {
+        send: getInitialSendStateWithExistingTxState({
           asset: {
             type: '',
           },
-        },
+        }),
       };
 
       it('should create action to update hexData', async () => {
@@ -2035,9 +2106,7 @@ describe('Send Slice', () => {
               mode: '',
               value: '',
             },
-            draftTransaction: {
-              userInputHexData: '',
-            },
+            userInputHexData: '',
           },
           metamask: {
             provider: {
@@ -2067,26 +2136,26 @@ describe('Send Slice', () => {
         );
       });
 
-      it('should create actions to toggle off  max mode when send amount mode is max', async () => {
+      it('should create actions to toggle off max mode when send amount mode is max', async () => {
         const sendMaxModeState = {
           send: {
-            asset: {
-              type: ASSET_TYPES.TOKEN,
-              details: {},
-            },
-            gas: {
-              gasPrice: '',
-            },
-            recipient: {
-              address: '',
-            },
-            amount: {
-              mode: AMOUNT_MODES.MAX,
-              value: '',
-            },
-            draftTransaction: {
+            ...getInitialSendStateWithExistingTxState({
+              asset: {
+                type: ASSET_TYPES.TOKEN,
+                details: {},
+              },
+              gas: {
+                gasPrice: '',
+              },
+              recipient: {
+                address: '',
+              },
+              amount: {
+                value: '',
+              },
               userInputHexData: '',
-            },
+            }),
+            amountMode: AMOUNT_MODES.MAX,
           },
           metamask: {
             provider: {
@@ -2118,14 +2187,15 @@ describe('Send Slice', () => {
 
     describe('SignTransaction', () => {
       const signTransactionState = {
-        send: {
+        send: getInitialSendStateWithExistingTxState({
+          id: 1,
           asset: {},
-          stage: '',
-          draftTransaction: {},
           recipient: {},
           amount: {},
-          account: {},
-        },
+          gas: {
+            gasLimit: GAS_LIMITS.SIMPLE,
+          },
+        }),
       };
 
       it('should show confirm tx page when no other conditions for signing have been met', async () => {
@@ -2144,6 +2214,61 @@ describe('Send Slice', () => {
         expect(actionResult[1].type).toStrictEqual('SHOW_CONF_TX_PAGE');
       });
 
+      describe('with token transfers', () => {
+        it('should pass the correct transaction parameters to addUnapprovedTransactionAndRouteToConfirmationPage', async () => {
+          const tokenTransferTxState = {
+            metamask: {
+              unapprovedTxs: {
+                1: {
+                  id: 1,
+                  txParams: {
+                    value: 'oldTxValue',
+                  },
+                },
+              },
+            },
+            send: {
+              ...getInitialSendStateWithExistingTxState({
+                id: 1,
+                asset: {
+                  details: {
+                    address: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
+                  },
+                  type: 'TOKEN',
+                },
+                recipient: {
+                  address: '4F90e18605Fd46F9F9Fab0e225D88e1ACf5F5324',
+                },
+                amount: {
+                  value: '0x1',
+                },
+              }),
+              stage: SEND_STAGES.DRAFT,
+              selectedAccount: {
+                address: '0x6784e8507A1A46443f7bDc8f8cA39bdA92A675A6',
+              },
+            },
+          };
+
+          jest.mock('../../store/actions.js');
+
+          const store = mockStore(tokenTransferTxState);
+
+          await store.dispatch(signTransaction());
+
+          expect(
+            addUnapprovedTransactionAndRouteToConfirmationPageStub.mock
+              .calls[0][0].data,
+          ).toStrictEqual(
+            '0xa9059cbb0000000000000000000000004f90e18605fd46f9f9fab0e225d88e1acf5f53240000000000000000000000000000000000000000000000000000000000000001',
+          );
+          expect(
+            addUnapprovedTransactionAndRouteToConfirmationPageStub.mock
+              .calls[0][0].to,
+          ).toStrictEqual('0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2');
+        });
+      });
+
       it('should create actions for updateTransaction rejecting', async () => {
         const editStageSignTxState = {
           metamask: {
@@ -2159,12 +2284,6 @@ describe('Send Slice', () => {
           send: {
             ...signTransactionState.send,
             stage: SEND_STAGES.EDIT,
-            draftTransaction: {
-              id: 1,
-              txParams: {
-                value: 'newTxValue',
-              },
-            },
           },
         };
 
@@ -2191,10 +2310,12 @@ describe('Send Slice', () => {
       });
     });
 
-    describe('editTransaction', () => {
+    describe('editExistingTransaction', () => {
       it('should set up the appropriate state for editing a native asset transaction', async () => {
         const editTransactionState = {
           metamask: {
+            gasEstimateType: GAS_ESTIMATE_TYPES.NONE,
+            gasFeeEstimates: {},
             provider: {
               chainId: RINKEBY_CHAIN_ID,
             },
@@ -2203,6 +2324,18 @@ describe('Send Slice', () => {
               [RINKEBY_CHAIN_ID]: {},
             },
             identities: {},
+            accounts: {
+              '0xAddress': {
+                address: '0xAddress',
+                balance: '0x0',
+              },
+            },
+            cachedBalances: {
+              [RINKEBY_CHAIN_ID]: {
+                '0xAddress': '0x0',
+              },
+            },
+            tokenList: {},
             unapprovedTxs: {
               1: {
                 id: 1,
@@ -2218,62 +2351,100 @@ describe('Send Slice', () => {
             },
           },
           send: {
-            asset: {
-              type: '',
-            },
-            recipient: {
-              address: 'Address',
-              nickname: 'NickName',
-            },
+            // We are going to remove this transaction as a part of the flow,
+            // but we need this stub to have the fromAccount because for our
+            // action checker the state isn't actually modified after each
+            // action is ran.
+            ...getInitialSendStateWithExistingTxState({
+              id: 1,
+              fromAccount: {
+                address: '0xAddress',
+              },
+            }),
           },
         };
 
         const store = mockStore(editTransactionState);
 
-        await store.dispatch(editTransaction(ASSET_TYPES.NATIVE, 1));
+        await store.dispatch(editExistingTransaction(ASSET_TYPES.NATIVE, 1));
         const actionResult = store.getActions();
 
-        expect(actionResult).toHaveLength(2);
+        expect(actionResult).toHaveLength(7);
         expect(actionResult[0]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user clicked edit on transaction with id 1',
+          type: 'send/clearPreviousDrafts',
         });
-        expect(actionResult[1].type).toStrictEqual('send/editTransaction');
-        expect(actionResult[1].payload).toStrictEqual({
-          address: '0xRecipientAddress',
-          amount: '0xde0b6b3a7640000',
-          data: '',
-          from: '0xAddress',
-          gasLimit: GAS_LIMITS.SIMPLE,
-          gasPrice: '0x3b9aca00',
-          id: 1,
-          nickname: '',
+        expect(actionResult[1]).toStrictEqual({
+          type: 'send/addNewDraft',
+          payload: {
+            amount: {
+              value: '0xde0b6b3a7640000',
+              error: null,
+            },
+            asset: {
+              balance: '0x0',
+              details: null,
+              error: null,
+              type: ASSET_TYPES.NATIVE,
+            },
+            fromAccount: {
+              address: '0xAddress',
+              balance: '0x0',
+            },
+            gas: {
+              error: null,
+              gasLimit: GAS_LIMITS.SIMPLE,
+              gasPrice: '0x3b9aca00',
+              gasTotal: '0x0',
+              maxFeePerGas: '0x0',
+              maxPriorityFeePerGas: '0x0',
+            },
+            history: ['sendFlow - user clicked edit on transaction with id 1'],
+            id: 1,
+            recipient: {
+              address: '0xRecipientAddress',
+              error: null,
+              nickname: '',
+              warning: null,
+              recipientWarningAcknowledged: false,
+            },
+            status: SEND_STATUSES.VALID,
+            transactionType: '0x0',
+            userInputHexData: '',
+          },
         });
 
         const action = actionResult[1];
 
-        const result = sendReducer(initialState, action);
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
-        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
+        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
 
-        expect(result.amount.value).toStrictEqual(action.payload.amount);
+        const draftTransaction =
+          result.draftTransactions[result.currentTransactionUUID];
 
-        expect(result.draftTransaction.txParams.to).toStrictEqual(
-          action.payload.address,
-        );
-        expect(result.draftTransaction.txParams.value).toStrictEqual(
-          action.payload.amount,
+        expect(draftTransaction.gas.gasLimit).toStrictEqual(
+          action.payload.gas.gasLimit,
         );
-        expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
-          action.payload.gasPrice,
+        expect(draftTransaction.gas.gasPrice).toStrictEqual(
+          action.payload.gas.gasPrice,
         );
-        expect(result.draftTransaction.txParams.gas).toStrictEqual(
-          action.payload.gasLimit,
+
+        expect(draftTransaction.amount.value).toStrictEqual(
+          action.payload.amount.value,
         );
       });
 
       it('should set up the appropriate state for editing a collectible asset transaction', async () => {
+        getTokenStandardAndDetailsStub.mockImplementation(() =>
+          Promise.resolve({
+            standard: 'ERC721',
+            balance: '0x1',
+            address: '0xCollectibleAddress',
+          }),
+        );
         const editTransactionState = {
           metamask: {
             blockGasLimit: '0x3a98',
@@ -2286,13 +2457,29 @@ describe('Send Slice', () => {
               [RINKEBY_CHAIN_ID]: {},
             },
             identities: {},
+            accounts: {
+              '0xAddress': {
+                address: '0xAddress',
+                balance: '0x0',
+              },
+            },
+            cachedBalances: {
+              [RINKEBY_CHAIN_ID]: {
+                '0xAddress': '0x0',
+              },
+            },
+            tokenList: {},
             unapprovedTxs: {
               1: {
                 id: 1,
                 txParams: {
-                  data: '',
+                  data: generateERC721TransferData({
+                    toAddress: BURN_ADDRESS,
+                    fromAddress: '0xAddress',
+                    tokenId: ethers.BigNumber.from(15000).toString(),
+                  }),
                   from: '0xAddress',
-                  to: '0xTokenAddress',
+                  to: '0xCollectibleAddress',
                   gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
                   gasPrice: '0x3b9aca00', // 1000000000
                   value: '0x0',
@@ -2301,26 +2488,12 @@ describe('Send Slice', () => {
             },
           },
           send: {
-            account: {
-              address: '0xAddress',
-              balance: '0x0',
-            },
-            asset: {
-              type: '',
-            },
-            gas: {
-              gasPrice: '',
-            },
-            amount: {
-              value: '',
-            },
-            draftTransaction: {
-              userInputHexData: '',
-            },
-            recipient: {
-              address: 'Address',
-              nickname: 'NickName',
-            },
+            ...getInitialSendStateWithExistingTxState({
+              id: 1,
+              test: 'wow',
+              gas: { gasLimit: GAS_LIMITS.SIMPLE },
+            }),
+            stage: SEND_STAGES.EDIT,
           },
         };
 
@@ -2336,90 +2509,109 @@ describe('Send Slice', () => {
         const store = mockStore(editTransactionState);
 
         await store.dispatch(
-          editTransaction(
-            ASSET_TYPES.COLLECTIBLE,
-            1,
-            {
-              name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
-              args: {
-                _to: '0xRecipientAddress',
-                _value: ethers.BigNumber.from(15000),
-              },
-            },
-            {
-              address: '0xf5de760f2e916647fd766B4AD9E85ff943cE3A2b',
-              description: 'A test NFT dispensed from faucet.paradigm.xyz.',
-              image:
-                'https://ipfs.io/ipfs/bafybeifvwitulq6elvka2hoqhwixfhgb42l4aiukmtrw335osetikviuuu',
-              name: 'MultiFaucet Test NFT',
-              standard: 'ERC721',
-              tokenId: '26847',
-            },
-          ),
+          editExistingTransaction(ASSET_TYPES.COLLECTIBLE, 1),
         );
         const actionResult = store.getActions();
         expect(actionResult).toHaveLength(9);
         expect(actionResult[0]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user clicked edit on transaction with id 1',
-        });
-        expect(actionResult[1]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: `sendFlow - user set asset type to ${ASSET_TYPES.COLLECTIBLE}`,
+          type: 'send/clearPreviousDrafts',
         });
-        expect(actionResult[2]).toMatchObject({
-          type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset symbol to undefined',
+        expect(actionResult[1]).toStrictEqual({
+          type: 'send/addNewDraft',
+          payload: {
+            amount: {
+              error: null,
+              value: '0x1',
+            },
+            asset: {
+              balance: '0x0',
+              details: null,
+              error: null,
+              type: ASSET_TYPES.NATIVE,
+            },
+            fromAccount: {
+              address: '0xAddress',
+              balance: '0x0',
+            },
+            gas: {
+              error: null,
+              gasLimit: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
+              gasPrice: '0x3b9aca00',
+              gasTotal: '0x0',
+              maxFeePerGas: '0x0',
+              maxPriorityFeePerGas: '0x0',
+            },
+            history: ['sendFlow - user clicked edit on transaction with id 1'],
+            id: 1,
+            recipient: {
+              address: BURN_ADDRESS,
+              error: null,
+              nickname: '',
+              warning: null,
+              recipientWarningAcknowledged: false,
+            },
+            status: SEND_STATUSES.VALID,
+            transactionType: '0x0',
+            userInputHexData:
+              editTransactionState.metamask.unapprovedTxs[1].txParams.data,
+          },
         });
-        expect(actionResult[3]).toMatchObject({
+        expect(actionResult[2].type).toStrictEqual('SHOW_LOADING_INDICATION');
+        expect(actionResult[3].type).toStrictEqual('HIDE_LOADING_INDICATION');
+        expect(actionResult[4]).toStrictEqual({
           type: 'send/addHistoryEntry',
-          payload: 'sendFlow - user set asset address to 0xTokenAddress',
+          payload:
+            'sendFlow - user set asset to NFT with tokenId 15000 and address 0xCollectibleAddress',
         });
-        expect(actionResult[4].type).toStrictEqual('send/updateAsset');
-        expect(actionResult[4].payload).toStrictEqual({
-          balance: '0x1',
-          type: ASSET_TYPES.COLLECTIBLE,
-          error: null,
-          details: {
-            address: '0xTokenAddress',
-            description: 'A test NFT dispensed from faucet.paradigm.xyz.',
-            image:
-              'https://ipfs.io/ipfs/bafybeifvwitulq6elvka2hoqhwixfhgb42l4aiukmtrw335osetikviuuu',
-            name: 'MultiFaucet Test NFT',
-            standard: 'ERC721',
-            tokenId: '26847',
+        expect(actionResult[5]).toStrictEqual({
+          type: 'send/updateAsset',
+          payload: {
+            asset: {
+              balance: '0x1',
+              details: {
+                address: '0xCollectibleAddress',
+                balance: '0x1',
+                standard: TOKEN_STANDARDS.ERC721,
+                tokenId: '15000',
+              },
+              error: null,
+              type: ASSET_TYPES.COLLECTIBLE,
+            },
+            initialAssetSet: true,
           },
         });
-        expect(actionResult[5].type).toStrictEqual(
-          'send/computeEstimatedGasLimit/pending',
-        );
         expect(actionResult[6].type).toStrictEqual(
-          'metamask/gas/SET_CUSTOM_GAS_LIMIT',
+          'send/initializeSendState/pending',
         );
-        expect(actionResult[7].type).toStrictEqual(
-          'send/computeEstimatedGasLimit/fulfilled',
+        expect(actionResult[7]).toStrictEqual({
+          type: 'metamask/gas/SET_CUSTOM_GAS_LIMIT',
+          value: GAS_LIMITS.SIMPLE,
+        });
+        expect(actionResult[8].type).toStrictEqual(
+          'send/initializeSendState/fulfilled',
         );
-        expect(actionResult[8].type).toStrictEqual('send/editTransaction');
-        const action = actionResult[8];
 
-        const result = sendReducer(initialState, action);
+        const action = actionResult[1];
+
+        const result = sendReducer(
+          INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          action,
+        );
 
-        expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
-        expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
+        expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
 
-        expect(result.amount.value).toStrictEqual(action.payload.amount);
+        const draftTransaction =
+          result.draftTransactions[result.currentTransactionUUID];
 
-        expect(result.draftTransaction.txParams.to).toStrictEqual(
-          action.payload.address,
+        expect(draftTransaction.gas.gasLimit).toStrictEqual(
+          action.payload.gas.gasLimit,
         );
-        expect(result.draftTransaction.txParams.value).toStrictEqual(
-          action.payload.amount,
+        expect(draftTransaction.gas.gasPrice).toStrictEqual(
+          action.payload.gas.gasPrice,
         );
-        expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
-          action.payload.gasPrice,
-        );
-        expect(result.draftTransaction.txParams.gas).toStrictEqual(
-          action.payload.gasLimit,
+
+        expect(draftTransaction.amount.value).toStrictEqual(
+          action.payload.amount.value,
         );
       });
     });
@@ -2432,16 +2624,46 @@ describe('Send Slice', () => {
           provider: {
             chainId: RINKEBY_CHAIN_ID,
           },
-          tokens: [],
+          tokens: [
+            {
+              address: '0xTokenAddress',
+              symbol: 'SYMB',
+            },
+          ],
+          tokenList: {
+            '0xTokenAddress': {
+              symbol: 'SYMB',
+              address: '0xTokenAddress',
+            },
+          },
           addressBook: {
             [RINKEBY_CHAIN_ID]: {},
           },
           identities: {},
+          accounts: {
+            '0xAddress': {
+              address: '0xAddress',
+              balance: '0x0',
+            },
+          },
+          cachedBalances: {
+            [RINKEBY_CHAIN_ID]: {
+              '0xAddress': '0x0',
+            },
+          },
           unapprovedTxs: {
             1: {
               id: 1,
               txParams: {
-                data: '',
+                data: generateERC20TransferData({
+                  toAddress: BURN_ADDRESS,
+                  amount: '0x3a98',
+                  sendToken: {
+                    address: '0xTokenAddress',
+                    symbol: 'SYMB',
+                    decimals: 18,
+                  },
+                }),
                 from: '0xAddress',
                 to: '0xTokenAddress',
                 gas: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
@@ -2452,26 +2674,18 @@ describe('Send Slice', () => {
           },
         },
         send: {
-          account: {
+          ...getInitialSendStateWithExistingTxState({
+            id: 1,
+            recipient: {
+              address: 'Address',
+              nickname: 'NickName',
+            },
+          }),
+          selectedAccount: {
             address: '0xAddress',
             balance: '0x0',
           },
-          asset: {
-            type: '',
-          },
-          gas: {
-            gasPrice: '',
-          },
-          amount: {
-            value: '',
-          },
-          draftTransaction: {
-            userInputHexData: '',
-          },
-          recipient: {
-            address: 'Address',
-            nickname: 'NickName',
-          },
+          stage: SEND_STAGES.EDIT,
         },
       };
 
@@ -2486,94 +2700,104 @@ describe('Send Slice', () => {
 
       const store = mockStore(editTransactionState);
 
-      await store.dispatch(
-        editTransaction(
-          ASSET_TYPES.TOKEN,
-          1,
-          {
-            name: TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
-            args: {
-              _to: '0xRecipientAddress',
-              _value: ethers.BigNumber.from(15000),
-            },
-          },
-          { address: '0xAddress', symbol: 'SYMB', decimals: 18 },
-        ),
-      );
+      await store.dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, 1));
       const actionResult = store.getActions();
 
-      expect(actionResult).toHaveLength(11);
-      expect(actionResult[0]).toMatchObject({
-        type: 'send/addHistoryEntry',
-        payload: 'sendFlow - user clicked edit on transaction with id 1',
-      });
-      expect(actionResult[1]).toMatchObject({
-        type: 'send/addHistoryEntry',
-        payload: `sendFlow - user set asset type to ${ASSET_TYPES.TOKEN}`,
+      expect(actionResult).toHaveLength(9);
+      expect(actionResult[0].type).toStrictEqual('send/clearPreviousDrafts');
+      expect(actionResult[1]).toStrictEqual({
+        type: 'send/addNewDraft',
+        payload: {
+          amount: {
+            error: null,
+            value: '0x3a98',
+          },
+          asset: {
+            balance: '0x0',
+            details: null,
+            error: null,
+            type: ASSET_TYPES.NATIVE,
+          },
+          fromAccount: {
+            address: '0xAddress',
+            balance: '0x0',
+          },
+          gas: {
+            error: null,
+            gasLimit: '0x186a0',
+            gasPrice: '0x3b9aca00',
+            gasTotal: '0x0',
+            maxFeePerGas: '0x0',
+            maxPriorityFeePerGas: '0x0',
+          },
+          history: ['sendFlow - user clicked edit on transaction with id 1'],
+          id: 1,
+          recipient: {
+            address: BURN_ADDRESS,
+            error: null,
+            warning: null,
+            nickname: '',
+            recipientWarningAcknowledged: false,
+          },
+          status: SEND_STATUSES.VALID,
+          transactionType: '0x0',
+          userInputHexData:
+            editTransactionState.metamask.unapprovedTxs[1].txParams.data,
+        },
       });
-      expect(actionResult[2]).toMatchObject({
+      expect(actionResult[2].type).toStrictEqual('SHOW_LOADING_INDICATION');
+      expect(actionResult[3].type).toStrictEqual('HIDE_LOADING_INDICATION');
+      expect(actionResult[4]).toMatchObject({
         type: 'send/addHistoryEntry',
-        payload: 'sendFlow - user set asset symbol to SYMB',
+        payload:
+          'sendFlow - user set asset to ERC20 token with symbol SYMB and address 0xTokenAddress',
       });
-      expect(actionResult[3]).toMatchObject({
-        type: 'send/addHistoryEntry',
-        payload: 'sendFlow - user set asset address to 0xTokenAddress',
-      });
-      expect(actionResult[4].type).toStrictEqual('SHOW_LOADING_INDICATION');
-      expect(actionResult[5].type).toStrictEqual('HIDE_LOADING_INDICATION');
-      expect(actionResult[6].type).toStrictEqual('send/updateAsset');
-      expect(actionResult[6].payload).toStrictEqual({
-        balance: '0x0',
-        type: ASSET_TYPES.TOKEN,
-        error: null,
-        details: {
-          address: '0xTokenAddress',
-          decimals: 18,
-          symbol: 'SYMB',
-          standard: 'ERC20',
+      expect(actionResult[5]).toStrictEqual({
+        type: 'send/updateAsset',
+        payload: {
+          asset: {
+            balance: '0x0',
+            type: ASSET_TYPES.TOKEN,
+            error: null,
+            details: {
+              balance: '0x0',
+              address: '0xTokenAddress',
+              decimals: 18,
+              symbol: 'SYMB',
+              standard: 'ERC20',
+            },
+          },
+          initialAssetSet: true,
         },
       });
-      expect(actionResult[7].type).toStrictEqual(
-        'send/computeEstimatedGasLimit/pending',
+      expect(actionResult[6].type).toStrictEqual(
+        'send/initializeSendState/pending',
       );
-      expect(actionResult[8].type).toStrictEqual(
+      expect(actionResult[7].type).toStrictEqual(
         'metamask/gas/SET_CUSTOM_GAS_LIMIT',
       );
-      expect(actionResult[9].type).toStrictEqual(
-        'send/computeEstimatedGasLimit/fulfilled',
+      expect(actionResult[8].type).toStrictEqual(
+        'send/initializeSendState/fulfilled',
       );
-      expect(actionResult[10].type).toStrictEqual('send/editTransaction');
-      expect(actionResult[10].payload).toStrictEqual({
-        address: '0xrecipientaddress', // getting address from tokenData does .toLowerCase
-        amount: '0x3a98',
-        data: '',
-        from: '0xAddress',
-        gasLimit: GAS_LIMITS.BASE_TOKEN_ESTIMATE,
-        gasPrice: '0x3b9aca00',
-        id: 1,
-        nickname: '',
-      });
 
-      const action = actionResult[10];
+      const action = actionResult[1];
 
-      const result = sendReducer(initialState, action);
+      const result = sendReducer(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT, action);
 
-      expect(result.gas.gasLimit).toStrictEqual(action.payload.gasLimit);
-      expect(result.gas.gasPrice).toStrictEqual(action.payload.gasPrice);
+      expect(result.currentTransactionUUID).not.toStrictEqual('test-uuid');
 
-      expect(result.amount.value).toStrictEqual(action.payload.amount);
+      const draftTransaction =
+        result.draftTransactions[result.currentTransactionUUID];
 
-      expect(result.draftTransaction.txParams.to).toStrictEqual(
-        action.payload.address,
-      );
-      expect(result.draftTransaction.txParams.value).toStrictEqual(
-        action.payload.amount,
+      expect(draftTransaction.gas.gasLimit).toStrictEqual(
+        action.payload.gas.gasLimit,
       );
-      expect(result.draftTransaction.txParams.gasPrice).toStrictEqual(
-        action.payload.gasPrice,
+      expect(draftTransaction.gas.gasPrice).toStrictEqual(
+        action.payload.gas.gasPrice,
       );
-      expect(result.draftTransaction.txParams.gas).toStrictEqual(
-        action.payload.gasLimit,
+
+      expect(draftTransaction.amount.value).toStrictEqual(
+        action.payload.amount.value,
       );
     });
   });
@@ -2581,36 +2805,44 @@ describe('Send Slice', () => {
   describe('selectors', () => {
     describe('gas selectors', () => {
       it('has a selector that gets gasLimit', () => {
-        expect(getGasLimit({ send: initialState })).toBe('0x0');
+        expect(
+          getGasLimit({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe('0x0');
       });
 
       it('has a selector that gets gasPrice', () => {
-        expect(getGasPrice({ send: initialState })).toBe('0x0');
+        expect(
+          getGasPrice({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe('0x0');
       });
 
       it('has a selector that gets gasTotal', () => {
-        expect(getGasTotal({ send: initialState })).toBe('0x0');
+        expect(
+          getGasTotal({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe('0x0');
       });
 
       it('has a selector to determine if gas fee is in error', () => {
-        expect(gasFeeIsInError({ send: initialState })).toBe(false);
+        expect(
+          gasFeeIsInError({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(false);
         expect(
           gasFeeIsInError({
-            send: {
-              ...initialState,
+            send: getInitialSendStateWithExistingTxState({
               gas: {
-                ...initialState.gas,
                 error: 'yes',
               },
-            },
+            }),
           }),
         ).toBe(true);
       });
 
       it('has a selector that gets minimumGasLimit', () => {
-        expect(getMinimumGasLimitForSend({ send: initialState })).toBe(
-          GAS_LIMITS.SIMPLE,
-        );
+        expect(
+          getMinimumGasLimitForSend({
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
+        ).toBe(GAS_LIMITS.SIMPLE);
       });
 
       describe('getGasInputMode selector', () => {
@@ -2680,7 +2912,7 @@ describe('Send Slice', () => {
           process.env.IN_TEST = false;
         });
 
-        it('returns CUSTOM if isCustomGasSet is true', () => {
+        it('returns CUSTOM if gasIsSetInModal is true', () => {
           expect(
             getGasInputMode({
               metamask: {
@@ -2688,11 +2920,8 @@ describe('Send Slice', () => {
                 featureFlags: { advancedInlineGas: true },
               },
               send: {
-                ...initialState,
-                gas: {
-                  ...initialState.send,
-                  isCustomGasSet: true,
-                },
+                ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+                gasIsSetInModal: true,
               },
             }),
           ).toBe(GAS_INPUT_MODES.CUSTOM);
@@ -2702,38 +2931,39 @@ describe('Send Slice', () => {
 
     describe('asset selectors', () => {
       it('has a selector to get the asset', () => {
-        expect(getSendAsset({ send: initialState })).toMatchObject(
-          initialState.asset,
+        expect(
+          getSendAsset({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toMatchObject(
+          getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).asset,
         );
       });
 
       it('has a selector to get the asset address', () => {
         expect(
           getSendAssetAddress({
-            send: {
-              ...initialState,
+            send: getInitialSendStateWithExistingTxState({
               asset: {
                 balance: '0x0',
                 details: { address: '0x0' },
                 type: ASSET_TYPES.TOKEN,
               },
-            },
+            }),
           }),
         ).toBe('0x0');
       });
 
       it('has a selector that determines if asset is sendable based on ERC721 status', () => {
-        expect(getIsAssetSendable({ send: initialState })).toBe(true);
+        expect(
+          getIsAssetSendable({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(true);
         expect(
           getIsAssetSendable({
-            send: {
-              ...initialState,
+            send: getInitialSendStateWithExistingTxState({
               asset: {
-                ...initialState,
                 type: ASSET_TYPES.TOKEN,
                 details: { isERC721: true },
               },
-            },
+            }),
           }),
         ).toBe(false);
       });
@@ -2741,71 +2971,77 @@ describe('Send Slice', () => {
 
     describe('amount selectors', () => {
       it('has a selector to get send amount', () => {
-        expect(getSendAmount({ send: initialState })).toBe('0x0');
+        expect(
+          getSendAmount({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe('0x0');
       });
 
       it('has a selector to get if there is an insufficient funds error', () => {
-        expect(getIsBalanceInsufficient({ send: initialState })).toBe(false);
         expect(
           getIsBalanceInsufficient({
-            send: {
-              ...initialState,
-              gas: { ...initialState.gas, error: INSUFFICIENT_FUNDS_ERROR },
-            },
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
+        ).toBe(false);
+        expect(
+          getIsBalanceInsufficient({
+            send: getInitialSendStateWithExistingTxState({
+              gas: { error: INSUFFICIENT_FUNDS_ERROR },
+            }),
           }),
         ).toBe(true);
       });
 
       it('has a selector to get max mode state', () => {
-        expect(getSendMaxModeState({ send: initialState })).toBe(false);
+        expect(
+          getSendMaxModeState({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(false);
         expect(
           getSendMaxModeState({
             send: {
-              ...initialState,
-              amount: { ...initialState.amount, mode: AMOUNT_MODES.MAX },
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              amountMode: AMOUNT_MODES.MAX,
             },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get the draft transaction ID', () => {
-        expect(getDraftTransactionID({ send: initialState })).toBeNull();
         expect(
           getDraftTransactionID({
-            send: {
-              ...initialState,
-              draftTransaction: {
-                ...initialState.draftTransaction,
-                id: 'ID',
-              },
-            },
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
+        ).toBeNull();
+        expect(
+          getDraftTransactionID({
+            send: getInitialSendStateWithExistingTxState({
+              id: 'ID',
+            }),
           }),
         ).toBe('ID');
       });
 
       it('has a selector to get the user entered hex data', () => {
-        expect(getSendHexData({ send: initialState })).toBeNull();
+        expect(
+          getSendHexData({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBeNull();
         expect(
           getSendHexData({
-            send: {
-              ...initialState,
-              draftTransaction: {
-                ...initialState.draftTransaction,
-                userInputHexData: '0x0',
-              },
-            },
+            send: getInitialSendStateWithExistingTxState({
+              userInputHexData: '0x0',
+            }),
           }),
         ).toBe('0x0');
       });
 
       it('has a selector to get if there is an amount error', () => {
-        expect(sendAmountIsInError({ send: initialState })).toBe(false);
+        expect(
+          sendAmountIsInError({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(false);
         expect(
           sendAmountIsInError({
-            send: {
-              ...initialState,
-              amount: { ...initialState.amount, error: 'any' },
-            },
+            send: getInitialSendStateWithExistingTxState({
+              amount: { error: 'any' },
+            }),
           }),
         ).toBe(true);
       });
@@ -2813,85 +3049,98 @@ describe('Send Slice', () => {
 
     describe('recipient selectors', () => {
       it('has a selector to get recipient address', () => {
-        expect(getSendTo({ send: initialState })).toBe('');
         expect(
           getSendTo({
-            send: {
-              ...initialState,
-              recipient: { ...initialState.recipient, address: '0xb' },
-            },
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            metamask: { ensResolutionsByAddress: {} },
+          }),
+        ).toBe('');
+        expect(
+          getSendTo({
+            send: getInitialSendStateWithExistingTxState({
+              recipient: { address: '0xb' },
+            }),
+            metamask: { ensResolutionsByAddress: {} },
           }),
         ).toBe('0xb');
       });
 
       it('has a selector to check if using the my accounts option for recipient selection', () => {
         expect(
-          getIsUsingMyAccountForRecipientSearch({ send: initialState }),
+          getIsUsingMyAccountForRecipientSearch({
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
         ).toBe(false);
         expect(
           getIsUsingMyAccountForRecipientSearch({
             send: {
-              ...initialState,
-              recipient: {
-                ...initialState.recipient,
-                mode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
-              },
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              recipientMode: RECIPIENT_SEARCH_MODES.MY_ACCOUNTS,
             },
           }),
         ).toBe(true);
       });
 
       it('has a selector to get recipient user input in input field', () => {
-        expect(getRecipientUserInput({ send: initialState })).toBe('');
+        expect(
+          getRecipientUserInput({
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
+        ).toBe('');
         expect(
           getRecipientUserInput({
             send: {
-              ...initialState,
-              recipient: {
-                ...initialState.recipient,
-                userInput: 'domain.eth',
-              },
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              recipientInput: 'domain.eth',
             },
           }),
         ).toBe('domain.eth');
       });
 
       it('has a selector to get recipient state', () => {
-        expect(getRecipient({ send: initialState })).toMatchObject(
-          initialState.recipient,
+        expect(
+          getRecipient({
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            metamask: { ensResolutionsByAddress: {} },
+          }),
+        ).toMatchObject(
+          getTestUUIDTx(INITIAL_SEND_STATE_FOR_EXISTING_DRAFT).recipient,
         );
       });
     });
 
     describe('send validity selectors', () => {
       it('has a selector to get send errors', () => {
-        expect(getSendErrors({ send: initialState })).toMatchObject({
+        expect(
+          getSendErrors({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toMatchObject({
           gasFee: null,
           amount: null,
         });
         expect(
           getSendErrors({
-            send: {
-              ...initialState,
+            send: getInitialSendStateWithExistingTxState({
               gas: {
-                ...initialState.gas,
                 error: 'gasFeeTest',
               },
               amount: {
-                ...initialState.amount,
                 error: 'amountTest',
               },
-            },
+            }),
           }),
         ).toMatchObject({ gasFee: 'gasFeeTest', amount: 'amountTest' });
       });
 
       it('has a selector to get send state initialization status', () => {
-        expect(isSendStateInitialized({ send: initialState })).toBe(false);
+        expect(
+          isSendStateInitialized({
+            send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+          }),
+        ).toBe(false);
         expect(
           isSendStateInitialized({
             send: {
-              ...initialState,
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
               stage: SEND_STATUSES.ADD_RECIPIENT,
             },
           }),
@@ -2899,19 +3148,28 @@ describe('Send Slice', () => {
       });
 
       it('has a selector to get send state validity', () => {
-        expect(isSendFormInvalid({ send: initialState })).toBe(false);
+        expect(
+          isSendFormInvalid({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(false);
         expect(
           isSendFormInvalid({
-            send: { ...initialState, status: SEND_STATUSES.INVALID },
+            send: getInitialSendStateWithExistingTxState({
+              status: SEND_STATUSES.INVALID,
+            }),
           }),
         ).toBe(true);
       });
 
       it('has a selector to get send stage', () => {
-        expect(getSendStage({ send: initialState })).toBe(SEND_STAGES.INACTIVE);
+        expect(
+          getSendStage({ send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT }),
+        ).toBe(SEND_STAGES.INACTIVE);
         expect(
           getSendStage({
-            send: { ...initialState, stage: SEND_STAGES.ADD_RECIPIENT },
+            send: {
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+              stage: SEND_STAGES.ADD_RECIPIENT,
+            },
           }),
         ).toBe(SEND_STAGES.ADD_RECIPIENT);
       });
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index fc75375baf7d..30a3b65b9f58 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -31,7 +31,6 @@ import {
   updateSmartTransaction,
   setSmartTransactionsRefreshInterval,
   fetchSmartTransactionFees,
-  estimateSmartTransactionsGas,
   cancelSmartTransaction,
   getTransactions,
 } from '../../store/actions';
@@ -81,6 +80,7 @@ import {
   SWAP_FAILED_ERROR,
   SWAPS_FETCH_ORDER_CONFLICT,
   ALLOWED_SMART_TRANSACTIONS_CHAIN_IDS,
+  SLIPPAGE,
 } from '../../../shared/constants/swaps';
 import {
   TRANSACTION_TYPES,
@@ -109,7 +109,7 @@ const initialState = {
   fromTokenInputValue: '',
   fromTokenError: null,
   isFeatureFlagLoaded: false,
-  maxSlippage: 3,
+  maxSlippage: SLIPPAGE.DEFAULT,
   quotesFetchStartTime: null,
   reviewSwapClickedTimestamp: null,
   topAssets: {},
@@ -734,7 +734,7 @@ export const fetchQuotesAndSetQuoteState = (
         token_to: toTokenSymbol,
         request_type: balanceError ? 'Quote' : 'Order',
         slippage: maxSlippage,
-        custom_slippage: maxSlippage !== 2,
+        custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
         is_hardware_wallet: hardwareWalletUsed,
         hardware_wallet_type: hardwareWalletType,
         stx_enabled: smartTransactionsEnabled,
@@ -788,7 +788,7 @@ export const fetchQuotesAndSetQuoteState = (
             token_to: toTokenSymbol,
             request_type: balanceError ? 'Quote' : 'Order',
             slippage: maxSlippage,
-            custom_slippage: maxSlippage !== 2,
+            custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
             is_hardware_wallet: hardwareWalletUsed,
             hardware_wallet_type: hardwareWalletType,
             stx_enabled: smartTransactionsEnabled,
@@ -813,7 +813,7 @@ export const fetchQuotesAndSetQuoteState = (
             ),
             request_type: balanceError ? 'Quote' : 'Order',
             slippage: maxSlippage,
-            custom_slippage: maxSlippage !== 2,
+            custom_slippage: maxSlippage !== SLIPPAGE.DEFAULT,
             response_time: Date.now() - fetchStartTime,
             best_quote_source: newSelectedQuote.aggregator,
             available_quotes: Object.values(fetchedQuotes)?.length,
@@ -923,36 +923,44 @@ export const signAndSendSwapsSmartTransaction = ({
 
     const approveTxParams = getApproveTxParams(state);
     let approvalTxUuid;
+    let updatedApproveTxParams;
     try {
       if (approveTxParams) {
-        const updatedApproveTxParams = {
+        updatedApproveTxParams = {
           ...approveTxParams,
           value: '0x0',
         };
-        const smartTransactionApprovalFees = await dispatch(
-          fetchSwapsSmartTransactionFees(updatedApproveTxParams),
-        );
+      }
+      const fees = await dispatch(
+        fetchSwapsSmartTransactionFees(
+          unsignedTransaction,
+          updatedApproveTxParams,
+        ),
+      );
+      if (!fees) {
+        log.error('"fetchSwapsSmartTransactionFees" failed');
+        dispatch(setSwapsSTXSubmitLoading(false));
+        dispatch(setCurrentSmartTransactionsError(stxErrorTypes.UNAVAILABLE));
+        return;
+      }
+      if (approveTxParams) {
         updatedApproveTxParams.gas = `0x${decimalToHex(
-          smartTransactionApprovalFees?.gasLimit || 0,
+          fees.approvalTxFees?.gasLimit || 0,
         )}`;
         approvalTxUuid = await dispatch(
           signAndSendSmartTransaction({
             unsignedTransaction: updatedApproveTxParams,
-            smartTransactionFees: smartTransactionApprovalFees,
+            smartTransactionFees: fees.approvalTxFees,
           }),
         );
       }
-
-      const smartTransactionFees = await dispatch(
-        fetchSwapsSmartTransactionFees(unsignedTransaction),
-      );
       unsignedTransaction.gas = `0x${decimalToHex(
-        smartTransactionFees?.gasLimit || 0,
+        fees.tradeTxFees?.gasLimit || 0,
       )}`;
       const uuid = await dispatch(
         signAndSendSmartTransaction({
           unsignedTransaction,
-          smartTransactionFees,
+          smartTransactionFees: fees.tradeTxFees,
         }),
       );
 
@@ -1304,37 +1312,17 @@ export function fetchMetaSwapsGasPriceEstimates() {
   };
 }
 
-export function fetchSwapsSmartTransactionFees(unsignedTransaction) {
-  return async (dispatch, getState) => {
-    const {
-      swaps: { isFeatureFlagLoaded },
-    } = getState();
-    try {
-      return await dispatch(fetchSmartTransactionFees(unsignedTransaction));
-    } catch (e) {
-      if (e.message.startsWith('Fetch error:') && isFeatureFlagLoaded) {
-        const errorObj = parseSmartTransactionsError(e.message);
-        dispatch(setCurrentSmartTransactionsError(errorObj?.type));
-      }
-    }
-    return null;
-  };
-}
-
-export function estimateSwapsSmartTransactionsGas(
+export function fetchSwapsSmartTransactionFees(
   unsignedTransaction,
   approveTxParams,
 ) {
   return async (dispatch, getState) => {
     const {
-      swaps: { isFeatureFlagLoaded, swapsSTXLoading },
+      swaps: { isFeatureFlagLoaded },
     } = getState();
-    if (swapsSTXLoading) {
-      return;
-    }
     try {
-      await dispatch(
-        estimateSmartTransactionsGas(unsignedTransaction, approveTxParams),
+      return await dispatch(
+        fetchSmartTransactionFees(unsignedTransaction, approveTxParams),
       );
     } catch (e) {
       if (e.message.startsWith('Fetch error:') && isFeatureFlagLoaded) {
@@ -1342,6 +1330,7 @@ export function estimateSwapsSmartTransactionsGas(
         dispatch(setCurrentSmartTransactionsError(errorObj?.type));
       }
     }
+    return null;
   };
 }
 
diff --git a/ui/helpers/constants/common.js b/ui/helpers/constants/common.js
index 3deae2356041..914299d1d9b6 100644
--- a/ui/helpers/constants/common.js
+++ b/ui/helpers/constants/common.js
@@ -5,17 +5,6 @@ export const WEI = 'WEI';
 export const PRIMARY = 'PRIMARY';
 export const SECONDARY = 'SECONDARY';
 
-export const ERC20 = 'ERC20';
-export const ERC721 = 'ERC721';
-export const ERC1155 = 'ERC1155';
-
-export const TOKEN_STANDARDS = {
-  ERC20,
-  ERC721,
-  ERC1155,
-  NONE: 'NONE',
-};
-
 export const GAS_ESTIMATE_TYPES = {
   SLOW: 'SLOW',
   AVERAGE: 'AVERAGE',
@@ -25,6 +14,8 @@ export const GAS_ESTIMATE_TYPES = {
 
 let _supportLink = 'https://support.metamask.io';
 let _supportRequestLink = 'https://metamask.zendesk.com/hc/en-us/requests/new';
+const _contractAddressLink =
+  'https://metamask.zendesk.com/hc/en-us/articles/360020028092-What-is-the-known-contract-address-warning-';
 
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 _supportLink = 'https://metamask-flask.zendesk.com/hc';
@@ -34,3 +25,4 @@ _supportRequestLink =
 
 export const SUPPORT_LINK = _supportLink;
 export const SUPPORT_REQUEST_LINK = _supportRequestLink;
+export const CONTRACT_ADDRESS_LINK = _contractAddressLink;
diff --git a/ui/helpers/constants/critical-error.js b/ui/helpers/constants/critical-error.js
new file mode 100644
index 000000000000..a9c18cf5599f
--- /dev/null
+++ b/ui/helpers/constants/critical-error.js
@@ -0,0 +1 @@
+export const TEN_SECONDS_IN_MILLISECONDS = 10_000;
diff --git a/ui/helpers/constants/design-system.js b/ui/helpers/constants/design-system.js
index 1809ea31c3af..7bfa2817c020 100644
--- a/ui/helpers/constants/design-system.js
+++ b/ui/helpers/constants/design-system.js
@@ -11,6 +11,7 @@ export const COLORS = {
   TEXT_ALTERNATIVE: 'text-alternative',
   TEXT_MUTED: 'text-muted',
   ICON_DEFAULT: 'icon-default',
+  ICON_ALTERNATIVE: 'text-alternative',
   ICON_MUTED: 'icon-muted',
   BORDER_DEFAULT: 'border-default',
   BORDER_MUTED: 'border-muted',
@@ -126,9 +127,11 @@ export const DISPLAY = {
   FLEX: 'flex',
   GRID: 'grid',
   INLINE_BLOCK: 'inline-block',
+  INLINE: 'inline',
   INLINE_FLEX: 'inline-flex',
   INLINE_GRID: 'inline-grid',
   LIST_ITEM: 'list-item',
+  NONE: 'none',
 };
 
 export const FRACTIONS = {
@@ -206,3 +209,5 @@ export const RESIZE = {
   INITIAL: 'initial',
   INHERIT: 'inherit',
 };
+
+export const BREAKPOINTS = ['base', 'sm', 'md', 'lg'];
diff --git a/ui/helpers/constants/notifications.js b/ui/helpers/constants/notifications.js
new file mode 100644
index 000000000000..1acc32dd06a3
--- /dev/null
+++ b/ui/helpers/constants/notifications.js
@@ -0,0 +1,6 @@
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+
+// The time after which a notification should be deleted.
+export const NOTIFICATIONS_EXPIRATION_DELAY = 10000;
+
+///: END:ONLY_INCLUDE_IN
diff --git a/ui/helpers/constants/routes.js b/ui/helpers/constants/routes.js
index 519e0a0981b6..fa816e412e1b 100644
--- a/ui/helpers/constants/routes.js
+++ b/ui/helpers/constants/routes.js
@@ -12,6 +12,8 @@ const ALERTS_ROUTE = '/settings/alerts';
 const NETWORKS_ROUTE = '/settings/networks';
 const NETWORKS_FORM_ROUTE = '/settings/networks/form';
 const ADD_NETWORK_ROUTE = '/settings/networks/add-network';
+const ADD_POPULAR_CUSTOM_NETWORK =
+  '/settings/networks/add-popular-custom-network';
 const SNAPS_LIST_ROUTE = '/settings/snaps-list';
 const SNAPS_VIEW_ROUTE = '/settings/snaps-view';
 const CONTACT_LIST_ROUTE = '/settings/contact-list';
@@ -33,6 +35,7 @@ const CONNECT_ROUTE = '/connect';
 const CONNECT_CONFIRM_PERMISSIONS_ROUTE = '/confirm-permissions';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 const CONNECT_SNAP_INSTALL_ROUTE = '/snap-install';
+const NOTIFICATIONS_ROUTE = '/notifications';
 ///: END:ONLY_INCLUDE_IN
 const CONNECTED_ROUTE = '/connected';
 const CONNECTED_ACCOUNTS_ROUTE = '/connected/accounts';
@@ -87,6 +90,7 @@ const CONFIRM_SEND_ETHER_PATH = '/send-ether';
 const CONFIRM_SEND_TOKEN_PATH = '/send-token';
 const CONFIRM_DEPLOY_CONTRACT_PATH = '/deploy-contract';
 const CONFIRM_APPROVE_PATH = '/approve';
+const CONFIRM_SET_APPROVAL_FOR_ALL_PATH = '/set-approval-for-all';
 const CONFIRM_TRANSFER_FROM_PATH = '/transfer-from';
 const CONFIRM_SAFE_TRANSFER_FROM_PATH = '/safe-transfer-from';
 const CONFIRM_TOKEN_METHOD_PATH = '/token-method';
@@ -112,6 +116,8 @@ const PATH_NAME_MAP = {
   [NETWORKS_ROUTE]: 'Network Settings Page',
   [NETWORKS_FORM_ROUTE]: 'Network Settings Page Form',
   [ADD_NETWORK_ROUTE]: 'Add Network From Settings Page Form',
+  [ADD_POPULAR_CUSTOM_NETWORK]:
+    'Add Network From A List Of Popular Custom Networks',
   [CONTACT_LIST_ROUTE]: 'Contact List Settings Page',
   [`${CONTACT_EDIT_ROUTE}/:address`]: 'Edit Contact Settings Page',
   [CONTACT_ADD_ROUTE]: 'Add Contact Settings Page',
@@ -140,6 +146,7 @@ const PATH_NAME_MAP = {
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SEND_TOKEN_PATH}`]: 'Confirm Send Token Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_DEPLOY_CONTRACT_PATH}`]: 'Confirm Deploy Contract Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_APPROVE_PATH}`]: 'Confirm Approve Transaction Page',
+  [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`]: 'Confirm Set Approval For All Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_TRANSFER_FROM_PATH}`]: 'Confirm Transfer From Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${CONFIRM_SAFE_TRANSFER_FROM_PATH}`]: 'Confirm Safe Transfer From Transaction Page',
   [`${CONFIRM_TRANSACTION_ROUTE}/:id${SIGNATURE_REQUEST_PATH}`]: 'Signature Request Page',
@@ -201,6 +208,7 @@ export {
   CONFIRM_SEND_TOKEN_PATH,
   CONFIRM_DEPLOY_CONTRACT_PATH,
   CONFIRM_APPROVE_PATH,
+  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
   CONFIRM_TRANSFER_FROM_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
   CONFIRM_TOKEN_METHOD_PATH,
@@ -223,12 +231,14 @@ export {
   NETWORKS_ROUTE,
   NETWORKS_FORM_ROUTE,
   ADD_NETWORK_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
   INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
   INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
   CONNECT_ROUTE,
   CONNECT_CONFIRM_PERMISSIONS_ROUTE,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   CONNECT_SNAP_INSTALL_ROUTE,
+  NOTIFICATIONS_ROUTE,
   ///: END:ONLY_INCLUDE_IN
   CONNECTED_ROUTE,
   CONNECTED_ACCOUNTS_ROUTE,
diff --git a/ui/helpers/constants/settings.js b/ui/helpers/constants/settings.js
index 3f05221e49e0..3148e7543ec4 100644
--- a/ui/helpers/constants/settings.js
+++ b/ui/helpers/constants/settings.js
@@ -346,4 +346,11 @@ export const SETTINGS_CONSTANTS = [
     icon: 'fa fa-flask',
     featureFlag: 'COLLECTIBLES_V1',
   },
+  {
+    tabMessage: (t) => t('experimental'),
+    sectionMessage: (t) => t('showCustomNetworkList'),
+    descriptionMessage: (t) => t('showCustomNetworkListDescription'),
+    route: `${EXPERIMENTAL_ROUTE}#show-custom-network`,
+    icon: 'fa fa-flask',
+  },
 ];
diff --git a/ui/helpers/constants/transactions.js b/ui/helpers/constants/transactions.js
index b7f9320547bc..4dc66ab79c43 100644
--- a/ui/helpers/constants/transactions.js
+++ b/ui/helpers/constants/transactions.js
@@ -17,6 +17,7 @@ export const PRIORITY_STATUS_HASH = {
 
 export const TOKEN_CATEGORY_HASH = {
   [TRANSACTION_TYPES.TOKEN_METHOD_APPROVE]: true,
+  [TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL]: true,
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER]: true,
   [TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM]: true,
 };
diff --git a/ui/helpers/utils/error-utils.js b/ui/helpers/utils/error-utils.js
new file mode 100644
index 000000000000..5b98bd60e162
--- /dev/null
+++ b/ui/helpers/utils/error-utils.js
@@ -0,0 +1,55 @@
+import getFirstPreferredLangCode from '../../../app/scripts/lib/get-first-preferred-lang-code';
+import { setupLocale } from '../..';
+import switchDirection from './switch-direction';
+
+const getLocaleContext = (currentLocaleMessages, enLocaleMessages) => {
+  return (key) => {
+    let message = currentLocaleMessages[key]?.message;
+    if (!message && enLocaleMessages[key]) {
+      message = enLocaleMessages[key].message;
+    }
+    return message;
+  };
+};
+
+export async function getErrorHtml(supportLink, metamaskState) {
+  let response, preferredLocale;
+  if (metamaskState?.currentLocale) {
+    preferredLocale = metamaskState.currentLocale;
+    response = await setupLocale(metamaskState.currentLocale);
+  } else {
+    preferredLocale = await getFirstPreferredLangCode();
+    response = await setupLocale(preferredLocale);
+  }
+
+  const textDirection = ['ar', 'dv', 'fa', 'he', 'ku'].includes(preferredLocale)
+    ? 'rtl'
+    : 'auto';
+
+  switchDirection(textDirection);
+  const { currentLocaleMessages, enLocaleMessages } = response;
+  const t = getLocaleContext(currentLocaleMessages, enLocaleMessages);
+
+  return `
+    <div class="critical-error">
+      <div class="critical-error__alert">
+        <p class="critical-error__alert__message">
+          ${t('troubleStarting')}        
+        </p>   
+        <button id='critical-error-button' class="critical-error__alert__button">
+          ${t('restartMetamask')}
+        </button>
+      </div>    
+      <p class="critical-error__paragraph">    
+        ${t('stillGettingMessage')}
+        <a           
+          href=${supportLink} 
+          class="critical-error__paragraph__link" 
+          target="_blank" 
+          rel="noopener noreferrer">
+            ${t('sendBugReport')}
+          </a>  
+      </p>
+    </div>
+    `;
+}
diff --git a/ui/helpers/utils/error-utils.test.js b/ui/helpers/utils/error-utils.test.js
new file mode 100644
index 000000000000..84aa05508ff5
--- /dev/null
+++ b/ui/helpers/utils/error-utils.test.js
@@ -0,0 +1,49 @@
+import { SUPPORT_LINK } from '../constants/common';
+import { getErrorHtml } from './error-utils';
+import { fetchLocale } from './i18n-helper';
+
+jest.mock('./i18n-helper', () => ({
+  fetchLocale: jest.fn(),
+  loadRelativeTimeFormatLocaleData: jest.fn(),
+}));
+
+describe('Error utils Tests', () => {
+  it('should get error html', async () => {
+    const mockStore = {
+      localeMessages: {
+        current: {
+          troubleStarting: {
+            message:
+              'MetaMask had trouble starting. This error could be intermittent, so try restarting the extension.',
+          },
+          restartMetamask: {
+            message: 'Restart MetaMask',
+          },
+          stillGettingMessage: {
+            message: 'Still getting this message?',
+          },
+          sendBugReport: {
+            message: 'Send us a bug report.',
+          },
+        },
+      },
+      metamask: {
+        currentLocale: 'en',
+      },
+    };
+
+    fetchLocale.mockReturnValue(mockStore.localeMessages.current);
+    const errorHtml = await getErrorHtml(SUPPORT_LINK, mockStore.metamask);
+    const currentLocale = mockStore.localeMessages.current;
+    const troubleStartingMessage = currentLocale.troubleStarting.message;
+    const restartMetamaskMessage = currentLocale.restartMetamask.message;
+    const stillGettingMessageMessage =
+      currentLocale.stillGettingMessage.message;
+    const sendBugReportMessage = currentLocale.sendBugReport.message;
+
+    expect(errorHtml).toContain(troubleStartingMessage);
+    expect(errorHtml).toContain(restartMetamaskMessage);
+    expect(errorHtml).toContain(stillGettingMessageMessage);
+    expect(errorHtml).toContain(sendBugReportMessage);
+  });
+});
diff --git a/ui/helpers/utils/i18n-helper.js b/ui/helpers/utils/i18n-helper.js
index f5a2aac22134..c18e7df83bb3 100644
--- a/ui/helpers/utils/i18n-helper.js
+++ b/ui/helpers/utils/i18n-helper.js
@@ -3,10 +3,9 @@ import React from 'react';
 import log from 'loglevel';
 import * as Sentry from '@sentry/browser';
 
-import { SECOND } from '../../../shared/constants/time';
 import getFetchWithTimeout from '../../../shared/modules/fetch-with-timeout';
 
-const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
+const fetchWithTimeout = getFetchWithTimeout();
 
 const warned = {};
 const missingMessageErrors = {};
diff --git a/ui/helpers/utils/icon-factory.js b/ui/helpers/utils/icon-factory.js
index 5e75f20fce76..8e36f6699bc3 100644
--- a/ui/helpers/utils/icon-factory.js
+++ b/ui/helpers/utils/icon-factory.js
@@ -1,7 +1,4 @@
-import {
-  isValidHexAddress,
-  toChecksumHexAddress,
-} from '../../../shared/modules/hexstring-utils';
+import { isValidHexAddress } from '../../../shared/modules/hexstring-utils';
 
 let iconFactory;
 
@@ -17,29 +14,9 @@ function IconFactory(jazzicon) {
   this.cache = {};
 }
 
-IconFactory.prototype.iconForAddress = function (
-  address,
-  diameter,
-  useTokenDetection,
-  tokenList,
-) {
-  if (process.env.TOKEN_DETECTION_V2) {
-    if (iconExistsFor(address.toLowerCase(), tokenList)) {
-      return imageElFor(address.toLowerCase(), useTokenDetection, tokenList);
-    }
-  } else {
-    /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
-    // When useTokenDetection flag is true the tokenList contains tokens with non-checksum address from the dynamic token service api,
-    // When useTokenDetection flag is false the tokenList contains tokens with checksum addresses from contract-metadata.
-    // So the flag indicates whether the address of tokens currently on the tokenList is checksum or not.
-    // And since the token.address from allTokens is checksumaddress
-    // tokenAddress have to be changed to lowercase when we are using dynamic list
-    const addr = useTokenDetection
-      ? address.toLowerCase()
-      : toChecksumHexAddress(address);
-    if (iconExistsFor(addr, tokenList)) {
-      return imageElFor(addr, useTokenDetection, tokenList);
-    }
+IconFactory.prototype.iconForAddress = function (address, diameter, tokenList) {
+  if (iconExistsFor(address.toLowerCase(), tokenList)) {
+    return imageElFor(address.toLowerCase(), tokenList);
   }
 
   return this.generateIdenticonSvg(address, diameter);
@@ -74,16 +51,10 @@ function iconExistsFor(address, tokenList) {
   );
 }
 
-function imageElFor(address, useTokenDetection, tokenList) {
+function imageElFor(address, tokenList) {
   const tokenMetadata = tokenList[address];
-  const fileName = tokenMetadata?.iconUrl;
-  // token from dynamic api list is fetched when useTokenDetection is true
-  // In the static list, the iconUrl will be holding only a filename for the image,
-  // the corresponding images will be available in the `images/contract/` location when the contract-metadata package was added to the extension
-  //  so that it can be accessed using the filename in iconUrl.
-  const path = useTokenDetection ? fileName : `images/contract/${fileName}`;
   const img = document.createElement('img');
-  img.src = process.env.TOKEN_DETECTION_V2 ? fileName : path;
+  img.src = tokenMetadata?.iconUrl;
   img.style.width = '100%';
   return img;
 }
diff --git a/ui/helpers/utils/permission.js b/ui/helpers/utils/permission.js
index 7625880eac67..c2f9023dfddd 100644
--- a/ui/helpers/utils/permission.js
+++ b/ui/helpers/utils/permission.js
@@ -58,6 +58,11 @@ const PERMISSION_DESCRIPTIONS = deepFreeze({
     leftIcon: 'fas fa-wifi',
     rightIcon: null,
   },
+  [EndowmentPermissions['endowment:long-running']]: {
+    label: (t) => t('permission_longRunning'),
+    leftIcon: 'fas fa-infinity',
+    rightIcon: null,
+  },
   ///: END:ONLY_INCLUDE_IN
   [UNKNOWN_PERMISSION]: {
     label: (t, permissionName) =>
diff --git a/ui/helpers/utils/settings-search.test.js b/ui/helpers/utils/settings-search.test.js
index 3ef7825d9f75..9f0264e1d761 100644
--- a/ui/helpers/utils/settings-search.test.js
+++ b/ui/helpers/utils/settings-search.test.js
@@ -195,7 +195,7 @@ describe('Settings Search Utils', () => {
 
     it('should get good experimental section number', () => {
       expect(getNumberOfSettingsInSection(t, t('experimental'))).toStrictEqual(
-        3,
+        4,
       );
     });
 
diff --git a/ui/helpers/utils/token-util.js b/ui/helpers/utils/token-util.js
index b934ed176763..5a7507c952df 100644
--- a/ui/helpers/utils/token-util.js
+++ b/ui/helpers/utils/token-util.js
@@ -5,9 +5,9 @@ import {
   multiplyCurrencies,
 } from '../../../shared/modules/conversion.utils';
 import { getTokenStandardAndDetails } from '../../store/actions';
-import { ERC1155, ERC721 } from '../constants/common';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
+import { ERC20 } from '../../../shared/constants/transaction';
 import * as util from './util';
 import { formatCurrency } from './confirm-tx.util';
 
@@ -43,7 +43,7 @@ async function getDecimalsFromContract(tokenAddress) {
   }
 }
 
-function getTokenMetadata(tokenAddress, tokenList) {
+export function getTokenMetadata(tokenAddress, tokenList) {
   const casedTokenList = Object.keys(tokenList).reduce((acc, base) => {
     return {
       ...acc,
@@ -151,9 +151,29 @@ export function getTokenValueParam(tokenData = {}) {
   return tokenData?.args?._value?.toString();
 }
 
-export function getTokenValue(tokenParams = []) {
-  const valueData = tokenParams.find((param) => param.name === '_value');
-  return valueData && valueData.value;
+/**
+ * Gets either the '_tokenId' parameter or the 'id' param of the passed token transaction data.,
+ * These are the parsed tokenId values returned by `parseStandardTokenTransactionData` as defined
+ * in the ERC721 and ERC1155 ABIs from metamask-eth-abis (https://github.com/MetaMask/metamask-eth-abis/tree/main/src/abis)
+ *
+ * @param {Object} tokenData - ethers Interface token data.
+ * @returns {string | undefined} A decimal string value.
+ */
+export function getTokenIdParam(tokenData = {}) {
+  return (
+    tokenData?.args?._tokenId?.toString() ?? tokenData?.args?.id?.toString()
+  );
+}
+
+/**
+ * Gets the '_approved' parameter of the given token transaction data
+ * (i.e function call) per the Human Standard Token ABI, if present.
+ *
+ * @param {Object} tokenData - ethers Interface token data.
+ * @returns {boolean | undefined} A boolean indicating whether the function is being called to approve or revoke access.
+ */
+export function getTokenApprovedParam(tokenData = {}) {
+  return tokenData?.args?._approved;
 }
 
 /**
@@ -228,8 +248,32 @@ export async function getAssetDetails(
     throw new Error('Unable to detect valid token data');
   }
 
-  const tokenId = getTokenValueParam(tokenData);
+  // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
+  // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
+  // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
+  let tokenId =
+    getTokenIdParam(tokenData)?.toString() ?? getTokenValueParam(tokenData);
+
+  const toAddress = getTokenAddressParam(tokenData);
+
   let tokenDetails;
+
+  // if a tokenId is present check if there is a collectible in state matching the address/tokenId
+  // and avoid unnecessary network requests to query token details we already have
+  if (existingCollectibles?.length && tokenId) {
+    const existingCollectible = existingCollectibles.find(
+      ({ address, tokenId: _tokenId }) =>
+        isEqualCaseInsensitive(tokenAddress, address) && _tokenId === tokenId,
+    );
+
+    if (existingCollectible) {
+      return {
+        toAddress,
+        ...existingCollectible,
+      };
+    }
+  }
+
   try {
     tokenDetails = await getTokenStandardAndDetails(
       tokenAddress,
@@ -238,26 +282,31 @@ export async function getAssetDetails(
     );
   } catch (error) {
     log.warn(error);
-    return {};
+    // if we can't determine any token standard or details return the data we can extract purely from the parsed transaction data
+    return { toAddress, tokenId };
   }
 
-  if (tokenDetails?.standard) {
-    const { standard } = tokenDetails;
-    if (standard === ERC721 || standard === ERC1155) {
-      const existingCollectible = existingCollectibles.find(({ address }) =>
-        isEqualCaseInsensitive(tokenAddress, address),
-      );
-
-      if (existingCollectible) {
-        return {
-          ...existingCollectible,
-          standard,
-        };
-      }
-    }
-    // else if not a collectible already in state or standard === ERC20 just return tokenDetails as it contains all required data
-    return tokenDetails;
+  const tokenAmount =
+    tokenData &&
+    tokenDetails?.decimals &&
+    calcTokenAmount(
+      getTokenValueParam(tokenData),
+      tokenDetails?.decimals,
+    ).toString(10);
+
+  const decimals =
+    tokenDetails?.decimals && Number(tokenDetails.decimals?.toString(10));
+
+  if (tokenDetails?.standard === ERC20) {
+    tokenId = undefined;
   }
 
-  return {};
+  // else if not a collectible already in state or standard === ERC20 return tokenDetails and tokenId
+  return {
+    tokenAmount,
+    toAddress,
+    decimals,
+    tokenId,
+    ...tokenDetails,
+  };
 }
diff --git a/ui/helpers/utils/transactions.util.js b/ui/helpers/utils/transactions.util.js
index 25a38593fc50..07d37341de98 100644
--- a/ui/helpers/utils/transactions.util.js
+++ b/ui/helpers/utils/transactions.util.js
@@ -35,12 +35,23 @@ async function getMethodFrom4Byte(fourBytePrefix) {
       mode: 'cors',
     },
   );
+  fourByteResponse.results.sort((a, b) => {
+    return new Date(a.created_at).getTime() < new Date(b.created_at).getTime()
+      ? -1
+      : 1;
+  });
+  return fourByteResponse.results[0].text_signature;
+}
 
-  if (fourByteResponse.count === 1) {
-    return fourByteResponse.results[0].text_signature;
+function pickShortest(registrySig, fourByteSig) {
+  if (!registrySig) {
+    return fourByteSig;
+  } else if (!fourByteSig) {
+    return registrySig;
   }
-  return null;
+  return fourByteSig.length < registrySig.length ? fourByteSig : registrySig;
 }
+
 let registry;
 
 /**
@@ -51,7 +62,7 @@ let registry;
  */
 export async function getMethodDataAsync(fourBytePrefix) {
   try {
-    const fourByteSig = getMethodFrom4Byte(fourBytePrefix).catch((e) => {
+    const fourByteSig = await getMethodFrom4Byte(fourBytePrefix).catch((e) => {
       log.error(e);
       return null;
     });
@@ -60,11 +71,12 @@ export async function getMethodDataAsync(fourBytePrefix) {
       registry = new MethodRegistry({ provider: global.ethereumProvider });
     }
 
-    let sig = await registry.lookup(fourBytePrefix);
+    const registrySig = await registry.lookup(fourBytePrefix).catch((e) => {
+      log.error(e);
+      return null;
+    });
 
-    if (!sig) {
-      sig = await fourByteSig;
-    }
+    const sig = pickShortest(registrySig, fourByteSig);
 
     if (!sig) {
       return {};
@@ -104,6 +116,7 @@ export function isTokenMethodAction(type) {
   return [
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER,
     TRANSACTION_TYPES.TOKEN_METHOD_APPROVE,
+    TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL,
     TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM,
     TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM,
   ].includes(type);
@@ -205,6 +218,9 @@ export function getTransactionTypeTitle(t, type, nativeCurrency = 'ETH') {
     case TRANSACTION_TYPES.TOKEN_METHOD_APPROVE: {
       return t('approve');
     }
+    case TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL: {
+      return t('setApprovalForAll');
+    }
     case TRANSACTION_TYPES.SIMPLE_SEND: {
       return t('sendingNativeAsset', [nativeCurrency]);
     }
diff --git a/ui/helpers/utils/transactions.util.test.js b/ui/helpers/utils/transactions.util.test.js
index 591e46d07f6e..eaf0a963abad 100644
--- a/ui/helpers/utils/transactions.util.test.js
+++ b/ui/helpers/utils/transactions.util.test.js
@@ -1,3 +1,5 @@
+import { HttpProvider } from 'ethjs';
+import nock from 'nock';
 import {
   TRANSACTION_GROUP_STATUSES,
   TRANSACTION_STATUSES,
@@ -55,4 +57,48 @@ describe('Transactions utils', () => {
       ).toStrictEqual(false);
     });
   });
+
+  describe('getMethodDataAsync', () => {
+    global.ethereumProvider = new HttpProvider(
+      'https://mainnet.infura.io/v3/341eacb578dd44a1a049cbc5f6fd4035',
+    );
+    it('returns a valid signature for setApprovalForAll', async () => {
+      nock('https://www.4byte.directory:443', { encodedQueryParams: true })
+        .get('/api/v1/signatures/')
+        .query({ hex_signature: '0xa22cb465' })
+        .reply(200, {
+          count: 2,
+          next: null,
+          previous: null,
+          results: [
+            {
+              id: 841519,
+              created_at: '2022-06-12T00:50:19.305588Z',
+              text_signature: 'niceFunctionHerePlzClick943230089(address,bool)',
+              hex_signature: '0xa22cb465',
+              bytes_signature: '¢,´e',
+            },
+            {
+              id: 29659,
+              created_at: '2018-04-11T21:47:39.980645Z',
+              text_signature: 'setApprovalForAll(address,bool)',
+              hex_signature: '0xa22cb465',
+              bytes_signature: '¢,´e',
+            },
+          ],
+        });
+      nock('https://mainnet.infura.io:443', { encodedQueryParams: true })
+        .post('/v3/341eacb578dd44a1a049cbc5f6fd4035')
+        .reply(200, (_, requestBody) => ({
+          id: requestBody.id,
+          jsonrpc: '2.0',
+          result:
+            '0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002f6e69636546756e6374696f6e48657265506c7a436c69636b39343332333030383928616464726573732c626f6f6c290000000000000000000000000000000000',
+        }));
+      expect(await utils.getMethodDataAsync('0xa22cb465')).toStrictEqual({
+        name: 'Set Approval For All',
+        params: [{ type: 'address' }, { type: 'bool' }],
+      });
+    });
+  });
 });
diff --git a/ui/hooks/useAssetDetails.js b/ui/hooks/useAssetDetails.js
index ce9ef30bab4e..8d9de9c6747c 100644
--- a/ui/hooks/useAssetDetails.js
+++ b/ui/hooks/useAssetDetails.js
@@ -1,24 +1,14 @@
 import { useState, useEffect } from 'react';
 import { useSelector, useDispatch } from 'react-redux';
-import { parseStandardTokenTransactionData } from '../../shared/modules/transaction.utils';
-import { getCollectibles, getTokens } from '../ducks/metamask/metamask';
-import { ERC1155, ERC721, ERC20 } from '../helpers/constants/common';
-import {
-  calcTokenAmount,
-  getAssetDetails,
-  getTokenAddressParam,
-  getTokenValueParam,
-} from '../helpers/utils/token-util';
-import { getTokenList } from '../selectors';
+import { getCollectibles } from '../ducks/metamask/metamask';
+import { getAssetDetails } from '../helpers/utils/token-util';
 import { hideLoadingIndication, showLoadingIndication } from '../store/actions';
 import { usePrevious } from './usePrevious';
 
 export function useAssetDetails(tokenAddress, userAddress, transactionData) {
   const dispatch = useDispatch();
   // state selectors
-  const tokens = useSelector(getTokens);
   const collectibles = useSelector(getCollectibles);
-  const tokenList = useSelector(getTokenList);
 
   // in-hook state
   const [currentAsset, setCurrentAsset] = useState(null);
@@ -36,8 +26,6 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
         userAddress,
         transactionData,
         collectibles,
-        tokens,
-        tokenList,
       );
       setCurrentAsset(assetDetails);
       dispatch(hideLoadingIndication());
@@ -58,22 +46,8 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
     userAddress,
     transactionData,
     collectibles,
-    tokens,
-    tokenList,
   ]);
 
-  let assetStandard,
-    assetName,
-    assetAddress,
-    tokenSymbol,
-    decimals,
-    tokenImage,
-    userBalance,
-    tokenValue,
-    toAddress,
-    tokenAmount,
-    tokenId;
-
   if (currentAsset) {
     const {
       standard,
@@ -81,37 +55,25 @@ export function useAssetDetails(tokenAddress, userAddress, transactionData) {
       image,
       name,
       balance,
-      decimals: currentAssetDecimals,
+      tokenId,
+      toAddress,
+      tokenAmount,
+      decimals,
     } = currentAsset;
-    const tokenData = parseStandardTokenTransactionData(transactionData);
-    assetStandard = standard;
-    assetAddress = tokenAddress;
-    tokenSymbol = symbol;
-    tokenImage = image;
-    toAddress = getTokenAddressParam(tokenData);
-    if (assetStandard === ERC721 || assetStandard === ERC1155) {
-      assetName = name;
-      tokenId = getTokenValueParam(tokenData);
-    }
-    if (assetStandard === ERC20) {
-      userBalance = balance;
-      decimals = Number(currentAssetDecimals?.toString(10));
-      tokenAmount =
-        tokenData &&
-        calcTokenAmount(getTokenValueParam(tokenData), decimals).toString(10);
-    }
+
+    return {
+      toAddress,
+      tokenId,
+      decimals,
+      tokenAmount,
+      assetAddress: tokenAddress,
+      assetStandard: standard,
+      tokenSymbol: symbol ?? '',
+      tokenImage: image,
+      userBalance: balance,
+      assetName: name,
+    };
   }
-  return {
-    assetStandard,
-    assetName,
-    assetAddress,
-    userBalance,
-    tokenSymbol,
-    decimals,
-    tokenImage,
-    tokenValue,
-    toAddress,
-    tokenAmount,
-    tokenId,
-  };
+
+  return {};
 }
diff --git a/ui/hooks/useAssetDetails.test.js b/ui/hooks/useAssetDetails.test.js
new file mode 100644
index 000000000000..d86ba2af7b98
--- /dev/null
+++ b/ui/hooks/useAssetDetails.test.js
@@ -0,0 +1,193 @@
+import React from 'react';
+import { Provider } from 'react-redux';
+import { renderHook } from '@testing-library/react-hooks';
+
+import configureStore from '../store/store';
+import * as Actions from '../store/actions';
+import { ERC1155, ERC20, ERC721 } from '../../shared/constants/transaction';
+import { useAssetDetails } from './useAssetDetails';
+
+const renderUseAssetDetails = ({
+  tokenAddress,
+  userAddress,
+  transactionData,
+}) => {
+  const mockState = {
+    metamask: {
+      provider: {
+        type: 'test',
+        chainId: '0x3',
+      },
+      tokenList: {},
+    },
+  };
+
+  const wrapper = ({ children }) => (
+    <Provider store={configureStore(mockState)}>{children}</Provider>
+  );
+
+  return renderHook(
+    () => useAssetDetails(tokenAddress, userAddress, transactionData),
+    { wrapper },
+  );
+};
+
+describe('useAssetDetails', () => {
+  let getTokenStandardAndDetailsStub;
+
+  beforeEach(() => {
+    getTokenStandardAndDetailsStub = jest
+      .spyOn(Actions, 'getTokenStandardAndDetails')
+      .mockImplementation(() => Promise.resolve({}));
+  });
+
+  it('should return object with tokenSymbol set to an empty string, when getAssetDetails returns and empty object', async () => {
+    const toAddress = '000000000000000000000000000000000000dead';
+    const tokenAddress = '0x1';
+
+    const transactionData = `0xa9059cbb000000000000000000000000${toAddress}000000000000000000000000000000000000000000000000016345785d8a0000`;
+
+    const { result, waitForNextUpdate } = renderUseAssetDetails({
+      tokenAddress,
+      userAddress: '0x111',
+      transactionData,
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toStrictEqual(
+      expect.objectContaining({
+        assetAddress: tokenAddress,
+        tokenSymbol: '',
+      }),
+    );
+  });
+
+  it('should return object with correct tokenValues for an ERC20 token', async () => {
+    const userAddress = '0xf04a5cc80b1e94c69b48f5ee68a08cd2f09a7c3e';
+    const tokenAddress = '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2';
+    const toAddress = '000000000000000000000000000000000000dead';
+    const transactionData = `0xa9059cbb000000000000000000000000${toAddress}00000000000000000000000000000000000000000000000000000000000001f4`;
+
+    const standard = ERC20;
+    const symbol = 'WETH';
+    const balance = '1';
+    const decimals = 18;
+
+    getTokenStandardAndDetailsStub.mockImplementation(() =>
+      Promise.resolve({
+        standard,
+        balance,
+        symbol,
+        decimals,
+      }),
+    );
+
+    const { result, waitForNextUpdate } = renderUseAssetDetails({
+      tokenAddress,
+      userAddress,
+      transactionData,
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toStrictEqual({
+      assetAddress: tokenAddress,
+      assetName: undefined,
+      assetStandard: standard,
+      decimals,
+      toAddress: `0x${toAddress}`,
+      tokenAmount: '0.0000000000000005',
+      tokenId: undefined,
+      tokenImage: undefined,
+      tokenSymbol: symbol,
+      userBalance: balance,
+    });
+  });
+
+  it('should return object with correct tokenValues for an ERC721 token', async () => {
+    const tokenAddress = '0xBC4CA0EdA7647A8aB7C2061c2E118A18a936f13D';
+    const toAddress = '000000000000000000000000000000000000dead';
+    const tokenId = '12';
+    const transactionData = `0x23b872dd000000000000000000000000a544eebe103733f22ef62af556023bc918b73d36000000000000000000000000${toAddress}000000000000000000000000000000000000000000000000000000000000000${Number(
+      tokenId,
+    ).toString(16)}`;
+
+    const symbol = 'BAYC';
+    const name = 'BoredApeYachtClub';
+    const image =
+      'https://bafybeihw3gvmthmvrenfmcvagtais5tv7r4nmiezgsv7nyknjubxw4lite.ipfs.dweb.link';
+    const standard = ERC721;
+
+    getTokenStandardAndDetailsStub.mockImplementation(() =>
+      Promise.resolve({
+        standard,
+        symbol,
+        name,
+        image,
+      }),
+    );
+
+    const { result, waitForNextUpdate } = renderUseAssetDetails({
+      tokenAddress,
+      transactionData,
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toStrictEqual({
+      assetAddress: tokenAddress,
+      assetName: name,
+      assetStandard: standard,
+      decimals: undefined,
+      toAddress: `0x${toAddress}`,
+      tokenId,
+      tokenImage: image,
+      tokenSymbol: symbol,
+      userBalance: undefined,
+      tokenAmount: undefined,
+    });
+  });
+
+  it('should return object with correct tokenValues for an ERC1155 token', async () => {
+    const tokenAddress = '0x76BE3b62873462d2142405439777e971754E8E77';
+    const toAddress = '000000000000000000000000000000000000dead';
+    const tokenId = '802';
+    const transactionData = `0xf242432a000000000000000000000000a544eebe103733f22ef62af556023bc918b73d36000000000000000000000000000000000000000000000000000000000000dead0000000000000000000000000000000000000000000000000000000000000${Number(
+      tokenId,
+    ).toString(
+      16,
+    )}000000000000000000000000000000000000000000000000000000000000009c00000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000`;
+
+    const image =
+      'https://bafybeihw3gvmthmvrenfmcvagtais5tv7r4nmiezgsv7nyknjubxw4lite.ipfs.dweb.link';
+    const standard = ERC1155;
+
+    getTokenStandardAndDetailsStub.mockImplementation(() =>
+      Promise.resolve({
+        standard,
+        image,
+      }),
+    );
+
+    const { result, waitForNextUpdate } = renderUseAssetDetails({
+      tokenAddress,
+      transactionData,
+    });
+
+    await waitForNextUpdate();
+
+    expect(result.current).toStrictEqual({
+      assetAddress: tokenAddress,
+      assetName: undefined,
+      assetStandard: standard,
+      decimals: undefined,
+      toAddress: `0x${toAddress}`,
+      tokenId,
+      tokenImage: image,
+      tokenSymbol: '',
+      userBalance: undefined,
+      tokenAmount: undefined,
+    });
+  });
+});
diff --git a/ui/hooks/useTransactionDisplayData.js b/ui/hooks/useTransactionDisplayData.js
index ee47225c8ee7..474bf814f08a 100644
--- a/ui/hooks/useTransactionDisplayData.js
+++ b/ui/hooks/useTransactionDisplayData.js
@@ -8,6 +8,7 @@ import { camelCaseToCapitalize } from '../helpers/utils/common.util';
 import { PRIMARY, SECONDARY } from '../helpers/constants/common';
 import {
   getTokenAddressParam,
+  getTokenIdParam,
   getTokenValueParam,
 } from '../helpers/utils/token-util';
 import {
@@ -37,17 +38,41 @@ import { useTokenData } from './useTokenData';
 import { useSwappedTokenValue } from './useSwappedTokenValue';
 import { useCurrentAsset } from './useCurrentAsset';
 
+/**
+ *  There are seven types of transaction entries that are currently differentiated in the design:
+ *  1. Signature request
+ *  2. Send (sendEth sendTokens)
+ *  3. Deposit
+ *  4. Site interaction
+ *  5. Approval
+ *  6. Swap
+ *  7. Swap Approval
+ */
+const signatureTypes = [
+  null,
+  undefined,
+  TRANSACTION_TYPES.SIGN,
+  TRANSACTION_TYPES.PERSONAL_SIGN,
+  TRANSACTION_TYPES.SIGN_TYPED_DATA,
+  TRANSACTION_TYPES.ETH_DECRYPT,
+  TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY,
+];
+
+/**
+ * @typedef {(import('../../selectors/transactions').TransactionGroup} TransactionGroup
+ */
+
 /**
  * @typedef {Object} TransactionDisplayData
- * @property {string} title - primary description of the transaction
- * @property {string} subtitle - supporting text describing the transaction
- * @property {bool} subtitleContainsOrigin - true if the subtitle includes the origin of the tx
- * @property {string} category - the transaction category
+ * @property {string} category - the transaction category that will be used for rendering the icon in the activity list
  * @property {string} primaryCurrency - the currency string to display in the primary position
- * @property {string} [secondaryCurrency] - the currency string to display in the secondary position
- * @property {string} status - the status of the transaction
- * @property {string} senderAddress - the Ethereum address of the sender
  * @property {string} recipientAddress - the Ethereum address of the recipient
+ * @property {string} senderAddress - the Ethereum address of the sender
+ * @property {string} status - the status of the transaction
+ * @property {string} subtitle - the supporting text describing the transaction
+ * @property {boolean} subtitleContainsOrigin - true if the subtitle includes the origin of the tx
+ * @property {string} title - the primary title of the tx that will be displayed in the activity list
+ * @property {string} [secondaryCurrency] - the currency string to display in the secondary position
  */
 
 /**
@@ -58,7 +83,7 @@ import { useCurrentAsset } from './useCurrentAsset';
  * of data that can power all views related to a transaction. Presently the main
  * case is for shared logic between transaction-list-item and transaction-detail-view
  *
- * @param {Object} transactionGroup - group of transactions
+ * @param {TransactionGroup} transactionGroup - group of transactions of the same nonce
  * @returns {TransactionDisplayData}
  */
 export function useTransactionDisplayData(transactionGroup) {
@@ -69,10 +94,10 @@ export function useTransactionDisplayData(transactionGroup) {
   const knownTokens = useSelector(getTokens);
   const knownCollectibles = useSelector(getCollectibles);
   const t = useI18nContext();
+
   const { initialTransaction, primaryTransaction } = transactionGroup;
   // initialTransaction contains the data we need to derive the primary purpose of this transaction group
   const { type } = initialTransaction;
-
   const { from: senderAddress, to } = initialTransaction.txParams || {};
 
   // for smart contract interactions, methodData can be used to derive the name of the action being taken
@@ -86,8 +111,9 @@ export function useTransactionDisplayData(transactionGroup) {
   const isSubmitted = displayedStatusKey === TRANSACTION_STATUSES.SUBMITTED;
 
   const primaryValue = primaryTransaction.txParams?.value;
-  let prefix = '-';
   const date = formatDateWithYearContext(initialTransaction.time);
+
+  let prefix = '-';
   let subtitle;
   let subtitleContainsOrigin = false;
   let recipientAddress = to;
@@ -113,16 +139,18 @@ export function useTransactionDisplayData(transactionGroup) {
     isTokenCategory,
   );
 
-  // If this is an ERC20 token transaction this value is equal to the amount sent
-  // If it is an ERC721 token transaction it is the tokenId being sent
-  const tokenAmountOrTokenId = getTokenValueParam(tokenData);
+  // Sometimes the tokenId value is parsed as "_value" param. Not seeing this often any more, but still occasionally:
+  // i.e. call approve() on BAYC contract - https://etherscan.io/token/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d#writeContract, and tokenId shows up as _value,
+  // not sure why since it doesn't match the ERC721 ABI spec we use to parse these transactions - https://github.com/MetaMask/metamask-eth-abis/blob/d0474308a288f9252597b7c93a3a8deaad19e1b2/src/abis/abiERC721.ts#L62.
+  const transactionDataTokenId =
+    getTokenIdParam(tokenData) ?? getTokenValueParam(tokenData);
 
   const collectible =
     isTokenCategory &&
     knownCollectibles.find(
       ({ address, tokenId }) =>
         isEqualCaseInsensitive(address, recipientAddress) &&
-        tokenId === tokenAmountOrTokenId,
+        tokenId === transactionDataTokenId,
     );
 
   const tokenDisplayValue = useTokenDisplayValue(
@@ -149,9 +177,8 @@ export function useTransactionDisplayData(transactionGroup) {
   // used to display fiat amount of tx. initialized to either tokenFiatAmount or undefined
   // but can later be modified if dealing with a swap
   let secondaryDisplayValue = isTokenCategory ? tokenFiatAmount : undefined;
-  // The transaction group category that will be used for rendering the icon in the activity list
+
   let category;
-  // The primary title of the Tx that will be displayed in the activity list
   let title;
 
   const {
@@ -161,25 +188,6 @@ export function useTransactionDisplayData(transactionGroup) {
     isViewingReceivedTokenFromSwap,
   } = useSwappedTokenValue(transactionGroup, currentAsset);
 
-  // There are seven types of transaction entries that are currently differentiated in the design
-  // 1. Signature request
-  // 2. Send (sendEth sendTokens)
-  // 3. Deposit
-  // 4. Site interaction
-  // 5. Approval
-  // 6. Swap
-  // 7. Swap Approval
-
-  const signatureTypes = [
-    null,
-    undefined,
-    TRANSACTION_TYPES.SIGN,
-    TRANSACTION_TYPES.PERSONAL_SIGN,
-    TRANSACTION_TYPES.SIGN_TYPED_DATA,
-    TRANSACTION_TYPES.ETH_DECRYPT,
-    TRANSACTION_TYPES.ETH_GET_ENCRYPTION_PUBLIC_KEY,
-  ];
-
   if (signatureTypes.includes(type)) {
     category = TRANSACTION_GROUP_CATEGORIES.SIGNATURE_REQUEST;
     title = t('signatureRequest');
@@ -217,6 +225,12 @@ export function useTransactionDisplayData(transactionGroup) {
     title = t('approveSpendLimit', [token?.symbol || t('token')]);
     subtitle = origin;
     subtitleContainsOrigin = true;
+  } else if (type === TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL) {
+    category = TRANSACTION_GROUP_CATEGORIES.APPROVAL;
+    prefix = '';
+    title = t('setApprovalForAllTitle', [token?.symbol || t('token')]);
+    subtitle = origin;
+    subtitleContainsOrigin = true;
   } else if (type === TRANSACTION_TYPES.CONTRACT_INTERACTION) {
     category = TRANSACTION_GROUP_CATEGORIES.INTERACTION;
     const transactionTypeTitle = getTransactionTypeTitle(t, type);
@@ -238,8 +252,7 @@ export function useTransactionDisplayData(transactionGroup) {
     subtitle = t('fromAddress', [shortenAddress(senderAddress)]);
   } else if (
     type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM ||
-    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER ||
-    type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM
+    type === TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER
   ) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('sendSpecifiedTokens', [
@@ -247,6 +260,11 @@ export function useTransactionDisplayData(transactionGroup) {
     ]);
     recipientAddress = getTokenAddressParam(tokenData);
     subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
+  } else if (type === TRANSACTION_TYPES.TOKEN_METHOD_SAFE_TRANSFER_FROM) {
+    category = TRANSACTION_GROUP_CATEGORIES.SEND;
+    title = t('safeTransferFrom');
+    recipientAddress = getTokenAddressParam(tokenData);
+    subtitle = t('toAddress', [shortenAddress(recipientAddress)]);
   } else if (type === TRANSACTION_TYPES.SIMPLE_SEND) {
     category = TRANSACTION_GROUP_CATEGORIES.SEND;
     title = t('send');
diff --git a/ui/hooks/useTransactionDisplayData.test.js b/ui/hooks/useTransactionDisplayData.test.js
index 29e4d43d269d..b30ea254db18 100644
--- a/ui/hooks/useTransactionDisplayData.test.js
+++ b/ui/hooks/useTransactionDisplayData.test.js
@@ -131,7 +131,7 @@ const expectedResults = [
     displayedStatusKey: TRANSACTION_STATUSES.CONFIRMED,
   },
   {
-    title: 'Send Token',
+    title: 'Safe Transfer From',
     category: TRANSACTION_GROUP_CATEGORIES.SEND,
     subtitle: 'To: 0xe7d...dd98',
     subtitleContainsOrigin: true,
diff --git a/ui/index.js b/ui/index.js
index 5c90d00a1fa1..842d0f2a9b5a 100644
--- a/ui/index.js
+++ b/ui/index.js
@@ -1,12 +1,13 @@
 import copyToClipboard from 'copy-to-clipboard';
 import log from 'loglevel';
-import { clone } from 'lodash';
+import { clone, memoize } from 'lodash';
 import React from 'react';
 import { render } from 'react-dom';
 import browser from 'webextension-polyfill';
 
 import { getEnvironmentType } from '../app/scripts/lib/util';
 import { ALERT_TYPES } from '../shared/constants/alerts';
+import { maskObject } from '../shared/modules/object.utils';
 import { SENTRY_STATE } from '../app/scripts/lib/setupSentry';
 import { ENVIRONMENT_TYPE_POPUP } from '../shared/constants/app';
 import * as actions from './store/actions';
@@ -36,7 +37,7 @@ export default function launchMetamaskUi(opts, cb) {
   // check if we are unlocked first
   backgroundConnection.getState(function (err, metamaskState) {
     if (err) {
-      cb(err);
+      cb(err, metamaskState);
       return;
     }
     startApp(metamaskState, backgroundConnection, opts).then((store) => {
@@ -46,21 +47,31 @@ export default function launchMetamaskUi(opts, cb) {
   });
 }
 
+const _setupLocale = async (currentLocale) => {
+  const currentLocaleMessages = currentLocale
+    ? await fetchLocale(currentLocale)
+    : {};
+  const enLocaleMessages = await fetchLocale('en');
+
+  await loadRelativeTimeFormatLocaleData('en');
+  if (currentLocale) {
+    await loadRelativeTimeFormatLocaleData(currentLocale);
+  }
+
+  return { currentLocaleMessages, enLocaleMessages };
+};
+
+export const setupLocale = memoize(_setupLocale);
+
 async function startApp(metamaskState, backgroundConnection, opts) {
   // parse opts
   if (!metamaskState.featureFlags) {
     metamaskState.featureFlags = {};
   }
 
-  const currentLocaleMessages = metamaskState.currentLocale
-    ? await fetchLocale(metamaskState.currentLocale)
-    : {};
-  const enLocaleMessages = await fetchLocale('en');
-
-  await loadRelativeTimeFormatLocaleData('en');
-  if (metamaskState.currentLocale) {
-    await loadRelativeTimeFormatLocaleData(metamaskState.currentLocale);
-  }
+  const { currentLocaleMessages, enLocaleMessages } = await setupLocale(
+    metamaskState.currentLocale,
+  );
 
   if (metamaskState.textDirection === 'rtl') {
     await switchDirection('rtl');
@@ -161,29 +172,6 @@ async function startApp(metamaskState, backgroundConnection, opts) {
   return store;
 }
 
-/**
- * Return a "masked" copy of the given object.
- *
- * The returned object includes only the properties present in the mask. The
- * mask is an object that mirrors the structure of the given object, except
- * the only values are `true` or a sub-mask. `true` implies the property
- * should be included, and a sub-mask implies the property should be further
- * masked according to that sub-mask.
- *
- * @param {Object} object - The object to mask
- * @param {Object<Object|boolean>} mask - The mask to apply to the object
- */
-function maskObject(object, mask) {
-  return Object.keys(object).reduce((state, key) => {
-    if (mask[key] === true) {
-      state[key] = object[key];
-    } else if (mask[key]) {
-      state[key] = maskObject(object[key], mask[key]);
-    }
-    return state;
-  }, {});
-}
-
 function setupDebuggingHelpers(store) {
   window.getCleanAppState = async function () {
     const state = clone(store.getState());
diff --git a/ui/index.test.js b/ui/index.test.js
new file mode 100644
index 000000000000..9cb44c025b9b
--- /dev/null
+++ b/ui/index.test.js
@@ -0,0 +1,70 @@
+import { setupLocale } from '.';
+
+const enMessages = {
+  troubleStarting: {
+    message:
+      'MetaMask had trouble starting. This error could be intermittent, so try restarting the extension.',
+  },
+  restartMetamask: {
+    message: 'Restart MetaMask',
+  },
+  stillGettingMessage: {
+    message: 'Still getting this message?',
+  },
+  sendBugReport: {
+    message: 'Send us a bug report.',
+  },
+};
+
+const esMessages = {
+  troubleStarting: {
+    message:
+      'MetaMask tuvo problemas para iniciarse. Este error podría ser intermitente, así que intente reiniciar la extensión.',
+  },
+  restartMetamask: {
+    message: 'Reiniciar metamáscara',
+  },
+  sendBugReport: {
+    message: 'Envíenos un informe de errores.',
+  },
+};
+
+jest.mock('./helpers/utils/i18n-helper', () => ({
+  fetchLocale: jest.fn((locale) => (locale === 'en' ? enMessages : esMessages)),
+  loadRelativeTimeFormatLocaleData: jest.fn(),
+}));
+
+describe('Index Tests', () => {
+  it('should get locale messages by calling setupLocale', async () => {
+    let result = await setupLocale('en');
+    const { currentLocaleMessages: clm, enLocaleMessages: elm } = result;
+    expect(clm).toBeDefined();
+    expect(elm).toBeDefined();
+    expect(clm.troubleStarting).toStrictEqual(enMessages.troubleStarting);
+
+    expect(clm.restartMetamask).toStrictEqual(enMessages.restartMetamask);
+
+    expect(clm.stillGettingMessage).toStrictEqual(
+      enMessages.stillGettingMessage,
+    );
+
+    expect(clm.sendBugReport).toStrictEqual(enMessages.sendBugReport);
+
+    result = await setupLocale('es');
+
+    const { currentLocaleMessages: clm2, enLocaleMessages: elm2 } = result;
+    expect(clm2).toBeDefined();
+    expect(elm2).toBeDefined();
+
+    expect(clm2.troubleStarting).toStrictEqual(esMessages.troubleStarting);
+
+    expect(clm2.restartMetamask).toStrictEqual(esMessages.restartMetamask);
+
+    expect(clm2.stillGettingMessage).toBeUndefined();
+    expect(elm2.stillGettingMessage).toStrictEqual(
+      enMessages.stillGettingMessage,
+    );
+
+    expect(clm2.sendBugReport).toStrictEqual(esMessages.sendBugReport);
+  });
+});
diff --git a/ui/pages/add-collectible/add-collectible.js b/ui/pages/add-collectible/add-collectible.js
index 7d9112a923ce..fd923d1ee411 100644
--- a/ui/pages/add-collectible/add-collectible.js
+++ b/ui/pages/add-collectible/add-collectible.js
@@ -4,7 +4,6 @@ import { useDispatch, useSelector } from 'react-redux';
 import { util } from '@metamask/controllers';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
-
 import {
   DISPLAY,
   FONT_WEIGHT,
@@ -18,7 +17,7 @@ import PageContainer from '../../components/ui/page-container';
 import {
   addCollectibleVerifyOwnership,
   getTokenStandardAndDetails,
-  removeToken,
+  ignoreTokens,
   setNewCollectibleAddedMessage,
 } from '../../store/actions';
 import FormField from '../../components/ui/form-field';
@@ -55,9 +54,7 @@ export default function AddCollectible() {
 
   const handleAddCollectible = async () => {
     try {
-      await dispatch(
-        addCollectibleVerifyOwnership(address, tokenId.toString()),
-      );
+      await dispatch(addCollectibleVerifyOwnership(address, tokenId));
     } catch (error) {
       const { message } = error;
       dispatch(setNewCollectibleAddedMessage(message));
@@ -66,7 +63,10 @@ export default function AddCollectible() {
     }
     if (contractAddressToConvertFromTokenToCollectible) {
       await dispatch(
-        removeToken(contractAddressToConvertFromTokenToCollectible),
+        ignoreTokens({
+          tokensToIgnore: contractAddressToConvertFromTokenToCollectible,
+          dontShowLoadingIndicator: true,
+        }),
       );
     }
     dispatch(setNewCollectibleAddedMessage('success'));
@@ -99,7 +99,7 @@ export default function AddCollectible() {
   };
 
   const validateAndSetTokenId = (val) => {
-    setDisabled(!util.isValidHexAddress(address) || !val);
+    setDisabled(!util.isValidHexAddress(address) || !val || isNaN(Number(val)));
     setTokenId(val);
   };
 
@@ -149,7 +149,7 @@ export default function AddCollectible() {
           )}
           <Box margin={4}>
             <FormField
-              id="address"
+              dataTestId="address"
               titleText={t('address')}
               placeholder="0x..."
               value={address}
@@ -161,7 +161,7 @@ export default function AddCollectible() {
               autoFocus
             />
             <FormField
-              id="token-id"
+              dataTestId="token-id"
               titleText={t('tokenId')}
               placeholder={t('nftTokenIdPlaceholder')}
               value={tokenId}
@@ -170,7 +170,6 @@ export default function AddCollectible() {
                 setCollectibleAddFailed(false);
               }}
               tooltipText={t('importNFTTokenIdToolTip')}
-              numeric
             />
           </Box>
         </Box>
diff --git a/ui/pages/add-collectible/add-collectible.test.js b/ui/pages/add-collectible/add-collectible.test.js
new file mode 100644
index 000000000000..be693e444447
--- /dev/null
+++ b/ui/pages/add-collectible/add-collectible.test.js
@@ -0,0 +1,79 @@
+import React from 'react';
+import { fireEvent } from '@testing-library/react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../test/jest/rendering';
+import * as Actions from '../../store/actions';
+import AddCollectible from '.';
+
+const VALID_ADDRESS = '0x312BE6a98441F9F6e3F6246B13CA19701e0AC3B9';
+const INVALID_ADDRESS = 'aoinsafasdfa';
+const VALID_TOKENID = '1201';
+const INVALID_TOKENID = 'abcde';
+
+describe('AddCollectible', () => {
+  const store = configureMockStore([])({
+    metamask: { provider: { chainId: '0x1' } },
+  });
+
+  it('should enable the "Add" button when valid entries are input into both Address and TokenId fields', () => {
+    const { getByTestId, getByText } = renderWithProvider(
+      <AddCollectible />,
+      store,
+    );
+    expect(getByText('Add')).not.toBeEnabled();
+    fireEvent.change(getByTestId('address'), {
+      target: { value: VALID_ADDRESS },
+    });
+    fireEvent.change(getByTestId('token-id'), {
+      target: { value: VALID_TOKENID },
+    });
+    expect(getByText('Add')).toBeEnabled();
+  });
+
+  it('should not enable the "Add" button when an invalid entry is input into one or both Address and TokenId fields', () => {
+    const { getByTestId, getByText } = renderWithProvider(
+      <AddCollectible />,
+      store,
+    );
+    expect(getByText('Add')).not.toBeEnabled();
+    fireEvent.change(getByTestId('address'), {
+      target: { value: INVALID_ADDRESS },
+    });
+    fireEvent.change(getByTestId('token-id'), {
+      target: { value: VALID_TOKENID },
+    });
+    expect(getByText('Add')).not.toBeEnabled();
+    fireEvent.change(getByTestId('address'), {
+      target: { value: VALID_ADDRESS },
+    });
+    expect(getByText('Add')).toBeEnabled();
+    fireEvent.change(getByTestId('token-id'), {
+      target: { value: INVALID_TOKENID },
+    });
+    expect(getByText('Add')).not.toBeEnabled();
+  });
+
+  it('should call addCollectibleVerifyOwnership action with correct values (tokenId should not be in scientific notation)', () => {
+    const { getByTestId, getByText } = renderWithProvider(
+      <AddCollectible />,
+      store,
+    );
+    fireEvent.change(getByTestId('address'), {
+      target: { value: VALID_ADDRESS },
+    });
+    const LARGE_TOKEN_ID = Number.MAX_SAFE_INTEGER + 1;
+    fireEvent.change(getByTestId('token-id'), {
+      target: { value: LARGE_TOKEN_ID },
+    });
+    const addCollectibleVerifyOwnershipSpy = jest.spyOn(
+      Actions,
+      'addCollectibleVerifyOwnership',
+    );
+
+    fireEvent.click(getByText('Add'));
+    expect(addCollectibleVerifyOwnershipSpy).toHaveBeenCalledWith(
+      '0x312BE6a98441F9F6e3F6246B13CA19701e0AC3B9',
+      '9007199254740992',
+    );
+  });
+});
diff --git a/ui/pages/asset/asset.scss b/ui/pages/asset/asset.scss
index c717f96503fa..0b1b8543eb3b 100644
--- a/ui/pages/asset/asset.scss
+++ b/ui/pages/asset/asset.scss
@@ -4,7 +4,7 @@
   }
 
   &__overview {
-    box-shadow: 0 3px 4px rgba(135, 134, 134, 0.16);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 }
 
diff --git a/ui/pages/asset/components/asset-options.js b/ui/pages/asset/components/asset-options.js
index 160c7788316b..4d7aef44f56f 100644
--- a/ui/pages/asset/components/asset-options.js
+++ b/ui/pages/asset/components/asset-options.js
@@ -85,14 +85,39 @@ const AssetOptions = ({
   );
 };
 
+const isNotFunc = (p) => {
+  return typeof p !== 'function';
+};
+
 AssetOptions.propTypes = {
   isEthNetwork: PropTypes.bool,
   isNativeAsset: PropTypes.bool,
-  onRemove: PropTypes.func.isRequired,
   onClickBlockExplorer: PropTypes.func.isRequired,
   onViewAccountDetails: PropTypes.func.isRequired,
-  onViewTokenDetails: PropTypes.func.isRequired,
-  tokenSymbol: PropTypes.string,
+  onRemove: (props) => {
+    if (props.isNativeAsset === false && isNotFunc(props.onRemove)) {
+      throw new Error(
+        'When isNativeAsset is true, onRemove is a required prop',
+      );
+    }
+  },
+  onViewTokenDetails: (props) => {
+    if (props.isNativeAsset === false && isNotFunc(props.onViewTokenDetails)) {
+      throw new Error(
+        'When isNativeAsset is true, onViewTokenDetails is a required prop',
+      );
+    }
+  },
+  tokenSymbol: (props) => {
+    if (
+      props.isNativeAsset === false &&
+      typeof props.tokenSymbol !== 'string'
+    ) {
+      throw new Error(
+        'When isNativeAsset is true, tokenSymbol is a required prop',
+      );
+    }
+  },
 };
 
 export default AssetOptions;
diff --git a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
index 919f68fd1ce2..26363fdd9d1b 100644
--- a/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
+++ b/ui/pages/confirm-add-suggested-token/confirm-add-suggested-token.js
@@ -13,9 +13,11 @@ import ZENDESK_URLS from '../../helpers/constants/zendesk-url';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getSuggestedAssets } from '../../selectors';
 import { rejectWatchAsset, acceptWatchAsset } from '../../store/actions';
-import { TOKEN_STANDARDS } from '../../helpers/constants/common';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
-import { ASSET_TYPES } from '../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+} from '../../../shared/constants/transaction';
 
 function getTokenName(name, symbol) {
   return name === undefined ? symbol : `${name} (${symbol})`;
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
index 7487e594b9a3..6c526c95e0e8 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.js
@@ -28,7 +28,11 @@ import { SECOND } from '../../../../shared/constants/time';
 import { ConfirmPageContainerWarning } from '../../../components/app/confirm-page-container/confirm-page-container-content';
 import GasDetailsItem from '../../../components/app/gas-details-item';
 import LedgerInstructionField from '../../../components/app/ledger-instruction-field';
-import { ERC1155, ERC20, ERC721 } from '../../../helpers/constants/common';
+import {
+  ERC1155,
+  ERC20,
+  ERC721,
+} from '../../../../shared/constants/transaction';
 
 export default class ConfirmApproveContent extends Component {
   static contextTypes = {
@@ -62,6 +66,7 @@ export default class ConfirmApproveContent extends Component {
     txData: PropTypes.object,
     fromAddressIsLedger: PropTypes.bool,
     chainId: PropTypes.string,
+    tokenAddress: PropTypes.string,
     rpcPrefs: PropTypes.object,
     isContract: PropTypes.bool,
     hexTransactionTotal: PropTypes.string,
@@ -70,6 +75,9 @@ export default class ConfirmApproveContent extends Component {
     assetName: PropTypes.string,
     tokenId: PropTypes.string,
     assetStandard: PropTypes.string,
+    isSetApproveForAll: PropTypes.bool,
+    setApproveForAllArg: PropTypes.bool,
+    userAddress: PropTypes.string,
   };
 
   state = {
@@ -99,7 +107,7 @@ export default class ConfirmApproveContent extends Component {
       >
         {showHeader && (
           <div className="confirm-approve-content__card-header">
-            {!supportsEIP1559V2 && (
+            {supportsEIP1559V2 && title === t('transactionFee') ? null : (
               <>
                 <div className="confirm-approve-content__card-header__symbol">
                   {symbol}
@@ -183,7 +191,9 @@ export default class ConfirmApproveContent extends Component {
 
   renderERC721OrERC1155PermissionContent() {
     const { t } = this.context;
-    const { origin, toAddress, isContract, assetName, tokenId } = this.props;
+    const { origin, toAddress, isContract, isSetApproveForAll } = this.props;
+
+    const titleTokenDescription = this.getTitleTokenDescription();
 
     const displayedAddress = isContract
       ? `${t('contract')} (${addressSummary(toAddress)})`
@@ -198,7 +208,9 @@ export default class ConfirmApproveContent extends Component {
             {t('approvedAsset')}:
           </div>
           <div className="confirm-approve-content__medium-text">
-            {`${assetName} #${tokenId}`}
+            {isSetApproveForAll
+              ? t('allOfYour', [titleTokenDescription])
+              : titleTokenDescription}
           </div>
         </div>
         <div className="flex-row">
@@ -296,12 +308,19 @@ export default class ConfirmApproveContent extends Component {
 
   renderDataContent() {
     const { t } = this.context;
-    const { data } = this.props;
+    const { data, isSetApproveForAll, setApproveForAllArg } = this.props;
     return (
       <div className="flex-column">
         <div className="confirm-approve-content__small-text">
-          {t('functionApprove')}
+          {isSetApproveForAll
+            ? t('functionSetApprovalForAll')
+            : t('functionApprove')}
         </div>
+        {isSetApproveForAll && setApproveForAllArg !== undefined ? (
+          <div className="confirm-approve-content__small-text">
+            {`${t('parameters')}: ${setApproveForAllArg}`}
+          </div>
+        ) : null}
         <div className="confirm-approve-content__small-text confirm-approve-content__data__data-block">
           {data}
         </div>
@@ -430,6 +449,124 @@ export default class ConfirmApproveContent extends Component {
     );
   }
 
+  getTitleTokenDescription() {
+    const {
+      tokenId,
+      assetName,
+      tokenAddress,
+      rpcPrefs,
+      chainId,
+      assetStandard,
+      tokenSymbol,
+      isSetApproveForAll,
+      userAddress,
+    } = this.props;
+    const { t } = this.context;
+    let titleTokenDescription = t('token');
+    if (rpcPrefs?.blockExplorerUrl || chainId) {
+      const unknownTokenBlockExplorerLink = getTokenTrackerLink(
+        tokenAddress,
+        chainId,
+        null,
+        userAddress,
+        {
+          blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+        },
+      );
+
+      const unknownTokenLink = (
+        <a
+          href={unknownTokenBlockExplorerLink}
+          target="_blank"
+          rel="noopener noreferrer"
+          className="confirm-approve-content__unknown-asset"
+        >
+          {t('token')}
+        </a>
+      );
+      titleTokenDescription = unknownTokenLink;
+    }
+
+    if (
+      assetStandard === ERC20 ||
+      (tokenSymbol && !tokenId && !isSetApproveForAll)
+    ) {
+      titleTokenDescription = tokenSymbol;
+    } else if (
+      assetStandard === ERC721 ||
+      assetStandard === ERC1155 ||
+      // if we don't have an asset standard but we do have either both an assetname and a tokenID or both a tokenSymbol and tokenId we assume its an NFT
+      (assetName && tokenId) ||
+      (tokenSymbol && tokenId)
+    ) {
+      const tokenIdWrapped = tokenId ? ` (#${tokenId})` : '';
+      if (assetName || tokenSymbol) {
+        titleTokenDescription = `${assetName ?? tokenSymbol}${tokenIdWrapped}`;
+      } else {
+        const unknownNFTBlockExplorerLink = getTokenTrackerLink(
+          tokenAddress,
+          chainId,
+          null,
+          userAddress,
+          {
+            blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+          },
+        );
+        const unknownNFTLink = (
+          <>
+            <a
+              href={unknownNFTBlockExplorerLink}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="confirm-approve-content__unknown-asset"
+            >
+              {t('nft')}
+            </a>
+            {tokenIdWrapped && <span>{tokenIdWrapped}</span>}
+          </>
+        );
+        titleTokenDescription = unknownNFTLink;
+      }
+    }
+
+    return titleTokenDescription;
+  }
+
+  renderTitle() {
+    const { t } = this.context;
+    const { isSetApproveForAll, setApproveForAllArg } = this.props;
+    const titleTokenDescription = this.getTitleTokenDescription();
+
+    let title;
+
+    if (isSetApproveForAll) {
+      title = t('approveAllTokensTitle', [titleTokenDescription]);
+      if (setApproveForAllArg === false) {
+        title = t('revokeAllTokensTitle', [titleTokenDescription]);
+      }
+    }
+    return title || t('allowSpendToken', [titleTokenDescription]);
+  }
+
+  renderDescription() {
+    const { t } = this.context;
+    const { isContract, isSetApproveForAll, setApproveForAllArg } = this.props;
+    const grantee = isContract
+      ? t('contract').toLowerCase()
+      : t('account').toLowerCase();
+
+    let description = t('trustSiteApprovePermission', [grantee]);
+
+    if (isSetApproveForAll && setApproveForAllArg === false) {
+      description = t('revokeApproveForAllDescription', [
+        grantee,
+        this.getTitleTokenDescription(),
+      ]);
+    }
+
+    return description;
+  }
+
   render() {
     const { t } = this.context;
     const {
@@ -452,8 +589,7 @@ export default class ConfirmApproveContent extends Component {
       rpcPrefs,
       isContract,
       assetStandard,
-      tokenId,
-      assetName,
+      userAddress,
     } = this.props;
     const { showFullTxDetails } = this.state;
 
@@ -496,18 +632,10 @@ export default class ConfirmApproveContent extends Component {
           </Box>
         </Box>
         <div className="confirm-approve-content__title">
-          {t('allowSpendToken', [
-            assetStandard === ERC20
-              ? tokenSymbol
-              : `${assetName} (#${tokenId})`,
-          ])}
+          {this.renderTitle()}
         </div>
         <div className="confirm-approve-content__description">
-          {t('trustSiteApprovePermission', [
-            isContract
-              ? t('contract').toLowerCase()
-              : t('account').toLowerCase(),
-          ])}
+          {this.renderDescription()}
         </div>
         <Box className="confirm-approve-content__address-display-content">
           <Box display={DISPLAY.FLEX}>
@@ -548,13 +676,15 @@ export default class ConfirmApproveContent extends Component {
               className="confirm-approve-content__etherscan-link"
               onClick={() => {
                 const blockExplorerTokenLink = isContract
-                  ? getTokenTrackerLink(toAddress, chainId, null, null, {
+                  ? getTokenTrackerLink(toAddress, chainId, null, userAddress, {
                       blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
                     })
                   : getAccountLink(
                       toAddress,
                       chainId,
-                      { blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null },
+                      {
+                        blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null,
+                      },
                       null,
                     );
                 global.platform.openTab({
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
index dd9cd8dd405c..56824d37745d 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.component.test.js
@@ -2,7 +2,7 @@ import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import { fireEvent } from '@testing-library/react';
 import { renderWithProvider } from '../../../../test/jest/rendering';
-import { ERC20 } from '../../../helpers/constants/common';
+import { ERC20 } from '../../../../shared/constants/transaction';
 import ConfirmApproveContent from '.';
 
 const renderComponent = (props) => {
diff --git a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
index de304a1c90c9..ca30abe1d6cb 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
+++ b/ui/pages/confirm-approve/confirm-approve-content/confirm-approve-content.stories.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { ERC20 } from '../../../helpers/constants/common';
+import { ERC20 } from '../../../../shared/constants/transaction';
 import ConfirmApproveContent from '.';
 
 export default {
diff --git a/ui/pages/confirm-approve/confirm-approve-content/index.scss b/ui/pages/confirm-approve/confirm-approve-content/index.scss
index 0f2593ee46a3..473be2f7b963 100644
--- a/ui/pages/confirm-approve/confirm-approve-content/index.scss
+++ b/ui/pages/confirm-approve/confirm-approve-content/index.scss
@@ -9,6 +9,10 @@
     padding: 0 24px 16px 24px;
   }
 
+  &__unknown-asset {
+    color: var(--color-primary-default);
+  }
+
   &__icon-display-content {
     display: flex;
     height: 51px;
diff --git a/ui/pages/confirm-approve/confirm-approve.js b/ui/pages/confirm-approve/confirm-approve.js
index 246baca771da..fba2d62f3f48 100644
--- a/ui/pages/confirm-approve/confirm-approve.js
+++ b/ui/pages/confirm-approve/confirm-approve.js
@@ -8,7 +8,10 @@ import {
   updateCustomNonce,
   getNextNonce,
 } from '../../store/actions';
-import { calcTokenAmount } from '../../helpers/utils/token-util';
+import {
+  calcTokenAmount,
+  getTokenApprovedParam,
+} from '../../helpers/utils/token-util';
 import { readAddressAsContract } from '../../../shared/modules/contract-utils';
 import { GasFeeContextProvider } from '../../contexts/gasFee';
 import { TransactionModalContextProvider } from '../../contexts/transaction-modal';
@@ -33,7 +36,8 @@ import AdvancedGasFeePopover from '../../components/app/advanced-gas-fee-popover
 import EditGasFeePopover from '../../components/app/edit-gas-fee-popover';
 import EditGasPopover from '../../components/app/edit-gas-popover/edit-gas-popover.component';
 import Loading from '../../components/ui/loading-screen';
-import { ERC20, ERC1155, ERC721 } from '../../helpers/constants/common';
+import { parseStandardTokenTransactionData } from '../../../shared/modules/transaction.utils';
+import { ERC1155, ERC20, ERC721 } from '../../../shared/constants/transaction';
 import { getCustomTxParamsData } from './confirm-approve.util';
 import ConfirmApproveContent from './confirm-approve-content';
 
@@ -52,10 +56,12 @@ export default function ConfirmApprove({
   tokenId,
   userAddress,
   toAddress,
+  tokenAddress,
   transaction,
   ethTransactionTotal,
   fiatTransactionTotal,
   hexTransactionTotal,
+  isSetApproveForAll,
 }) {
   const dispatch = useDispatch();
   const { txParams: { data: transactionData } = {} } = transaction;
@@ -149,6 +155,11 @@ export default function ConfirmApprove({
       })
     : null;
 
+  const parsedTransactionData = parseStandardTokenTransactionData(
+    transactionData,
+  );
+  const setApproveForAllArg = getTokenApprovedParam(parsedTransactionData);
+
   return tokenSymbol === undefined && assetName === undefined ? (
     <Loading />
   ) : (
@@ -161,6 +172,9 @@ export default function ConfirmApprove({
         contentComponent={
           <TransactionModalContextProvider>
             <ConfirmApproveContent
+              userAddress={userAddress}
+              isSetApproveForAll={isSetApproveForAll}
+              setApproveForAllArg={setApproveForAllArg}
               decimals={decimals}
               siteImage={siteImage}
               setCustomAmount={setCustomPermissionAmount}
@@ -173,6 +187,7 @@ export default function ConfirmApprove({
               tokenId={tokenId}
               assetName={assetName}
               assetStandard={assetStandard}
+              tokenAddress={tokenAddress}
               showCustomizeGasModal={approveTransaction}
               showEditApprovalPermissionModal={({
                 /* eslint-disable no-shadow */
@@ -268,6 +283,7 @@ export default function ConfirmApprove({
 ConfirmApprove.propTypes = {
   assetStandard: PropTypes.string,
   assetName: PropTypes.string,
+  tokenAddress: PropTypes.string,
   userBalance: PropTypes.string,
   tokenSymbol: PropTypes.string,
   decimals: PropTypes.string,
@@ -287,4 +303,5 @@ ConfirmApprove.propTypes = {
   ethTransactionTotal: PropTypes.string,
   fiatTransactionTotal: PropTypes.string,
   hexTransactionTotal: PropTypes.string,
+  isSetApproveForAll: PropTypes.bool,
 };
diff --git a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
index a619e5837f11..01988e2b71c6 100644
--- a/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
+++ b/ui/pages/confirm-decrypt-message/confirm-decrypt-message.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
diff --git a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
index f6dd81d8e190..b2112a6e262b 100644
--- a/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
+++ b/ui/pages/confirm-deploy-contract/confirm-deploy-contract.stories.js
@@ -1,60 +1,22 @@
 /* eslint-disable react/prop-types */
-import React, { useEffect } from 'react';
-
-import { select } from '@storybook/addon-knobs';
-import { store } from '../../../.storybook/preview';
-import { updateTransactionParams } from '../../store/actions';
+import React from 'react';
 import ConfirmDeployContract from '.';
 
 export default {
   title: 'Pages/ConfirmDeployContract',
   id: __filename,
+  component: ConfirmDeployContract,
+  argTypes: {
+    txData: {
+      control: {
+        type: 'object',
+      },
+    },
+  },
 };
 
-// transaction ID
-const id = 3111025347726181;
-
-const PageSet = ({ children }) => {
-  const options = [];
-  const receiverOptions = {
-    'Address 1': '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
-    'Address 2': '0x55e0bfb2d400e9be8cf9b114e38a40969a02f69a',
-  };
-  const state = store.getState();
-  const { identities } = state.metamask;
-  Object.keys(identities).forEach(function (key) {
-    options.push({
-      label: identities[key].name,
-      address: key,
-    });
-  });
-  const sender = select('Sender', options, options[0]);
-  const receiver = select(
-    'Receiver',
-    receiverOptions,
-    '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
-  );
-
-  const confirmTransactionState = state.confirmTransaction.txData.txParams;
-
-  useEffect(() => {
-    confirmTransactionState.from = sender.address;
-    store.dispatch(updateTransactionParams(id, confirmTransactionState));
-  }, [sender, confirmTransactionState]);
-
-  useEffect(() => {
-    confirmTransactionState.to = receiver;
-    store.dispatch(updateTransactionParams(id, confirmTransactionState));
-  }, [receiver, confirmTransactionState]);
-  return children;
-};
-
-export const DefaultStory = () => {
-  return (
-    <PageSet>
-      <ConfirmDeployContract />
-    </PageSet>
-  );
+export const DefaultStory = (args) => {
+  return <ConfirmDeployContract {...args} />;
 };
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
index 026cea6d8c0b..92cbf9dae401 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.component.js
@@ -7,6 +7,7 @@ import Identicon from '../../components/ui/identicon';
 
 import { EVENT } from '../../../shared/constants/metametrics';
 import { conversionUtil } from '../../../shared/modules/conversion.utils';
+import SiteOrigin from '../../components/ui/site-origin';
 
 export default class ConfirmEncryptionPublicKey extends Component {
   static contextTypes = {
@@ -118,7 +119,9 @@ export default class ConfirmEncryptionPublicKey extends Component {
     const { t } = this.context;
 
     const targetSubjectMetadata = subjectMetadata[txData.origin];
-    const notice = t('encryptionPublicKeyNotice', [txData.origin]);
+    const notice = t('encryptionPublicKeyNotice', [
+      <SiteOrigin siteOrigin={txData.origin} key={txData.origin} />,
+    ]);
     const name = targetSubjectMetadata?.hostname || txData.origin;
 
     return (
diff --git a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
index caed0982a408..4e7a2c62b8b6 100644
--- a/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
+++ b/ui/pages/confirm-encryption-public-key/confirm-encryption-public-key.scss
@@ -3,7 +3,7 @@
     width: 380px;
     border-radius: 8px;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.08);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     display: flex;
     flex-flow: column nowrap;
     z-index: 25;
@@ -198,6 +198,7 @@
       flex-direction: column;
       align-items: center;
       flex: 1;
+      width: 100%;
     }
 
     &-identicon {
diff --git a/ui/pages/confirm-import-token/confirm-import-token.js b/ui/pages/confirm-import-token/confirm-import-token.js
index e1a2e4e566cb..dbf32b63b529 100644
--- a/ui/pages/confirm-import-token/confirm-import-token.js
+++ b/ui/pages/confirm-import-token/confirm-import-token.js
@@ -13,9 +13,11 @@ import { MetaMetricsContext } from '../../contexts/metametrics';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import { getPendingTokens } from '../../ducks/metamask/metamask';
 import { addTokens, clearPendingTokens } from '../../store/actions';
-import { TOKEN_STANDARDS } from '../../helpers/constants/common';
 import { EVENT, EVENT_NAMES } from '../../../shared/constants/metametrics';
-import { ASSET_TYPES } from '../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  TOKEN_STANDARDS,
+} from '../../../shared/constants/transaction';
 
 const getTokenName = (name, symbol) => {
   return name === undefined ? symbol : `${name} (${symbol})`;
diff --git a/ui/pages/confirm-send-ether/confirm-send-ether.container.js b/ui/pages/confirm-send-ether/confirm-send-ether.container.js
index eb794b6ce395..80318ea46bbb 100644
--- a/ui/pages/confirm-send-ether/confirm-send-ether.container.js
+++ b/ui/pages/confirm-send-ether/confirm-send-ether.container.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
-import { editTransaction } from '../../ducks/send';
+import { editExistingTransaction } from '../../ducks/send';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import ConfirmSendEther from './confirm-send-ether.component';
@@ -20,7 +20,9 @@ const mapDispatchToProps = (dispatch) => {
   return {
     editTransaction: async (txData) => {
       const { id } = txData;
-      await dispatch(editTransaction(ASSET_TYPES.NATIVE, id.toString()));
+      await dispatch(
+        editExistingTransaction(ASSET_TYPES.NATIVE, id.toString()),
+      );
       dispatch(clearConfirmTransaction());
     },
   };
diff --git a/ui/pages/confirm-send-ether/confirm-send-ether.stories.js b/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
index db92dc53790a..b4029f6e3f6f 100644
--- a/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
+++ b/ui/pages/confirm-send-ether/confirm-send-ether.stories.js
@@ -1,59 +1,25 @@
-import React, { useEffect } from 'react';
-
-import { select } from '@storybook/addon-knobs';
-import { store } from '../../../.storybook/preview';
-import { updateTransactionParams } from '../../store/actions';
+import React from 'react';
 import ConfirmSendEther from '.';
 
 export default {
   title: 'Pages/ConfirmSendEther',
   id: __filename,
+  component: ConfirmSendEther,
+  argTypes: {
+    editTransaction: {
+      action: 'editTransaction',
+    },
+    history: {
+      control: 'object',
+    },
+    txParams: {
+      control: 'object',
+    },
+  },
 };
 
-// transaction id for redux dispatcher
-const id = 3111025347726181;
-
-const PageSet = ({ children }) => {
-  const options = [];
-  const receiverOptions = {
-    'Address 1': '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
-    'Address 2': '0x55e0bfb2d400e9be8cf9b114e38a40969a02f69a',
-  };
-  const state = store.getState();
-  const { identities } = state.metamask;
-  Object.keys(identities).forEach(function (key) {
-    options.push({
-      label: identities[key].name,
-      address: key,
-    });
-  });
-  const sender = select('Sender', options, options[0]);
-  const receiver = select(
-    'Receiver',
-    receiverOptions,
-    '0xaD6D458402F60fD3Bd25163575031ACDce07538D',
-  );
-
-  const confirmTransactionState = state.confirmTransaction.txData.txParams;
-
-  useEffect(() => {
-    confirmTransactionState.from = sender.address;
-    store.dispatch(updateTransactionParams(id, confirmTransactionState));
-  }, [sender, confirmTransactionState]);
-
-  useEffect(() => {
-    confirmTransactionState.to = receiver;
-    store.dispatch(updateTransactionParams(id, confirmTransactionState));
-  }, [receiver, confirmTransactionState]);
-  return children;
-};
-
-export const DefaultStory = () => {
-  return (
-    <PageSet>
-      <ConfirmSendEther />
-    </PageSet>
-  );
+export const DefaultStory = (args) => {
+  return <ConfirmSendEther {...args} />;
 };
 
 DefaultStory.storyName = 'Default';
diff --git a/ui/pages/confirm-send-token/confirm-send-token.component.js b/ui/pages/confirm-send-token/confirm-send-token.component.js
index 6e040fb06118..774fbf670675 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.component.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.component.js
@@ -6,14 +6,15 @@ import { SEND_ROUTE } from '../../helpers/constants/routes';
 export default class ConfirmSendToken extends Component {
   static propTypes = {
     history: PropTypes.object,
-    editTransaction: PropTypes.func,
+    editExistingTransaction: PropTypes.func,
     tokenAmount: PropTypes.string,
   };
 
   handleEdit(confirmTransactionData) {
-    const { editTransaction, history } = this.props;
-    editTransaction(confirmTransactionData);
-    history.push(SEND_ROUTE);
+    const { editExistingTransaction, history } = this.props;
+    editExistingTransaction(confirmTransactionData).then(() => {
+      history.push(SEND_ROUTE);
+    });
   }
 
   render() {
diff --git a/ui/pages/confirm-send-token/confirm-send-token.container.js b/ui/pages/confirm-send-token/confirm-send-token.container.js
index d8a4984244f1..62cee9ac38d7 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.container.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.container.js
@@ -3,7 +3,7 @@ import { compose } from 'redux';
 import { withRouter } from 'react-router-dom';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../store/actions';
-import { editTransaction } from '../../ducks/send';
+import { editExistingTransaction } from '../../ducks/send';
 import { sendTokenTokenAmountAndToAddressSelector } from '../../selectors';
 import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import ConfirmSendToken from './confirm-send-token.component';
@@ -18,18 +18,11 @@ const mapStateToProps = (state) => {
 
 const mapDispatchToProps = (dispatch) => {
   return {
-    editTransaction: ({ txData, tokenData, tokenProps: assetDetails }) => {
+    editExistingTransaction: async ({ txData }) => {
       const { id } = txData;
-      dispatch(
-        editTransaction(
-          ASSET_TYPES.TOKEN,
-          id.toString(),
-          tokenData,
-          assetDetails,
-        ),
-      );
-      dispatch(clearConfirmTransaction());
-      dispatch(showSendTokenPage());
+      await dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, id.toString()));
+      await dispatch(clearConfirmTransaction());
+      await dispatch(showSendTokenPage());
     },
   };
 };
diff --git a/ui/pages/confirm-send-token/confirm-send-token.js b/ui/pages/confirm-send-token/confirm-send-token.js
index 8d40d36c9860..9a8625e34a83 100644
--- a/ui/pages/confirm-send-token/confirm-send-token.js
+++ b/ui/pages/confirm-send-token/confirm-send-token.js
@@ -4,7 +4,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import ConfirmTokenTransactionBase from '../confirm-token-transaction-base/confirm-token-transaction-base';
 import { SEND_ROUTE } from '../../helpers/constants/routes';
-import { editTransaction } from '../../ducks/send';
+import { editExistingTransaction } from '../../ducks/send';
 import {
   contractExchangeRateSelector,
   getCurrentCurrency,
@@ -13,10 +13,13 @@ import {
   getConversionRate,
   getNativeCurrency,
 } from '../../ducks/metamask/metamask';
-import { ERC20, ERC721 } from '../../helpers/constants/common';
 import { clearConfirmTransaction } from '../../ducks/confirm-transaction/confirm-transaction.duck';
 import { showSendTokenPage } from '../../store/actions';
-import { ASSET_TYPES } from '../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  ERC20,
+  ERC721,
+} from '../../../shared/constants/transaction';
 
 export default function ConfirmSendToken({
   assetStandard,
@@ -35,27 +38,17 @@ export default function ConfirmSendToken({
   const dispatch = useDispatch();
   const history = useHistory();
 
-  const handleEditTransaction = ({
-    txData,
-    tokenData,
-    tokenProps: assetDetails,
-  }) => {
+  const handleEditTransaction = async ({ txData }) => {
     const { id } = txData;
-    dispatch(
-      editTransaction(
-        ASSET_TYPES.TOKEN,
-        id.toString(),
-        tokenData,
-        assetDetails,
-      ),
-    );
+    await dispatch(editExistingTransaction(ASSET_TYPES.TOKEN, id.toString()));
     dispatch(clearConfirmTransaction());
     dispatch(showSendTokenPage());
   };
 
   const handleEdit = (confirmTransactionData) => {
-    handleEditTransaction(confirmTransactionData);
-    history.push(SEND_ROUTE);
+    handleEditTransaction(confirmTransactionData).then(() => {
+      history.push(SEND_ROUTE);
+    });
   };
   const conversionRate = useSelector(getConversionRate);
   const nativeCurrency = useSelector(getNativeCurrency);
diff --git a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
index edacfaa8aa1d..735ede09471b 100644
--- a/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
+++ b/ui/pages/confirm-token-transaction-base/confirm-token-transaction-base.js
@@ -15,13 +15,7 @@ import {
   getWeiHexFromDecimalValue,
   hexWEIToDecETH,
 } from '../../helpers/utils/conversions.util';
-import {
-  ERC1155,
-  ERC20,
-  ERC721,
-  ETH,
-  PRIMARY,
-} from '../../helpers/constants/common';
+import { ETH, PRIMARY } from '../../helpers/constants/common';
 import {
   contractExchangeRateSelector,
   getCurrentCurrency,
@@ -30,6 +24,7 @@ import {
   getConversionRate,
   getNativeCurrency,
 } from '../../ducks/metamask/metamask';
+import { ERC1155, ERC20, ERC721 } from '../../../shared/constants/transaction';
 
 export default function ConfirmTokenTransactionBase({
   image = '',
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
index 4d5fccfe510c..571bc3524c0f 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -338,6 +338,7 @@ export default class ConfirmTransactionBase extends Component {
     };
 
     const hasSimulationError = Boolean(txData.simulationFails);
+
     const renderSimulationFailureWarning =
       hasSimulationError && !userAcknowledgedGasMissing;
     const networkName = NETWORK_TO_NAME_MAP[txData.chainId];
@@ -417,7 +418,7 @@ export default class ConfirmTransactionBase extends Component {
           <div className="custom-nonce-input">
             <TextField
               type="number"
-              min="0"
+              min={0}
               placeholder={
                 typeof nextNonce === 'number' ? nextNonce.toString() : null
               }
@@ -546,10 +547,10 @@ export default class ConfirmTransactionBase extends Component {
                   maxPriorityFeePerGas={hexWEIToDecGWEI(
                     maxPriorityFeePerGas ||
                       txData.txParams.maxPriorityFeePerGas,
-                  )}
+                  ).toString()}
                   maxFeePerGas={hexWEIToDecGWEI(
                     maxFeePerGas || txData.txParams.maxFeePerGas,
-                  )}
+                  ).toString()}
                 />
               )}
             </>
@@ -805,8 +806,10 @@ export default class ConfirmTransactionBase extends Component {
       maxFeePerGas,
       maxPriorityFeePerGas,
       baseFeePerGas,
+      methodData,
     } = this.props;
     const { submitting } = this.state;
+    const { name } = methodData;
 
     if (submitting) {
       return;
@@ -816,6 +819,10 @@ export default class ConfirmTransactionBase extends Component {
       txData.estimatedBaseFee = baseFeePerGas;
     }
 
+    if (name) {
+      txData.contractMethodName = name;
+    }
+
     if (maxFeePerGas) {
       txData.txParams = {
         ...txData.txParams,
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
index 7752305a2563..7321d279340c 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -34,6 +34,7 @@ import {
   getIsMultiLayerFeeNetwork,
   getEIP1559V2Enabled,
   getIsBuyableChain,
+  getEnsResolutionByAddress,
 } from '../../selectors';
 import { getMostRecentOverviewPage } from '../../ducks/history/history';
 import {
@@ -53,6 +54,7 @@ import { toChecksumHexAddress } from '../../../shared/modules/hexstring-utils';
 import { getGasLoadingAnimationIsShowing } from '../../ducks/app/app';
 import { isLegacyTransaction } from '../../helpers/utils/transactions.util';
 import { CUSTOM_GAS_ESTIMATE } from '../../../shared/constants/gas';
+import { TRANSACTION_TYPES } from '../../../shared/constants/transaction';
 import { isEqualCaseInsensitive } from '../../../shared/modules/string-utils';
 import { getTokenAddressParam } from '../../helpers/utils/token-util';
 import ConfirmTransactionBase from './confirm-transaction-base.component';
@@ -80,7 +82,6 @@ const mapStateToProps = (state, ownProps) => {
   const isBuyableChain = getIsBuyableChain(state);
   const { confirmTransaction, metamask } = state;
   const {
-    ensResolutionsByAddress,
     conversionRate,
     identities,
     addressBook,
@@ -112,7 +113,10 @@ const mapStateToProps = (state, ownProps) => {
 
   const { balance } = accounts[fromAddress];
   const { name: fromName } = identities[fromAddress];
-  const toAddress = propsToAddress || tokenToAddress || txParamsToAddress;
+  let toAddress = txParamsToAddress;
+  if (type !== TRANSACTION_TYPES.SIMPLE_SEND) {
+    toAddress = propsToAddress || tokenToAddress || txParamsToAddress;
+  }
 
   const tokenList = getTokenList(state);
   const useTokenDetection = getUseTokenDetection(state);
@@ -137,7 +141,7 @@ const mapStateToProps = (state, ownProps) => {
     addressBook &&
     addressBook[chainId] &&
     addressBook[chainId][checksummedAddress];
-  const toEns = ensResolutionsByAddress[checksummedAddress] || '';
+  const toEns = getEnsResolutionByAddress(state, checksummedAddress);
   const toNickname = addressBookObject ? addressBookObject.name : '';
   const transactionStatus = transaction ? transaction.status : '';
   const supportsEIP1559 =
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
index c47530242f6d..7d7bf1837ddd 100644
--- a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
@@ -7,7 +7,6 @@ import { submittedPendingTransactionsSelector } from '../../../selectors/transac
 import { useGasFeeContext } from '../../../contexts/gasFee';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import ActionableMessage from '../../../components/ui/actionable-message/actionable-message';
-import I18nValue from '../../../components/ui/i18n-value';
 import Button from '../../../components/ui/button';
 import Typography from '../../../components/ui/typography';
 import { TYPOGRAPHY } from '../../../helpers/constants/design-system';
@@ -40,7 +39,7 @@ const TransactionAlerts = ({
     <div className="transaction-alerts">
       {hasSimulationError && (
         <ActionableMessage
-          message={<I18nValue messageKey="simulationErrorMessageV2" />}
+          message={t('simulationErrorMessageV2')}
           useIcon
           iconFillColor="var(--color-error-default)"
           type="danger"
@@ -60,34 +59,28 @@ const TransactionAlerts = ({
             <Typography
               align="left"
               className="transaction-alerts__pending-transactions"
-              margin={[0, 0]}
+              margin={0}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
               <strong>
-                <I18nValue
-                  messageKey={
-                    pendingTransactions?.length === 1
-                      ? 'pendingTransactionSingle'
-                      : 'pendingTransactionMultiple'
-                  }
-                  options={[pendingTransactions?.length]}
-                />
+                {pendingTransactions?.length === 1
+                  ? t('pendingTransactionSingle', [pendingTransactions?.length])
+                  : t('pendingTransactionMultiple', [
+                      pendingTransactions?.length,
+                    ])}
               </strong>{' '}
-              <I18nValue messageKey="pendingTransactionInfo" />{' '}
-              <I18nValue
-                messageKey="learnCancelSpeeedup"
-                options={[
-                  <a
-                    key="cancelSpeedUpInfo"
-                    href="https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-speed-up-or-cancel-a-pending-transaction"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    <I18nValue messageKey="cancelSpeedUp" />
-                  </a>,
-                ]}
-              />
+              {t('pendingTransactionInfo')}
+              {t('learnCancelSpeeedup', [
+                <a
+                  key="cancelSpeedUpInfo"
+                  href="https://metamask.zendesk.com/hc/en-us/articles/360015489251-How-to-speed-up-or-cancel-a-pending-transaction"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  {t('cancelSpeedUp')}
+                </a>,
+              ])}
             </Typography>
           }
           useIcon
@@ -134,11 +127,11 @@ const TransactionAlerts = ({
           message={
             <Typography
               align="left"
-              margin={[0, 0]}
+              margin={0}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
-              <I18nValue messageKey="lowPriorityMessage" />
+              {t('lowPriorityMessage')}
             </Typography>
           }
           useIcon
@@ -151,11 +144,11 @@ const TransactionAlerts = ({
           message={
             <Typography
               align="left"
-              margin={[0, 0]}
+              margin={0}
               tag={TYPOGRAPHY.Paragraph}
               variant={TYPOGRAPHY.H7}
             >
-              <I18nValue messageKey="networkIsBusy" />
+              {t('networkIsBusy')}
             </Typography>
           }
           iconFillColor="var(--color-warning-default)"
diff --git a/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js b/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
index db58cc640ae6..4c6f964fa6a3 100644
--- a/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
+++ b/ui/pages/confirm-transaction-switch/confirm-transaction-switch.component.js
@@ -14,6 +14,7 @@ import {
   DECRYPT_MESSAGE_REQUEST_PATH,
   ENCRYPTION_PUBLIC_KEY_REQUEST_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
+  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
 } from '../../helpers/constants/routes';
 import { MESSAGE_TYPE } from '../../../shared/constants/app';
 import { TRANSACTION_TYPES } from '../../../shared/constants/transaction';
@@ -47,6 +48,10 @@ export default class ConfirmTransactionSwitch extends Component {
           const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_APPROVE_PATH}`;
           return <Redirect to={{ pathname }} />;
         }
+        case TRANSACTION_TYPES.TOKEN_METHOD_SET_APPROVAL_FOR_ALL: {
+          const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`;
+          return <Redirect to={{ pathname }} />;
+        }
         case TRANSACTION_TYPES.TOKEN_METHOD_TRANSFER_FROM: {
           const pathname = `${CONFIRM_TRANSACTION_ROUTE}/${id}${CONFIRM_TRANSFER_FROM_PATH}`;
           return <Redirect to={{ pathname }} />;
diff --git a/ui/pages/confirm-transaction/confirm-token-transaction-switch.js b/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
index 036f2b149fd7..43b554595019 100644
--- a/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
+++ b/ui/pages/confirm-transaction/confirm-token-transaction-switch.js
@@ -6,6 +6,7 @@ import {
   CONFIRM_APPROVE_PATH,
   CONFIRM_SAFE_TRANSFER_FROM_PATH,
   CONFIRM_SEND_TOKEN_PATH,
+  CONFIRM_SET_APPROVAL_FOR_ALL_PATH,
   CONFIRM_TRANSACTION_ROUTE,
   CONFIRM_TRANSFER_FROM_PATH,
 } from '../../helpers/constants/routes';
@@ -66,6 +67,30 @@ export default function ConfirmTokenTransactionSwitch({ transaction }) {
           />
         )}
       />
+      <Route
+        exact
+        path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${CONFIRM_SET_APPROVAL_FOR_ALL_PATH}`}
+        render={() => (
+          <ConfirmApprove
+            isSetApproveForAll
+            assetStandard={assetStandard}
+            assetName={assetName}
+            userBalance={userBalance}
+            tokenSymbol={tokenSymbol}
+            decimals={decimals}
+            tokenImage={tokenImage}
+            tokenAmount={tokenAmount}
+            tokenId={tokenId}
+            userAddress={userAddress}
+            tokenAddress={tokenAddress}
+            toAddress={toAddress}
+            transaction={transaction}
+            ethTransactionTotal={ethTransactionTotal}
+            fiatTransactionTotal={fiatTransactionTotal}
+            hexTransactionTotal={hexTransactionTotal}
+          />
+        )}
+      />
       <Route
         exact
         path={`${CONFIRM_TRANSACTION_ROUTE}/:id?${CONFIRM_TRANSFER_FROM_PATH}`}
diff --git a/ui/pages/confirmation/components/confirmation-network-switch/index.scss b/ui/pages/confirmation/components/confirmation-network-switch/index.scss
index 21c014ea6a8f..b988c30daddf 100644
--- a/ui/pages/confirmation/components/confirmation-network-switch/index.scss
+++ b/ui/pages/confirmation/components/confirmation-network-switch/index.scss
@@ -18,7 +18,6 @@
     align-items: center;
     justify-content: center;
     position: absolute;
-    filter: drop-shadow(0 1px 5px rgba(0, 0, 0, 0.25));
 
     &::before {
       content: '';
diff --git a/ui/pages/confirmation/confirmation.js b/ui/pages/confirmation/confirmation.js
index 1d09457c547f..6c6308cceefa 100644
--- a/ui/pages/confirmation/confirmation.js
+++ b/ui/pages/confirmation/confirmation.js
@@ -10,9 +10,7 @@ import { useHistory } from 'react-router-dom';
 import { isEqual } from 'lodash';
 import { produce } from 'immer';
 import Box from '../../components/ui/box';
-import Chip from '../../components/ui/chip';
 import MetaMaskTemplateRenderer from '../../components/app/metamask-template-renderer';
-import SiteIcon from '../../components/ui/site-icon';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import {
   COLORS,
@@ -25,6 +23,8 @@ import { useOriginMetadata } from '../../hooks/useOriginMetadata';
 import { getUnapprovedTemplatedConfirmations } from '../../selectors';
 import NetworkDisplay from '../../components/app/network-display/network-display';
 import Callout from '../../components/ui/callout';
+import SiteOrigin from '../../components/ui/site-origin';
+import { addCustomNetwork } from '../../store/actions';
 import ConfirmationFooter from './components/confirmation-footer';
 import { getTemplateValues, getTemplateAlerts } from './templates';
 
@@ -130,6 +130,7 @@ export default function ConfirmationPage() {
   const pendingConfirmation = pendingConfirmations[currentPendingConfirmation];
   const originMetadata = useOriginMetadata(pendingConfirmation?.origin) || {};
   const [alertState, dismissAlert] = useAlertState(pendingConfirmation);
+  const [stayOnPage, setStayOnPage] = useState(false);
 
   // Generating templatedValues is potentially expensive, and if done on every render
   // will result in a new object. Avoiding calling this generation unnecessarily will
@@ -146,11 +147,11 @@ export default function ConfirmationPage() {
     // confirmations reduces to a number that is less than the currently
     // viewed index, reset the index.
     if (pendingConfirmations.length === 0) {
-      history.push(DEFAULT_ROUTE);
+      !stayOnPage && history.push(DEFAULT_ROUTE);
     } else if (pendingConfirmations.length <= currentPendingConfirmation) {
       setCurrentPendingConfirmation(pendingConfirmations.length - 1);
     }
-  }, [pendingConfirmations, history, currentPendingConfirmation]);
+  }, [pendingConfirmations, history, currentPendingConfirmation, stayOnPage]);
   if (!pendingConfirmation) {
     return null;
   }
@@ -190,29 +191,32 @@ export default function ConfirmationPage() {
       )}
       <div className="confirmation-page__content">
         {templatedValues.networkDisplay ? (
-          <Box justifyContent="center">
+          <Box justifyContent="center" marginTop={2}>
             <NetworkDisplay
               indicatorSize={SIZES.XS}
               labelProps={{ color: COLORS.TEXT_DEFAULT }}
             />
           </Box>
         ) : null}
-        <Box
-          alignItems="center"
-          marginTop={1}
-          padding={[1, 4, 4]}
-          flexDirection={FLEX_DIRECTION.COLUMN}
-        >
-          <SiteIcon
-            icon={originMetadata.iconUrl}
-            name={originMetadata.hostname}
-            size={36}
-          />
-          <Chip
-            label={stripHttpsScheme(originMetadata.origin)}
-            borderColor={COLORS.BORDER_DEFAULT}
-          />
-        </Box>
+        {pendingConfirmation.origin === 'metamask' ? null : (
+          <Box
+            alignItems="center"
+            marginTop={1}
+            paddingTop={1}
+            paddingRight={4}
+            paddingLeft={4}
+            paddingBottom={4}
+            flexDirection={FLEX_DIRECTION.COLUMN}
+          >
+            <SiteOrigin
+              chip
+              siteOrigin={stripHttpsScheme(originMetadata.origin)}
+              title={stripHttpsScheme(originMetadata.origin)}
+              iconSrc={originMetadata.iconUrl}
+              iconName={originMetadata.hostname}
+            />
+          </Box>
+        )}
         <MetaMaskTemplateRenderer sections={templatedValues.content} />
       </div>
       <ConfirmationFooter
@@ -233,8 +237,15 @@ export default function ConfirmationPage() {
               </Callout>
             ))
         }
-        onApprove={templatedValues.onApprove}
-        onCancel={templatedValues.onCancel}
+        onApprove={() => {
+          templatedValues.onApprove.apply();
+          pendingConfirmation.origin === 'metamask' &&
+            dispatch(addCustomNetwork(pendingConfirmation.requestData));
+        }}
+        onCancel={() => {
+          templatedValues.onCancel.apply();
+          pendingConfirmation.origin === 'metamask' && setStayOnPage(true);
+        }}
         approveText={templatedValues.approvalText}
         cancelText={templatedValues.cancelText}
       />
diff --git a/ui/pages/confirmation/templates/add-ethereum-chain.js b/ui/pages/confirmation/templates/add-ethereum-chain.js
index db7dac420035..f4a56890698e 100644
--- a/ui/pages/confirmation/templates/add-ethereum-chain.js
+++ b/ui/pages/confirmation/templates/add-ethereum-chain.js
@@ -1,7 +1,13 @@
 import { ethErrors } from 'eth-rpc-errors';
+import React from 'react';
+import { infuraProjectId } from '../../../../shared/constants/network';
 import {
   SEVERITIES,
   TYPOGRAPHY,
+  TEXT_ALIGN,
+  JUSTIFY_CONTENT,
+  DISPLAY,
+  COLORS,
 } from '../../../helpers/constants/design-system';
 import fetchWithCache from '../../../helpers/utils/fetch-with-cache';
 
@@ -14,38 +20,19 @@ const UNRECOGNIZED_CHAIN = {
       element: 'MetaMaskTranslation',
       props: {
         translationKey: 'unrecognizedChain',
-        variables: [
-          {
-            element: 'a',
-            key: 'unrecognizedChainLink',
-            props: {
-              href:
-                'https://metamask.zendesk.com/hc/en-us/articles/360057142392',
-              target: '__blank',
-              tabIndex: 0,
-            },
-            children: {
-              element: 'MetaMaskTranslation',
-              props: {
-                translationKey: 'unrecognizedChainLinkText',
-              },
-            },
-          },
-        ],
       },
     },
   },
 };
 
-const INVALID_CHAIN = {
-  id: 'INVALID_CHAIN',
-  severity: SEVERITIES.DANGER,
+const MISMATCHED_CHAIN_RECOMMENDATION = {
+  id: 'MISMATCHED_CHAIN_RECOMMENDATION',
   content: {
     element: 'span',
     children: {
       element: 'MetaMaskTranslation',
       props: {
-        translationKey: 'mismatchedChain',
+        translationKey: 'mismatchedChainRecommendation',
         variables: [
           {
             element: 'a',
@@ -69,48 +56,126 @@ const INVALID_CHAIN = {
   },
 };
 
+const MISMATCHED_NETWORK_NAME = {
+  id: 'MISMATCHED_NETWORK_NAME',
+  severity: SEVERITIES.WARNING,
+  content: {
+    element: 'span',
+    children: {
+      element: 'MetaMaskTranslation',
+      props: {
+        translationKey: 'mismatchedNetworkName',
+      },
+    },
+  },
+};
+
+const MISMATCHED_NETWORK_SYMBOL = {
+  id: 'MISMATCHED_NETWORK_SYMBOL',
+  severity: SEVERITIES.DANGER,
+  content: {
+    element: 'span',
+    children: {
+      element: 'MetaMaskTranslation',
+      props: {
+        translationKey: 'mismatchedNetworkSymbol',
+      },
+    },
+  },
+};
+
+const MISMATCHED_NETWORK_RPC = {
+  id: 'MISMATCHED_NETWORK_RPC',
+  severity: SEVERITIES.DANGER,
+  content: {
+    element: 'span',
+    children: {
+      element: 'MetaMaskTranslation',
+      props: {
+        translationKey: 'mismatchedRpcUrl',
+      },
+    },
+  },
+};
+
 async function getAlerts(pendingApproval) {
   const alerts = [];
-  const safeChainsList = await fetchWithCache(
-    'https://chainid.network/chains.json',
-  );
+  const safeChainsList =
+    (await fetchWithCache('https://chainid.network/chains.json')) || [];
   const matchedChain = safeChainsList.find(
     (chain) =>
       chain.chainId === parseInt(pendingApproval.requestData.chainId, 16),
   );
-  let validated = Boolean(matchedChain);
+
+  const originIsMetaMask = pendingApproval.origin === 'metamask';
+  if (originIsMetaMask && Boolean(matchedChain)) {
+    return [];
+  }
 
   if (matchedChain) {
     if (
-      matchedChain.nativeCurrency?.decimals !== 18 ||
       matchedChain.name.toLowerCase() !==
-        pendingApproval.requestData.chainName.toLowerCase() ||
+      pendingApproval.requestData.chainName.toLowerCase()
+    ) {
+      alerts.push(MISMATCHED_NETWORK_NAME);
+    }
+    if (
       matchedChain.nativeCurrency?.symbol !== pendingApproval.requestData.ticker
     ) {
-      validated = false;
+      alerts.push(MISMATCHED_NETWORK_SYMBOL);
     }
 
     const { origin } = new URL(pendingApproval.requestData.rpcUrl);
     if (!matchedChain.rpc.map((rpc) => new URL(rpc).origin).includes(origin)) {
-      validated = false;
+      alerts.push(MISMATCHED_NETWORK_RPC);
     }
   }
 
   if (!matchedChain) {
     alerts.push(UNRECOGNIZED_CHAIN);
-  } else if (!validated) {
-    alerts.push(INVALID_CHAIN);
   }
+
+  if (alerts.length) {
+    alerts.push(MISMATCHED_CHAIN_RECOMMENDATION);
+  }
+
   return alerts;
 }
 
 function getValues(pendingApproval, t, actions) {
+  const originIsMetaMask = pendingApproval.origin === 'metamask';
+
   return {
     content: [
+      {
+        hide: !originIsMetaMask,
+        element: 'Box',
+        key: 'network-box',
+        props: {
+          textAlign: TEXT_ALIGN.CENTER,
+          display: DISPLAY.FLEX,
+          justifyContent: JUSTIFY_CONTENT.CENTER,
+          marginTop: 4,
+          marginBottom: 2,
+        },
+        children: [
+          {
+            element: 'Chip',
+            key: 'network-chip',
+            props: {
+              label: pendingApproval.requestData.chainName,
+              backgroundColor: COLORS.BACKGROUND_ALTERNATIVE,
+              leftIconUrl: pendingApproval.requestData.imageUrl,
+            },
+          },
+        ],
+      },
       {
         element: 'Typography',
         key: 'title',
-        children: t('addEthereumChainConfirmationTitle'),
+        children: originIsMetaMask
+          ? t('wantToAddThisNetwork')
+          : t('addEthereumChainConfirmationTitle'),
         props: {
           variant: TYPOGRAPHY.H3,
           align: 'center',
@@ -128,7 +193,7 @@ function getValues(pendingApproval, t, actions) {
           variant: TYPOGRAPHY.H7,
           align: 'center',
           boxProps: {
-            margin: [0, 0, 4],
+            margin: originIsMetaMask ? [0, 8, 4] : [0, 0, 4],
           },
         },
       },
@@ -139,7 +204,55 @@ function getValues(pendingApproval, t, actions) {
           {
             element: 'b',
             key: 'bolded-text',
-            children: `${t('addEthereumChainConfirmationRisks')} `,
+            props: {
+              style: { display: originIsMetaMask && '-webkit-box' },
+            },
+            children: [
+              `${t('addEthereumChainConfirmationRisks')} `,
+              {
+                hide: !originIsMetaMask,
+                element: 'Tooltip',
+                key: 'tooltip-info',
+                props: {
+                  position: 'bottom',
+                  interactive: true,
+                  trigger: 'mouseenter',
+                  html: (
+                    <div
+                      style={{
+                        width: '180px',
+                        margin: '16px',
+                        textAlign: 'left',
+                      }}
+                    >
+                      {t('someNetworksMayPoseSecurity')}{' '}
+                      <a
+                        key="zendesk_page_link"
+                        href="https://metamask.zendesk.com/hc/en-us/articles/4417500466971"
+                        rel="noreferrer"
+                        target="_blank"
+                        style={{ color: 'var(--color-primary-default)' }}
+                      >
+                        {t('learnMoreUpperCase')}
+                      </a>
+                    </div>
+                  ),
+                },
+                children: [
+                  {
+                    element: 'i',
+                    key: 'info-circle',
+                    props: {
+                      className: 'fas fa-info-circle',
+                      style: {
+                        marginLeft: '4px',
+                        color: 'var(--color-icon-default)',
+                      },
+                    },
+                  },
+                ],
+              },
+            ],
           },
           {
             element: 'MetaMaskTranslation',
@@ -165,7 +278,7 @@ function getValues(pendingApproval, t, actions) {
           variant: TYPOGRAPHY.H7,
           align: 'center',
           boxProps: {
-            margin: 0,
+            margin: originIsMetaMask ? [0, 8] : 0,
           },
         },
       },
@@ -183,13 +296,25 @@ function getValues(pendingApproval, t, actions) {
           },
           dictionary: {
             [t('networkName')]: pendingApproval.requestData.chainName,
-            [t('networkURL')]: pendingApproval.requestData.rpcUrl,
+            [t('networkURL')]: pendingApproval.requestData.rpcUrl?.includes(
+              `/v3/${infuraProjectId}`,
+            )
+              ? pendingApproval.requestData.rpcUrl.replace(
+                  `/v3/${infuraProjectId}`,
+                  '',
+                )
+              : pendingApproval.requestData.rpcUrl,
             [t('chainId')]: parseInt(pendingApproval.requestData.chainId, 16),
             [t('currencySymbol')]: pendingApproval.requestData.ticker,
             [t('blockExplorerUrl')]: pendingApproval.requestData
               .blockExplorerUrl,
           },
-          prefaceKeys: [t('networkName'), t('networkURL'), t('chainId')],
+          prefaceKeys: [
+            t('networkName'),
+            t('networkURL'),
+            t('chainId'),
+            t('currencySymbol'),
+          ],
         },
       },
     ],
@@ -206,7 +331,7 @@ function getValues(pendingApproval, t, actions) {
         pendingApproval.id,
         ethErrors.provider.userRejectedRequest().serialize(),
       ),
-    networkDisplay: true,
+    networkDisplay: !originIsMetaMask,
   };
 }
 
diff --git a/ui/pages/create-account/connect-hardware/index.scss b/ui/pages/create-account/connect-hardware/index.scss
index 4521e4a48be0..2a380affb017 100644
--- a/ui/pages/create-account/connect-hardware/index.scss
+++ b/ui/pages/create-account/connect-hardware/index.scss
@@ -151,7 +151,7 @@
   }
 
   &__error {
-    color: var(--color-secondary-default);
+    color: var(--color-warning-default);
     margin: 20px 20px 10px;
     display: block;
     text-align: center;
diff --git a/ui/pages/create-account/index.scss b/ui/pages/create-account/index.scss
index 962160c43daa..a39b96980052 100644
--- a/ui/pages/create-account/index.scss
+++ b/ui/pages/create-account/index.scss
@@ -4,7 +4,7 @@
 .new-account {
   width: 375px;
   background-color: var(--color-background-default);
-  box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+  box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   z-index: 25;
   height: unset;
   overflow: auto;
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/index.scss b/ui/pages/first-time-flow/metametrics-opt-in/index.scss
index de905adaee40..b8ce8929c2fb 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/index.scss
+++ b/ui/pages/first-time-flow/metametrics-opt-in/index.scss
@@ -33,10 +33,6 @@
 
   &__body-graphic {
     margin-top: 25px;
-
-    .fa-bar-chart {
-      color: var(--color-icon-default);
-    }
   }
 
   &__description {
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
index 673d1c7f3aef..7fc24e6572fa 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
+++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.component.js
@@ -3,12 +3,12 @@ import PropTypes from 'prop-types';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
 import PageContainerFooter from '../../../components/ui/page-container/page-container-footer';
 import { EVENT } from '../../../../shared/constants/metametrics';
+import { INITIALIZE_SELECT_ACTION_ROUTE } from '../../../helpers/constants/routes';
 
 export default class MetaMetricsOptIn extends Component {
   static propTypes = {
     history: PropTypes.object,
     setParticipateInMetaMetrics: PropTypes.func,
-    nextRoute: PropTypes.string,
     firstTimeSelectionMetaMetricsName: PropTypes.string,
     participateInMetaMetrics: PropTypes.bool,
   };
@@ -21,7 +21,6 @@ export default class MetaMetricsOptIn extends Component {
   render() {
     const { trackEvent, t } = this.context;
     const {
-      nextRoute,
       history,
       setParticipateInMetaMetrics,
       firstTimeSelectionMetaMetricsName,
@@ -105,29 +104,7 @@ export default class MetaMetricsOptIn extends Component {
               onCancel={async () => {
                 await setParticipateInMetaMetrics(false);
 
-                try {
-                  if (
-                    participateInMetaMetrics === null ||
-                    participateInMetaMetrics === true
-                  ) {
-                    await trackEvent(
-                      {
-                        category: EVENT.CATEGORIES.ONBOARDING,
-                        event: 'Metrics Opt Out',
-                        properties: {
-                          action: 'Metrics Option',
-                          legacy_event: true,
-                        },
-                      },
-                      {
-                        isOptIn: true,
-                        flushImmediately: true,
-                      },
-                    );
-                  }
-                } finally {
-                  history.push(nextRoute);
-                }
+                history.push(INITIALIZE_SELECT_ACTION_ROUTE);
               }}
               cancelText={t('noThanks')}
               hideCancel={false}
@@ -177,7 +154,7 @@ export default class MetaMetricsOptIn extends Component {
                   );
                   await Promise.all(metrics);
                 } finally {
-                  history.push(nextRoute);
+                  history.push(INITIALIZE_SELECT_ACTION_ROUTE);
                 }
               }}
               submitText={t('affirmAgree')}
diff --git a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
index e336a9dd2e4d..9e607ccf757f 100644
--- a/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
+++ b/ui/pages/first-time-flow/metametrics-opt-in/metametrics-opt-in.container.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import { setParticipateInMetaMetrics } from '../../../store/actions';
-import { getFirstTimeFlowTypeRoute } from '../../../selectors';
 import MetaMetricsOptIn from './metametrics-opt-in.component';
 
 const firstTimeFlowTypeNameMap = {
@@ -12,7 +11,6 @@ const mapStateToProps = (state) => {
   const { firstTimeFlowType, participateInMetaMetrics } = state.metamask;
 
   return {
-    nextRoute: getFirstTimeFlowTypeRoute(state),
     firstTimeSelectionMetaMetricsName:
       firstTimeFlowTypeNameMap[firstTimeFlowType],
     participateInMetaMetrics,
diff --git a/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss b/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
index 32922fa11c06..3ff753ce7d69 100644
--- a/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
+++ b/ui/pages/first-time-flow/seed-phrase/confirm-seed-phrase/index.scss
@@ -85,7 +85,7 @@
       display: inline-flex;
 
       &:hover {
-        box-shadow: 0 2px 4px rgba(0, 0, 0, 0.25);
+        box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
       }
     }
 
diff --git a/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js b/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
index f410ed305142..fd95d11f2195 100644
--- a/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
+++ b/ui/pages/first-time-flow/seed-phrase/seed-phrase-intro/seed-phrase-intro.component.js
@@ -35,6 +35,11 @@ export default function SeedPhraseIntro() {
     ru: 'Russian',
     tl: 'Tagalog',
     vi: 'Vietnamese',
+    de: 'German',
+    el: 'Greek',
+    fr: 'French',
+    tr: 'Turkish',
+    zh: 'Chinese - China',
   };
 
   return (
diff --git a/ui/pages/first-time-flow/select-action/select-action.component.js b/ui/pages/first-time-flow/select-action/select-action.component.js
index 7feadb9a3bb2..51d2876d7682 100644
--- a/ui/pages/first-time-flow/select-action/select-action.component.js
+++ b/ui/pages/first-time-flow/select-action/select-action.component.js
@@ -2,7 +2,10 @@ import React, { PureComponent } from 'react';
 import PropTypes from 'prop-types';
 import Button from '../../../components/ui/button';
 import MetaFoxLogo from '../../../components/ui/metafox-logo';
-import { INITIALIZE_METAMETRICS_OPT_IN_ROUTE } from '../../../helpers/constants/routes';
+import {
+  INITIALIZE_CREATE_PASSWORD_ROUTE,
+  INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE,
+} from '../../../helpers/constants/routes';
 
 export default class SelectAction extends PureComponent {
   static propTypes = {
@@ -26,12 +29,12 @@ export default class SelectAction extends PureComponent {
 
   handleCreate = () => {
     this.props.setFirstTimeFlowType('create');
-    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
+    this.props.history.push(INITIALIZE_CREATE_PASSWORD_ROUTE);
   };
 
   handleImport = () => {
     this.props.setFirstTimeFlowType('import');
-    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
+    this.props.history.push(INITIALIZE_IMPORT_WITH_SEED_PHRASE_ROUTE);
   };
 
   render() {
diff --git a/ui/pages/first-time-flow/welcome/welcome.component.js b/ui/pages/first-time-flow/welcome/welcome.component.js
index 20a929372420..46bf36d226a8 100644
--- a/ui/pages/first-time-flow/welcome/welcome.component.js
+++ b/ui/pages/first-time-flow/welcome/welcome.component.js
@@ -6,6 +6,7 @@ import Button from '../../../components/ui/button';
 import {
   INITIALIZE_CREATE_PASSWORD_ROUTE,
   INITIALIZE_SELECT_ACTION_ROUTE,
+  INITIALIZE_METAMETRICS_OPT_IN_ROUTE,
 } from '../../../helpers/constants/routes';
 import { isBeta } from '../../../helpers/utils/build-types';
 import WelcomeFooter from './welcome-footer.component';
@@ -16,6 +17,7 @@ export default class Welcome extends PureComponent {
     history: PropTypes.object,
     participateInMetaMetrics: PropTypes.bool,
     welcomeScreenSeen: PropTypes.bool,
+    isInitialized: PropTypes.bool,
   };
 
   static contextTypes = {
@@ -29,17 +31,28 @@ export default class Welcome extends PureComponent {
   }
 
   componentDidMount() {
-    const { history, participateInMetaMetrics, welcomeScreenSeen } = this.props;
+    const {
+      history,
+      participateInMetaMetrics,
+      welcomeScreenSeen,
+      isInitialized,
+    } = this.props;
 
-    if (welcomeScreenSeen && participateInMetaMetrics !== null) {
+    if (
+      welcomeScreenSeen &&
+      isInitialized &&
+      participateInMetaMetrics !== null
+    ) {
       history.push(INITIALIZE_CREATE_PASSWORD_ROUTE);
-    } else if (welcomeScreenSeen) {
+    } else if (welcomeScreenSeen && participateInMetaMetrics !== null) {
       history.push(INITIALIZE_SELECT_ACTION_ROUTE);
+    } else if (welcomeScreenSeen) {
+      history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
     }
   }
 
   handleContinue = () => {
-    this.props.history.push(INITIALIZE_SELECT_ACTION_ROUTE);
+    this.props.history.push(INITIALIZE_METAMETRICS_OPT_IN_ROUTE);
   };
 
   render() {
diff --git a/ui/pages/first-time-flow/welcome/welcome.container.js b/ui/pages/first-time-flow/welcome/welcome.container.js
index 77909d25b061..27bd2e198efe 100644
--- a/ui/pages/first-time-flow/welcome/welcome.container.js
+++ b/ui/pages/first-time-flow/welcome/welcome.container.js
@@ -5,11 +5,16 @@ import { closeWelcomeScreen } from '../../../store/actions';
 import Welcome from './welcome.component';
 
 const mapStateToProps = ({ metamask }) => {
-  const { welcomeScreenSeen, participateInMetaMetrics } = metamask;
+  const {
+    welcomeScreenSeen,
+    participateInMetaMetrics,
+    isInitialized,
+  } = metamask;
 
   return {
     welcomeScreenSeen,
     participateInMetaMetrics,
+    isInitialized,
   };
 };
 
diff --git a/ui/pages/first-time-flow/welcome/welcome.test.js b/ui/pages/first-time-flow/welcome/welcome.test.js
index 14d1a22ccfea..2c0f79106694 100644
--- a/ui/pages/first-time-flow/welcome/welcome.test.js
+++ b/ui/pages/first-time-flow/welcome/welcome.test.js
@@ -15,7 +15,7 @@ describe('Welcome', () => {
     sinon.restore();
   });
 
-  it('routes to select action when participateInMetaMetrics is not initialized', () => {
+  it('routes to the metametrics screen when participateInMetaMetrics is not initialized', () => {
     const props = {
       history: {
         push: sinon.spy(),
@@ -32,11 +32,11 @@ describe('Welcome', () => {
     );
     getStartedButton.simulate('click');
     expect(props.history.push.getCall(0).args[0]).toStrictEqual(
-      '/initialize/select-action',
+      '/initialize/metametrics-opt-in',
     );
   });
 
-  it('routes to correct password when participateInMetaMetrics is initialized', () => {
+  it('routes to select action when participateInMetaMetrics is initialized', () => {
     const props = {
       welcomeScreenSeen: true,
       participateInMetaMetrics: false,
@@ -55,7 +55,7 @@ describe('Welcome', () => {
     );
     getStartedButton.simulate('click');
     expect(props.history.push.getCall(0).args[0]).toStrictEqual(
-      '/initialize/create-password',
+      '/initialize/select-action',
     );
   });
 });
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index ab4fda2e8af6..0ce2fdd1ee8e 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -26,9 +26,7 @@ import {
   TYPOGRAPHY,
   FONT_WEIGHT,
   DISPLAY,
-  ///: BEGIN:ONLY_INCLUDE_IN(flask)
   COLORS,
-  ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/design-system';
 
 import {
@@ -114,7 +112,7 @@ export default class Home extends PureComponent {
     infuraBlocked: PropTypes.bool.isRequired,
     showWhatsNewPopup: PropTypes.bool.isRequired,
     hideWhatsNewPopup: PropTypes.func.isRequired,
-    notificationsToShow: PropTypes.bool.isRequired,
+    announcementsToShow: PropTypes.bool.isRequired,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     errorsToShow: PropTypes.object.isRequired,
     shouldShowErrors: PropTypes.bool.isRequired,
@@ -123,7 +121,16 @@ export default class Home extends PureComponent {
     showRecoveryPhraseReminder: PropTypes.bool.isRequired,
     setRecoveryPhraseReminderHasBeenShown: PropTypes.func.isRequired,
     setRecoveryPhraseReminderLastShown: PropTypes.func.isRequired,
-    seedPhraseBackedUp: PropTypes.bool.isRequired,
+    seedPhraseBackedUp: (props) => {
+      if (
+        props.seedPhraseBackedUp !== null &&
+        typeof props.seedPhraseBackedUp !== 'boolean'
+      ) {
+        throw new Error(
+          `seedPhraseBackedUp is required to be null or boolean. Received ${props.seedPhraseBackedUp}`,
+        );
+      }
+    },
     newNetworkAdded: PropTypes.string,
     setNewNetworkAdded: PropTypes.func.isRequired,
     // This prop is used in the `shouldCloseNotificationPopup` function
@@ -134,6 +141,9 @@ export default class Home extends PureComponent {
     closeNotificationPopup: PropTypes.func.isRequired,
     newTokensImported: PropTypes.string,
     setNewTokensImported: PropTypes.func.isRequired,
+    newCustomNetworkAdded: PropTypes.object,
+    setNewCustomNetworkAdded: PropTypes.func,
+    setRpcTarget: PropTypes.func,
   };
 
   state = {
@@ -271,6 +281,9 @@ export default class Home extends PureComponent {
       setNewCollectibleAddedMessage,
       newTokensImported,
       setNewTokensImported,
+      newCustomNetworkAdded,
+      setNewCustomNetworkAdded,
+      setRpcTarget,
     } = this.props;
     return (
       <MultipleNotifications>
@@ -470,6 +483,56 @@ export default class Home extends PureComponent {
             key="home-infuraBlockedNotification"
           />
         ) : null}
+        {Object.keys(newCustomNetworkAdded).length !== 0 && (
+          <Popover className="home__new-network-added">
+            <i className="fa fa-check-circle fa-2x home__new-network-added__check-circle" />
+            <Typography
+              variant={TYPOGRAPHY.H4}
+              marginTop={5}
+              marginRight={9}
+              marginLeft={9}
+              marginBottom={0}
+              fontWeight={FONT_WEIGHT.BOLD}
+            >
+              {t('networkAddedSuccessfully')}
+            </Typography>
+            <Box marginTop={8} marginRight={8} marginLeft={8} marginBottom={5}>
+              <Button
+                type="primary"
+                className="home__new-network-added__switch-to-button"
+                onClick={() => {
+                  setRpcTarget(
+                    newCustomNetworkAdded.rpcUrl,
+                    newCustomNetworkAdded.chainId,
+                    newCustomNetworkAdded.ticker,
+                    newCustomNetworkAdded.chainName,
+                  );
+                  setNewCustomNetworkAdded();
+                }}
+              >
+                <Typography
+                  variant={TYPOGRAPHY.H6}
+                  fontWeight={FONT_WEIGHT.NORMAL}
+                  color={COLORS.PRIMARY_INVERSE}
+                >
+                  {t('switchToNetwork', [newCustomNetworkAdded.chainName])}
+                </Typography>
+              </Button>
+              <Button
+                type="secondary"
+                onClick={() => setNewCustomNetworkAdded()}
+              >
+                <Typography
+                  variant={TYPOGRAPHY.H6}
+                  fontWeight={FONT_WEIGHT.NORMAL}
+                  color={COLORS.PRIMARY_DEFAULT}
+                >
+                  {t('dismiss')}
+                </Typography>
+              </Button>
+            </Box>
+          </Popover>
+        )}
       </MultipleNotifications>
     );
   }
@@ -525,7 +588,7 @@ export default class Home extends PureComponent {
       history,
       connectedStatusPopoverHasBeenShown,
       isPopup,
-      notificationsToShow,
+      announcementsToShow,
       showWhatsNewPopup,
       hideWhatsNewPopup,
       seedPhraseBackedUp,
@@ -543,9 +606,8 @@ export default class Home extends PureComponent {
     const showWhatsNew =
       ((completedOnboarding && firstTimeFlowType === 'import') ||
         !completedOnboarding) &&
-      notificationsToShow &&
+      announcementsToShow &&
       showWhatsNewPopup;
-
     return (
       <div className="main-container">
         <Route path={CONNECTED_ROUTE} component={ConnectedSites} exact />
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 13229b1996a6..1c7f5dfed54d 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -37,11 +37,16 @@ import {
   setNewNetworkAdded,
   setNewCollectibleAddedMessage,
   setNewTokensImported,
+  setRpcTarget,
   ///: BEGIN:ONLY_INCLUDE_IN(flask)
   removeSnapError,
   ///: END:ONLY_INCLUDE_IN
 } from '../../store/actions';
-import { setThreeBoxLastUpdated, hideWhatsNewPopup } from '../../ducks/app/app';
+import {
+  setThreeBoxLastUpdated,
+  hideWhatsNewPopup,
+  setNewCustomNetworkAdded,
+} from '../../ducks/app/app';
 import { getWeb3ShimUsageAlertEnabledness } from '../../ducks/metamask/metamask';
 import { getSwapsFeatureIsLive } from '../../ducks/swaps/swaps';
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
@@ -126,7 +131,7 @@ const mapStateToProps = (state) => {
     shouldShowWeb3ShimUsageNotification,
     pendingConfirmations,
     infuraBlocked: getInfuraBlocked(state),
-    notificationsToShow: getSortedAnnouncementsToShow(state).length > 0,
+    announcementsToShow: getSortedAnnouncementsToShow(state).length > 0,
     ///: BEGIN:ONLY_INCLUDE_IN(flask)
     errorsToShow: metamask.snapErrors,
     shouldShowErrors: Object.entries(metamask.snapErrors || []).length > 0,
@@ -138,6 +143,7 @@ const mapStateToProps = (state) => {
     isSigningQRHardwareTransaction,
     newCollectibleAddedMessage: getNewCollectibleAddedMessage(state),
     newTokensImported: getNewTokensImported(state),
+    newCustomNetworkAdded: appState.newCustomNetworkAdded,
   };
 };
 
@@ -180,6 +186,12 @@ const mapDispatchToProps = (dispatch) => ({
   setNewTokensImported: (newTokens) => {
     dispatch(setNewTokensImported(newTokens));
   },
+  setNewCustomNetworkAdded: () => {
+    dispatch(setNewCustomNetworkAdded({}));
+  },
+  setRpcTarget: (rpcUrl, chainId, ticker, nickname) => {
+    dispatch(setRpcTarget(rpcUrl, chainId, ticker, nickname));
+  },
 });
 
 export default compose(
diff --git a/ui/pages/home/index.scss b/ui/pages/home/index.scss
index dbecff15393f..388a4f008104 100644
--- a/ui/pages/home/index.scss
+++ b/ui/pages/home/index.scss
@@ -23,7 +23,7 @@
   // TODO: fix style import order so this isn't required to override specificity of `tab` class
   &__main-view &__tabs {
     border: none;
-    box-shadow: 0 3px 4px rgba(135, 134, 134, 0.16);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
   }
 
   &__main-view &__tab {
@@ -116,7 +116,7 @@
     position: absolute;
     top: 73px;
     opacity: 1;
-    box-shadow: 0 0 0 9999px rgba(0, 0, 0, 0.2);
+    box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
     background: none;
   }
 
@@ -207,4 +207,18 @@
       margin-inline-start: 32px;
     }
   }
+
+  &__new-network-added {
+    border-radius: 10px;
+    text-align: center;
+
+    &__check-circle {
+      color: var(--color-success-default);
+      margin-top: 20px;
+    }
+
+    &__switch-to-button {
+      margin-bottom: 16px;
+    }
+  }
 }
diff --git a/ui/pages/import-token/import-token.component.js b/ui/pages/import-token/import-token.component.js
index 443988a27962..30880ca70f35 100644
--- a/ui/pages/import-token/import-token.component.js
+++ b/ui/pages/import-token/import-token.component.js
@@ -23,7 +23,7 @@ import ActionableMessage from '../../components/ui/actionable-message/actionable
 import Typography from '../../components/ui/typography';
 import { TYPOGRAPHY, FONT_WEIGHT } from '../../helpers/constants/design-system';
 import Button from '../../components/ui/button';
-import { TOKEN_STANDARDS } from '../../helpers/constants/common';
+import { TOKEN_STANDARDS } from '../../../shared/constants/transaction';
 import TokenSearch from './token-search';
 import TokenList from './token-list';
 
diff --git a/ui/pages/import-token/token-list/index.scss b/ui/pages/import-token/token-list/index.scss
index f1bfd790da76..b776d093c8ff 100644
--- a/ui/pages/import-token/token-list/index.scss
+++ b/ui/pages/import-token/token-list/index.scss
@@ -46,7 +46,7 @@
     background-position: center;
     border-radius: 50%;
     background-color: var(--color-background-default);
-    box-shadow: 0 2px 4px 0 rgba($black, 0.24);
+    box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
     margin-right: 12px;
     flex: 0 0 auto;
   }
diff --git a/ui/pages/import-token/token-list/token-list.component.js b/ui/pages/import-token/token-list/token-list.component.js
index 73ac862bffd1..670ea6126422 100644
--- a/ui/pages/import-token/token-list/token-list.component.js
+++ b/ui/pages/import-token/token-list/token-list.component.js
@@ -14,7 +14,6 @@ export default class TokenList extends Component {
     results: PropTypes.array,
     selectedTokens: PropTypes.object,
     onToggleToken: PropTypes.func,
-    useTokenDetection: PropTypes.bool,
   };
 
   render() {
@@ -23,7 +22,6 @@ export default class TokenList extends Component {
       selectedTokens = {},
       onToggleToken,
       tokens = [],
-      useTokenDetection,
     } = this.props;
 
     return results.length === 0 ? (
@@ -38,14 +36,7 @@ export default class TokenList extends Component {
             .fill(undefined)
             .map((_, i) => {
               const { iconUrl, symbol, name, address } = results[i] || {};
-              let iconPath = iconUrl;
-              if (!process.env.TOKEN_DETECTION_V2) {
-                /** TODO: Remove during TOKEN_DETECTION_V2 feature flag clean up */
-                // token from dynamic api list is fetched when useTokenDetection is true
-                iconPath = useTokenDetection
-                  ? iconUrl
-                  : `images/contract/${iconUrl}`;
-              }
+              const iconPath = iconUrl;
               const tokenAlreadyAdded = checkExistingAddresses(address, tokens);
               const onClick = () =>
                 !tokenAlreadyAdded && onToggleToken(results[i]);
diff --git a/ui/pages/import-token/token-search/token-search.component.js b/ui/pages/import-token/token-search/token-search.component.js
index d5f88a8263d6..b6546cd78be3 100644
--- a/ui/pages/import-token/token-search/token-search.component.js
+++ b/ui/pages/import-token/token-search/token-search.component.js
@@ -4,6 +4,7 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../components/ui/text-field';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
+import SearchIcon from '../../../components/ui/icon/search-icon';
 
 export default class TokenSearch extends Component {
   static contextTypes = {
@@ -59,10 +60,7 @@ export default class TokenSearch extends Component {
   renderAdornment() {
     return (
       <InputAdornment position="start" style={{ marginRight: '12px' }}>
-        <i
-          className="fa fa-search"
-          style={{ color: 'var(--color-icon-muted)' }}
-        />
+        <SearchIcon color="var(--color-icon-muted)" />
       </InputAdornment>
     );
   }
diff --git a/ui/pages/keychains/restore-vault.js b/ui/pages/keychains/restore-vault.js
index eda28ed551fd..b9c4c3ed8662 100644
--- a/ui/pages/keychains/restore-vault.js
+++ b/ui/pages/keychains/restore-vault.js
@@ -78,7 +78,11 @@ class RestoreVaultPage extends Component {
             <Typography color={COLORS.TEXT_DEFAULT}>
               {t('resetWalletSubHeader')}
             </Typography>
-            <Typography color={COLORS.TEXT_DEFAULT} margin={[4, 0]}>
+            <Typography
+              color={COLORS.TEXT_DEFAULT}
+              marginTop={4}
+              marginBottom={4}
+            >
               {t('resetWalletUsingSRP', [
                 <Button
                   type="link"
@@ -112,7 +116,7 @@ class RestoreVaultPage extends Component {
                 </Button>,
               ])}
             </Typography>
-            <Typography color={COLORS.TEXT_DEFAULT} margin={[0, 0, 4]}>
+            <Typography color={COLORS.TEXT_DEFAULT} margin={0} marginBottom={4}>
               {t('resetWalletWarning')}
             </Typography>
             <CreateNewVault
diff --git a/ui/pages/notifications/index.js b/ui/pages/notifications/index.js
new file mode 100644
index 000000000000..d9f22168ea6a
--- /dev/null
+++ b/ui/pages/notifications/index.js
@@ -0,0 +1 @@
+export { default } from './notifications';
diff --git a/ui/pages/notifications/index.scss b/ui/pages/notifications/index.scss
new file mode 100644
index 000000000000..a76a4cb870d8
--- /dev/null
+++ b/ui/pages/notifications/index.scss
@@ -0,0 +1,114 @@
+.notifications {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  background-color: var(--color-background-default);
+
+  &__header {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    width: 100%;
+    padding: 65px 24px 15px 24px;
+    border-bottom: 1px solid var(--color-border-muted);
+
+    @media screen and (max-width: $break-small) {
+      padding: 10px 20px;
+    }
+
+    &__title-container {
+      display: flex;
+      flex-flow: row;
+      align-items: center;
+      flex: 0 0 auto;
+
+      &__title {
+        @include H3;
+
+        margin-left: 26px;
+
+        @media screen and (max-width: $break-small) {
+          @include H6;
+
+          margin-left: 16px;
+          font-weight: bold;
+        }
+      }
+    }
+
+    &_button {
+      width: auto;
+
+      @media screen and (max-width: $break-small) {
+        font-size: 0.75rem;
+        padding: 3.5px 1rem;
+      }
+    }
+  }
+
+  &__container {
+    display: flex;
+    overflow: auto;
+    flex-direction: column;
+    flex: 1 1 auto;
+
+    @media screen and (max-width: $break-small) {
+      height: 100%;
+    }
+
+    &__text {
+      @include H3;
+
+      color: var(--color-text-muted);
+      text-align: center;
+
+      @media screen and (max-width: $break-small) {
+        @include H6;
+      }
+    }
+  }
+
+  .empty {
+    justify-content: center;
+    align-items: center;
+  }
+
+  &__item {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    border-bottom: 1px solid var(--color-border-muted);
+    padding: 16px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: var(--color-background-alternative);
+    }
+
+    &__unread-dot {
+      content: ' ';
+      align-self: flex-start;
+      margin-top: 6px;
+      width: 8px;
+      height: 8px;
+      background-color: transparent;
+      border-radius: 50%;
+    }
+
+    .unread {
+      background-color: var(--color-primary-default);
+    }
+
+    &__details {
+      display: flex;
+      flex-direction: column;
+      margin-left: 12px;
+
+      &__infos {
+        color: var(--color-text-muted);
+        font-size: 12px;
+        margin-top: 6px;
+      }
+    }
+  }
+}
diff --git a/ui/pages/notifications/notification.test.js b/ui/pages/notifications/notification.test.js
new file mode 100644
index 000000000000..b66a9113e2c8
--- /dev/null
+++ b/ui/pages/notifications/notification.test.js
@@ -0,0 +1,100 @@
+import React from 'react';
+
+import { renderWithProvider } from '../../../test/lib/render-helpers';
+import configureStore from '../../store/store';
+import Notifications, { NotificationItem } from './notifications';
+
+describe('Notifications', () => {
+  const render = (params) => {
+    const store = configureStore({
+      ...params,
+    });
+
+    return renderWithProvider(<Notifications />, store);
+  };
+
+  it('can render a list of notifications', () => {
+    const mockStore = {
+      metamask: {
+        notifications: {
+          test: {
+            id: 'test',
+            origin: 'test',
+            createdDate: 1652967897732,
+            readDate: null,
+            message: 'foo',
+          },
+          test2: {
+            id: 'test2',
+            origin: 'test',
+            createdDate: 1652967897732,
+            readDate: null,
+            message: 'bar',
+          },
+        },
+        snaps: {
+          test: {
+            enabled: true,
+            id: 'test',
+            manifest: {
+              proposedName: 'Notification Example Snap',
+              description: 'A notification example snap.',
+            },
+          },
+        },
+      },
+    };
+
+    const { getByText } = render(mockStore);
+
+    expect(
+      getByText(mockStore.metamask.notifications.test.message),
+    ).toBeDefined();
+
+    expect(
+      getByText(mockStore.metamask.notifications.test2.message),
+    ).toBeDefined();
+  });
+
+  it('can render an empty list of notifications', () => {
+    const mockStore = {
+      metamask: {
+        notifications: {},
+        snaps: {},
+      },
+    };
+
+    const { getByText } = render(mockStore);
+
+    expect(getByText('Nothing to see here.')).toBeDefined();
+  });
+});
+
+describe('NotificationItem', () => {
+  const render = (props) => renderWithProvider(<NotificationItem {...props} />);
+  it('can render notification item', () => {
+    const props = {
+      notification: {
+        id: 'test',
+        origin: 'test',
+        createdDate: 1652967897732,
+        readDate: null,
+        message: 'Hello, http://localhost:8086!',
+      },
+      snaps: [
+        {
+          id: 'test',
+          tabMessage: () => 'test snap name',
+          descriptionMessage: () => 'test description',
+          sectionMessage: () => 'test section Message',
+          route: '/test',
+          icon: 'test',
+        },
+      ],
+      onItemClick: jest.fn(),
+    };
+    const { getByText } = render(props);
+
+    expect(getByText(props.notification.message)).toBeDefined();
+  });
+});
diff --git a/ui/pages/notifications/notifications.js b/ui/pages/notifications/notifications.js
new file mode 100644
index 000000000000..3c485137a99c
--- /dev/null
+++ b/ui/pages/notifications/notifications.js
@@ -0,0 +1,141 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+import { useDispatch, useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { formatDate } from '../../helpers/utils/util';
+import {
+  getNotifications,
+  getSnapsRouteObjects,
+  getUnreadNotifications,
+} from '../../selectors';
+import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
+import {
+  deleteExpiredNotifications,
+  markNotificationsAsRead,
+} from '../../store/actions';
+import IconCaretLeft from '../../components/ui/icon/icon-caret-left';
+import Button from '../../components/ui/button';
+import { useI18nContext } from '../../hooks/useI18nContext';
+
+export function NotificationItem({ notification, snaps, onItemClick }) {
+  const { message, origin, createdDate, readDate } = notification;
+  const history = useHistory();
+  const t = useI18nContext();
+
+  const snap = snaps.find(({ id: snapId }) => {
+    return snapId === origin;
+  });
+
+  const handleNameClick = (e) => {
+    e.stopPropagation();
+    history.push(snap.route);
+  };
+
+  const handleItemClick = () => onItemClick(notification);
+
+  return (
+    <div className="notifications__item" onClick={handleItemClick}>
+      <div
+        className={classnames(
+          'notifications__item__unread-dot',
+          !readDate && 'unread',
+        )}
+      />
+      <div className="notifications__item__details">
+        <p className="notifications__item__details__message">{message}</p>
+        <p className="notifications__item__details__infos">
+          {t('notificationsInfos', [
+            formatDate(createdDate, "LLLL d',' yyyy 'at' t"),
+            <Button type="inline" onClick={handleNameClick} key="button">
+              {snap.tabMessage()}
+            </Button>,
+          ])}
+        </p>
+      </div>
+    </div>
+  );
+}
+
+export default function Notifications() {
+  const history = useHistory();
+  const dispatch = useDispatch();
+  const t = useI18nContext();
+  const notifications = useSelector(getNotifications);
+  const snapsRouteObject = useSelector(getSnapsRouteObjects);
+  const unreadNotifications = useSelector(getUnreadNotifications);
+
+  const markAllAsRead = () => {
+    const unreadNotificationIds = unreadNotifications.map(({ id }) => id);
+
+    dispatch(markNotificationsAsRead(unreadNotificationIds));
+  };
+
+  const markAsRead = (notificationToMark) => {
+    if (!notificationToMark.readDate) {
+      dispatch(markNotificationsAsRead([notificationToMark.id]));
+    }
+  };
+
+  useEffect(() => {
+    return () => dispatch(deleteExpiredNotifications());
+  }, [dispatch]);
+
+  return (
+    <div className="main-container notifications">
+      <div className="notifications__header">
+        <div className="notifications__header__title-container">
+          <IconCaretLeft
+            className="notifications__header__title-container__back-button"
+            color="var(--color-text-default)"
+            size={23}
+            onClick={() => history.push(DEFAULT_ROUTE)}
+          />
+          <div className="notifications__header__title-container__title">
+            {t('notificationsHeader')}
+          </div>
+        </div>
+        <Button
+          type="secondary"
+          className="notifications__header_button"
+          onClick={markAllAsRead}
+        >
+          {t('notificationsMarkAllAsRead')}
+        </Button>
+      </div>
+      <div
+        className={classnames(
+          'notifications__container',
+          notifications.length === 0 && 'empty',
+        )}
+      >
+        {notifications.length > 0 ? (
+          notifications.map((notification, id) => (
+            <NotificationItem
+              notification={notification}
+              snaps={snapsRouteObject}
+              key={id}
+              onItemClick={markAsRead}
+            />
+          ))
+        ) : (
+          <div className="notifications__container__text">
+            {t('notificationsEmptyText')}
+          </div>
+        )}
+      </div>
+    </div>
+  );
+}
+
+NotificationItem.propTypes = {
+  notification: {
+    id: PropTypes.string.isRequired,
+    message: PropTypes.string.isRequired,
+    origin: PropTypes.string.isRequired,
+    createdDate: PropTypes.number.isRequired,
+    readDate: PropTypes.number.isRequired,
+  },
+  snaps: PropTypes.array.isRequired,
+  onItemClick: PropTypes.func.isRequired,
+};
diff --git a/ui/pages/onboarding-flow/create-password/create-password.js b/ui/pages/onboarding-flow/create-password/create-password.js
index 96d7d838ff51..0bb23a96d565 100644
--- a/ui/pages/onboarding-flow/create-password/create-password.js
+++ b/ui/pages/onboarding-flow/create-password/create-password.js
@@ -154,25 +154,23 @@ export default function CreatePassword({
     <div className="create-password__wrapper">
       {secretRecoveryPhrase &&
       firstTimeFlowType === FIRST_TIME_FLOW_TYPES.IMPORT ? (
-        <TwoStepProgressBar stage={twoStepStages.PASSWORD_CREATE} />
+        <TwoStepProgressBar
+          stage={twoStepStages.PASSWORD_CREATE}
+          marginBottom={4}
+        />
       ) : (
-        <ThreeStepProgressBar stage={threeStepStages.PASSWORD_CREATE} />
+        <ThreeStepProgressBar
+          stage={threeStepStages.PASSWORD_CREATE}
+          marginBottom={4}
+        />
       )}
       <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
         {t('createPassword')}
       </Typography>
-      <Typography
-        variant={TYPOGRAPHY.H4}
-        align={TEXT_ALIGN.CENTER}
-        boxProps={{ margin: 5 }}
-      >
+      <Typography variant={TYPOGRAPHY.H4} align={TEXT_ALIGN.CENTER}>
         {t('passwordSetupDetails')}
       </Typography>
-      <Box
-        justifyContent={JUSTIFY_CONTENT.CENTER}
-        marginTop={3}
-        padding={[0, 12]}
-      >
+      <Box justifyContent={JUSTIFY_CONTENT.CENTER} marginTop={3}>
         <form className="create-password__form" onSubmit={handleCreate}>
           <FormField
             dataTestId="create-password-new"
@@ -247,6 +245,7 @@ export default function CreatePassword({
                 : 'create-password-wallet'
             }
             type="primary"
+            large
             className="create-password__form--submit-button"
             disabled={!isValid || !termsChecked}
             onClick={handleCreate}
diff --git a/ui/pages/onboarding-flow/create-password/index.scss b/ui/pages/onboarding-flow/create-password/index.scss
index c56853aada6d..dc87f8cc6e41 100644
--- a/ui/pages/onboarding-flow/create-password/index.scss
+++ b/ui/pages/onboarding-flow/create-password/index.scss
@@ -16,8 +16,6 @@
     justify-content: center;
     flex-direction: column;
     align-items: center;
-    max-width: 600px;
-    max-height: 750px;
   }
 
   &__link-text {
@@ -25,17 +23,15 @@
   }
 
   &__form {
-    padding: 0 24px;
+    @media screen and (min-width: $break-large) {
+      max-width: 320px;
+    }
 
     &--password-button {
       background-color: transparent;
       color: var(--color-text-default);
     }
 
-    &--submit-button {
-      padding: 20px;
-    }
-
     &--checkmark {
       i {
         color: var(--color-success-default);
@@ -48,6 +44,7 @@
 
     .form-field__input {
       height: 50px;
+      width: 100%;
     }
   }
 }
diff --git a/ui/pages/onboarding-flow/creation-successful/creation-successful.js b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
index d4cefa637ef7..969487f4e8bc 100644
--- a/ui/pages/onboarding-flow/creation-successful/creation-successful.js
+++ b/ui/pages/onboarding-flow/creation-successful/creation-successful.js
@@ -8,6 +8,7 @@ import {
   FONT_WEIGHT,
   TEXT_ALIGN,
   TYPOGRAPHY,
+  ALIGN_ITEMS,
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
@@ -45,7 +46,7 @@ export default function CreationSuccessful() {
   };
   return (
     <div className="creation-successful">
-      <Box textAlign={TEXT_ALIGN.CENTER} margin={6}>
+      <Box textAlign={TEXT_ALIGN.CENTER}>
         <img src="./images/tada.png" />
         <Typography
           variant={TYPOGRAPHY.H2}
@@ -58,7 +59,13 @@ export default function CreationSuccessful() {
           {t('walletCreationSuccessDetail')}
         </Typography>
       </Box>
-      <Typography variant={TYPOGRAPHY.H4}>{t('remember')}</Typography>
+      <Typography
+        variant={TYPOGRAPHY.H4}
+        boxProps={{ align: ALIGN_ITEMS.LEFT }}
+        marginLeft={12}
+      >
+        {t('remember')}
+      </Typography>
       <ul>
         <li>
           <Typography variant={TYPOGRAPHY.H4}>
diff --git a/ui/pages/onboarding-flow/creation-successful/index.scss b/ui/pages/onboarding-flow/creation-successful/index.scss
index 54273b1e0d20..5aa7567bf5b6 100644
--- a/ui/pages/onboarding-flow/creation-successful/index.scss
+++ b/ui/pages/onboarding-flow/creation-successful/index.scss
@@ -1,9 +1,15 @@
 .creation-successful {
+  @media screen and (min-width: $break-large) {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+  }
+
   img {
     align-self: center;
   }
 
-  max-width: 575px;
+  max-width: 600px;
 
   ul {
     list-style-type: disc;
diff --git a/ui/pages/onboarding-flow/import-srp/import-srp.js b/ui/pages/onboarding-flow/import-srp/import-srp.js
index df02244fbf8e..536c5823f086 100644
--- a/ui/pages/onboarding-flow/import-srp/import-srp.js
+++ b/ui/pages/onboarding-flow/import-srp/import-srp.js
@@ -25,7 +25,10 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
 
   return (
     <div className="import-srp">
-      <TwoStepProgressBar stage={twoStepStages.RECOVERY_PHRASE_CONFIRM} />
+      <TwoStepProgressBar
+        stage={twoStepStages.RECOVERY_PHRASE_CONFIRM}
+        marginBottom={4}
+      />
       <div className="import-srp__header">
         <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
           {t('accessYourWalletWithSRP')}
@@ -53,10 +56,10 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
             srpText={t('typeYourSRP')}
           />
           <Button
+            className="import-srp__confirm-button"
             type="primary"
             data-testid="import-srp-confirm"
             large
-            className="import-srp__confirm-button"
             onClick={() => {
               submitSecretRecoveryPhrase(secretRecoveryPhrase);
               history.replace(ONBOARDING_CREATE_PASSWORD_ROUTE);
diff --git a/ui/pages/onboarding-flow/import-srp/index.scss b/ui/pages/onboarding-flow/import-srp/index.scss
index 912cd52eb7fd..55d53dfe898e 100644
--- a/ui/pages/onboarding-flow/import-srp/index.scss
+++ b/ui/pages/onboarding-flow/import-srp/index.scss
@@ -1,29 +1,12 @@
 .import-srp {
-  width: 840px;
-
-  @media screen and (max-width: 349px) {
-    width: 300px;
-  }
-
-  @media screen and (min-width: 350px) and (max-width: 460px) {
-    width: 357px;
-  }
-
-  @media screen and (min-width: 461px) and (max-width: $break-small) {
-    width: 450px;
-  }
-
-  @media screen and (min-width: $break-small) and (max-width: 840px) {
-    width: 580px;
-  }
+  margin-bottom: 24px;
 
   &__header {
     display: flex;
     flex-direction: column;
     justify-content: center;
     text-align: center;
-    margin: 20px auto;
-    max-width: 500px;
+    margin-bottom: 24px;
   }
 
   &__description {
@@ -50,17 +33,11 @@
     align-items: center;
     text-align: left;
     margin: auto;
-
-    &--link {
-      @include H6;
-
-      margin-bottom: 12px;
-    }
   }
 
   &__confirm-button {
-    width: 327px;
+    max-width: 327px;
     margin: auto;
-    margin-top: 59px;
+    margin-top: 24px;
   }
 }
diff --git a/ui/pages/onboarding-flow/index.scss b/ui/pages/onboarding-flow/index.scss
index bddf337de3bc..72d384031163 100644
--- a/ui/pages/onboarding-flow/index.scss
+++ b/ui/pages/onboarding-flow/index.scss
@@ -10,17 +10,21 @@
 @import 'metametrics/index';
 
 .onboarding-flow {
-  width: 100%;
   background-color: var(--color-background-default);
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+  padding: 0 16px;
+  width: 100%;
 
   &__wrapper {
-    margin-top: 40px;
-    padding: 32px;
+    margin: 24px auto;
+    padding: 32px 16px;
+    max-width: 600px;
     border: 1px solid var(--color-border-muted);
-    border-radius: 20px;
+    border-radius: 24px;
+
+    @media screen and (min-width: $break-large) {
+      margin: 64px auto 40px;
+      padding: 32px;
+    }
   }
 
   &__twitter-button {
diff --git a/ui/pages/onboarding-flow/metametrics/index.scss b/ui/pages/onboarding-flow/metametrics/index.scss
index 2157182572fc..568a367a9b2f 100644
--- a/ui/pages/onboarding-flow/metametrics/index.scss
+++ b/ui/pages/onboarding-flow/metametrics/index.scss
@@ -1,5 +1,10 @@
 .onboarding-metametrics {
-  width: 600px;
+  @media screen and (min-width: $break-large) {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+  }
 
   ul {
     margin: 24px 0 0 0;
@@ -29,13 +34,21 @@
   }
 
   &__buttons {
-    margin: 24px auto 0 auto;
-    justify-content: space-between;
-    display: flex;
+    margin-top: 24px;
+    width: 100%;
+
+    @media screen and (min-width: $break-large) {
+      margin-top: 40px;
+      justify-content: space-between;
+      display: flex;
+    }
 
     button {
       margin-bottom: 24px;
-      width: 200px;
+
+      @media screen and (min-width: $break-large) {
+        width: 200px;
+      }
     }
   }
 }
diff --git a/ui/pages/onboarding-flow/metametrics/metametrics.js b/ui/pages/onboarding-flow/metametrics/metametrics.js
index 78695700d98e..e9928577ca12 100644
--- a/ui/pages/onboarding-flow/metametrics/metametrics.js
+++ b/ui/pages/onboarding-flow/metametrics/metametrics.js
@@ -43,8 +43,10 @@ export default function OnboardingMetametrics() {
   const onConfirm = async () => {
     const [, metaMetricsId] = await dispatch(setParticipateInMetaMetrics(true));
 
+    const isInitiallyNotParticipating = !participateInMetaMetrics;
+
     try {
-      if (!participateInMetaMetrics) {
+      if (isInitiallyNotParticipating) {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
@@ -83,8 +85,11 @@ export default function OnboardingMetametrics() {
   const onCancel = async () => {
     await dispatch(setParticipateInMetaMetrics(false));
 
+    const isInitiallyParticipatingOrNotSet =
+      participateInMetaMetrics === null || participateInMetaMetrics;
+
     try {
-      if (!participateInMetaMetrics) {
+      if (isInitiallyParticipatingOrNotSet) {
         trackEvent(
           {
             category: EVENT.CATEGORIES.ONBOARDING,
@@ -114,7 +119,10 @@ export default function OnboardingMetametrics() {
       >
         {t('metametricsTitle')}
       </Typography>
-      <Typography align={TEXT_ALIGN.CENTER}>
+      <Typography
+        className="onboarding-metametrics__desc"
+        align={TEXT_ALIGN.CENTER}
+      >
         {t('metametricsOptInDescription2')}
       </Typography>
       <ul>
diff --git a/ui/pages/onboarding-flow/onboarding-app-header/index.scss b/ui/pages/onboarding-flow/onboarding-app-header/index.scss
index 567d8bfe11eb..400ca92314eb 100644
--- a/ui/pages/onboarding-flow/onboarding-app-header/index.scss
+++ b/ui/pages/onboarding-flow/onboarding-app-header/index.scss
@@ -9,7 +9,7 @@
   flex: 0 0 auto;
 
   @media screen and (max-width: $break-small) {
-    padding: 1rem;
+    padding: 16px;
     z-index: $mobile-header-z-index;
   }
 
diff --git a/ui/pages/onboarding-flow/pin-extension/index.scss b/ui/pages/onboarding-flow/pin-extension/index.scss
index 0ff5f9c0f7b1..89830f801a19 100644
--- a/ui/pages/onboarding-flow/pin-extension/index.scss
+++ b/ui/pages/onboarding-flow/pin-extension/index.scss
@@ -1,6 +1,4 @@
 .onboarding-pin-extension {
-  max-width: 800px;
-
   .control-dots .dot {
     background: var(--color-icon-muted);
     box-shadow: none;
@@ -12,7 +10,7 @@
 
   &__diagram {
     margin: 24px auto;
-    width: 799px;
+    max-width: 799px;
     height: 320px;
   }
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/index.scss b/ui/pages/onboarding-flow/privacy-settings/index.scss
index 75d23b83dc0f..0f3c1e874b18 100644
--- a/ui/pages/onboarding-flow/privacy-settings/index.scss
+++ b/ui/pages/onboarding-flow/privacy-settings/index.scss
@@ -4,6 +4,14 @@
   justify-content: center;
   align-items: center;
 
+  @media screen and (max-width: $break-small) {
+    margin-bottom: 24px;
+  }
+
+  @media screen and (min-width: $break-large) {
+    margin-bottom: 40px;
+  }
+
   &__header {
     display: flex;
     justify-content: center;
@@ -21,6 +29,11 @@
     max-width: 620px;
     margin-bottom: 20px;
 
+    @media screen and (min-width: $break-large) {
+      margin-inline-start: 48px;
+      margin-inline-end: 48px;
+    }
+
     a {
       color: var(--color-primary-default);
 
diff --git a/ui/pages/onboarding-flow/privacy-settings/setting.js b/ui/pages/onboarding-flow/privacy-settings/setting.js
index 82ba1275ca3d..f2951fc97979 100644
--- a/ui/pages/onboarding-flow/privacy-settings/setting.js
+++ b/ui/pages/onboarding-flow/privacy-settings/setting.js
@@ -29,5 +29,5 @@ Setting.propTypes = {
   value: PropTypes.bool,
   setValue: PropTypes.func,
   title: PropTypes.string,
-  description: PropTypes.string,
+  description: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
 };
diff --git a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
index b600b7f78c69..32e6888c8129 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/confirm-recovery-phrase.js
@@ -54,8 +54,11 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
   };
 
   return (
-    <div>
-      <ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_CONFIRM} />
+    <div className="recovery-phrase__confirm">
+      <ThreeStepProgressBar
+        stage={threeStepStages.RECOVERY_PHRASE_CONFIRM}
+        marginBottom={4}
+      />
       <Box
         justifyContent={JUSTIFY_CONTENT.CENTER}
         textAlign={TEXT_ALIGN.CENTER}
@@ -81,11 +84,12 @@ export default function ConfirmRecoveryPhrase({ secretRecoveryPhrase = '' }) {
         inputValue={phraseElements}
         indicesToCheck={indicesToCheck}
       />
-      <div className="recovery-phrase__footer">
+      <div className="recovery-phrase__footer__confirm">
         <Button
           data-testid="recovery-phrase-confirm"
           type="primary"
-          className="recovery-phrase__footer--button"
+          large
+          className="recovery-phrase__footer__confirm--button"
           onClick={() => {
             history.push(ONBOARDING_COMPLETION_ROUTE);
           }}
diff --git a/ui/pages/onboarding-flow/recovery-phrase/index.scss b/ui/pages/onboarding-flow/recovery-phrase/index.scss
index d55ec5e82d9e..89fa4d1ed98d 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/index.scss
+++ b/ui/pages/onboarding-flow/recovery-phrase/index.scss
@@ -1,22 +1,42 @@
 .recovery-phrase {
-  max-width: 600px;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  &__header {
+    max-width: 420px;
+  }
 
   &__tips {
     flex-direction: column;
+    max-width: 420px;
+    margin: 0 auto;
 
     ul {
       list-style: disc;
       margin-left: 20px;
+      margin-bottom: 24px;
     }
   }
 
   &__chips {
     display: grid;
-    grid-template-columns: 190px 190px 190px;
     justify-items: center;
     align-items: center;
     row-gap: 16px;
 
+    @media screen and (max-width: 460px) {
+      grid-template-columns: 198px;
+    }
+
+    @media screen and (min-width: 460px) and (max-width: $break-small) {
+      grid-template-columns: 181px 181px;
+    }
+
+    @media screen and (min-width: $break-large) {
+      grid-template-columns: 166px 166px 166px;
+    }
+
     &--hidden {
       filter: blur(5px);
     }
@@ -24,6 +44,7 @@
 
   &__secret {
     position: relative;
+    width: 100%;
   }
 
   &__secret-blocker {
@@ -62,11 +83,38 @@
     flex-direction: column;
     justify-content: center;
     align-items: center;
+    width: 100%;
+
+    @media screen and (max-width: $break-small) {
+      margin-inline-start: 40px;
+      margin-inline-end: 40px;
+      margin-bottom: 40px;
+    }
+
+    &__confirm {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      width: 100%;
+
+      @media screen and (min-width: $break-small) {
+        margin-top: 20px;
+      }
+
+      &--button {
+        align-self: center;
+        width: 100%;
+        max-width: 300px;
+      }
+    }
 
     &--button {
-      width: 50%;
-      padding: 20px;
       align-self: center;
+
+      @media screen and (min-width: $break-large) {
+        max-width: 300px;
+      }
     }
 
     &__copy-and-hide {
@@ -78,6 +126,10 @@
         display: flex;
         flex-direction: row;
         justify-content: space-between;
+
+        @media screen and (min-width: $break-large) {
+          justify-content: space-around;
+        }
       }
 
       &__button {
@@ -100,6 +152,11 @@
           justify-content: flex-end;
         }
 
+        @media screen and (max-width: $break-small) {
+          justify-content: center;
+          width: 100%;
+        }
+
         svg {
           width: 15px;
         }
@@ -122,10 +179,18 @@
 
     &--with-input {
       width: 120px;
-      box-shadow: 0 3px 4px -3px rgba(0, 0, 0, 0.15);
+      box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
       border-width: 2px;
       border-radius: 13px;
       height: 32px;
     }
   }
+
+  &__confirm {
+    @media screen and (min-width: $break-large) {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+    }
+  }
 }
diff --git a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
index 0482a36693c7..a046b3d75d6d 100644
--- a/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
+++ b/ui/pages/onboarding-flow/recovery-phrase/review-recovery-phrase.js
@@ -35,7 +35,11 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
         textAlign={TEXT_ALIGN.CENTER}
         marginBottom={4}
       >
-        <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
+        <Typography
+          variant={TYPOGRAPHY.H2}
+          fontWeight={FONT_WEIGHT.BOLD}
+          className="recovery-phrase__header"
+        >
           {t('seedPhraseWriteDownHeader')}
         </Typography>
       </Box>
@@ -49,7 +53,6 @@ export default function RecoveryPhrase({ secretRecoveryPhrase }) {
         </Typography>
       </Box>
       <Box
-        justifyContent={JUSTIFY_CONTENT.SPACE_EVENLY}
         textAlign={TEXT_ALIGN.LEFT}
         marginBottom={4}
         className="recovery-phrase__tips"
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/index.scss b/ui/pages/onboarding-flow/secure-your-wallet/index.scss
index 5fa4f553085e..9fcad972fea0 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/index.scss
+++ b/ui/pages/onboarding-flow/secure-your-wallet/index.scss
@@ -3,17 +3,29 @@
   justify-content: center;
   align-items: center;
   flex-direction: column;
-  max-width: 1000px;
-  max-height: 1300px;
 
-  &__details {
-    max-width: 550px;
-    padding-inline-end: 10px;
+  &__video {
+    max-width: 100%;
+    border-radius: 8px;
   }
 
   &__actions {
+    flex-direction: column;
+    justify-content: space-between;
+    width: 100%;
+
+    @media screen and (min-width: $break-large) {
+      flex-direction: row;
+    }
+
     button {
-      margin: 16px;
+      margin-bottom: 16px;
+
+      @media screen and (min-width: $break-large) {
+        + button {
+          margin-left: 16px;
+        }
+      }
     }
   }
 
@@ -21,7 +33,7 @@
     list-style: disc inside;
 
     li {
-      font-size: 18px;
+      @include H4;
     }
   }
 
@@ -29,6 +41,10 @@
     background-color: var(--color-primary-muted);
     padding: 12px;
     border-radius: 10px;
+
+    @media screen and (min-width: $break-large) {
+      margin-inline-end: 43px;
+    }
   }
 }
 
diff --git a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
index 1990b7a4c1fc..04eb178128c0 100644
--- a/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
+++ b/ui/pages/onboarding-flow/secure-your-wallet/secure-your-wallet.js
@@ -47,6 +47,11 @@ export default function SecureYourWallet() {
     ru: 'Russian',
     tl: 'Tagalog',
     vi: 'Vietnamese',
+    de: 'German',
+    el: 'Greek',
+    fr: 'French',
+    tr: 'Turkish',
+    zh: 'Chinese - China',
   };
 
   const defaultLang = subtitles[currentLocale] ? currentLocale : 'en';
@@ -55,12 +60,14 @@ export default function SecureYourWallet() {
       {showSkipSRPBackupPopover && (
         <SkipSRPBackup handleClose={() => setShowSkipSRPBackupPopover(false)} />
       )}
-      <ThreeStepProgressBar stage={threeStepStages.RECOVERY_PHRASE_VIDEO} />
+      <ThreeStepProgressBar
+        stage={threeStepStages.RECOVERY_PHRASE_VIDEO}
+        marginBottom={4}
+      />
       <Box
         justifyContent={JUSTIFY_CONTENT.CENTER}
         textAlign={TEXT_ALIGN.CENTER}
         marginBottom={4}
-        marginTop={8}
       >
         <Typography variant={TYPOGRAPHY.H2} fontWeight={FONT_WEIGHT.BOLD}>
           {t('seedPhraseIntroTitle')}
@@ -75,7 +82,7 @@ export default function SecureYourWallet() {
         </Typography>
       </Box>
       <Box>
-        <video controls style={{ borderRadius: '10px' }}>
+        <video className="secure-your-wallet__video" controls>
           <source
             type="video/webm"
             src="./images/videos/recovery-onboarding/video.webm"
@@ -96,7 +103,6 @@ export default function SecureYourWallet() {
       </Box>
       <Box
         margin={8}
-        width="10/12"
         justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
         className="secure-your-wallet__actions"
       >
@@ -119,7 +125,7 @@ export default function SecureYourWallet() {
           {t('seedPhraseIntroRecommendedButtonCopy')}
         </Button>
       </Box>
-      <Box>
+      <Box className="secure-your-wallet__desc">
         <Box marginBottom={4}>
           <Typography
             tag="p"
diff --git a/ui/pages/onboarding-flow/welcome/index.scss b/ui/pages/onboarding-flow/welcome/index.scss
index 603b44a1e7fc..3131edfecb35 100644
--- a/ui/pages/onboarding-flow/welcome/index.scss
+++ b/ui/pages/onboarding-flow/welcome/index.scss
@@ -1,8 +1,6 @@
 @import "./react-gallery/carousel.min.css";
 
 .onboarding-welcome {
-  width: 600px;
-
   .control-dots .dot {
     background: var(--color-icon-muted);
     box-shadow: none;
@@ -16,6 +14,10 @@
   .carousel.carousel-slider .control-arrow {
     opacity: 1;
     color: var(--color-icon-default);
+
+    @media screen and (min-width: $break-large) {
+      padding: 40px;
+    }
   }
 
   .carousel .control-next.control-arrow::before {
@@ -42,7 +44,7 @@
   }
 
   &__buttons {
-    max-width: 50%;
+    max-width: 300px;
     margin: 40px auto 0 auto;
 
     li {
diff --git a/ui/pages/onboarding-flow/welcome/welcome.js b/ui/pages/onboarding-flow/welcome/welcome.js
index 3943575c3588..f1290cc04b72 100644
--- a/ui/pages/onboarding-flow/welcome/welcome.js
+++ b/ui/pages/onboarding-flow/welcome/welcome.js
@@ -42,7 +42,7 @@ export default function OnboardingWelcome() {
           >
             {t('welcomeToMetaMask')}
           </Typography>
-          <Typography align={TEXT_ALIGN.CENTER}>
+          <Typography align={TEXT_ALIGN.CENTER} marginLeft={6} marginRight={6}>
             {t('welcomeToMetaMaskIntro')}
           </Typography>
           <div className="onboarding-welcome__mascot">
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index a2a6c56c2bc7..d6160c24f745 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -24,3 +24,4 @@
 @import 'token-details/index';
 @import 'unlock-page/index';
 @import 'onboarding-flow/index';
+@import 'notifications/index';
diff --git a/ui/pages/permissions-connect/flask/snap-install/index.scss b/ui/pages/permissions-connect/flask/snap-install/index.scss
index 53e525acbdf1..87047ec056b3 100644
--- a/ui/pages/permissions-connect/flask/snap-install/index.scss
+++ b/ui/pages/permissions-connect/flask/snap-install/index.scss
@@ -22,10 +22,6 @@
     }
   }
 
-  .version {
-    font-family: monospace;
-  }
-
   .page-container__footer {
     width: 100%;
     margin-top: 12px;
diff --git a/ui/pages/permissions-connect/flask/snap-install/snap-install.js b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
index 497ca45af016..466a874fa5a3 100644
--- a/ui/pages/permissions-connect/flask/snap-install/snap-install.js
+++ b/ui/pages/permissions-connect/flask/snap-install/snap-install.js
@@ -37,13 +37,6 @@ export default function SnapInstall({
     approveSnapInstall,
   ]);
 
-  const npmId = useMemo(() => {
-    if (!targetSubjectMetadata.origin.startsWith('npm:')) {
-      return undefined;
-    }
-    return targetSubjectMetadata.origin.substring(4);
-  }, [targetSubjectMetadata]);
-
   const shouldShowWarning = useMemo(
     () =>
       Boolean(
@@ -74,7 +67,7 @@ export default function SnapInstall({
           headerTitle={t('snapInstall')}
           headerText={null} // TODO(ritave): Add header text when snaps support description
           siteOrigin={targetSubjectMetadata.origin}
-          npmPackageName={npmId}
+          isSnapInstall
           snapVersion={targetSubjectMetadata.version}
           boxProps={{ alignItems: ALIGN_ITEMS.CENTER }}
         />
diff --git a/ui/pages/permissions-connect/index.scss b/ui/pages/permissions-connect/index.scss
index fc07dede8b7a..fd02a75b23f7 100644
--- a/ui/pages/permissions-connect/index.scss
+++ b/ui/pages/permissions-connect/index.scss
@@ -27,7 +27,7 @@
   &__back {
     @include H7;
 
-    color: var(--color-text-default);
+    color: var(--color-icon-default);
     font-weight: bold;
     cursor: pointer;
 
@@ -39,7 +39,7 @@
   &__page-count {
     @include H7;
 
-    color: var(--color-icon-default);
+    color: var(--color-text-default);
     grid-column: 2;
     justify-self: end;
     font-weight: bold;
diff --git a/ui/pages/permissions-connect/redirect/index.scss b/ui/pages/permissions-connect/redirect/index.scss
index 9fbb6f1216dc..a1a8c8047c72 100644
--- a/ui/pages/permissions-connect/redirect/index.scss
+++ b/ui/pages/permissions-connect/redirect/index.scss
@@ -39,7 +39,6 @@
     align-items: center;
     justify-content: center;
     position: absolute;
-    filter: drop-shadow(0 1px 5px rgba(0, 0, 0, 0.25));
 
     &::before {
       content: '';
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 851111fa7abf..a4d3d8c5a69a 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -34,6 +34,9 @@ import Alerts from '../../components/app/alerts';
 import Asset from '../asset';
 import OnboardingAppHeader from '../onboarding-flow/onboarding-app-header/onboarding-app-header';
 import TokenDetailsPage from '../token-details';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import Notifications from '../notifications';
+///: END:ONLY_INCLUDE_IN
 
 import {
   IMPORT_TOKEN_ROUTE,
@@ -59,6 +62,9 @@ import {
   ONBOARDING_ROUTE,
   ADD_COLLECTIBLE_ROUTE,
   TOKEN_DETAILS,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  NOTIFICATIONS_ROUTE,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/routes';
 
 import {
@@ -175,6 +181,11 @@ export default class Routes extends Component {
           exact
         />
         <Authenticated path={SETTINGS_ROUTE} component={Settings} />
+        {
+          ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          <Authenticated path={NOTIFICATIONS_ROUTE} component={Notifications} />
+          ///: END:ONLY_INCLUDE_IN
+        }
         <Authenticated
           path={`${CONFIRM_TRANSACTION_ROUTE}/:id?`}
           component={ConfirmTransaction}
diff --git a/ui/pages/send/send-content/add-recipient/add-recipient.component.js b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
index a46fa7a8b82c..efe1070ebf22 100644
--- a/ui/pages/send/send-content/add-recipient/add-recipient.component.js
+++ b/ui/pages/send/send-content/add-recipient/add-recipient.component.js
@@ -32,6 +32,7 @@ export default class AddRecipient extends Component {
       error: PropTypes.string,
       warning: PropTypes.string,
     }),
+    updateRecipientUserInput: PropTypes.func,
   };
 
   constructor(props) {
@@ -70,6 +71,7 @@ export default class AddRecipient extends Component {
       `sendFlow - User clicked recipient from ${type}. address: ${address}, nickname ${nickname}`,
     );
     this.props.updateRecipient({ address, nickname });
+    this.props.updateRecipientUserInput(address);
   };
 
   searchForContacts = () => {
@@ -115,7 +117,7 @@ export default class AddRecipient extends Component {
         recipient.nickname,
         'validated user input',
       );
-    } else if (ensResolution) {
+    } else if (ensResolution && !recipient.error) {
       content = this.renderExplicitAddress(
         ensResolution,
         addressBookEntryName || userInput,
@@ -208,9 +210,13 @@ export default class AddRecipient extends Component {
           addressBook={addressBook}
           searchForContacts={this.searchForContacts.bind(this)}
           searchForRecents={this.searchForRecents.bind(this)}
-          selectRecipient={(address, name) =>
-            this.selectRecipient(address, name, 'contact list')
-          }
+          selectRecipient={(address, name) => {
+            this.selectRecipient(
+              address,
+              name,
+              `${name ? 'contact' : 'recent'} list`,
+            );
+          }}
         >
           {ownedAccounts && ownedAccounts.length > 1 && !userInput && (
             <Button
diff --git a/ui/pages/send/send-content/add-recipient/ens-input.component.js b/ui/pages/send/send-content/add-recipient/ens-input.component.js
index 4cf63a7fab48..d220d753ee16 100644
--- a/ui/pages/send/send-content/add-recipient/ens-input.component.js
+++ b/ui/pages/send/send-content/add-recipient/ens-input.component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
+import { addHexPrefix } from '../../../../../app/scripts/lib/util';
 import { isValidDomainName } from '../../../../helpers/utils/util';
 import {
   isBurnAddress,
@@ -43,7 +44,7 @@ export default class EnsInput extends Component {
           !isBurnAddress(input) &&
           isValidHexAddress(input, { mixedCaseUseChecksum: true })
         ) {
-          this.props.onPaste(input);
+          this.props.onPaste(addHexPrefix(input));
         }
       });
     }
@@ -74,7 +75,7 @@ export default class EnsInput extends Component {
         !isBurnAddress(input) &&
         isValidHexAddress(input, { mixedCaseUseChecksum: true })
       ) {
-        onValidAddressTyped(input);
+        onValidAddressTyped(addHexPrefix(input));
       }
     }
 
diff --git a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
index a163a13a0973..45b85d79904f 100644
--- a/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
+++ b/ui/pages/send/send-content/send-amount-row/amount-max-button/amount-max-button.test.js
@@ -3,9 +3,13 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import { fireEvent } from '@testing-library/react';
-import { initialState, SEND_STATUSES } from '../../../../../ducks/send';
+import { AMOUNT_MODES, SEND_STATUSES } from '../../../../../ducks/send';
 import { renderWithProvider } from '../../../../../../test/jest';
 import { GAS_ESTIMATE_TYPES } from '../../../../../../shared/constants/gas';
+import {
+  getInitialSendStateWithExistingTxState,
+  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+} from '../../../../../../test/jest/mocks';
 import AmountMaxButton from './amount-max-button';
 
 const middleware = [thunk];
@@ -22,7 +26,7 @@ describe('AmountMaxButton Component', () => {
               EIPS: {},
             },
           },
-          send: initialState,
+          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
         }),
       );
       expect(getByText('Max')).toBeTruthy();
@@ -36,12 +40,14 @@ describe('AmountMaxButton Component', () => {
             EIPS: {},
           },
         },
-        send: { ...initialState, status: SEND_STATUSES.VALID },
+        send: getInitialSendStateWithExistingTxState({
+          status: SEND_STATUSES.VALID,
+        }),
       });
       const { getByText } = renderWithProvider(<AmountMaxButton />, store);
 
       const expectedActions = [
-        { type: 'send/updateAmountMode', payload: 'MAX' },
+        { type: 'send/updateAmountMode', payload: AMOUNT_MODES.MAX },
       ];
 
       fireEvent.click(getByText('Max'), { bubbles: true });
@@ -58,9 +64,10 @@ describe('AmountMaxButton Component', () => {
           },
         },
         send: {
-          ...initialState,
-          status: SEND_STATUSES.VALID,
-          amount: { ...initialState.amount, mode: 'MAX' },
+          ...getInitialSendStateWithExistingTxState({
+            status: SEND_STATUSES.VALID,
+          }),
+          amountMode: AMOUNT_MODES.MAX,
         },
       });
       const { getByText } = renderWithProvider(<AmountMaxButton />, store);
diff --git a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
index ac075ddf845f..138ad06edad4 100644
--- a/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
+++ b/ui/pages/send/send-content/send-asset-row/send-asset-row.component.js
@@ -5,10 +5,14 @@ import Identicon from '../../../../components/ui/identicon';
 import TokenBalance from '../../../../components/ui/token-balance';
 import TokenListDisplay from '../../../../components/app/token-list-display';
 import UserPreferencedCurrencyDisplay from '../../../../components/app/user-preferenced-currency-display';
-import { ERC20, ERC721, PRIMARY } from '../../../../helpers/constants/common';
+import { PRIMARY } from '../../../../helpers/constants/common';
 import { isEqualCaseInsensitive } from '../../../../../shared/modules/string-utils';
 import { EVENT } from '../../../../../shared/constants/metametrics';
-import { ASSET_TYPES } from '../../../../../shared/constants/transaction';
+import {
+  ASSET_TYPES,
+  ERC20,
+  ERC721,
+} from '../../../../../shared/constants/transaction';
 
 export default class SendAssetRow extends Component {
   static propTypes = {
diff --git a/ui/pages/send/send-content/send-content.component.js b/ui/pages/send/send-content/send-content.component.js
index 3b54b4a784ac..a856624d12fa 100644
--- a/ui/pages/send/send-content/send-content.component.js
+++ b/ui/pages/send/send-content/send-content.component.js
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import PageContainerContent from '../../../components/ui/page-container/page-container-content.component';
 import Dialog from '../../../components/ui/dialog';
+import ActionableMessage from '../../../components/ui/actionable-message';
 import NicknamePopovers from '../../../components/app/modals/nickname-popovers';
 import {
   ETH_GAS_PRICE_FETCH_WARNING_KEY,
@@ -10,6 +11,7 @@ import {
   INSUFFICIENT_FUNDS_FOR_GAS_ERROR_KEY,
 } from '../../../helpers/constants/error-keys';
 import { ASSET_TYPES } from '../../../../shared/constants/transaction';
+import { CONTRACT_ADDRESS_LINK } from '../../../helpers/constants/common';
 import SendAmountRow from './send-amount-row';
 import SendHexDataRow from './send-hex-data-row';
 import SendAssetRow from './send-asset-row';
@@ -38,6 +40,9 @@ export default class SendContent extends Component {
     asset: PropTypes.object,
     to: PropTypes.string,
     assetError: PropTypes.string,
+    recipient: PropTypes.object,
+    acknowledgeRecipientWarning: PropTypes.func,
+    recipientWarningAcknowledged: PropTypes.bool,
   };
 
   render() {
@@ -51,6 +56,8 @@ export default class SendContent extends Component {
       getIsBalanceInsufficient,
       asset,
       assetError,
+      recipient,
+      recipientWarningAcknowledged,
     } = this.props;
 
     let gasError;
@@ -66,6 +73,10 @@ export default class SendContent extends Component {
       asset.type !== ASSET_TYPES.TOKEN &&
       asset.type !== ASSET_TYPES.COLLECTIBLE;
 
+    const showKnownRecipientWarning =
+      recipient.warning === 'knownAddressRecipient';
+    const hideAddContactDialog = recipient.warning === 'loading';
+
     return (
       <PageContainerContent>
         <div className="send-v2__form">
@@ -76,7 +87,12 @@ export default class SendContent extends Component {
             : null}
           {error ? this.renderError(error) : null}
           {warning ? this.renderWarning() : null}
-          {this.maybeRenderAddContact()}
+          {showKnownRecipientWarning && !recipientWarningAcknowledged
+            ? this.renderRecipientWarning()
+            : null}
+          {showKnownRecipientWarning || hideAddContactDialog
+            ? null
+            : this.maybeRenderAddContact()}
           <SendAssetRow />
           <SendAmountRow />
           {networkOrAccountNotSupports1559 ? <SendGasRow /> : null}
@@ -104,6 +120,7 @@ export default class SendContent extends Component {
         >
           {t('newAccountDetectedDialogMessage')}
         </Dialog>
+
         {showNicknamePopovers ? (
           <NicknamePopovers
             onClose={() => this.setState({ showNicknamePopovers: false })}
@@ -124,6 +141,36 @@ export default class SendContent extends Component {
     );
   }
 
+  renderRecipientWarning() {
+    const { acknowledgeRecipientWarning } = this.props;
+    const { t } = this.context;
+    return (
+      <div className="send__warning-container">
+        <ActionableMessage
+          type="danger"
+          useIcon
+          iconFillColor="#d73a49"
+          primaryActionV2={{
+            label: t('tooltipApproveButton'),
+            onClick: acknowledgeRecipientWarning,
+          }}
+          message={t('sendingToTokenContractWarning', [
+            <a
+              key="contractWarningSupport"
+              target="_blank"
+              rel="noopener noreferrer"
+              className="send__warning-container__link"
+              href={CONTRACT_ADDRESS_LINK}
+            >
+              {t('learnMoreUpperCase')}
+            </a>,
+          ])}
+          roundedButtons
+        />
+      </div>
+    );
+  }
+
   renderError(error) {
     const { t } = this.context;
     return (
diff --git a/ui/pages/send/send-content/send-content.component.test.js b/ui/pages/send/send-content/send-content.component.test.js
index 7b06b50e313e..ec8ed3ecf66d 100644
--- a/ui/pages/send/send-content/send-content.component.test.js
+++ b/ui/pages/send/send-content/send-content.component.test.js
@@ -16,6 +16,32 @@ describe('SendContent Component', () => {
     gasIsExcessive: false,
     networkAndAccountSupports1559: true,
     asset: { type: 'NATIVE' },
+    recipient: {
+      mode: 'CONTACT_LIST',
+      userInput: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
+      address: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
+      nickname: 'John Doe',
+      error: null,
+      warning: null,
+    },
+    tokenAddressList: {
+      '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
+        name: 'BitBase',
+        symbol: 'BTBS',
+        decimals: 18,
+        address: '0x32E6C34Cd57087aBBD59B5A4AECC4cB495924356',
+        iconUrl: 'BTBS.svg',
+        occurrences: null,
+      },
+      '0x3fa400483487a489ec9b1db29c4129063eec4654': {
+        name: 'Cryptokek.com',
+        symbol: 'KEK',
+        decimals: 18,
+        address: '0x3fa400483487A489EC9b1dB29C4129063EEC4654',
+        iconUrl: 'cryptokek.svg',
+        occurrences: null,
+      },
+    },
   };
 
   beforeEach(() => {
@@ -150,7 +176,7 @@ describe('SendContent Component', () => {
       true,
     );
     expect(
-      PageContainerContentChild.childAt(1).find(
+      PageContainerContentChild.childAt(2).find(
         'send-v2__asset-dropdown__single-asset',
       ),
     ).toHaveLength(0);
diff --git a/ui/pages/send/send-content/send-content.container.js b/ui/pages/send/send-content/send-content.container.js
index d3e508e9f4e2..53fca75303be 100644
--- a/ui/pages/send/send-content/send-content.container.js
+++ b/ui/pages/send/send-content/send-content.container.js
@@ -11,6 +11,9 @@ import {
   getSendTo,
   getSendAsset,
   getAssetError,
+  getRecipient,
+  acknowledgeRecipientWarning,
+  getRecipientWarningAcknowledgement,
 } from '../../../ducks/send';
 
 import SendContent from './send-content.component';
@@ -18,6 +21,10 @@ import SendContent from './send-content.component';
 function mapStateToProps(state) {
   const ownedAccounts = accountsWithSendEtherInfoSelector(state);
   const to = getSendTo(state);
+  const recipient = getRecipient(state);
+  const recipientWarningAcknowledged = getRecipientWarningAcknowledgement(
+    state,
+  );
   return {
     isOwnedAccount: Boolean(
       ownedAccounts.find(
@@ -34,7 +41,15 @@ function mapStateToProps(state) {
     getIsBalanceInsufficient: getIsBalanceInsufficient(state),
     asset: getSendAsset(state),
     assetError: getAssetError(state),
+    recipient,
+    recipientWarningAcknowledged,
   };
 }
 
-export default connect(mapStateToProps)(SendContent);
+function mapDispatchToProps(dispatch) {
+  return {
+    acknowledgeRecipientWarning: () => dispatch(acknowledgeRecipientWarning()),
+  };
+}
+
+export default connect(mapStateToProps, mapDispatchToProps)(SendContent);
diff --git a/ui/pages/send/send-content/send-content.stories.js b/ui/pages/send/send-content/send-content.stories.js
index 66ed9b53bf9f..16f9ab6b0fe3 100644
--- a/ui/pages/send/send-content/send-content.stories.js
+++ b/ui/pages/send/send-content/send-content.stories.js
@@ -1,26 +1,84 @@
 import React from 'react';
-import { boolean, text } from '@storybook/addon-knobs';
 
 import SendContent from './send-content.component';
 
 export default {
   title: 'Pages/Send/SendContent',
   id: __filename,
+  argsTypes: {
+    showHexData: {
+      control: 'boolean',
+    },
+    isOwnedAccount: {
+      control: 'boolean',
+    },
+    contact: {
+      control: 'object',
+    },
+    noGasPrice: {
+      control: 'boolean',
+    },
+    isEthGasPrice: {
+      control: 'boolean',
+    },
+
+    gasIsExcessive: {
+      control: 'boolean',
+    },
+    networkOrAccountNotSupports1559: {
+      control: 'boolean',
+    },
+    getIsBalanceInsufficient: {
+      control: 'boolean',
+    },
+    error: {
+      control: 'text',
+    },
+    warning: {
+      control: 'text',
+    },
+    to: {
+      control: 'text',
+    },
+    assetError: {
+      control: 'text',
+    },
+    asset: {
+      control: 'object',
+    },
+    recipient: {
+      control: 'object',
+    },
+  },
 };
 
-export const DefaultStory = () => {
-  return (
-    <SendContent
-      showHexData={boolean('Show Hex Data', false)}
-      isOwnedAccount={boolean('Is In Address Book', true)}
-      noGasPrice={boolean('No Gas Price', false)}
-      isEthGasPrice={boolean('Backup Gas Price', false)}
-      gasIsExcessive={boolean('Gas Is Excessive', false)}
-      // Get error and warning message from messages.json
-      error={text('Error', 'connecting')}
-      warning={text('Warning', 'connecting')}
-    />
-  );
+export const DefaultStory = (args) => {
+  return <SendContent {...args} />;
 };
 
 DefaultStory.storyName = 'Default';
+DefaultStory.args = {
+  showHexData: false,
+  isOwnedAccount: true,
+  noGasPrice: false,
+  isEthGasPrice: false,
+  gasIsExcessive: false,
+  error: 'connecting',
+  warning: 'connecting',
+  asset: {
+    type: 'NATIVE',
+  },
+  recipient: {
+    mode: 'CONTACT_LIST',
+    userInput: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
+    address: '0x31A2764925BD47CCBd57b2F277702dB46e9C5F66',
+    nickname: 'John Doe',
+    error: null,
+    warning: null,
+  },
+  contact: { name: 'testName' },
+  networkOrAccountNotSupports1559: false,
+  getIsBalanceInsufficient: false,
+  to: 'string to',
+  assetError: 'newAccountDetectedDialogMessage',
+};
diff --git a/ui/pages/send/send-header/send-header.component.js b/ui/pages/send/send-header/send-header.component.js
index f4528a6c4a14..d71b6ef99d3d 100644
--- a/ui/pages/send/send-header/send-header.component.js
+++ b/ui/pages/send/send-header/send-header.component.js
@@ -5,6 +5,7 @@ import PageContainerHeader from '../../../components/ui/page-container/page-cont
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
+  getDraftTransactionExists,
   getSendAsset,
   getSendStage,
   resetSendState,
@@ -19,15 +20,18 @@ export default function SendHeader() {
   const stage = useSelector(getSendStage);
   const asset = useSelector(getSendAsset);
   const t = useI18nContext();
-
+  const draftTransactionExists = useSelector(getDraftTransactionExists);
   const onClose = () => {
     dispatch(resetSendState());
     history.push(mostRecentOverviewPage);
   };
 
-  let title = asset.type === ASSET_TYPES.NATIVE ? t('send') : t('sendTokens');
+  let title = asset?.type === ASSET_TYPES.NATIVE ? t('send') : t('sendTokens');
 
-  if (stage === SEND_STAGES.ADD_RECIPIENT || stage === SEND_STAGES.INACTIVE) {
+  if (
+    draftTransactionExists === false ||
+    [SEND_STAGES.ADD_RECIPIENT, SEND_STAGES.INACTIVE].includes(stage)
+  ) {
     title = t('sendTo');
   } else if (stage === SEND_STAGES.EDIT) {
     title = t('edit');
diff --git a/ui/pages/send/send-header/send-header.component.test.js b/ui/pages/send/send-header/send-header.component.test.js
index 5ec8bdc6914c..a6eaa19d9106 100644
--- a/ui/pages/send/send-header/send-header.component.test.js
+++ b/ui/pages/send/send-header/send-header.component.test.js
@@ -3,9 +3,13 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import { fireEvent } from '@testing-library/react';
-import { initialState, SEND_STAGES } from '../../../ducks/send';
+import { SEND_STAGES } from '../../../ducks/send';
 import { renderWithProvider } from '../../../../test/jest';
 import { ASSET_TYPES } from '../../../../shared/constants/transaction';
+import {
+  getInitialSendStateWithExistingTxState,
+  INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+} from '../../../../test/jest/mocks';
 import SendHeader from './send-header.component';
 
 const middleware = [thunk];
@@ -26,7 +30,7 @@ describe('SendHeader Component', () => {
       const { getByText, rerender } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: initialState,
+          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -35,7 +39,10 @@ describe('SendHeader Component', () => {
       rerender(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: { ...initialState, stage: SEND_STAGES.ADD_RECIPIENT },
+          send: {
+            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            stage: SEND_STAGES.ADD_RECIPIENT,
+          },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -48,9 +55,12 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...initialState,
+            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
             stage: SEND_STAGES.DRAFT,
-            asset: { ...initialState.asset, type: ASSET_TYPES.NATIVE },
+            asset: {
+              ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT.asset,
+              type: ASSET_TYPES.NATIVE,
+            },
           },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
@@ -64,9 +74,12 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...initialState,
+            ...getInitialSendStateWithExistingTxState({
+              asset: {
+                type: ASSET_TYPES.TOKEN,
+              },
+            }),
             stage: SEND_STAGES.DRAFT,
-            asset: { ...initialState.asset, type: ASSET_TYPES.TOKEN },
           },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
@@ -80,7 +93,7 @@ describe('SendHeader Component', () => {
         <SendHeader />,
         configureMockStore(middleware)({
           send: {
-            ...initialState,
+            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
             stage: SEND_STAGES.EDIT,
           },
           gas: { basicEstimateStatus: 'LOADING' },
@@ -96,7 +109,7 @@ describe('SendHeader Component', () => {
       const { getByText } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: initialState,
+          send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -108,7 +121,10 @@ describe('SendHeader Component', () => {
       const { getByText } = renderWithProvider(
         <SendHeader />,
         configureMockStore(middleware)({
-          send: { ...initialState, stage: SEND_STAGES.EDIT },
+          send: {
+            ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
+            stage: SEND_STAGES.EDIT,
+          },
           gas: { basicEstimateStatus: 'LOADING' },
           history: { mostRecentOverviewPage: 'activity' },
         }),
@@ -118,7 +134,7 @@ describe('SendHeader Component', () => {
 
     it('resets send state when clicked', () => {
       const store = configureMockStore(middleware)({
-        send: initialState,
+        send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
         gas: { basicEstimateStatus: 'LOADING' },
         history: { mostRecentOverviewPage: 'activity' },
       });
diff --git a/ui/pages/send/send.constants.js b/ui/pages/send/send.constants.js
index 9f48bea0ad74..c1db267225fc 100644
--- a/ui/pages/send/send.constants.js
+++ b/ui/pages/send/send.constants.js
@@ -3,12 +3,12 @@ import {
   multiplyCurrencies,
 } from '../../../shared/modules/conversion.utils';
 import { addHexPrefix } from '../../../app/scripts/lib/util';
+import { MIN_GAS_LIMIT_HEX } from '../../../shared/constants/gas';
 
 const MIN_GAS_PRICE_DEC = '0';
 const MIN_GAS_PRICE_HEX = parseInt(MIN_GAS_PRICE_DEC, 10).toString(16);
 const MIN_GAS_LIMIT_DEC = '21000';
 const MAX_GAS_LIMIT_DEC = '7920027';
-const MIN_GAS_LIMIT_HEX = parseInt(MIN_GAS_LIMIT_DEC, 10).toString(16);
 
 const HIGH_FEE_WARNING_MULTIPLIER = 1.5;
 const MIN_GAS_PRICE_GWEI = addHexPrefix(
@@ -63,7 +63,6 @@ export {
   ENS_UNKNOWN_ERROR,
   ENS_REGISTRATION_ERROR,
   MIN_GAS_LIMIT_DEC,
-  MIN_GAS_LIMIT_HEX,
   MIN_GAS_PRICE_DEC,
   MIN_GAS_PRICE_GWEI,
   MIN_GAS_PRICE_HEX,
diff --git a/ui/pages/send/send.js b/ui/pages/send/send.js
index 79980b25c4e6..ad10615a7728 100644
--- a/ui/pages/send/send.js
+++ b/ui/pages/send/send.js
@@ -1,24 +1,26 @@
-import React, { useEffect, useCallback, useContext } from 'react';
+import React, { useEffect, useCallback, useContext, useRef } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { useHistory, useLocation } from 'react-router-dom';
 import {
   addHistoryEntry,
+  getDraftTransactionExists,
   getIsUsingMyAccountForRecipientSearch,
   getRecipient,
   getRecipientUserInput,
   getSendStage,
-  initializeSendState,
   resetRecipientInput,
   resetSendState,
   SEND_STAGES,
+  startNewDraftTransaction,
   updateRecipient,
   updateRecipientUserInput,
 } from '../../ducks/send';
-import { getCurrentChainId, isCustomPriceExcessive } from '../../selectors';
+import { isCustomPriceExcessive } from '../../selectors';
 import { getSendHexDataFeatureFlagState } from '../../ducks/metamask/metamask';
 import { showQrScanner } from '../../store/actions';
 import { MetaMetricsContext } from '../../contexts/metametrics';
 import { EVENT } from '../../../shared/constants/metametrics';
+import { ASSET_TYPES } from '../../../shared/constants/transaction';
 import SendHeader from './send-header';
 import AddRecipient from './send-content/add-recipient';
 import SendContent from './send-content';
@@ -30,7 +32,7 @@ const sendSliceIsCustomPriceExcessive = (state) =>
 
 export default function SendTransactionScreen() {
   const history = useHistory();
-  const chainId = useSelector(getCurrentChainId);
+  const startedNewDraftTransaction = useRef(false);
   const stage = useSelector(getSendStage);
   const gasIsExcessive = useSelector(sendSliceIsCustomPriceExcessive);
   const isUsingMyAccountsForRecipientSearch = useSelector(
@@ -39,6 +41,7 @@ export default function SendTransactionScreen() {
   const recipient = useSelector(getRecipient);
   const showHexData = useSelector(getSendHexDataFeatureFlagState);
   const userInput = useSelector(getRecipientUserInput);
+  const draftTransactionExists = useSelector(getDraftTransactionExists);
   const location = useLocation();
   const trackEvent = useContext(MetaMetricsContext);
 
@@ -48,12 +51,26 @@ export default function SendTransactionScreen() {
     dispatch(resetSendState());
   }, [dispatch]);
 
+  /**
+   * It is possible to route to this page directly, either by typing in the url
+   * or by clicking the browser back button after progressing to the confirm
+   * screen. In the case where a draft transaction does not yet exist, this
+   * hook is responsible for creating it. We will assume that this is a native
+   * asset send.
+   */
   useEffect(() => {
-    if (chainId !== undefined) {
-      dispatch(initializeSendState());
-      window.addEventListener('beforeunload', cleanup);
+    if (
+      draftTransactionExists === false &&
+      startedNewDraftTransaction.current === false
+    ) {
+      startedNewDraftTransaction.current = true;
+      dispatch(startNewDraftTransaction({ type: ASSET_TYPES.NATIVE }));
     }
-  }, [chainId, dispatch, cleanup]);
+  }, [draftTransactionExists, dispatch]);
+
+  useEffect(() => {
+    window.addEventListener('beforeunload', cleanup);
+  }, [cleanup]);
 
   useEffect(() => {
     if (location.search === '?scan=true') {
@@ -75,7 +92,10 @@ export default function SendTransactionScreen() {
 
   let content;
 
-  if ([SEND_STAGES.EDIT, SEND_STAGES.DRAFT].includes(stage)) {
+  if (
+    draftTransactionExists &&
+    [SEND_STAGES.EDIT, SEND_STAGES.DRAFT].includes(stage)
+  ) {
     content = (
       <>
         <SendContent
@@ -96,10 +116,11 @@ export default function SendTransactionScreen() {
         userInput={userInput}
         className="send__to-row"
         onChange={(address) => dispatch(updateRecipientUserInput(address))}
-        onValidAddressTyped={(address) => {
+        onValidAddressTyped={async (address) => {
           dispatch(
             addHistoryEntry(`sendFlow - Valid address typed ${address}`),
           );
+          await dispatch(updateRecipientUserInput(address));
           dispatch(updateRecipient({ address, nickname: '' }));
         }}
         internalSearch={isUsingMyAccountsForRecipientSearch}
@@ -111,7 +132,6 @@ export default function SendTransactionScreen() {
               `sendFlow - User pasted ${text} into address field`,
             ),
           );
-          return dispatch(updateRecipient({ address: text, nickname: '' }));
         }}
         onReset={() => dispatch(resetRecipientInput())}
         scanQrCode={() => {
diff --git a/ui/pages/send/send.scss b/ui/pages/send/send.scss
index 71c40afb005f..2735ba89a699 100644
--- a/ui/pages/send/send.scss
+++ b/ui/pages/send/send.scss
@@ -35,6 +35,15 @@
     margin: 1rem;
   }
 
+  &__warning-container {
+    padding-left: 16px;
+    padding-right: 16px;
+
+    &__link {
+      color: var(--primary-1);
+    }
+  }
+
   &__to-row {
     margin: 0;
     padding: 0.5rem;
@@ -232,7 +241,7 @@
     &__subtitle {
       @include H7;
 
-      color: var(--color-icon-default);
+      color: var(--color-text-default);
       margin-top: 0.25rem;
     }
   }
diff --git a/ui/pages/send/send.test.js b/ui/pages/send/send.test.js
index e2d16be9f5ae..dc8a76628f66 100644
--- a/ui/pages/send/send.test.js
+++ b/ui/pages/send/send.test.js
@@ -1,17 +1,31 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-
 import { useLocation } from 'react-router-dom';
-import { initialState, SEND_STAGES } from '../../ducks/send';
+import { SEND_STAGES, startNewDraftTransaction } from '../../ducks/send';
 import { ensInitialState } from '../../ducks/ens';
 import { renderWithProvider } from '../../../test/jest';
 import { RINKEBY_CHAIN_ID } from '../../../shared/constants/network';
 import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas';
+import { INITIAL_SEND_STATE_FOR_EXISTING_DRAFT } from '../../../test/jest/mocks';
 import Send from './send';
 
 const middleware = [thunk];
 
+jest.mock('../../ducks/send/send', () => {
+  const original = jest.requireActual('../../ducks/send/send');
+  return {
+    ...original,
+    // We don't really need to start a draft transaction, and the mock store
+    // does not update as a result of action calls so instead we just ensure
+    // that the action WOULD be called.
+    startNewDraftTransaction: jest.fn(() => ({
+      type: 'TEST_START_NEW_DRAFT',
+      payload: null,
+    })),
+  };
+});
+
 jest.mock('react-router-dom', () => {
   const original = jest.requireActual('react-router-dom');
   return {
@@ -23,18 +37,22 @@ jest.mock('react-router-dom', () => {
   };
 });
 
-jest.mock(
-  'ethjs-ens',
-  () =>
-    class MocKENS {
-      async ensLookup() {
-        return '';
-      }
+jest.mock('ethers', () => {
+  const originalModule = jest.requireActual('ethers');
+  return {
+    ...originalModule,
+    ethers: {
+      ...originalModule.ethers,
+      providers: {
+        Web3Provider: jest.fn().mockImplementation(() => {
+          return {};
+        }),
+      },
     },
-);
-
+  };
+});
 const baseStore = {
-  send: initialState,
+  send: INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
   ENS: ensInitialState,
   gas: {
     customData: { limit: null, price: null },
@@ -79,6 +97,25 @@ const baseStore = {
       '0x0': { balance: '0x0', address: '0x0' },
     },
     identities: { '0x0': { address: '0x0' } },
+    tokenAddress: '0x32e6c34cd57087abbd59b5a4aecc4cb495924356',
+    tokenList: {
+      '0x32e6c34cd57087abbd59b5a4aecc4cb495924356': {
+        name: 'BitBase',
+        symbol: 'BTBS',
+        decimals: 18,
+        address: '0x32E6C34Cd57087aBBD59B5A4AECC4cB495924356',
+        iconUrl: 'BTBS.svg',
+        occurrences: null,
+      },
+      '0x3fa400483487a489ec9b1db29c4129063eec4654': {
+        name: 'Cryptokek.com',
+        symbol: 'KEK',
+        decimals: 18,
+        address: '0x3fa400483487A489EC9b1dB29C4129063EEC4654',
+        iconUrl: 'cryptokek.svg',
+        occurrences: null,
+      },
+    },
   },
   appState: {
     sendInputCurrencySwitched: false,
@@ -87,7 +124,7 @@ const baseStore = {
 
 describe('Send Page', () => {
   describe('Send Flow Initialization', () => {
-    it('should initialize the send, ENS, and gas slices on render', () => {
+    it('should initialize the ENS slice on render', () => {
       const store = configureMockStore(middleware)(baseStore);
       renderWithProvider(<Send />, store);
       const actions = store.getActions();
@@ -96,9 +133,6 @@ describe('Send Page', () => {
           expect.objectContaining({
             type: 'ENS/enableEnsLookup',
           }),
-          expect.objectContaining({
-            type: 'send/initializeSendState/pending',
-          }),
         ]),
       );
     });
@@ -113,9 +147,6 @@ describe('Send Page', () => {
           expect.objectContaining({
             type: 'ENS/enableEnsLookup',
           }),
-          expect.objectContaining({
-            type: 'send/initializeSendState/pending',
-          }),
           expect.objectContaining({
             type: 'UI_MODAL_OPEN',
             payload: { name: 'QR_SCANNER' },
@@ -146,6 +177,25 @@ describe('Send Page', () => {
       const { queryByText } = renderWithProvider(<Send />, store);
       expect(queryByText('Next')).toBeNull();
     });
+
+    it('should render correctly even when a draftTransaction does not exist', () => {
+      const modifiedStore = {
+        ...baseStore,
+        send: {
+          ...baseStore.send,
+          currentTransactionUUID: null,
+        },
+      };
+      const store = configureMockStore(middleware)(modifiedStore);
+      const { getByPlaceholderText } = renderWithProvider(<Send />, store);
+      // Ensure that the send flow renders on the add recipient screen when
+      // there is no draft transaction.
+      expect(
+        getByPlaceholderText('Search, public address (0x), or ENS'),
+      ).toBeTruthy();
+      // Ensure we start a new draft transaction when its missing.
+      expect(startNewDraftTransaction).toHaveBeenCalledTimes(1);
+    });
   });
 
   describe('Send and Edit Flow (draft)', () => {
diff --git a/ui/pages/send/send.utils.js b/ui/pages/send/send.utils.js
index 6935a8b0c2bb..2a917dcd1db4 100644
--- a/ui/pages/send/send.utils.js
+++ b/ui/pages/send/send.utils.js
@@ -10,7 +10,7 @@ import {
 
 import { calcTokenAmount } from '../../helpers/utils/token-util';
 import { addHexPrefix } from '../../../app/scripts/lib/util';
-import { ERC20, ERC721 } from '../../helpers/constants/common';
+import { ERC20, ERC721 } from '../../../shared/constants/transaction';
 import {
   TOKEN_TRANSFER_FUNCTION_SIGNATURE,
   COLLECTIBLE_TRANSFER_FROM_FUNCTION_SIGNATURE,
@@ -142,7 +142,7 @@ function generateERC20TransferData({
       .call(
         abi.rawEncode(
           ['address', 'uint256'],
-          [toAddress, addHexPrefix(amount)],
+          [addHexPrefix(toAddress), addHexPrefix(amount)],
         ),
         (x) => `00${x.toString(16)}`.slice(-2),
       )
@@ -164,7 +164,7 @@ function generateERC721TransferData({
       .call(
         abi.rawEncode(
           ['address', 'address', 'uint256'],
-          [fromAddress, toAddress, tokenId],
+          [addHexPrefix(fromAddress), addHexPrefix(toAddress), tokenId],
         ),
         (x) => `00${x.toString(16)}`.slice(-2),
       )
diff --git a/ui/pages/send/send.utils.test.js b/ui/pages/send/send.utils.test.js
index f6da81d0e71d..39f7c7b8fba9 100644
--- a/ui/pages/send/send.utils.test.js
+++ b/ui/pages/send/send.utils.test.js
@@ -73,7 +73,7 @@ describe('send utils', () => {
       expect(rawEncode.mock.calls[0].toString()).toStrictEqual(
         [
           ['address', 'uint256'],
-          ['mockAddress', '0xab'],
+          ['0xmockAddress', '0xab'],
         ].toString(),
       );
     });
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 5c639e551f49..3000033197da 100644
--- a/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
+++ b/ui/pages/settings/advanced-tab/advanced-tab.component.test.js
@@ -30,6 +30,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -59,6 +60,9 @@ describe('AdvancedTab Component', () => {
         setDismissSeedBackUpReminder={() => undefined}
         dismissSeedBackUpReminder={false}
         setShowTestNetworks={toggleTestnet}
+        useTokenDetection
+        setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -103,6 +107,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
@@ -139,6 +144,7 @@ describe('AdvancedTab Component', () => {
         dismissSeedBackUpReminder={false}
         useTokenDetection
         setUseTokenDetection={toggleTokenDetection}
+        userHasALedgerAccount
       />,
       {
         context: {
diff --git a/ui/pages/settings/alerts-tab/alerts-tab.js b/ui/pages/settings/alerts-tab/alerts-tab.js
index 9eecef497e3d..40ecf4394407 100644
--- a/ui/pages/settings/alerts-tab/alerts-tab.js
+++ b/ui/pages/settings/alerts-tab/alerts-tab.js
@@ -30,7 +30,7 @@ const AlertSettingsEntry = ({ alertId, description, title }) => {
             title={description}
             wrapperClassName="alerts-tab__description"
           >
-            <i className="fa fa-info-circle" />
+            <i className="fa fa-info-circle alerts-tab__description__icon" />
           </Tooltip>
           <ToggleButton
             offLabel={t('off')}
diff --git a/ui/pages/settings/alerts-tab/alerts-tab.scss b/ui/pages/settings/alerts-tab/alerts-tab.scss
index 8266b885d3ca..5027ac49a951 100644
--- a/ui/pages/settings/alerts-tab/alerts-tab.scss
+++ b/ui/pages/settings/alerts-tab/alerts-tab.scss
@@ -20,6 +20,10 @@
   &__description {
     display: flex;
     align-items: center;
+
+    &__icon {
+      color: var(--color-icon-alternative);
+    }
   }
 
   &__item {
diff --git a/ui/pages/settings/contact-list-tab/index.scss b/ui/pages/settings/contact-list-tab/index.scss
index 12a3e252ad29..543635c979ec 100644
--- a/ui/pages/settings/contact-list-tab/index.scss
+++ b/ui/pages/settings/contact-list-tab/index.scss
@@ -53,6 +53,7 @@
   &__icon {
     margin-bottom: 16px;
     display: block;
+    color: var(--color-icon-muted);
   }
 
   &__title {
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index f702c466f9d5..d3f26068faf0 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -26,6 +26,8 @@ export default class ExperimentalTab extends PureComponent {
     setEIP1559V2Enabled: PropTypes.func,
     theme: PropTypes.string,
     setTheme: PropTypes.func,
+    customNetworkListEnabled: PropTypes.bool,
+    setCustomNetworkListEnabled: PropTypes.func,
   };
 
   settingsRefs = Array(
@@ -215,9 +217,9 @@ export default class ExperimentalTab extends PureComponent {
               onToggle={(value) => {
                 this.context.trackEvent({
                   category: EVENT.CATEGORIES.SETTINGS,
-                  event: 'Enabled/Disable OpenSea',
+                  event: 'Enable/Disable Advanced Gas UI',
                   properties: {
-                    action: 'Enabled/Disable OpenSea',
+                    action: 'Enable/Disable Advanced Gas UI',
                     legacy_event: true,
                   },
                 });
@@ -284,6 +286,45 @@ export default class ExperimentalTab extends PureComponent {
     );
   }
 
+  renderCustomNetworkListToggle() {
+    const { t } = this.context;
+    const {
+      customNetworkListEnabled,
+      setCustomNetworkListEnabled,
+    } = this.props;
+
+    return (
+      <div ref={this.settingsRefs[5]} className="settings-page__content-row">
+        <div className="settings-page__content-item">
+          <span>{t('showCustomNetworkList')}</span>
+          <div className="settings-page__content-description">
+            {t('showCustomNetworkListDescription')}
+          </div>
+        </div>
+        <div className="settings-page__content-item">
+          <div className="settings-page__content-item-col">
+            <ToggleButton
+              value={customNetworkListEnabled}
+              onToggle={(value) => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.SETTINGS,
+                  event: 'Enabled/Disable CustomNetworkList',
+                  properties: {
+                    action: 'Enabled/Disable CustomNetworkList',
+                    legacy_event: true,
+                  },
+                });
+                setCustomNetworkListEnabled(!value);
+              }}
+              offLabel={t('off')}
+              onLabel={t('on')}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   render() {
     return (
       <div className="settings-page__body">
@@ -295,6 +336,7 @@ export default class ExperimentalTab extends PureComponent {
         {this.renderCollectibleDetectionToggle()}
         {this.renderEIP1559V2EnabledToggle()}
         {this.renderTheme()}
+        {this.renderCustomNetworkListToggle()}
       </div>
     );
   }
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.js b/ui/pages/settings/experimental-tab/experimental-tab.container.js
index 1fb4124ee957..244de6198096 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.js
@@ -7,6 +7,7 @@ import {
   setOpenSeaEnabled,
   setEIP1559V2Enabled,
   setTheme,
+  setCustomNetworkListEnabled,
 } from '../../../store/actions';
 import {
   getUseTokenDetection,
@@ -14,6 +15,7 @@ import {
   getOpenSeaEnabled,
   getEIP1559V2Enabled,
   getTheme,
+  getIsCustomNetworkListEnabled,
 } from '../../../selectors';
 import ExperimentalTab from './experimental-tab.component';
 
@@ -26,6 +28,7 @@ const mapStateToProps = (state) => {
     openSeaEnabled: getOpenSeaEnabled(state),
     eip1559V2Enabled: getEIP1559V2Enabled(state),
     theme: getTheme(state),
+    customNetworkListEnabled: getIsCustomNetworkListEnabled(state),
   };
 };
 
@@ -40,6 +43,8 @@ const mapDispatchToProps = (dispatch) => {
     setOpenSeaEnabled: (val) => dispatch(setOpenSeaEnabled(val)),
     setEIP1559V2Enabled: (val) => dispatch(setEIP1559V2Enabled(val)),
     setTheme: (val) => dispatch(setTheme(val)),
+    setCustomNetworkListEnabled: (val) =>
+      dispatch(setCustomNetworkListEnabled(val)),
   };
 };
 
diff --git a/ui/pages/settings/flask/view-snap/view-snap.js b/ui/pages/settings/flask/view-snap/view-snap.js
index eab873053e86..0fa9964c16c4 100644
--- a/ui/pages/settings/flask/view-snap/view-snap.js
+++ b/ui/pages/settings/flask/view-snap/view-snap.js
@@ -47,7 +47,6 @@ function ViewSnap() {
     }
   }, [history, snap]);
 
-  const authorshipPillUrl = `https://npmjs.com/package/${snap?.manifest.source.location.npm.packageName}`;
   const connectedSubjects = useSelector((state) =>
     getSubjectsWithPermission(state, snap?.permissionName),
   );
@@ -87,10 +86,7 @@ function ViewSnap() {
           </Typography>
           <Box className="view-snap__pill-toggle-container">
             <Box className="view-snap__pill-container" paddingLeft={2}>
-              <SnapsAuthorshipPill
-                packageName={snap.id}
-                url={authorshipPillUrl}
-              />
+              <SnapsAuthorshipPill snapId={snap.id} />
             </Box>
             <Box paddingLeft={4} className="view-snap__toggle-container">
               <Tooltip interactive position="bottom" html={t('snapsToggle')}>
diff --git a/ui/pages/settings/index.scss b/ui/pages/settings/index.scss
index 7696fce541e5..caf7e0f7f4d9 100644
--- a/ui/pages/settings/index.scss
+++ b/ui/pages/settings/index.scss
@@ -70,7 +70,7 @@
       &__list {
         background: var(--color-background-default);
         box-sizing: border-box;
-        box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+        box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
         border-radius: 6px;
         position: absolute;
         width: 100%;
@@ -320,7 +320,7 @@
 
       margin-top: 8px;
       margin-bottom: 12px;
-      color: var(--color-icon-default);
+      color: var(--color-text-default);
     }
   }
 
@@ -331,7 +331,7 @@
   &__content-description {
     @include H6;
 
-    color: var(--color-icon-default);
+    color: var(--color-text-default);
     padding-top: 5px;
 
     a {
diff --git a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
index b3f7f8a346c7..7daffb4ce4fc 100644
--- a/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
+++ b/ui/pages/settings/networks-tab/custom-content-search/custom-content-search.js
@@ -4,7 +4,7 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../../components/ui/text-field';
 import { I18nContext } from '../../../../contexts/i18n';
-import SearchIcon from '../../../../components/ui/search-icon';
+import SearchIcon from '../../../../components/ui/icon/search-icon';
 
 export default function CustomContentSearch({
   onSearch,
@@ -32,7 +32,7 @@ export default function CustomContentSearch({
     if (searchQuery === '') {
       setSearchIconColor('var(--color-icon-muted)');
     } else {
-      setSearchIconColor('var(--color-icon-default)');
+      setSearchIconColor('var(--color-icon-alternative)');
     }
 
     const fuseSearchResult = networksSearchFuse.search(searchQuery);
diff --git a/ui/pages/settings/networks-tab/index.scss b/ui/pages/settings/networks-tab/index.scss
index 6c57a4b5ddbf..f105548390ba 100644
--- a/ui/pages/settings/networks-tab/index.scss
+++ b/ui/pages/settings/networks-tab/index.scss
@@ -7,31 +7,34 @@
   }
 
   &__content {
-    display: flex;
-    height: 100%;
-    max-width: 779px;
-    justify-content: space-between;
+    &--with-networks-list-popup-footer {
+      // padding-bottom required to offset content from fixed footer: &__networks-list-popup-footer
+      padding-bottom: 80px;
+      // isolation contains stacking context(z-index) of &__networks-list-popup-footer
+      isolation: isolate;
+    }
 
-    &__custom-image {
-      border: 1px solid var(--color-border-default);
-      margin-inline-start: 8px;
+    @media screen and (min-width: $break-large) {
+      display: grid;
+      grid-template-columns: 1fr 1fr;
     }
 
-    &__check-icon {
-      margin-inline-end: 10px;
-      color: var(--color-success-default);
+    &__icon-check {
+      max-width: 24px;
+      flex: 0 0 24px;
+    }
 
-      &__transparent {
-        color: transparent;
-        width: 16px;
-        margin-inline-end: 10px;
-      }
+    &__custom-image {
+      border: 1px solid var(--color-border-muted);
     }
 
     &__icon-with-fallback {
-      padding: 0 1px 2px 2px;
-      color: var(--color-primary-inverse); // TODO: design-tokens needs network colors
-      margin-inline-start: 8px;
+      display: flex;
+      align-items: center;
+      padding: 0;
+      max-width: 24px;
+      flex: 0 0 24px;
+      color: var(--color-text-alternative);
 
       @each $variant, $color in design-system.$color-map {
         &--color-#{$variant} {
@@ -40,160 +43,90 @@
         }
       }
     }
-
-    @media screen and (max-width: $break-small) {
-      margin-top: 0;
-      flex-direction: column;
-      overflow-x: hidden;
-      align-items: center;
-    }
   }
 
   &__body {
-    padding-right: 24px;
-    height: 100%;
     display: flex;
     flex-direction: column;
 
-    @media screen and (max-width: $break-small) {
-      padding: 0;
+    @media screen and (min-width: $break-large) {
+      margin-inline-end: 16px;
+      margin-bottom: 24px;
     }
   }
 
   &__subheader {
-    @include H4;
+    display: none;
 
-    padding: 16px 4px;
-    border-bottom: 1px solid var(--color-border-default);
-    height: 72px;
-    align-items: center;
-    display: flex;
-    flex-flow: row nowrap;
-  }
+    @media screen and (min-width: $break-large) {
+      @include H4;
 
-  &__subheader--break {
-    margin-inline-start: 10px;
+      padding: 16px 4px;
+      border-bottom: 1px solid var(--color-border-default);
+      height: 72px;
+      align-items: center;
+      display: flex;
+      gap: 8px;
+      flex-flow: row nowrap;
+    }
   }
 
   &__sub-header-text {
     @include H4;
 
     color: var(--color-text-muted);
-    margin-right: 10px;
   }
 
   &__network-form {
-    display: flex;
-    flex: 1 0;
-    flex-direction: column;
-    justify-content: space-between;
-    max-height: 465px;
-    max-width: 400px;
-    margin-top: 24px;
-    padding-inline-start: 24px;
+    padding: 16px 24px;
+
+    @media screen and (min-width: $break-large) {
+      padding: 16px;
+    }
 
     .page-container__footer {
       border-top: none;
 
-      @media screen and (max-width: $break-small) {
-        width: 93%;
-      }
-
       footer {
         padding: 10px 0;
       }
     }
-
-    @media screen and (max-width: $break-small) {
-      display: flex;
-      flex: auto;
-      max-width: 100%;
-      max-height: 100%;
-      align-items: center;
-      width: 90%;
-      margin-top: 10px;
-      padding: 0;
-    }
   }
 
-  &__add-network-form {
+  &__networks-list {
     display: flex;
     flex-direction: column;
-    max-height: 465px;
-  }
-
-  &__network-form-body {
-    display: grid;
-    grid-template-columns: 100%;
-    width: 95%;
+    gap: 16px;
+    padding: 16px 24px;
 
-    &__view-only {
-      width: 100%;
+    @media screen and (min-width: $break-large) {
+      padding: 16px;
+      min-width: 160px; // Allow network form to take priority in the grid on resize
+      border-right: 1px solid var(--color-border-muted);
     }
-  }
-
-  &__add-network-form-body {
-    display: grid;
-    grid-template-columns: 48% 48%;
-    column-gap: 5%;
-    margin-top: 24px;
-    width: 100%;
-  }
-
-  &__networks-list {
-    flex: 0.5 0 auto;
-    max-width: 350px;
-    border-right: 1px solid var(--color-border-default);
 
     &__custom-search-network {
-      margin-top: 24px;
-    }
-
-    .MuiInput-input {
-      font-size: 14px;
-
-      @media screen and (max-width: $break-small) {
-        font-size: 12px;
-      }
-    }
-
-    .MuiTextField-root {
-      padding-inline-end: 16px;
-
-      #search-networks-helper-text {
-        color: var(--color-text-alternative);
-      }
+      @include H6;
 
-      @media screen and (max-width: $break-small) {
-        padding: 0 24px 0 24px;
+      @media screen and (min-width: $break-large) {
+        @include Paragraph;
       }
     }
-
-    &__label {
-      @media screen and (max-width: $break-small) {
-        margin-inline-start: 58px;
-      }
-    }
-
-    @media screen and (max-width: $break-small) {
-      flex: 1;
-      overflow-y: auto;
-      max-width: 100vw;
-      width: 100vw;
-      margin-top: 0;
-    }
   }
 
   &__networks-list-popup-footer {
-    width: 100%;
     display: flex;
     justify-content: center;
-    padding-top: 23px;
-    padding-bottom: 23px;
+    padding: 16px 24px;
     border-top: 1px solid var(--color-border-default);
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: var(--color-background-default);
 
-    .button {
-      width: 178px;
+    @media screen and (min-width: $break-large) {
+      display: none;
     }
   }
 
@@ -218,42 +151,20 @@
 
   &__networks-list-item {
     display: flex;
-    padding: 12px 24px 12px 0;
-    position: relative;
-    align-items: center;
-    width: 311px;
-
-    .color-indicator {
-      &:hover {
-        cursor: pointer;
-      }
-
-      @media screen and (max-width: $break-small) {
-        margin: 0 4px 0 20px;
-      }
-    }
-
-    @media screen and (max-width: $break-small) {
-      padding: 12px 0 12px 24px;
-      max-width: 351px;
-    }
-  }
-
-  &__networks-list-item:last-of-type {
-    @media screen and (max-width: $break-small) {
-      border-bottom: none;
-    }
+    gap: 4px;
+    padding-top: 4px;
+    padding-bottom: 4px;
   }
 
   &__networks-list-name {
     @include Paragraph;
 
-    margin-left: 11px;
+    margin-left: 8px;
     color: var(--color-text-alternative);
-    width: 70%;
     text-overflow: ellipsis;
     white-space: nowrap;
     overflow: hidden;
+    flex-grow: 1;
 
     &:hover {
       cursor: pointer;
@@ -290,30 +201,43 @@
   &__network-form-footer {
     display: flex;
     flex-flow: row nowrap;
-    padding: 0.75rem 0;
-    width: 95%;
+    padding: 12px 0;
 
-    @media screen and (max-width: $break-small) {
-      width: 93%;
+    .btn--rounded {
+      white-space: nowrap;
     }
 
     .btn-secondary {
-      margin-right: 0.375rem;
+      margin-left: auto;
     }
 
     .btn-primary {
-      margin-left: 0.375rem;
+      margin-left: 16px;
     }
 
     .btn-danger {
-      margin-right: 3.75rem;
+      margin-right: 16px;
+    }
+  }
+
+  &__add-network-form {
+    padding: 16px 24px;
+    grid-column: span 2; // spread both columns of grid layout
+
+    @media screen and (min-width: $break-large) {
+      max-width: 400px; // but only expand to 400px
+      padding: 16px;
+    }
+
+    &__alert {
+      margin-top: 0;
     }
   }
 
   &__add-network-form-footer {
     display: flex;
     flex-flow: row;
-    padding: 0.75rem 0;
+    padding: 12px 0;
     width: 60%;
 
     .btn-secondary {
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 533910d6574d..682af2f1291a 100644
--- a/ui/pages/settings/networks-tab/networks-form/networks-form.js
+++ b/ui/pages/settings/networks-tab/networks-form/networks-form.js
@@ -1,4 +1,10 @@
-import React, { useCallback, useEffect, useRef, useState } from 'react';
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useRef,
+  useState,
+} from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
@@ -28,6 +34,12 @@ import {
 } from '../../../../helpers/constants/routes';
 import fetchWithCache from '../../../../helpers/utils/fetch-with-cache';
 import { usePrevious } from '../../../../hooks/usePrevious';
+import { MetaMetricsContext } from '../../../../contexts/metametrics';
+import { EVENT } from '../../../../../shared/constants/metametrics';
+import {
+  infuraProjectId,
+  FEATURED_RPCS,
+} from '../../../../../shared/constants/network';
 
 /**
  * Attempts to convert the given chainId to a decimal string, for display
@@ -73,6 +85,7 @@ const NetworksForm = ({
   selectedNetwork,
 }) => {
   const t = useI18nContext();
+  const trackEvent = useContext(MetaMetricsContext);
   const history = useHistory();
   const dispatch = useDispatch();
   const { label, labelKey, viewOnly, rpcPrefs } = selectedNetwork;
@@ -87,6 +100,9 @@ const NetworksForm = ({
   const [errors, setErrors] = useState({});
   const [warnings, setWarnings] = useState({});
   const [isSubmitting, setIsSubmitting] = useState(false);
+  const chainIdMatchesFeaturedRPC = FEATURED_RPCS.some(
+    (featuredRpc) => Number(featuredRpc.chainId) === Number(chainId),
+  );
 
   const resetForm = useCallback(() => {
     setNetworkName(selectedNetworkName || '');
@@ -328,15 +344,14 @@ const NetworksForm = ({
       }
 
       try {
-        safeChainsList = await fetchWithCache(
-          'https://chainid.network/chains.json',
-        );
+        safeChainsList =
+          (await fetchWithCache('https://chainid.network/chains.json')) || [];
       } catch (err) {
         log.warn('Failed to fetch the chainList from chainid.network', err);
         providerError = err;
       }
 
-      if (providerError || !Array.isArray(safeChainsList)) {
+      if (providerError) {
         warningKey = 'failedToFetchTickerSymbolData';
         warningMessage = t('failedToFetchTickerSymbolData');
       } else {
@@ -436,12 +451,12 @@ const NetworksForm = ({
       const rpcUrlError = validateRPCUrl(rpcUrl);
       setErrors({
         ...errors,
-        chainId: chainIdError,
         blockExplorerUrl: blockExplorerError,
         rpcUrl: rpcUrlError,
       });
       setWarnings({
         ...warnings,
+        chainId: chainIdError,
         ticker: tickerWarning,
       });
     }
@@ -497,6 +512,30 @@ const NetworksForm = ({
       }
 
       if (addNewNetwork) {
+        let rpcUrlOrigin;
+        try {
+          rpcUrlOrigin = new URL(rpcUrl).origin;
+        } catch {
+          // error
+        }
+        trackEvent({
+          event: 'Custom Network Added',
+          category: EVENT.CATEGORIES.NETWORK,
+          referrer: {
+            url: rpcUrlOrigin,
+          },
+          properties: {
+            chain_id: chainId,
+            network_name: networkName,
+            network: rpcUrlOrigin,
+            symbol: ticker,
+            block_explorer_url: blockExplorerUrl,
+            source: EVENT.SOURCE.NETWORK.CUSTOM_NETWORK_FORM,
+          },
+          sensitiveProperties: {
+            rpc_url: rpcUrlOrigin,
+          },
+        });
         dispatch(setNewNetworkAdded(networkName));
         history.push(DEFAULT_ROUTE);
       }
@@ -523,17 +562,19 @@ const NetworksForm = ({
         onConfirm: () => {
           resetForm();
           dispatch(setSelectedSettingsRpcUrl(''));
-          history.push(NETWORKS_ROUTE);
         },
       }),
     );
   };
   const deletable = !isCurrentRpcTarget && !viewOnly && !addNewNetwork;
   const stateUnchanged = stateIsUnchanged();
+  const chainIdErrorOnFeaturedRpcDuringEdit =
+    selectedNetwork?.rpcUrl && warnings.chainId && chainIdMatchesFeaturedRPC;
   const isSubmitDisabled =
     hasErrors() ||
     isSubmitting ||
     stateUnchanged ||
+    chainIdErrorOnFeaturedRpcDuringEdit ||
     !rpcUrl ||
     !chainId ||
     !ticker;
@@ -552,6 +593,7 @@ const NetworksForm = ({
           iconFillColor="var(--color-warning-default)"
           useIcon
           withRightButton
+          className="networks-tab__add-network-form__alert"
         />
       ) : null}
       <div
@@ -573,11 +615,15 @@ const NetworksForm = ({
           error={errors.rpcUrl?.msg || ''}
           onChange={setRpcUrl}
           titleText={t('rpcUrl')}
-          value={rpcUrl}
+          value={
+            rpcUrl?.includes(`/v3/${infuraProjectId}`)
+              ? rpcUrl.replace(`/v3/${infuraProjectId}`, '')
+              : rpcUrl
+          }
           disabled={viewOnly}
         />
         <FormField
-          error={errors.chainId?.msg || ''}
+          warning={warnings.chainId?.msg || ''}
           onChange={setChainId}
           titleText={t('chainId')}
           value={chainId}
diff --git a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
index 5f41df97c35f..b6b13089c13a 100644
--- a/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
+++ b/ui/pages/settings/networks-tab/networks-list-item/networks-list-item.js
@@ -73,9 +73,17 @@ const NetworksListItem = ({
       }}
     >
       {isCurrentRpcTarget ? (
-        <IconCheck color="var(--color-success-default)" />
+        <IconCheck
+          className="networks-tab__content__icon-check"
+          color="var(--color-success-default)"
+          aria-label={t('active')}
+        />
       ) : (
-        <div className="networks-tab__content__check-icon__transparent">✓</div>
+        <IconCheck
+          className="networks-tab__content__icon-check"
+          color="transparent"
+          aria-hidden="true"
+        />
       )}
       {network.chainId in CHAIN_ID_TO_NETWORK_IMAGE_URL_MAP ? (
         <Identicon
diff --git a/ui/pages/settings/networks-tab/networks-list/networks-list.js b/ui/pages/settings/networks-tab/networks-list/networks-list.js
index 58e13e87f2f3..56c12834be03 100644
--- a/ui/pages/settings/networks-tab/networks-list/networks-list.js
+++ b/ui/pages/settings/networks-tab/networks-list/networks-list.js
@@ -66,8 +66,8 @@ const NetworksList = ({
       {searchQuery === '' && (
         <Typography
           variant={TYPOGRAPHY.H6}
-          margin={[6, 0, 0, 9]}
-          color={COLORS.TEXT_MUTED}
+          marginTop={4}
+          color={COLORS.TEXT_ALTERNATIVE}
           className="networks-tab__networks-list__label"
         >
           {t('testNetworks')}
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
index 1420e3082cd8..1fad5fdc48ca 100644
--- a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.js
@@ -1,18 +1,31 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useHistory } from 'react-router-dom';
+import { useSelector } from 'react-redux';
 import { useI18nContext } from '../../../../hooks/useI18nContext';
-import { ADD_NETWORK_ROUTE } from '../../../../helpers/constants/routes';
+import {
+  ADD_NETWORK_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
+} from '../../../../helpers/constants/routes';
 import Button from '../../../../components/ui/button';
+import { getIsCustomNetworkListEnabled } from '../../../../selectors';
 
 const NetworksFormSubheader = ({ addNewNetwork }) => {
   const t = useI18nContext();
   const history = useHistory();
+  const addPopularNetworkFeatureToggledOn = useSelector(
+    getIsCustomNetworkListEnabled,
+  );
+
   return addNewNetwork ? (
     <div className="networks-tab__subheader">
       <span className="networks-tab__sub-header-text">{t('networks')}</span>
+      <span className="networks-tab__sub-header-text">{'  >  '}</span>
+      <div className="networks-tab__sub-header-text">{t('addANetwork')}</div>
       <span>{'  >  '}</span>
-      <div className="networks-tab__subheader--break">{t('addANetwork')}</div>
+      <div className="networks-tab__subheader--break">
+        {t('addANetworkManually')}
+      </div>
     </div>
   ) : (
     <div className="settings-page__sub-header">
@@ -22,7 +35,9 @@ const NetworksFormSubheader = ({ addNewNetwork }) => {
           type="primary"
           onClick={(event) => {
             event.preventDefault();
-            history.push(ADD_NETWORK_ROUTE);
+            addPopularNetworkFeatureToggledOn
+              ? history.push(ADD_POPULAR_CUSTOM_NETWORK)
+              : history.push(ADD_NETWORK_ROUTE);
           }}
         >
           {t('addANetwork')}
diff --git a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
index 0992610491ea..44b5b1768bf3 100644
--- a/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
+++ b/ui/pages/settings/networks-tab/networks-tab-subheader/networks-tab-subheader.test.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
+import { waitFor } from '@testing-library/react';
 import { renderWithProvider } from '../../../../../test/jest/rendering';
 import NetworksTabSubheader from '.';
 
@@ -36,11 +37,11 @@ describe('NetworksTabSubheader Component', () => {
     expect(getByRole('button', { text: 'Add a network' })).toBeDefined();
   });
   it('should render add network form subheader correctly', () => {
-    const { queryByText } = renderComponent({
+    const { queryByText, getAllByText } = renderComponent({
       addNewNetwork: true,
     });
     expect(queryByText('Networks')).toBeInTheDocument();
-    expect(queryByText('>')).toBeInTheDocument();
+    waitFor(() => expect(getAllByText('>')).toBeInTheDocument());
     expect(queryByText('Add a network')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/settings/networks-tab/networks-tab.js b/ui/pages/settings/networks-tab/networks-tab.js
index 71028c3ccd7f..35814d419e91 100644
--- a/ui/pages/settings/networks-tab/networks-tab.js
+++ b/ui/pages/settings/networks-tab/networks-tab.js
@@ -1,10 +1,12 @@
 import React, { useEffect } from 'react';
 import PropTypes from 'prop-types';
-import { useLocation } from 'react-router-dom';
+import classnames from 'classnames';
+import { useLocation, useHistory } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import {
   ADD_NETWORK_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
   NETWORKS_FORM_ROUTE,
 } from '../../../helpers/constants/routes';
 import { setSelectedSettingsRpcUrl } from '../../../store/actions';
@@ -13,6 +15,7 @@ import { getEnvironmentType } from '../../../../app/scripts/lib/util';
 import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
 import {
   getFrequentRpcListDetail,
+  getIsCustomNetworkListEnabled,
   getNetworksTabSelectedRpcUrl,
   getProvider,
 } from '../../../selectors';
@@ -35,6 +38,7 @@ const NetworksTab = ({ addNewNetwork }) => {
   const t = useI18nContext();
   const dispatch = useDispatch();
   const { pathname } = useLocation();
+  const history = useHistory();
 
   const environmentType = getEnvironmentType();
   const isFullScreen = environmentType === ENVIRONMENT_TYPE_FULLSCREEN;
@@ -44,11 +48,14 @@ const NetworksTab = ({ addNewNetwork }) => {
   const frequentRpcListDetail = useSelector(getFrequentRpcListDetail);
   const provider = useSelector(getProvider);
   const networksTabSelectedRpcUrl = useSelector(getNetworksTabSelectedRpcUrl);
+  const addPopularNetworkFeatureToggledOn = useSelector(
+    getIsCustomNetworkListEnabled,
+  );
 
   const frequentRpcNetworkListDetails = frequentRpcListDetail.map((rpc) => {
     return {
       label: rpc.nickname,
-      iconColor: 'var(--color-icon-default)',
+      iconColor: 'var(--color-icon-alternative)',
       providerType: NETWORK_TYPE_RPC,
       rpcUrl: rpc.rpcUrl,
       chainId: rpc.chainId,
@@ -92,7 +99,12 @@ const NetworksTab = ({ addNewNetwork }) => {
       {isFullScreen ? (
         <NetworksFormSubheader addNewNetwork={addNewNetwork} />
       ) : null}
-      <div className="networks-tab__content">
+      <div
+        className={classnames('networks-tab__content', {
+          'networks-tab__content--with-networks-list-popup-footer':
+            !isFullScreen && !shouldRenderNetworkForm,
+        })}
+      >
         {addNewNetwork ? (
           <NetworksForm
             networksToRender={networksToRender}
@@ -112,9 +124,16 @@ const NetworksTab = ({ addNewNetwork }) => {
               <div className="networks-tab__networks-list-popup-footer">
                 <Button
                   type="primary"
-                  onClick={(event) => {
-                    event.preventDefault();
-                    global.platform.openExtensionInBrowser(ADD_NETWORK_ROUTE);
+                  onClick={() => {
+                    if (addPopularNetworkFeatureToggledOn) {
+                      history.push(ADD_POPULAR_CUSTOM_NETWORK);
+                    } else {
+                      isFullScreen
+                        ? history.push(ADD_NETWORK_ROUTE)
+                        : global.platform.openExtensionInBrowser(
+                            ADD_NETWORK_ROUTE,
+                          );
+                    }
                   }}
                 >
                   {t('addNetwork')}
diff --git a/ui/pages/settings/settings-search/settings-search.js b/ui/pages/settings/settings-search/settings-search.js
index 2126d55471d2..6f37e399c931 100644
--- a/ui/pages/settings/settings-search/settings-search.js
+++ b/ui/pages/settings/settings-search/settings-search.js
@@ -7,7 +7,7 @@ import Fuse from 'fuse.js';
 import InputAdornment from '@material-ui/core/InputAdornment';
 import TextField from '../../../components/ui/text-field';
 import { I18nContext } from '../../../contexts/i18n';
-import SearchIcon from '../../../components/ui/search-icon';
+import SearchIcon from '../../../components/ui/icon/search-icon';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 ///: BEGIN:ONLY_INCLUDE_IN(flask)
 import { getSnapsRouteObjects } from '../../../selectors';
diff --git a/ui/pages/settings/settings-tab/settings-tab.component.js b/ui/pages/settings/settings-tab/settings-tab.component.js
index 982447077f84..fe117ee065ea 100644
--- a/ui/pages/settings/settings-tab/settings-tab.component.js
+++ b/ui/pages/settings/settings-tab/settings-tab.component.js
@@ -225,7 +225,10 @@ export default class SettingsTab extends PureComponent {
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H7}
-                margin={[0, 12, 0, 3]}
+                marginTop={0}
+                marginRight={12}
+                marginBottom={0}
+                marginLeft={3}
               >
                 {t('jazzicons')}
               </Typography>
@@ -253,7 +256,8 @@ export default class SettingsTab extends PureComponent {
               <Typography
                 color={COLORS.TEXT_DEFAULT}
                 variant={TYPOGRAPHY.H7}
-                margin={[0, 0, 0, 3]}
+                margin={0}
+                marginBottom={3}
               >
                 {t('blockies')}
               </Typography>
diff --git a/ui/pages/settings/settings.component.js b/ui/pages/settings/settings.component.js
index dc9bb1d31430..64995b15cf12 100644
--- a/ui/pages/settings/settings.component.js
+++ b/ui/pages/settings/settings.component.js
@@ -23,9 +23,11 @@ import {
   CONTACT_VIEW_ROUTE,
   EXPERIMENTAL_ROUTE,
   ADD_NETWORK_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
 } from '../../helpers/constants/routes';
 
 import { getSettingsRoutes } from '../../helpers/utils/settings-search';
+import AddNetwork from '../../components/app/add-network/add-network';
 import SettingsTab from './settings-tab';
 import AlertsTab from './alerts-tab';
 import NetworksTab from './networks-tab';
@@ -124,7 +126,6 @@ class SettingsPage extends PureComponent {
             )}
 
             {this.renderTitle()}
-
             <div
               className="settings-page__header__title-container__close-button"
               onClick={() => {
@@ -342,7 +343,16 @@ class SettingsPage extends PureComponent {
           path={ADD_NETWORK_ROUTE}
           render={() => <NetworksTab addNewNetwork />}
         />
-        <Route path={NETWORKS_ROUTE} component={NetworksTab} />
+        <Route
+          exact
+          path={NETWORKS_ROUTE}
+          render={() => <NetworksTab addNewNetwork={false} />}
+        />
+        <Route
+          exact
+          path={ADD_POPULAR_CUSTOM_NETWORK}
+          render={() => <AddNetwork />}
+        />
         <Route exact path={SECURITY_ROUTE} component={SecurityTab} />
         <Route exact path={EXPERIMENTAL_ROUTE} component={ExperimentalTab} />
         <Route exact path={CONTACT_LIST_ROUTE} component={ContactListTab} />
diff --git a/ui/pages/settings/settings.container.js b/ui/pages/settings/settings.container.js
index 78a470b94147..735e66507576 100644
--- a/ui/pages/settings/settings.container.js
+++ b/ui/pages/settings/settings.container.js
@@ -27,6 +27,7 @@ import {
   ADD_NETWORK_ROUTE,
   SNAPS_LIST_ROUTE,
   SNAPS_VIEW_ROUTE,
+  ADD_POPULAR_CUSTOM_NETWORK,
 } from '../../helpers/constants/routes';
 import Settings from './settings.component';
 
@@ -46,6 +47,7 @@ const ROUTES_TO_I18N_KEYS = {
   [ADD_NETWORK_ROUTE]: 'networks',
   [SECURITY_ROUTE]: 'securityAndPrivacy',
   [EXPERIMENTAL_ROUTE]: 'experimental',
+  [ADD_POPULAR_CUSTOM_NETWORK]: 'addNetwork',
 };
 
 const mapStateToProps = (state, ownProps) => {
@@ -64,6 +66,9 @@ const mapStateToProps = (state, ownProps) => {
     Boolean(pathname.match(NETWORKS_FORM_ROUTE)) ||
     Boolean(pathname.match(ADD_NETWORK_ROUTE));
   const addNewNetwork = Boolean(pathname.match(ADD_NETWORK_ROUTE));
+  const isAddPopularCustomNetwork = Boolean(
+    pathname.match(ADD_POPULAR_CUSTOM_NETWORK),
+  );
 
   const isPopup = getEnvironmentType() === ENVIRONMENT_TYPE_POPUP;
   const pathnameI18nKey = ROUTES_TO_I18N_KEYS[pathname];
@@ -77,6 +82,8 @@ const mapStateToProps = (state, ownProps) => {
     backRoute = NETWORKS_ROUTE;
   } else if (isSnapViewPage) {
     backRoute = SNAPS_LIST_ROUTE;
+  } else if (isAddPopularCustomNetwork) {
+    backRoute = NETWORKS_ROUTE;
   }
 
   let initialBreadCrumbRoute;
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index dcb3a08b197a..5456c10673dd 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -17,7 +17,6 @@ import {
   getUSDConversionRate,
   isHardwareWallet,
   getHardwareWalletType,
-  getSwapsDefaultToken,
 } from '../../../selectors';
 
 import {
@@ -34,10 +33,8 @@ import {
   getCurrentSmartTransactionsEnabled,
   getFromTokenInputValue,
   getMaxSlippage,
-  setSwapsFromToken,
 } from '../../../ducks/swaps/swaps';
 import Mascot from '../../../components/ui/mascot';
-import Box from '../../../components/ui/box';
 import {
   QUOTES_EXPIRED_ERROR,
   SWAP_FAILED_ERROR,
@@ -56,10 +53,11 @@ import { stopPollingForQuotes } from '../../../store/actions';
 import { getRenderableNetworkFeesForQuote } from '../swaps.util';
 import SwapsFooter from '../swaps-footer';
 
+import CreateNewSwap from '../create-new-swap';
+import ViewOnBlockExplorer from '../view-on-block-explorer';
 import SwapFailureIcon from './swap-failure-icon';
 import SwapSuccessIcon from './swap-success-icon';
 import QuotesTimeoutIcon from './quotes-timeout-icon';
-import ViewOnEtherScanLink from './view-on-ether-scan-link';
 
 export default function AwaitingSwap({
   swapComplete,
@@ -85,8 +83,6 @@ export default function AwaitingSwap({
   const usdConversionRate = useSelector(getUSDConversionRate);
   const chainId = useSelector(getCurrentChainId);
   const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider, shallowEqual);
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
-
   const [trackedQuotesExpiredEvent, setTrackedQuotesExpiredEvent] = useState(
     false,
   );
@@ -141,11 +137,6 @@ export default function AwaitingSwap({
     { blockExplorerUrl: baseNetworkUrl },
   );
 
-  const isCustomBlockExplorerUrl = Boolean(
-    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ||
-      rpcPrefs.blockExplorerUrl,
-  );
-
   let headerText;
   let statusImage;
   let descriptionText;
@@ -173,10 +164,9 @@ export default function AwaitingSwap({
     submitText = t('tryAgain');
     statusImage = <SwapFailureIcon />;
     content = blockExplorerUrl && (
-      <ViewOnEtherScanLink
-        txHash={txHash}
+      <ViewOnBlockExplorer
         blockExplorerUrl={blockExplorerUrl}
-        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
+        sensitiveTrackingProperties={sensitiveProperties}
       />
     );
   } else if (errorKey === QUOTES_EXPIRED_ERROR) {
@@ -221,10 +211,9 @@ export default function AwaitingSwap({
       </span>,
     ]);
     content = blockExplorerUrl && (
-      <ViewOnEtherScanLink
-        txHash={txHash}
+      <ViewOnBlockExplorer
         blockExplorerUrl={blockExplorerUrl}
-        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
+        sensitiveTrackingProperties={sensitiveProperties}
       />
     );
   } else if (!errorKey && swapComplete) {
@@ -240,35 +229,13 @@ export default function AwaitingSwap({
       </span>,
     ]);
     content = blockExplorerUrl && (
-      <ViewOnEtherScanLink
-        txHash={txHash}
+      <ViewOnBlockExplorer
         blockExplorerUrl={blockExplorerUrl}
-        isCustomBlockExplorerUrl={isCustomBlockExplorerUrl}
+        sensitiveTrackingProperties={sensitiveProperties}
       />
     );
   }
 
-  const MakeAnotherSwap = () => {
-    return (
-      <Box marginBottom={3}>
-        <a
-          href="#"
-          onClick={async () => {
-            trackEvent({
-              event: 'Make Another Swap',
-              category: EVENT.CATEGORIES.SWAPS,
-              sensitiveProperties,
-            });
-            await dispatch(navigateBackToBuildQuote(history));
-            dispatch(setSwapsFromToken(defaultSwapsToken));
-          }}
-        >
-          {t('makeAnotherSwap')}
-        </a>
-      </Box>
-    );
-  };
-
   useEffect(() => {
     if (errorKey) {
       // If there was an error, stop polling for quotes.
@@ -291,7 +258,9 @@ export default function AwaitingSwap({
         <div className="awaiting-swap__main-description">{descriptionText}</div>
         {content}
       </div>
-      {!errorKey && swapComplete ? <MakeAnotherSwap /> : null}
+      {!errorKey && swapComplete ? (
+        <CreateNewSwap sensitiveTrackingProperties={sensitiveProperties} />
+      ) : null}
       <SwapsFooter
         onSubmit={async () => {
           if (errorKey === OFFLINE_FOR_MAINTENANCE) {
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
index 30a587df1300..5bc56817c9e2 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.test.js
@@ -5,6 +5,7 @@ import {
   renderWithProvider,
   createSwapsMockStore,
 } from '../../../../test/jest';
+import { SLIPPAGE } from '../../../../shared/constants/swaps';
 import AwaitingSwap from '.';
 
 const createProps = (customProps = {}) => {
@@ -14,7 +15,7 @@ const createProps = (customProps = {}) => {
     tokensReceived: 'tokens received:',
     submittingSwap: true,
     inputValue: 5,
-    maxSlippage: 3,
+    maxSlippage: SLIPPAGE.DEFAULT,
     ...customProps,
   };
 };
diff --git a/ui/pages/swaps/awaiting-swap/index.scss b/ui/pages/swaps/awaiting-swap/index.scss
index 0750ace6f58c..2dd865fd3419 100644
--- a/ui/pages/swaps/awaiting-swap/index.scss
+++ b/ui/pages/swaps/awaiting-swap/index.scss
@@ -20,10 +20,6 @@
     justify-content: center;
   }
 
-  a {
-    color: var(--color-primary-default);
-  }
-
   &__status-image {
     margin-top: 12px;
     margin-bottom: 16px;
@@ -64,7 +60,6 @@
     font-weight: bold;
   }
 
-  &__view-on-etherscan,
   &__support-link {
     color: var(--color-primary-default);
     margin-top: 24px;
@@ -75,20 +70,6 @@
     @include H6;
   }
 
-  &__view-on-etherscan {
-    @include H7;
-
-    transition: opacity 1s ease-in-out;
-  }
-
-  &__view-on-etherscan--invisible {
-    opacity: 0;
-  }
-
-  &__view-on-etherscan--visible {
-    opacity: 1;
-  }
-
   &__amount-and-symbol {
     color: var(--color-text-default);
     font-weight: bold;
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
deleted file mode 100644
index 89d31d36df2e..000000000000
--- a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/__snapshots__/view-on-ether-scan-link.test.js.snap
+++ /dev/null
@@ -1,21 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ViewOnEtherScanLink renders the component with a custom block explorer link 1`] = `
-<div>
-  <div
-    class="awaiting-swap__view-on-etherscan awaiting-swap__view-on-etherscan--visible"
-  >
-    View Swap at custom-blockchain.explorer
-  </div>
-</div>
-`;
-
-exports[`ViewOnEtherScanLink renders the component with initial props 1`] = `
-<div>
-  <div
-    class="awaiting-swap__view-on-etherscan awaiting-swap__view-on-etherscan--visible"
-  >
-    View Swap on Etherscan
-  </div>
-</div>
-`;
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
deleted file mode 100644
index 6aa4a3347117..000000000000
--- a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './view-on-ether-scan-link';
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
deleted file mode 100644
index baa13ef02d1e..000000000000
--- a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import React, { useContext } from 'react';
-import PropTypes from 'prop-types';
-import classnames from 'classnames';
-import { I18nContext } from '../../../../contexts/i18n';
-import { getURLHostName } from '../../../../helpers/utils/util';
-import { MetaMetricsContext } from '../../../../contexts/metametrics';
-import { EVENT } from '../../../../../shared/constants/metametrics';
-
-export default function ViewOnEtherScanLink({
-  txHash,
-  blockExplorerUrl,
-  isCustomBlockExplorerUrl,
-}) {
-  const t = useContext(I18nContext);
-  const trackEvent = useContext(MetaMetricsContext);
-
-  return (
-    <div
-      className={classnames('awaiting-swap__view-on-etherscan', {
-        'awaiting-swap__view-on-etherscan--visible': txHash,
-        'awaiting-swap__view-on-etherscan--invisible': !txHash,
-      })}
-      onClick={() => {
-        trackEvent({
-          event: 'Clicked Block Explorer Link',
-          category: EVENT.CATEGORIES.SWAPS,
-          properties: {
-            link_type: 'Transaction Block Explorer',
-            action: 'Swap Transaction',
-            block_explorer_domain: getURLHostName(blockExplorerUrl),
-          },
-        });
-        global.platform.openTab({ url: blockExplorerUrl });
-      }}
-    >
-      {isCustomBlockExplorerUrl
-        ? t('viewOnCustomBlockExplorer', [
-            t('blockExplorerSwapAction'),
-            getURLHostName(blockExplorerUrl),
-          ])
-        : t('viewOnEtherscan', [t('blockExplorerSwapAction')])}
-    </div>
-  );
-}
-
-ViewOnEtherScanLink.propTypes = {
-  txHash: PropTypes.string,
-  blockExplorerUrl: PropTypes.string,
-  isCustomBlockExplorerUrl: PropTypes.bool,
-};
diff --git a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js b/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
deleted file mode 100644
index 0fc96d87d68a..000000000000
--- a/ui/pages/swaps/awaiting-swap/view-on-ether-scan-link/view-on-ether-scan-link.test.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import React from 'react';
-
-import { renderWithProvider } from '../../../../../test/jest';
-import ViewOnEtherScanLink from '.';
-
-const createProps = (customProps = {}) => {
-  return {
-    txHash:
-      '0x58e5a0fc7fbc849eddc100d44e86276168a8c7baaa5604e44ba6f5eb8ba1b7eb',
-    blockExplorerUrl: 'https://block.explorer',
-    isCustomBlockExplorerUrl: false,
-    ...customProps,
-  };
-};
-
-describe('ViewOnEtherScanLink', () => {
-  it('renders the component with initial props', () => {
-    const { container, getByText } = renderWithProvider(
-      <ViewOnEtherScanLink {...createProps()} />,
-    );
-    expect(getByText('View Swap on Etherscan')).toBeInTheDocument();
-    expect(container).toMatchSnapshot();
-  });
-
-  it('renders the component with a custom block explorer link', () => {
-    const { container, getByText } = renderWithProvider(
-      <ViewOnEtherScanLink
-        {...createProps({
-          blockExplorerUrl: 'https://custom-blockchain.explorer',
-          isCustomBlockExplorerUrl: true,
-        })}
-      />,
-    );
-    expect(
-      getByText('View Swap at custom-blockchain.explorer'),
-    ).toBeInTheDocument();
-    expect(container).toMatchSnapshot();
-  });
-});
diff --git a/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap b/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
index 4314aea3a33e..b0551966d1c6 100644
--- a/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
+++ b/ui/pages/swaps/build-quote/__snapshots__/build-quote.test.js.snap
@@ -6,16 +6,16 @@ exports[`BuildQuote renders the component with initial props 1`] = `
   role="radiogroup"
 >
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button1"
     role="radio"
   >
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index 230b5aa4ec73..eac8f2a04bf8 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -95,7 +95,7 @@ import {
 
 import {
   resetSwapsPostFetchState,
-  removeToken,
+  ignoreTokens,
   setBackgroundSwapRouteState,
   clearSwapsQuotes,
   stopPollingForQuotes,
@@ -359,7 +359,12 @@ export default function BuildQuote({
   const onToSelect = useCallback(
     (token) => {
       if (destinationTokenAddedForSwap && token.address !== toAddress) {
-        dispatch(removeToken(toAddress));
+        dispatch(
+          ignoreTokens({
+            tokensToIgnore: toAddress,
+            dontShowLoadingIndicator: true,
+          }),
+        );
       }
       dispatch(setSwapToToken(token));
       setVerificationClicked(false);
diff --git a/ui/pages/swaps/build-quote/build-quote.stories.js b/ui/pages/swaps/build-quote/build-quote.stories.js
index 9783c63042fd..f3fd3d462ab4 100644
--- a/ui/pages/swaps/build-quote/build-quote.stories.js
+++ b/ui/pages/swaps/build-quote/build-quote.stories.js
@@ -1,204 +1,33 @@
-import React, { useState } from 'react';
-import { action } from '@storybook/addon-actions';
-import { boolean } from '@storybook/addon-knobs';
-import DropdownInputPair from '../dropdown-input-pair';
-import DropdownSearchList from '../dropdown-search-list';
+import React from 'react';
+import { shuffle } from 'lodash';
+import testData from '../../../../.storybook/test-data';
+import BuildQuote from './build-quote';
 
-const tokens = [
-  {
-    primaryLabel: 'MetaMark (META)',
-    name: 'MetaMark',
-    iconUrl: '.storybook/images/metamark.svg',
-    erc20: true,
-    decimals: 18,
-    symbol: 'META',
-    address: '0x617b3f8050a0BD94b6b1da02B4384eE5B4DF13F4',
-  },
-  {
-    primaryLabel: '0x (ZRX)',
-    name: '0x',
-    iconUrl: '.storybook/images/0x.svg',
-    erc20: true,
-    symbol: 'ZRX',
-    decimals: 18,
-    address: '0xE41d2489571d322189246DaFA5ebDe1F4699F498',
-  },
-  {
-    primaryLabel: 'AirSwap Token (AST)',
-    name: 'AirSwap Token',
-    iconUrl: '.storybook/images/AST.png',
-    erc20: true,
-    symbol: 'AST',
-    decimals: 4,
-    address: '0x27054b13b1B798B345b591a4d22e6562d47eA75a',
-  },
-  {
-    primaryLabel: 'Basic Attention Token (BAT)',
-    name: 'Basic Attention Token',
-    iconUrl: '.storybook/images/BAT_icon.svg',
-    erc20: true,
-    symbol: 'BAT',
-    decimals: 18,
-    address: '0x0D8775F648430679A709E98d2b0Cb6250d2887EF',
-  },
-  {
-    primaryLabel: 'Civil Token (CVL)',
-    name: 'Civil Token',
-    iconUrl: '.storybook/images/CVL_token.svg',
-    erc20: true,
-    symbol: 'CVL',
-    decimals: 18,
-    address: '0x01FA555c97D7958Fa6f771f3BbD5CCD508f81e22',
-  },
-  {
-    primaryLabel: 'Gladius (GLA)',
-    name: 'Gladius',
-    iconUrl: '.storybook/images/gladius.svg',
-    erc20: true,
-    symbol: 'GLA',
-    decimals: 8,
-    address: '0x71D01dB8d6a2fBEa7f8d434599C237980C234e4C',
-  },
-  {
-    primaryLabel: 'Gnosis Token (GNO)',
-    name: 'Gnosis Token',
-    iconUrl: '.storybook/images/gnosis.svg',
-    erc20: true,
-    symbol: 'GNO',
-    decimals: 18,
-    address: '0x6810e776880C02933D47DB1b9fc05908e5386b96',
-  },
-  {
-    primaryLabel: 'OmiseGO (OMG)',
-    name: 'OmiseGO',
-    iconUrl: '.storybook/images/omg.jpg',
-    erc20: true,
-    symbol: 'OMG',
-    decimals: 18,
-    address: '0xd26114cd6EE289AccF82350c8d8487fedB8A0C07',
-  },
-  {
-    primaryLabel: 'Sai Stablecoin v1.0 (SAI)',
-    name: 'Sai Stablecoin v1.0',
-    iconUrl: '.storybook/images/sai.svg',
-    erc20: true,
-    symbol: 'SAI',
-    decimals: 18,
-    address: '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359',
-  },
-  {
-    primaryLabel: 'Tether USD (USDT)',
-    name: 'Tether USD',
-    iconUrl: '.storybook/images/tether_usd.png',
-    erc20: true,
-    symbol: 'USDT',
-    decimals: 6,
-    address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
-  },
-  {
-    primaryLabel: 'WednesdayCoin (WED)',
-    name: 'WednesdayCoin',
-    iconUrl: '.storybook/images/wed.png',
-    erc20: true,
-    symbol: 'WED',
-    decimals: 18,
-    address: '0x7848ae8F19671Dc05966dafBeFbBbb0308BDfAbD',
-  },
-  {
-    primaryLabel: 'Wrapped BTC (WBTC)',
-    name: 'Wrapped BTC',
-    iconUrl: '.storybook/images/wbtc.png',
-    erc20: true,
-    symbol: 'WBTC',
-    decimals: 8,
-    address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-  },
-];
-
-const tokensToSearch = tokens.map((token) => ({
-  ...token,
-  primaryLabel: token.symbol,
-  secondaryLabel: token.name,
-  rightPrimaryLabel: `${(Math.random() * 100).toFixed(
-    Math.floor(Math.random() * 6),
-  )} ${token.symbol}`,
-  rightSecondaryLabel: `$${(Math.random() * 1000).toFixed(2)}`,
-}));
+const tokenValuesArr = shuffle(testData.metamask.tokenList);
 
 export default {
   title: 'Pages/Swaps/BuildQuote',
   id: __filename,
+  argTypes: {
+    ethBalance: {
+      control: { type: 'text' },
+    },
+    selectedAccountAddress: {
+      control: { type: 'text' },
+    },
+    shuffledTokensList: { control: 'object' },
+  },
+  args: {
+    ethBalance: '0x8',
+    selectedAccountAddress: '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
+    shuffledTokensList: tokenValuesArr,
+  },
 };
 
-export const DefaultStory = () => {
-  const [inputValue, onInputChange] = useState(null);
-  const [selectedFromToken, setSelectedFromToken] = useState(null);
-  const formattedSwapFromFiatValue = `$${(Number(inputValue) * 4).toFixed(2)}`;
-  const loading = boolean('loading', false);
-  const selectedFromTokenIsNull = boolean('selectedFromTokenIsNull', false);
+export const DefaultStory = (args) => {
   return (
     <>
-      <h1>NOT ACTUAL COMPONENT</h1>
-
-      <div
-        style={{
-          height: '415px',
-          width: '357px',
-          border: '1px solid grey',
-          paddingLeft: '24px',
-          paddingRight: '24px',
-          overflow: 'hidden',
-        }}
-      >
-        <div className="build-quote">
-          <div className="build-quote__dropdown-input-pair-header">
-            <div className="build-quote__input-label">Swap from</div>
-            <div
-              className="build-quote__max-button"
-              onClick={action('clickedMax')}
-            >
-              Max
-            </div>
-          </div>
-          <DropdownInputPair
-            itemsToSearch={tokensToSearch}
-            onInputChange={onInputChange}
-            inputValue={inputValue}
-            leftValue={formattedSwapFromFiatValue}
-            onSelect={setSelectedFromToken}
-            selectedItem={selectedFromTokenIsNull ? null : selectedFromToken}
-            maxListItems={30}
-            loading={loading}
-            hideItemIf={(tokenListItem) => tokenListItem.decimals !== 18}
-            selectPlaceHolderText="Select"
-          />
-          <div className="build-quote__swap-arrows-row">
-            <button className="build-quote__swap-arrows">
-              <i className="fa fa-arrow-up" title="swapSwapSwitch" />
-              <i className="fa fa-arrow-down" title="swapSwapSwitch" />
-            </button>
-          </div>
-          <div className="build-quote__dropdown-swap-to-header">
-            <div className="build-quote__input-label">Swap to</div>
-          </div>
-          <DropdownSearchList
-            itemsToSearch={tokensToSearch}
-            listContainerClassName="build-quote__open-to-dropdown"
-            searchPlaceholderText="Search for a token"
-            fuseSearchKeys={[
-              { name: 'name', weight: 0.499 },
-              { name: 'symbol', weight: 0.499 },
-              { name: 'address', weight: 0.002 },
-            ]}
-            maxListItems={30}
-            onSelect={action('onToSelect')}
-            selectPlaceHolderText="Select a token"
-            loading={loading}
-            hideRightLabels
-            defaultToAll
-          />
-        </div>
-      </div>
+      <BuildQuote {...args} />
     </>
   );
 };
diff --git a/ui/pages/swaps/build-quote/build-quote.test.js b/ui/pages/swaps/build-quote/build-quote.test.js
index 12f1b27bc452..5ea33a674a0c 100644
--- a/ui/pages/swaps/build-quote/build-quote.test.js
+++ b/ui/pages/swaps/build-quote/build-quote.test.js
@@ -22,7 +22,7 @@ const createProps = (customProps = {}) => {
 
 setBackgroundConnection({
   resetPostFetchState: jest.fn(),
-  removeToken: jest.fn(),
+  ignoreTokens: jest.fn(),
   setBackgroundSwapRouteState: jest.fn(),
   clearSwapsQuotes: jest.fn(),
   stopPollingForQuotes: jest.fn(),
diff --git a/ui/pages/swaps/build-quote/index.scss b/ui/pages/swaps/build-quote/index.scss
index e062d492d599..bf28abb1aeae 100644
--- a/ui/pages/swaps/build-quote/index.scss
+++ b/ui/pages/swaps/build-quote/index.scss
@@ -110,7 +110,7 @@
   &__open-dropdown,
   &__open-to-dropdown {
     max-height: 330px;
-    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
     position: absolute;
     width: 100%;
   }
diff --git a/ui/pages/swaps/create-new-swap/create-new-swap.js b/ui/pages/swaps/create-new-swap/create-new-swap.js
new file mode 100644
index 000000000000..2739085497ac
--- /dev/null
+++ b/ui/pages/swaps/create-new-swap/create-new-swap.js
@@ -0,0 +1,47 @@
+import React, { useContext } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import { useHistory } from 'react-router-dom';
+import isEqual from 'lodash/isEqual';
+
+import Box from '../../../components/ui/box';
+import { I18nContext } from '../../../contexts/i18n';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { EVENT } from '../../../../shared/constants/metametrics';
+import {
+  navigateBackToBuildQuote,
+  setSwapsFromToken,
+} from '../../../ducks/swaps/swaps';
+import { DEFAULT_ROUTE } from '../../../helpers/constants/routes';
+import { getSwapsDefaultToken } from '../../../selectors';
+
+export default function CreateNewSwap({ sensitiveTrackingProperties }) {
+  const t = useContext(I18nContext);
+  const trackEvent = useContext(MetaMetricsContext);
+  const dispatch = useDispatch();
+  const history = useHistory();
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
+
+  return (
+    <Box marginBottom={3} className="create-new-swap">
+      <button
+        onClick={async () => {
+          trackEvent({
+            event: 'Make Another Swap',
+            category: EVENT.CATEGORIES.SWAPS,
+            sensitiveProperties: sensitiveTrackingProperties,
+          });
+          history.push(DEFAULT_ROUTE); // It cleans up Swaps state.
+          await dispatch(navigateBackToBuildQuote(history));
+          dispatch(setSwapsFromToken(defaultSwapsToken));
+        }}
+      >
+        {t('makeAnotherSwap')}
+      </button>
+    </Box>
+  );
+}
+
+CreateNewSwap.propTypes = {
+  sensitiveTrackingProperties: PropTypes.object.isRequired,
+};
diff --git a/ui/pages/swaps/create-new-swap/create-new-swap.test.js b/ui/pages/swaps/create-new-swap/create-new-swap.test.js
new file mode 100644
index 000000000000..53835efff221
--- /dev/null
+++ b/ui/pages/swaps/create-new-swap/create-new-swap.test.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+
+import {
+  renderWithProvider,
+  createSwapsMockStore,
+} from '../../../../test/jest';
+import CreateNewSwap from '.';
+
+const createProps = (customProps = {}) => {
+  return {
+    sensitiveProperties: {},
+    ...customProps,
+  };
+};
+
+describe('CreateNewSwap', () => {
+  it('renders the component with initial props', () => {
+    const store = configureMockStore()(createSwapsMockStore());
+    const props = createProps();
+    const { getByText } = renderWithProvider(
+      <CreateNewSwap {...props} />,
+      store,
+    );
+    expect(getByText('Create a new swap')).toBeInTheDocument();
+  });
+});
diff --git a/ui/pages/swaps/create-new-swap/index.js b/ui/pages/swaps/create-new-swap/index.js
new file mode 100644
index 000000000000..d9e08ef8ba30
--- /dev/null
+++ b/ui/pages/swaps/create-new-swap/index.js
@@ -0,0 +1 @@
+export { default } from './create-new-swap';
diff --git a/ui/pages/swaps/create-new-swap/index.scss b/ui/pages/swaps/create-new-swap/index.scss
new file mode 100644
index 000000000000..fb7beecf5687
--- /dev/null
+++ b/ui/pages/swaps/create-new-swap/index.scss
@@ -0,0 +1,8 @@
+.create-new-swap {
+  button {
+    @include H5;
+
+    color: var(--color-primary-default);
+    background-color: transparent;
+  }
+}
diff --git a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
index f8c81626477b..d65d50117b62 100644
--- a/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
+++ b/ui/pages/swaps/dropdown-search-list/dropdown-search-list.js
@@ -154,9 +154,7 @@ export default function DropdownSearchList({
     SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
 
-  const blockExplorerLabel = rpcPrefs.blockExplorerUrl
-    ? getURLHostName(blockExplorerLink)
-    : t('etherscan');
+  const blockExplorerHostName = getURLHostName(blockExplorerLink);
 
   const importTokenProps = {
     onImportTokenCloseClick,
@@ -228,15 +226,14 @@ export default function DropdownSearchList({
               ) : (
                 <div className="dropdown-search-list__placeholder">
                   {t('swapBuildQuotePlaceHolderText', [searchQuery])}
-                  <div
-                    tabIndex="0"
-                    className="searchable-item-list__item searchable-item-list__item--add-token"
-                    key="searchable-item-list-item-last"
-                  >
-                    <ActionableMessage
-                      message={
-                        blockExplorerLink &&
-                        t('addCustomTokenByContractAddress', [
+                  {blockExplorerLink && (
+                    <div
+                      tabIndex="0"
+                      className="searchable-item-list__item searchable-item-list__item--add-token"
+                      key="searchable-item-list-item-last"
+                    >
+                      <ActionableMessage
+                        message={t('addCustomTokenByContractAddress', [
                           <a
                             key="dropdown-search-list__etherscan-link"
                             onClick={() => {
@@ -246,9 +243,7 @@ export default function DropdownSearchList({
                                 properties: {
                                   link_type: 'Token Tracker',
                                   action: 'Verify Contract Address',
-                                  block_explorer_domain: getURLHostName(
-                                    blockExplorerLink,
-                                  ),
+                                  block_explorer_domain: blockExplorerHostName,
                                 },
                               });
                               global.platform.openTab({
@@ -258,12 +253,12 @@ export default function DropdownSearchList({
                             target="_blank"
                             rel="noopener noreferrer"
                           >
-                            {blockExplorerLabel}
+                            {blockExplorerHostName}
                           </a>,
-                        ])
-                      }
-                    />
-                  </div>
+                        ])}
+                      />
+                    </div>
+                  )}
                 </div>
               )
             }
diff --git a/ui/pages/swaps/dropdown-search-list/index.scss b/ui/pages/swaps/dropdown-search-list/index.scss
index 711fd3f3155c..18a9134c0c7f 100644
--- a/ui/pages/swaps/dropdown-search-list/index.scss
+++ b/ui/pages/swaps/dropdown-search-list/index.scss
@@ -18,7 +18,7 @@
   }
 
   &--open {
-    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18); /* TODO! */
+    box-shadow: var(--shadow-size-sm) var(--color-shadow-default);
     border: 1px solid var(--color-border-default);
   }
 
@@ -91,7 +91,7 @@
   }
 
   &__search-list--open {
-    box-shadow: 0 0 14px rgba(0, 0, 0, 0.18);
+    box-shadow: var(--shadow-size-md) var(--color-shadow-default);
     border: 1px solid var(--color-border-muted);
   }
 
diff --git a/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap b/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
index c07a79d6c578..019965e73101 100644
--- a/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
+++ b/ui/pages/swaps/exchange-rate-display/__snapshots__/exchange-rate-display.test.js.snap
@@ -36,7 +36,7 @@ exports[`ExchangeRateDisplay renders the component with initial props 1`] = `
       >
         <path
           d="M4.15294 4.38514H9.99223L8.50853 5.86884C8.30421 6.07297 8.30421 6.40418 8.50853 6.60869C8.61069 6.71085 8.74443 6.76203 8.87836 6.76203C9.01229 6.76203 9.14603 6.71085 9.24819 6.60869L11.6249 4.23219C11.649 4.20803 11.6707 4.1814 11.6899 4.15305C11.6947 4.14563 11.6981 4.13726 11.7025 4.12965C11.7154 4.10815 11.7282 4.08646 11.7381 4.06325C11.7426 4.05222 11.7447 4.04043 11.7487 4.0292C11.7558 4.00827 11.7636 3.98754 11.7681 3.96547C11.775 3.93161 11.7786 3.89717 11.7786 3.86198C11.7786 3.82678 11.775 3.79235 11.7681 3.75849C11.7638 3.73642 11.756 3.71568 11.7487 3.69476C11.7447 3.68353 11.7428 3.67174 11.7381 3.6607C11.7282 3.63749 11.7156 3.616 11.7025 3.59431C11.6981 3.5867 11.6947 3.57833 11.6899 3.57091C11.6707 3.54256 11.649 3.51593 11.6249 3.49177L9.24876 1.11564C9.04444 0.911322 8.71342 0.911322 8.50891 1.11564C8.30459 1.31977 8.30459 1.65098 8.50891 1.85549L9.99223 3.339H4.15294C2.22978 3.339 0.665039 4.90374 0.665039 6.8269C0.665039 7.11588 0.899227 7.35007 1.1882 7.35007C1.47718 7.35007 1.71137 7.11588 1.71137 6.8269C1.71137 5.48037 2.80659 4.38514 4.15294 4.38514ZM12.2066 6.57445C11.9177 6.57445 11.6835 6.80864 11.6835 7.09762C11.6835 8.44396 10.5883 9.53919 9.24191 9.53919H3.40262L4.88632 8.05549C5.09064 7.85136 5.09064 7.52014 4.88632 7.31563C4.682 7.11112 4.35098 7.11131 4.14647 7.31563L1.76977 9.69233C1.74561 9.71649 1.72393 9.74312 1.70471 9.77147C1.70015 9.7787 1.69691 9.78669 1.69273 9.79392C1.6796 9.81561 1.66647 9.83748 1.65677 9.86126C1.6524 9.87211 1.6503 9.88371 1.64631 9.89475C1.63927 9.91586 1.63128 9.93679 1.62671 9.95905C1.61986 9.99291 1.61625 10.0273 1.61625 10.0625C1.61625 10.0977 1.61986 10.1322 1.62671 10.166C1.63109 10.1883 1.63908 10.2092 1.64631 10.2303C1.6503 10.2414 1.65221 10.253 1.65677 10.2638C1.66666 10.2874 1.6796 10.3093 1.69273 10.3312C1.69691 10.3384 1.70015 10.3464 1.70471 10.3536C1.72393 10.382 1.74561 10.4086 1.76977 10.4328L4.14609 12.8091C4.24825 12.9112 4.38199 12.9624 4.51592 12.9624C4.64985 12.9624 4.78359 12.9112 4.88575 12.8091C5.09007 12.6049 5.09007 12.2737 4.88575 12.0692L3.40243 10.5857H9.24172C11.1649 10.5857 12.7296 9.02097 12.7296 7.09781C12.7298 6.80864 12.4956 6.57445 12.2066 6.57445Z"
-          fill="var(--color-icon-default)"
+          fill="var(--color-primary-default)"
         />
       </svg>
     </div>
diff --git a/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js b/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
index ffa0d9fab677..e9eb34c6cece 100644
--- a/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
+++ b/ui/pages/swaps/exchange-rate-display/exchange-rate-display.js
@@ -12,7 +12,7 @@ export default function ExchangeRateDisplay({
   secondaryTokenValue,
   secondaryTokenDecimals = 18,
   secondaryTokenSymbol,
-  arrowColor = 'var(--color-icon-default)',
+  arrowColor = 'var(--color-primary-default)',
   boldSymbols = true,
   className,
 }) {
diff --git a/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap b/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
index 85bc1b6b42ca..dea196ec9932 100644
--- a/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
+++ b/ui/pages/swaps/fee-card/__snapshots__/fee-card.test.js.snap
@@ -1,7 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FeeCard renders the component with EIP-1559 V2 enabled 1`] = `null`;
-
 exports[`FeeCard renders the component with EIP-1559 enabled 1`] = `null`;
 
 exports[`FeeCard renders the component with initial props 1`] = `null`;
diff --git a/ui/pages/swaps/fee-card/fee-card.js b/ui/pages/swaps/fee-card/fee-card.js
index f2451f6245c4..dfb6d9d5ab59 100644
--- a/ui/pages/swaps/fee-card/fee-card.js
+++ b/ui/pages/swaps/fee-card/fee-card.js
@@ -18,7 +18,6 @@ import {
   TYPOGRAPHY,
   FONT_WEIGHT,
 } from '../../../helpers/constants/design-system';
-import GasDetailsItemTitle from '../../../components/app/gas-details-item/gas-details-item-title';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
 import { EVENT } from '../../../../shared/constants/metametrics';
 
@@ -35,10 +34,7 @@ export default function FeeCard({
   numberOfQuotes,
   onQuotesClick,
   chainId,
-  smartTransactionsOptInStatus,
-  smartTransactionsEnabled,
   isBestQuote,
-  supportsEIP1559V2 = false,
 }) {
   const t = useContext(I18nContext);
 
@@ -72,57 +68,49 @@ export default function FeeCard({
     <div className="fee-card">
       <div className="fee-card__main">
         <TransactionDetail
-          disableEditGasFeeButton={
-            smartTransactionsEnabled && smartTransactionsOptInStatus
-          }
+          disableEditGasFeeButton
           rows={[
             <TransactionDetailItem
               key="gas-item"
               detailTitle={
-                supportsEIP1559V2 &&
-                (!smartTransactionsEnabled || !smartTransactionsOptInStatus) ? (
-                  <GasDetailsItemTitle />
-                ) : (
-                  <>
-                    {t('transactionDetailGasHeading')}
-                    <InfoTooltip
-                      position="top"
-                      contentText={
-                        <>
-                          <p className="fee-card__info-tooltip-paragraph">
-                            {t('swapGasFeesSummary', [
-                              getTranslatedNetworkName(),
-                            ])}
-                          </p>
-                          <p className="fee-card__info-tooltip-paragraph">
-                            {t('swapGasFeesDetails')}
-                          </p>
-                          <p className="fee-card__info-tooltip-paragraph">
-                            <a
-                              className="fee-card__link"
-                              onClick={() => {
-                                trackEvent({
-                                  event: 'Clicked "Gas Fees: Learn More" Link',
-                                  category: EVENT.CATEGORIES.SWAPS,
-                                });
-                                global.platform.openTab({
-                                  url: GAS_FEES_LEARN_MORE_URL,
-                                });
-                              }}
-                              target="_blank"
-                              rel="noopener noreferrer"
-                            >
-                              {t('swapGasFeesLearnMore')}
-                            </a>
-                          </p>
-                        </>
-                      }
-                      containerClassName="fee-card__info-tooltip-content-container"
-                      wrapperClassName="fee-card__row-label fee-card__info-tooltip-container"
-                      wide
-                    />
-                  </>
-                )
+                <>
+                  {t('transactionDetailGasHeading')}
+                  <InfoTooltip
+                    position="top"
+                    contentText={
+                      <>
+                        <p className="fee-card__info-tooltip-paragraph">
+                          {t('swapGasFeesSummary', [
+                            getTranslatedNetworkName(),
+                          ])}
+                        </p>
+                        <p className="fee-card__info-tooltip-paragraph">
+                          {t('swapGasFeesDetails')}
+                        </p>
+                        <p className="fee-card__info-tooltip-paragraph">
+                          <a
+                            className="fee-card__link"
+                            onClick={() => {
+                              trackEvent({
+                                event: 'Clicked "Gas Fees: Learn More" Link',
+                                category: EVENT.CATEGORIES.SWAPS,
+                              });
+                              global.platform.openTab({
+                                url: GAS_FEES_LEARN_MORE_URL,
+                              });
+                            }}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                          >
+                            {t('swapGasFeesLearnMore')}
+                          </a>
+                        </p>
+                      </>
+                    }
+                    containerClassName="fee-card__info-tooltip-content-container"
+                    wrapperClassName="fee-card__row-label fee-card__info-tooltip-container"
+                  />
+                </>
               }
               detailText={primaryFee.fee}
               detailTotal={secondaryFee.fee}
@@ -209,8 +197,5 @@ FeeCard.propTypes = {
   onQuotesClick: PropTypes.func.isRequired,
   numberOfQuotes: PropTypes.number.isRequired,
   chainId: PropTypes.string.isRequired,
-  smartTransactionsOptInStatus: PropTypes.bool,
-  smartTransactionsEnabled: PropTypes.bool,
   isBestQuote: PropTypes.bool.isRequired,
-  supportsEIP1559V2: PropTypes.bool,
 };
diff --git a/ui/pages/swaps/fee-card/fee-card.test.js b/ui/pages/swaps/fee-card/fee-card.test.js
index 218fba458f5e..5caea9a71d0e 100644
--- a/ui/pages/swaps/fee-card/fee-card.test.js
+++ b/ui/pages/swaps/fee-card/fee-card.test.js
@@ -9,23 +9,15 @@ import {
   setBackgroundConnection,
   MOCKS,
 } from '../../../../test/jest';
-import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
 import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network';
 
-import {
-  checkNetworkAndAccountSupports1559,
-  getEIP1559V2Enabled,
-  getPreferences,
-  getSelectedAccount,
-} from '../../../selectors';
+import { checkNetworkAndAccountSupports1559 } from '../../../selectors';
 import {
   getGasEstimateType,
   getGasFeeEstimates,
   getIsGasEstimatesLoading,
 } from '../../../ducks/metamask/metamask';
-import { GasFeeContextProvider } from '../../../contexts/gasFee';
 import { TRANSACTION_ENVELOPE_TYPE_NAMES } from '../../../helpers/constants/transactions';
-import { useGasFeeEstimates } from '../../../hooks/useGasFeeEstimates';
 
 import FeeCard from '.';
 
@@ -153,56 +145,4 @@ describe('FeeCard', () => {
     expect(getByText(`: ${props.secondaryFee.maxFee}`)).toBeInTheDocument();
     expect(queryByTestId('fee-card__edit-link')).not.toBeInTheDocument();
   });
-
-  it('renders the component with EIP-1559 V2 enabled', () => {
-    useGasFeeEstimates.mockImplementation(() => ({ gasFeeEstimates: {} }));
-    useSelector.mockImplementation((selector) => {
-      if (selector === getPreferences) {
-        return {
-          useNativeCurrencyAsPrimaryCurrency: true,
-        };
-      }
-      if (selector === getEIP1559V2Enabled) {
-        return true;
-      }
-      if (selector === getSelectedAccount) {
-        return {
-          balance: '0x440aa47cc2556',
-        };
-      }
-      if (selector === checkNetworkAndAccountSupports1559) {
-        return true;
-      }
-      return undefined;
-    });
-
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const props = createProps({
-      networkAndAccountSupports1559: true,
-      maxPriorityFeePerGasDecGWEI: '3',
-      maxFeePerGasDecGWEI: '4',
-      supportsEIP1559V2: true,
-    });
-    const { getByText } = renderWithProvider(
-      <GasFeeContextProvider
-        transaction={{ txParams: {}, userFeeLevel: 'high' }}
-        editGasMode={EDIT_GAS_MODES.SWAPS}
-      >
-        <FeeCard {...props} />
-      </GasFeeContextProvider>,
-      store,
-    );
-    expect(getByText('Best of 6 quotes.')).toBeInTheDocument();
-    expect(getByText('Gas')).toBeInTheDocument();
-    expect(getByText('(estimated)')).toBeInTheDocument();
-    expect(getByText('Swap suggested')).toBeInTheDocument();
-    expect(getByText('Max fee')).toBeInTheDocument();
-    expect(getByText(props.primaryFee.fee)).toBeInTheDocument();
-    expect(getByText(props.secondaryFee.fee)).toBeInTheDocument();
-    expect(getByText(`: ${props.secondaryFee.maxFee}`)).toBeInTheDocument();
-    expect(getByText('Includes a 0.875% MetaMask fee.')).toBeInTheDocument();
-    expect(
-      document.querySelector('.fee-card__top-bordered-row'),
-    ).toMatchSnapshot();
-  });
 });
diff --git a/ui/pages/swaps/import-token/import-token.js b/ui/pages/swaps/import-token/import-token.js
index 88a0645a84f5..baa0ab9e7eae 100644
--- a/ui/pages/swaps/import-token/import-token.js
+++ b/ui/pages/swaps/import-token/import-token.js
@@ -47,7 +47,9 @@ export default function ImportToken({
       footer={ImportTokenModalFooter}
     >
       <Box
-        padding={[0, 6, 4, 6]}
+        paddingRight={6}
+        paddingBottom={4}
+        paddingLeft={4}
         alignItems={ALIGN_ITEMS.CENTER}
         display={DISPLAY.FLEX}
         className="import-token"
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index bae9e6cbde38..861d0292e7df 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -76,7 +76,7 @@ import {
 import {
   resetBackgroundSwapsState,
   setSwapsTokens,
-  removeToken,
+  ignoreTokens,
   setBackgroundSwapRouteState,
   setSwapsErrorKey,
 } from '../../store/actions';
@@ -157,11 +157,21 @@ export default function Swap() {
   const showSmartTransactionsErrorMessage =
     currentSmartTransactionsError && !smartTransactionsErrorMessageDismissed;
 
-  if (networkAndAccountSupports1559) {
-    // This will pre-load gas fees before going to the View Quote page.
-    // eslint-disable-next-line react-hooks/rules-of-hooks
-    useGasFeeEstimates();
-  }
+  useEffect(() => {
+    const leaveSwaps = async () => {
+      await dispatch(prepareToLeaveSwaps());
+      // We need to wait until "prepareToLeaveSwaps" is done, because otherwise
+      // a user would be redirected from DEFAULT_ROUTE back to Swaps.
+      history.push(DEFAULT_ROUTE);
+    };
+
+    if (!isSwapsChain) {
+      leaveSwaps();
+    }
+  }, [isSwapsChain, dispatch, history]);
+
+  // This will pre-load gas fees before going to the View Quote page.
+  useGasFeeEstimates();
 
   const {
     balance: ethBalance,
@@ -204,7 +214,12 @@ export default function Swap() {
         destinationTokenAddedForSwap &&
         (!isAwaitingSwapRoute || conversionError)
       ) {
-        dispatch(removeToken(destinationTokenInfo?.address));
+        dispatch(
+          ignoreTokens({
+            tokensToIgnore: destinationTokenInfo?.address,
+            dontShowLoadingIndicator: true,
+          }),
+        );
       }
     };
   }, [
@@ -223,6 +238,9 @@ export default function Swap() {
 
   // eslint-disable-next-line
   useEffect(() => {
+    if (!isSwapsChain) {
+      return undefined;
+    }
     fetchTokens(chainId)
       .then((tokens) => {
         dispatch(setSwapsTokens(tokens));
@@ -240,7 +258,7 @@ export default function Swap() {
     return () => {
       dispatch(prepareToLeaveSwaps());
     };
-  }, [dispatch, chainId, networkAndAccountSupports1559]);
+  }, [dispatch, chainId, networkAndAccountSupports1559, isSwapsChain]);
 
   const hardwareWalletUsed = useSelector(isHardwareWallet);
   const hardwareWalletType = useSelector(getHardwareWalletType);
@@ -353,7 +371,9 @@ export default function Swap() {
   ]);
 
   if (!isSwapsChain) {
-    return <Redirect to={{ pathname: DEFAULT_ROUTE }} />;
+    // A user is being redirected outside of Swaps via the async "leaveSwaps" function above. In the meantime
+    // we have to prevent the code below this condition, which wouldn't work on an unsupported chain.
+    return <></>;
   }
 
   const isStxNotEnoughFundsError =
diff --git a/ui/pages/swaps/index.scss b/ui/pages/swaps/index.scss
index faa2e8b9e50c..4d2f8f6c9a5b 100644
--- a/ui/pages/swaps/index.scss
+++ b/ui/pages/swaps/index.scss
@@ -15,6 +15,8 @@
 @import 'swaps-footer/index';
 @import 'view-quote/index';
 @import 'import-token/index';
+@import 'create-new-swap/index';
+@import 'view-on-block-explorer/index';
 
 .swaps {
   display: flex;
@@ -48,7 +50,7 @@
       width: 460px;
       background: var(--color-background-default);
       border: 1px solid var(--color-border-muted);
-      box-shadow: 0 0 7px 0 rgba(0, 0, 0, 0.08);
+      box-shadow: var(--shadow-size-xs) var(--color-shadow-default);
       border-radius: 8px;
       height: 620px;
     }
diff --git a/ui/pages/swaps/main-quote-summary/README.mdx b/ui/pages/swaps/main-quote-summary/README.mdx
new file mode 100644
index 000000000000..75a8f89baf59
--- /dev/null
+++ b/ui/pages/swaps/main-quote-summary/README.mdx
@@ -0,0 +1,14 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+import MainQuoteSummary from '.';
+
+# MainQuoteSummary
+
+MainQuoteSummary displays the quote of a swap.
+
+<Canvas>
+  <Story id="ui-pages-swaps-main-quote-summary-main-quote-summary-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={MainQuoteSummary} />
\ No newline at end of file
diff --git a/ui/pages/swaps/main-quote-summary/main-quote-summary.js b/ui/pages/swaps/main-quote-summary/main-quote-summary.js
index ceab8ef75ea1..33a1f8fdcd82 100644
--- a/ui/pages/swaps/main-quote-summary/main-quote-summary.js
+++ b/ui/pages/swaps/main-quote-summary/main-quote-summary.js
@@ -93,7 +93,6 @@ export default function MainQuoteSummary({
               position="bottom"
               html={amountToDisplay}
               disabled={ellipsedAmountToDisplay === amountToDisplay}
-              theme="white"
             >
               <span
                 className="main-quote-summary__quote-large-number"
@@ -129,21 +128,54 @@ export default function MainQuoteSummary({
 }
 
 MainQuoteSummary.propTypes = {
+  /**
+   * The amount that will be sent in the smallest denomination.
+   * For example, wei is the smallest denomination for ether.
+   */
   sourceValue: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.instanceOf(BigNumber),
   ]).isRequired,
+
+  /**
+   * Maximum number of decimal places for the source token.
+   */
   sourceDecimals: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+
+  /**
+   * The ticker symbol for the source token.
+   */
   sourceSymbol: PropTypes.string.isRequired,
+
+  /**
+   * The amount that will be received in the smallest denomination.
+   * For example, wei is the smallest denomination for ether.
+   */
   destinationValue: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.instanceOf(BigNumber),
   ]).isRequired,
+
+  /**
+   * Maximum number of decimal places for the destination token.
+   */
   destinationDecimals: PropTypes.oneOfType([
     PropTypes.string,
     PropTypes.number,
   ]),
+
+  /**
+   * The ticker symbol for the destination token.
+   */
   destinationSymbol: PropTypes.string.isRequired,
+
+  /**
+   * The location of the source token icon file.
+   */
   sourceIconUrl: PropTypes.string,
+
+  /**
+   * The location of the destination token icon file.
+   */
   destinationIconUrl: PropTypes.string,
 };
diff --git a/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js b/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
index 51dd381826bb..7648e3e0c847 100644
--- a/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
+++ b/ui/pages/swaps/main-quote-summary/main-quote-summary.stories.js
@@ -1,13 +1,55 @@
 import React from 'react';
-import { text, number } from '@storybook/addon-knobs';
+import README from './README.mdx';
 import MainQuoteSummary from './main-quote-summary';
 
 export default {
   title: 'Pages/Swaps/MainQuoteSummary',
   id: __filename,
+  component: MainQuoteSummary,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    sourceValue: {
+      control: 'text',
+    },
+    sourceDecimals: {
+      control: 'number',
+    },
+    sourceSymbol: {
+      control: 'text',
+    },
+    destinationValue: {
+      control: 'text',
+    },
+    destinationDecimals: {
+      control: 'number',
+    },
+    destinationSymbol: {
+      control: 'text',
+    },
+    sourceIconUrl: {
+      control: 'text',
+    },
+    destinationIconUrl: {
+      control: 'text',
+    },
+  },
+  args: {
+    sourceValue: '2000000000000000000',
+    sourceDecimals: 18,
+    sourceSymbol: 'ETH',
+    destinationValue: '200000000000000000',
+    destinationDecimals: 18,
+    destinationSymbol: 'ABC',
+    sourceIconUrl: '.storybook/images/metamark.svg',
+    destinationIconUrl: '.storybook/images/sai.svg',
+  },
 };
 
-export const DefaultStory = () => {
+export const DefaultStory = (args) => {
   return (
     <div
       style={{
@@ -17,16 +59,7 @@ export const DefaultStory = () => {
         padding: '24px',
       }}
     >
-      <MainQuoteSummary
-        sourceValue={text('sourceValue', '2000000000000000000')}
-        sourceDecimals={number('sourceDecimals', 18)}
-        sourceSymbol={text('sourceSymbol', 'ETH')}
-        destinationValue={text('destinationValue', '200000000000000000')}
-        destinationDecimals={number('destinationDecimals', 18)}
-        destinationSymbol={text('destinationSymbol', 'ABC')}
-        sourceIconUrl=".storybook/images/metamark.svg"
-        destinationIconUrl=".storybook/images/sai.svg"
-      />
+      <MainQuoteSummary {...args} />
     </div>
   );
 };
diff --git a/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap b/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
index b0ea92102c4e..347fcbec7bbe 100644
--- a/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
+++ b/ui/pages/swaps/searchable-item-list/__snapshots__/searchable-item-list.test.js.snap
@@ -11,9 +11,17 @@ exports[`SearchableItemList renders the component with initial props 1`] = `
       class="MuiInputAdornment-root MuiInputAdornment-positionStart"
       style="margin-right: 12px;"
     >
-      <i
-        class="fa fa-search fa-lg"
-      />
+      <svg
+        fill="var(--color-icon-muted)"
+        height="20"
+        viewBox="0 0 512 512"
+        width="20"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="m235 427c-51 0-100-21-136-57-36-36-56-84-56-135 0-26 5-51 14-74 10-23 24-44 42-62 18-18 39-32 62-42 23-9 48-14 74-14 25 0 50 5 73 14 23 10 45 24 62 42 18 18 32 39 42 62 10 23 15 48 15 74 0 43-15 86-42 119l78 79c2 2 4 4 5 7 1 2 1 5 1 8 0 3 0 6-1 8-1 3-3 5-5 7-2 2-4 4-7 5-2 1-5 1-8 1-3 0-6 0-8-1-3-1-5-3-7-5l-79-78c-33 27-76 42-119 42z m0-43c82 0 149-67 149-149 0-83-67-150-149-150-83 0-150 67-150 150 0 82 67 149 150 149z"
+        />
+      </svg>
     </div>
     <input
       aria-invalid="false"
diff --git a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
index 01ab42c03ee6..34d2ed87f061 100644
--- a/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
+++ b/ui/pages/swaps/searchable-item-list/item-list/item-list.component.js
@@ -37,9 +37,7 @@ export default function ItemList({
     SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
     null;
 
-  const blockExplorerLabel = rpcPrefs.blockExplorerUrl
-    ? getURLHostName(blockExplorerLink)
-    : t('etherscan');
+  const blockExplorerHostName = getURLHostName(blockExplorerLink);
   const trackEvent = useContext(MetaMetricsContext);
 
   // If there is a token for import based on a contract address, it's the only one in the list.
@@ -141,41 +139,36 @@ export default function ItemList({
             </div>
           );
         })}
-        {!hasTokenForImport && (
+        {!hasTokenForImport && blockExplorerLink && (
           <div
             tabIndex="0"
             className="searchable-item-list__item searchable-item-list__item--add-token"
             key="searchable-item-list-item-last"
           >
             <ActionableMessage
-              message={
-                blockExplorerLink &&
-                t('addCustomTokenByContractAddress', [
-                  <a
-                    key="searchable-item-list__etherscan-link"
-                    onClick={() => {
-                      trackEvent({
-                        event: 'Clicked Block Explorer Link',
-                        category: EVENT.CATEGORIES.SWAPS,
-                        properties: {
-                          link_type: 'Token Tracker',
-                          action: 'Verify Contract Address',
-                          block_explorer_domain: getURLHostName(
-                            blockExplorerLink,
-                          ),
-                        },
-                      });
-                      global.platform.openTab({
-                        url: blockExplorerLink,
-                      });
-                    }}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                  >
-                    {blockExplorerLabel}
-                  </a>,
-                ])
-              }
+              message={t('addCustomTokenByContractAddress', [
+                <a
+                  key="searchable-item-list__etherscan-link"
+                  onClick={() => {
+                    trackEvent({
+                      event: 'Clicked Block Explorer Link',
+                      category: EVENT.CATEGORIES.SWAPS,
+                      properties: {
+                        link_type: 'Token Tracker',
+                        action: 'Verify Contract Address',
+                        block_explorer_domain: blockExplorerHostName,
+                      },
+                    });
+                    global.platform.openTab({
+                      url: blockExplorerLink,
+                    });
+                  }}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                >
+                  {blockExplorerHostName}
+                </a>,
+              ])}
             />
           </div>
         )}
diff --git a/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js b/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
index afab74664091..6e67e00cdffe 100644
--- a/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
+++ b/ui/pages/swaps/searchable-item-list/list-item-search/list-item-search.component.js
@@ -9,13 +9,11 @@ import { usePrevious } from '../../../../hooks/usePrevious';
 import { isValidHexAddress } from '../../../../../shared/modules/hexstring-utils';
 import { fetchToken } from '../../swaps.util';
 import { getCurrentChainId } from '../../../../selectors/selectors';
+import SearchIcon from '../../../../components/ui/icon/search-icon';
 
 const renderAdornment = () => (
   <InputAdornment position="start" style={{ marginRight: '12px' }}>
-    <i
-      className="fa fa-search fa-lg"
-      style={{ color: 'var(--color-icon-muted)' }}
-    />
+    <SearchIcon size={20} color="var(--color-icon-muted)" />
   </InputAdornment>
 );
 
diff --git a/ui/pages/swaps/searchable-item-list/searchable-item-list.js b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
index 318c2094eb27..d4cdaaf1189c 100644
--- a/ui/pages/swaps/searchable-item-list/searchable-item-list.js
+++ b/ui/pages/swaps/searchable-item-list/searchable-item-list.js
@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useMemo, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import ItemList from './item-list';
 import ListItemSearch from './list-item-search';
@@ -22,7 +22,14 @@ export default function SearchableItemList({
 }) {
   const itemListRef = useRef();
 
-  const [results, setResults] = useState(defaultToAll ? itemsToSearch : []);
+  const initialResultsState = useMemo(() => {
+    return defaultToAll ? itemsToSearch : [];
+  }, [defaultToAll, itemsToSearch]);
+  const [results, setResults] = useState(initialResultsState);
+  useEffect(() => {
+    setResults(initialResultsState);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [initialResultsState.length]);
   const [searchQuery, setSearchQuery] = useState('');
 
   return (
diff --git a/ui/pages/swaps/select-quote-popover/index.scss b/ui/pages/swaps/select-quote-popover/index.scss
index 987a323b5ebe..e2e5bd829183 100644
--- a/ui/pages/swaps/select-quote-popover/index.scss
+++ b/ui/pages/swaps/select-quote-popover/index.scss
@@ -98,7 +98,7 @@
     &--selected {
       color: var(--color-primary-inverse);
       background: linear-gradient(90deg, var(--color-primary-default) 0%, var(--color-primary-alternative) 101.32%);
-      box-shadow: 0 10px 39px rgba(3, 125, 214, 0.15);
+      box-shadow: var(--shadow-size-lg) var(--color-shadow-default);
       border-radius: 8px;
       height: 64px;
 
@@ -246,7 +246,7 @@
     }
 
     &--orange {
-      background: var(--color-secondary-default);
+      background: var(--color-warning-default);
     }
 
     &--green {
diff --git a/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js b/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
index 1eaa997389d8..705cec1924c2 100644
--- a/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
+++ b/ui/pages/swaps/select-quote-popover/select-quote-popover.test.js
@@ -10,6 +10,7 @@ const createProps = (customProps = {}) => {
     swapToSymbol: 'ETH',
     initialAggId: 'initialAggId',
     onQuoteDetailsIsOpened: jest.fn(),
+    hideEstimatedGasFee: false,
     ...customProps,
   };
 };
diff --git a/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js b/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
index 1b594ba3cc4c..51a53b3bf0e9 100644
--- a/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
+++ b/ui/pages/swaps/select-quote-popover/sort-list/sort-list.test.js
@@ -10,6 +10,7 @@ jest.mock(
 
 const createProps = (customProps = {}) => {
   return {
+    hideEstimatedGasFee: false,
     selectedAggId: 'Agg2',
     onSelect: jest.fn(),
     onCaretClick: jest.fn(),
diff --git a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
index 47517ebf3444..34aebe6c49d4 100644
--- a/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
+++ b/ui/pages/swaps/slippage-buttons/__snapshots__/slippage-buttons.test.js.snap
@@ -21,16 +21,16 @@ exports[`SlippageButtons renders the component with initial props 2`] = `
   role="radiogroup"
 >
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button1"
     role="radio"
   >
@@ -68,16 +68,16 @@ exports[`SlippageButtons renders the component with the Smart Transaction opt-in
   role="radiogroup"
 >
   <button
-    aria-checked="true"
-    class="button-group__button radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button radio-button"
     data-testid="button-group__button0"
     role="radio"
   >
     2%
   </button>
   <button
-    aria-checked="false"
-    class="button-group__button radio-button"
+    aria-checked="true"
+    class="button-group__button radio-button button-group__button--active radio-button--active"
     data-testid="button-group__button1"
     role="radio"
   >
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
index b93ca1e527f2..78e117dfdec9 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.js
@@ -15,6 +15,7 @@ import {
   DISPLAY,
 } from '../../../helpers/constants/design-system';
 import { getTranslatedStxErrorMessage } from '../swaps.util';
+import { SLIPPAGE } from '../../../../shared/constants/swaps';
 
 export default function SlippageButtons({
   onSelect,
@@ -30,8 +31,7 @@ export default function SlippageButtons({
   const [customValue, setCustomValue] = useState(() => {
     if (
       typeof currentSlippage === 'number' &&
-      currentSlippage !== 2 &&
-      currentSlippage !== 3
+      !Object.values(SLIPPAGE).includes(currentSlippage)
     ) {
       return currentSlippage.toString();
     }
@@ -39,17 +39,17 @@ export default function SlippageButtons({
   });
   const [enteringCustomValue, setEnteringCustomValue] = useState(false);
   const [activeButtonIndex, setActiveButtonIndex] = useState(() => {
-    if (currentSlippage === 3) {
-      return 1;
-    } else if (currentSlippage === 2) {
-      return 0;
+    if (currentSlippage === SLIPPAGE.HIGH) {
+      return 1; // 3% slippage.
+    } else if (currentSlippage === SLIPPAGE.DEFAULT) {
+      return 0; // 2% slippage.
     } else if (typeof currentSlippage === 'number') {
-      return 2;
+      return 2; // Custom slippage.
     }
-    return 1; // Choose activeButtonIndex = 1 for 3% slippage by default.
+    return 0;
   });
   const [open, setOpen] = useState(() => {
-    return currentSlippage !== 3; // Only open Advanced Options by default if it's not default 3% slippage.
+    return currentSlippage !== SLIPPAGE.DEFAULT; // Only open Advanced Options by default if it's not default slippage.
   });
   const [inputRef, setInputRef] = useState(null);
 
@@ -133,20 +133,20 @@ export default function SlippageButtons({
                       setCustomValue('');
                       setEnteringCustomValue(false);
                       setActiveButtonIndex(0);
-                      onSelect(2);
+                      onSelect(SLIPPAGE.DEFAULT);
                     }}
                   >
-                    2%
+                    {t('swapSlippagePercent', [SLIPPAGE.DEFAULT])}
                   </Button>
                   <Button
                     onClick={() => {
                       setCustomValue('');
                       setEnteringCustomValue(false);
                       setActiveButtonIndex(1);
-                      onSelect(3);
+                      onSelect(SLIPPAGE.HIGH);
                     }}
                   >
-                    3%
+                    {t('swapSlippagePercent', [SLIPPAGE.HIGH])}
                   </Button>
                   <Button
                     className={classnames(
diff --git a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
index 232c00639099..aaf992930a60 100644
--- a/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
+++ b/ui/pages/swaps/slippage-buttons/slippage-buttons.test.js
@@ -7,7 +7,7 @@ const createProps = (customProps = {}) => {
   return {
     onSelect: jest.fn(),
     maxAllowedSlippage: 15,
-    currentSlippage: 2,
+    currentSlippage: 3,
     smartTransactionsEnabled: false,
     ...customProps,
   };
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 84c7a0fe8244..85cc42f25736 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.js
@@ -1,6 +1,7 @@
 import React, { useContext, useEffect, useState } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch, useSelector, shallowEqual } from 'react-redux';
 import { useHistory } from 'react-router-dom';
+import { getBlockExplorerLink } from '@metamask/etherscan-link';
 
 import { I18nContext } from '../../../contexts/i18n';
 import {
@@ -18,7 +19,14 @@ import {
 import {
   isHardwareWallet,
   getHardwareWalletType,
-} from '../../../selectors/selectors';
+  getCurrentChainId,
+  getUSDConversionRate,
+  conversionRateSelector,
+  getCurrentCurrency,
+  getRpcPrefsForCurrentProvider,
+} from '../../../selectors';
+import { SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP } from '../../../../shared/constants/swaps';
+import { getNativeCurrency } from '../../../ducks/metamask/metamask';
 import {
   DEFAULT_ROUTE,
   BUILD_QUOTE_ROUTE,
@@ -44,8 +52,13 @@ import { SMART_TRANSACTION_STATUSES } from '../../../../shared/constants/transac
 
 import SwapsFooter from '../swaps-footer';
 import { calcTokenAmount } from '../../../helpers/utils/token-util';
-import { showRemainingTimeInMinAndSec } from '../swaps.util';
+import {
+  showRemainingTimeInMinAndSec,
+  getFeeForSmartTransaction,
+} from '../swaps.util';
 import { MetaMetricsContext } from '../../../contexts/metametrics';
+import CreateNewSwap from '../create-new-swap';
+import ViewOnBlockExplorer from '../view-on-block-explorer';
 import SuccessIcon from './success-icon';
 import RevertedIcon from './reverted-icon';
 import CanceledIcon from './canceled-icon';
@@ -71,14 +84,26 @@ export default function SmartTransactionStatus() {
   const smartTransactionsOptInStatus = useSelector(
     getSmartTransactionsOptInStatus,
   );
+  const chainId = useSelector(getCurrentChainId);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider, shallowEqual);
   const swapsNetworkConfig = useSelector(getSwapsNetworkConfig);
   const smartTransactionsEnabled = useSelector(getSmartTransactionsEnabled);
   const currentSmartTransactionsEnabled = useSelector(
     getCurrentSmartTransactionsEnabled,
   );
+  const baseNetworkUrl =
+    rpcPrefs.blockExplorerUrl ??
+    SWAPS_CHAINID_DEFAULT_BLOCK_EXPLORER_URL_MAP[chainId] ??
+    null;
+  const nativeCurrencySymbol = useSelector(getNativeCurrency);
+  const conversionRate = useSelector(conversionRateSelector);
+  const USDConversionRate = useSelector(getUSDConversionRate);
+  const currentCurrency = useSelector(getCurrentCurrency);
+
   let smartTransactionStatus = SMART_TRANSACTION_STATUSES.PENDING;
   let latestSmartTransaction = {};
   let latestSmartTransactionUuid;
+  let cancellationFeeWei;
 
   if (currentSmartTransactions && currentSmartTransactions.length > 0) {
     latestSmartTransaction =
@@ -86,6 +111,8 @@ export default function SmartTransactionStatus() {
     latestSmartTransactionUuid = latestSmartTransaction?.uuid;
     smartTransactionStatus =
       latestSmartTransaction?.status || SMART_TRANSACTION_STATUSES.PENDING;
+    cancellationFeeWei =
+      latestSmartTransaction?.statusMetadata?.cancellationFeeWei;
   }
 
   const [timeLeftForPendingStxInSec, setTimeLeftForPendingStxInSec] = useState(
@@ -122,6 +149,7 @@ export default function SmartTransactionStatus() {
   const showCloseButtonOnly =
     isSmartTransactionPending ||
     smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS;
+  const txHash = latestSmartTransaction?.statusMetadata?.minedHash;
 
   useEffect(() => {
     trackEvent({
@@ -169,17 +197,16 @@ export default function SmartTransactionStatus() {
     }, 1000); // Stop polling for quotes after 1s.
   }, [dispatch]);
 
-  let headerText = t('stxPendingOptimizingGas');
+  let headerText = t('stxPendingPrivatelySubmittingSwap');
   let description;
   let subDescription;
   let icon;
+  let blockExplorerUrl;
   if (isSmartTransactionPending) {
-    if (timeLeftForPendingStxInSec < 120) {
-      headerText = t('stxPendingFinalizing');
-    } else if (timeLeftForPendingStxInSec < 150) {
-      headerText = t('stxPendingPrivatelySubmitting');
-    } else if (cancelSwapLinkClicked) {
+    if (cancelSwapLinkClicked) {
       headerText = t('stxTryingToCancel');
+    } else if (cancellationFeeWei > 0) {
+      headerText = t('stxPendingPubliclySubmittingSwap');
     }
   }
   if (smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS) {
@@ -223,11 +250,28 @@ export default function SmartTransactionStatus() {
     ]);
     icon = <RevertedIcon />;
   }
+  if (txHash && latestSmartTransactionUuid) {
+    blockExplorerUrl = getBlockExplorerLink(
+      { hash: txHash, chainId },
+      { blockExplorerUrl: baseNetworkUrl },
+    );
+  }
 
   const showCancelSwapLink =
     latestSmartTransaction.cancellable && !cancelSwapLinkClicked;
 
   const CancelSwap = () => {
+    let feeInFiat;
+    if (cancellationFeeWei > 0) {
+      ({ feeInFiat } = getFeeForSmartTransaction({
+        chainId,
+        currentCurrency,
+        conversionRate,
+        USDConversionRate,
+        nativeCurrencySymbol,
+        feeInWeiDec: cancellationFeeWei,
+      }));
+    }
     return (
       <Box marginBottom={0}>
         <a
@@ -244,7 +288,9 @@ export default function SmartTransactionStatus() {
             dispatch(cancelSwapsSmartTransaction(latestSmartTransactionUuid));
           }}
         >
-          {t('cancelSwap')}
+          {feeInFiat
+            ? t('cancelSwapForFee', [feeInFiat])
+            : t('cancelSwapForFree')}
         </a>
       </Box>
     );
@@ -332,7 +378,7 @@ export default function SmartTransactionStatus() {
               variant={TYPOGRAPHY.H6}
               boxProps={{ marginLeft: 1 }}
             >
-              {`${t('swapCompleteIn')} `}
+              {`${t('stxSwapCompleteIn')} `}
             </Typography>
             <Typography
               color={COLORS.TEXT_ALTERNATIVE}
@@ -369,12 +415,18 @@ export default function SmartTransactionStatus() {
         {description && (
           <Typography
             variant={TYPOGRAPHY.H6}
-            boxProps={{ marginTop: 0 }}
+            boxProps={{ ...(blockExplorerUrl && { margin: [1, 0, 0] }) }}
             color={COLORS.TEXT_ALTERNATIVE}
           >
             {description}
           </Typography>
         )}
+        {blockExplorerUrl && (
+          <ViewOnBlockExplorer
+            blockExplorerUrl={blockExplorerUrl}
+            sensitiveTrackingProperties={sensitiveProperties}
+          />
+        )}
         <Box
           marginTop={3}
           className="smart-transaction-status__background-animation smart-transaction-status__background-animation--bottom"
@@ -392,6 +444,9 @@ export default function SmartTransactionStatus() {
       {showCancelSwapLink &&
         latestSmartTransactionUuid &&
         isSmartTransactionPending && <CancelSwap />}
+      {smartTransactionStatus === SMART_TRANSACTION_STATUSES.SUCCESS ? (
+        <CreateNewSwap sensitiveTrackingProperties={sensitiveProperties} />
+      ) : null}
       <SwapsFooter
         onSubmit={async () => {
           if (showCloseButtonOnly) {
diff --git a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
index 091ded904988..8c9a118c610c 100644
--- a/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
+++ b/ui/pages/swaps/smart-transaction-status/smart-transaction-status.test.js
@@ -19,7 +19,7 @@ describe('SmartTransactionStatus', () => {
   it('renders the component with initial props', () => {
     const store = configureMockStore(middleware)(createSwapsMockStore());
     const { getByText } = renderWithProvider(<SmartTransactionStatus />, store);
-    expect(getByText('Optimizing gas...')).toBeInTheDocument();
+    expect(getByText('Publicly submitting your Swap...')).toBeInTheDocument();
     expect(getByText('Close')).toBeInTheDocument();
   });
 });
diff --git a/ui/pages/swaps/swaps.util.js b/ui/pages/swaps/swaps.util.js
index c0993b63f8e0..ec12cc6f96c7 100644
--- a/ui/pages/swaps/swaps.util.js
+++ b/ui/pages/swaps/swaps.util.js
@@ -420,11 +420,12 @@ export async function fetchAggregatorMetadata(chainId) {
 
 export async function fetchTopAssets(chainId) {
   const topAssetsUrl = getBaseApi('topAssets', chainId);
-  const response = await fetchWithCache(
-    topAssetsUrl,
-    { method: 'GET', headers: clientIdHeader },
-    { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
-  );
+  const response =
+    (await fetchWithCache(
+      topAssetsUrl,
+      { method: 'GET', headers: clientIdHeader },
+      { cacheRefreshTime: CACHE_REFRESH_FIVE_MINUTES },
+    )) || [];
   const topAssetsMap = response.reduce((_topAssetsMap, asset, index) => {
     if (validateData(TOP_ASSET_VALIDATORS, asset, topAssetsUrl)) {
       return { ..._topAssetsMap, [asset.address]: { index: String(index) } };
@@ -757,6 +758,12 @@ export function getSwapsTokensReceivedFromTxMeta(
       return null;
     }
 
+    if (txMeta.swapMetaData && txMeta.preTxBalance === txMeta.postTxBalance) {
+      // If preTxBalance and postTxBalance are equal, postTxBalance hasn't been updated on time
+      // because of the RPC provider delay, so we return an estimated receiving amount instead.
+      return txMeta.swapMetaData.token_to_amount;
+    }
+
     let approvalTxGasCost = '0x0';
     if (approvalTxMeta && approvalTxMeta.txReceipt) {
       approvalTxGasCost = calcGasTotal(
diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js
index 0aaa2345f220..8abff8171fb1 100644
--- a/ui/pages/swaps/swaps.util.test.js
+++ b/ui/pages/swaps/swaps.util.test.js
@@ -8,6 +8,7 @@ import {
   RINKEBY_CHAIN_ID,
   KOVAN_CHAIN_ID,
   AVALANCHE_CHAIN_ID,
+  ETH_SYMBOL,
 } from '../../../shared/constants/network';
 import {
   SWAPS_CHAINID_CONTRACT_ADDRESS_MAP,
@@ -39,6 +40,7 @@ import {
   countDecimals,
   shouldEnableDirectWrapping,
   showRemainingTimeInMinAndSec,
+  getSwapsTokensReceivedFromTxMeta,
 } from './swaps.util';
 
 jest.mock('../../helpers/utils/storage-helpers.js', () => ({
@@ -567,4 +569,106 @@ describe('Swaps Util', () => {
       expect(true).toBe(true);
     });
   });
+
+  describe('getSwapsTokensReceivedFromTxMeta', () => {
+    const createProps = () => {
+      return {
+        tokenSymbol: ETH_SYMBOL,
+        txMeta: {
+          swapMetaData: {
+            token_to_amount: 5,
+          },
+          txReceipt: {
+            status: '0x0',
+          },
+          preTxBalance: '8b11',
+          postTxBalance: '8b11',
+        },
+        tokenAddress: '0x881d40237659c251811cec9c364ef91234567890',
+        accountAddress: '0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
+        tokenDecimals: 6,
+        approvalTxMeta: null,
+        chainId: MAINNET_CHAIN_ID,
+      };
+    };
+
+    it('returns an estimated amount if preTxBalance and postTxBalance are the same for ETH', () => {
+      const props = createProps();
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          props.tokenSymbol,
+          props.txMeta,
+          props.tokenAddress,
+          props.accountAddress,
+          props.tokenDecimals,
+          props.approvalTxMeta,
+          props.chainId,
+        ),
+      ).toBe(props.txMeta.swapMetaData.token_to_amount);
+    });
+
+    it('returns null if there is no txMeta', () => {
+      const props = createProps();
+      props.txMeta = undefined;
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          props.tokenSymbol,
+          props.txMeta,
+          props.tokenAddress,
+          props.accountAddress,
+          props.tokenDecimals,
+          props.approvalTxMeta,
+          props.chainId,
+        ),
+      ).toBeNull();
+    });
+
+    it('returns null if there is no txMeta.txReceipt', () => {
+      const props = createProps();
+      props.txMeta.txReceipt = undefined;
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          props.tokenSymbol,
+          props.txMeta,
+          props.tokenAddress,
+          props.accountAddress,
+          props.tokenDecimals,
+          props.approvalTxMeta,
+          props.chainId,
+        ),
+      ).toBeNull();
+    });
+
+    it('returns null if there is no txMeta.postTxBalance', () => {
+      const props = createProps();
+      props.txMeta.postTxBalance = undefined;
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          props.tokenSymbol,
+          props.txMeta,
+          props.tokenAddress,
+          props.accountAddress,
+          props.tokenDecimals,
+          props.approvalTxMeta,
+          props.chainId,
+        ),
+      ).toBeNull();
+    });
+
+    it('returns null if there is no txMeta.preTxBalance', () => {
+      const props = createProps();
+      props.txMeta.preTxBalance = undefined;
+      expect(
+        getSwapsTokensReceivedFromTxMeta(
+          props.tokenSymbol,
+          props.txMeta,
+          props.tokenAddress,
+          props.accountAddress,
+          props.tokenDecimals,
+          props.approvalTxMeta,
+          props.chainId,
+        ),
+      ).toBeNull();
+    });
+  });
 });
diff --git a/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap b/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
new file mode 100644
index 000000000000..e7b00963ca9a
--- /dev/null
+++ b/ui/pages/swaps/view-on-block-explorer/__snapshots__/view-on-block-explorer.test.js.snap
@@ -0,0 +1,13 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ViewOnBlockExplorer renders the component with initial props 1`] = `
+<div>
+  <div
+    class="box view-on-block-explorer box--margin-top-6 box--flex-direction-row"
+  >
+    <button>
+      View Swap at etherscan.io
+    </button>
+  </div>
+</div>
+`;
diff --git a/ui/pages/swaps/view-on-block-explorer/index.js b/ui/pages/swaps/view-on-block-explorer/index.js
new file mode 100644
index 000000000000..7f7e427fcefe
--- /dev/null
+++ b/ui/pages/swaps/view-on-block-explorer/index.js
@@ -0,0 +1 @@
+export { default } from './view-on-block-explorer';
diff --git a/ui/pages/swaps/view-on-block-explorer/index.scss b/ui/pages/swaps/view-on-block-explorer/index.scss
new file mode 100644
index 000000000000..ed05e956c36c
--- /dev/null
+++ b/ui/pages/swaps/view-on-block-explorer/index.scss
@@ -0,0 +1,8 @@
+.view-on-block-explorer {
+  button {
+    @include H7;
+
+    color: var(--color-primary-default);
+    background-color: transparent;
+  }
+}
diff --git a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
new file mode 100644
index 000000000000..145ca010f535
--- /dev/null
+++ b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.js
@@ -0,0 +1,47 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+
+import Box from '../../../components/ui/box';
+import { I18nContext } from '../../../contexts/i18n';
+import { getURLHostName } from '../../../helpers/utils/util';
+import { MetaMetricsContext } from '../../../contexts/metametrics';
+import { EVENT } from '../../../../shared/constants/metametrics';
+
+export default function ViewOnBlockExplorer({
+  blockExplorerUrl,
+  sensitiveTrackingProperties,
+}) {
+  const t = useContext(I18nContext);
+  const trackEvent = useContext(MetaMetricsContext);
+  const blockExplorerHostName = getURLHostName(blockExplorerUrl);
+
+  return (
+    <Box marginTop={6} className="view-on-block-explorer">
+      <button
+        onClick={() => {
+          trackEvent({
+            event: 'Clicked Block Explorer Link',
+            category: EVENT.CATEGORIES.SWAPS,
+            sensitiveProperties: sensitiveTrackingProperties,
+            properties: {
+              link_type: 'Transaction Block Explorer',
+              action: 'Swap Transaction',
+              block_explorer_domain: blockExplorerHostName,
+            },
+          });
+          global.platform.openTab({ url: blockExplorerUrl });
+        }}
+      >
+        {t('viewOnCustomBlockExplorer', [
+          t('blockExplorerSwapAction'),
+          blockExplorerHostName,
+        ])}
+      </button>
+    </Box>
+  );
+}
+
+ViewOnBlockExplorer.propTypes = {
+  blockExplorerUrl: PropTypes.string.isRequired,
+  sensitiveTrackingProperties: PropTypes.object.isRequired,
+};
diff --git a/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js
new file mode 100644
index 000000000000..e2917a68fa21
--- /dev/null
+++ b/ui/pages/swaps/view-on-block-explorer/view-on-block-explorer.test.js
@@ -0,0 +1,23 @@
+import React from 'react';
+
+import { renderWithProvider } from '../../../../test/jest';
+import ViewOnBlockExplorer from '.';
+
+const createProps = (customProps = {}) => {
+  return {
+    txHash:
+      '0x58e5a0fc7fbc849eddc100d44e86276168a8c7baaa5604e44ba6f5eb8ba1b7eb',
+    blockExplorerUrl: 'https://etherscan.io',
+    ...customProps,
+  };
+};
+
+describe('ViewOnBlockExplorer', () => {
+  it('renders the component with initial props', () => {
+    const { container, getByText } = renderWithProvider(
+      <ViewOnBlockExplorer {...createProps()} />,
+    );
+    expect(getByText('View Swap at etherscan.io')).toBeInTheDocument();
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/swaps/view-quote/view-quote-price-difference.js b/ui/pages/swaps/view-quote/view-quote-price-difference.js
index 343083ce515b..c8f2cd162dfb 100644
--- a/ui/pages/swaps/view-quote/view-quote-price-difference.js
+++ b/ui/pages/swaps/view-quote/view-quote-price-difference.js
@@ -73,11 +73,7 @@ export default function ViewQuotePriceDifference(props) {
                 <div className="view-quote__price-difference-warning-contents-title">
                   {priceDifferenceTitle}
                 </div>
-                <Tooltip
-                  position="bottom"
-                  theme="white"
-                  title={t('swapPriceImpactTooltip')}
-                >
+                <Tooltip position="bottom" title={t('swapPriceImpactTooltip')}>
                   <i className="fa fa-info-circle" />
                 </Tooltip>
               </Box>
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index e1a098b2b089..7a576d1be2c2 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -47,8 +47,8 @@ import {
   getCurrentSmartTransactionsError,
   getCurrentSmartTransactionsErrorMessageDismissed,
   getSwapsSTXLoading,
-  estimateSwapsSmartTransactionsGas,
-  getSmartTransactionEstimatedGas,
+  fetchSwapsSmartTransactionFees,
+  getSmartTransactionFees,
 } from '../../../ducks/swaps/swaps';
 import {
   conversionRateSelector,
@@ -60,7 +60,6 @@ import {
   isHardwareWallet,
   getHardwareWalletType,
   checkNetworkAndAccountSupports1559,
-  getEIP1559V2Enabled,
   getUSDConversionRate,
 } from '../../../selectors';
 import { getNativeCurrency, getTokens } from '../../../ducks/metamask/metamask';
@@ -92,8 +91,6 @@ import {
   hexWEIToDecGWEI,
   addHexes,
 } from '../../../helpers/utils/conversions.util';
-import { GasFeeContextProvider } from '../../../contexts/gasFee';
-import { TransactionModalContextProvider } from '../../../contexts/transaction-modal';
 import MainQuoteSummary from '../main-quote-summary';
 import { calcGasTotal } from '../../send/send.utils';
 import { getCustomTxParamsData } from '../../confirm-approve/confirm-approve.util';
@@ -105,10 +102,7 @@ import {
 } from '../swaps.util';
 import { useTokenTracker } from '../../../hooks/useTokenTracker';
 import { QUOTES_EXPIRED_ERROR } from '../../../../shared/constants/swaps';
-import {
-  EDIT_GAS_MODES,
-  GAS_RECOMMENDATIONS,
-} from '../../../../shared/constants/gas';
+import { GAS_RECOMMENDATIONS } from '../../../../shared/constants/gas';
 import CountdownTimer from '../countdown-timer';
 import SwapsFooter from '../swaps-footer';
 import PulseLoader from '../../../components/ui/pulse-loader'; // TODO: Replace this with a different loading component.
@@ -125,7 +119,6 @@ export default function ViewQuote() {
   const dispatch = useDispatch();
   const t = useContext(I18nContext);
   const trackEvent = useContext(MetaMetricsContext);
-  const eip1559V2Enabled = useSelector(getEIP1559V2Enabled);
 
   const [dispatchedSafeRefetch, setDispatchedSafeRefetch] = useState(false);
   const [submitClicked, setSubmitClicked] = useState(false);
@@ -202,9 +195,7 @@ export default function ViewQuote() {
       (currentSmartTransactionsError !== 'not_enough_funds' ||
         currentSmartTransactionsErrorMessageDismissed)
     );
-  const smartTransactionEstimatedGas = useSelector(
-    getSmartTransactionEstimatedGas,
-  );
+  const smartTransactionFees = useSelector(getSmartTransactionFees);
   const swapsNetworkConfig = useSelector(getSwapsNetworkConfig);
   const unsignedTransaction = usedQuote.trade;
 
@@ -308,7 +299,7 @@ export default function ViewQuote() {
       chainId,
       smartTransactionsEnabled &&
         smartTransactionsOptInStatus &&
-        smartTransactionEstimatedGas?.txData,
+        smartTransactionFees?.tradeTxFees,
       nativeCurrencySymbol,
     );
   }, [
@@ -321,7 +312,7 @@ export default function ViewQuote() {
     approveGas,
     memoizedTokenConversionRates,
     chainId,
-    smartTransactionEstimatedGas?.txData,
+    smartTransactionFees?.tradeTxFees,
     nativeCurrencySymbol,
     smartTransactionsEnabled,
     smartTransactionsOptInStatus,
@@ -391,11 +382,11 @@ export default function ViewQuote() {
   if (
     currentSmartTransactionsEnabled &&
     smartTransactionsOptInStatus &&
-    smartTransactionEstimatedGas?.txData
+    smartTransactionFees?.tradeTxFees
   ) {
     const stxEstimatedFeeInWeiDec =
-      smartTransactionEstimatedGas.txData.feeEstimate +
-      (smartTransactionEstimatedGas.approvalTxData?.feeEstimate || 0);
+      smartTransactionFees?.tradeTxFees.feeEstimate +
+      (smartTransactionFees?.approvalTxFees?.feeEstimate || 0);
     const stxMaxFeeInWeiDec =
       stxEstimatedFeeInWeiDec * swapsNetworkConfig.stxMaxFeeMultiplier;
     ({ feeInFiat, feeInEth, rawEthFee, feeInUsd } = getFeeForSmartTransaction({
@@ -409,7 +400,7 @@ export default function ViewQuote() {
     additionalTrackingParams.stx_fee_in_usd = Number(feeInUsd);
     additionalTrackingParams.stx_fee_in_eth = Number(rawEthFee);
     additionalTrackingParams.estimated_gas =
-      smartTransactionEstimatedGas.txData.gasLimit;
+      smartTransactionFees?.tradeTxFees.gasLimit;
     ({
       feeInFiat: maxFeeInFiat,
       feeInEth: maxFeeInEth,
@@ -785,11 +776,11 @@ export default function ViewQuote() {
         chainId,
       };
       intervalId = setInterval(() => {
-        dispatch(
-          estimateSwapsSmartTransactionsGas(unsignedTx, approveTxParams),
-        );
+        if (!swapsSTXLoading) {
+          dispatch(fetchSwapsSmartTransactionFees(unsignedTx, approveTxParams));
+        }
       }, swapsNetworkConfig.stxGetTransactionsRefreshTime);
-      dispatch(estimateSwapsSmartTransactionsGas(unsignedTx, approveTxParams));
+      dispatch(fetchSwapsSmartTransactionFees(unsignedTx, approveTxParams));
     } else if (intervalId) {
       clearInterval(intervalId);
     }
@@ -832,176 +823,150 @@ export default function ViewQuote() {
     submitClicked,
   ]);
 
-  const transaction = {
-    userFeeLevel: swapsUserFeeLevel || GAS_RECOMMENDATIONS.HIGH,
-    txParams: {
-      maxFeePerGas,
-      maxPriorityFeePerGas,
-      gas: maxGasLimit,
-    },
-  };
-
-  const supportsEIP1559V2 = eip1559V2Enabled && networkAndAccountSupports1559;
-
   return (
-    <GasFeeContextProvider
-      editGasMode={EDIT_GAS_MODES.SWAPS}
-      minimumGasLimit={usedGasLimit}
-      transaction={transaction}
-    >
-      <TransactionModalContextProvider>
-        <div className="view-quote">
+    <div className="view-quote">
+      <div
+        className={classnames('view-quote__content', {
+          'view-quote__content_modal': disableSubmissionDueToPriceWarning,
+        })}
+      >
+        {selectQuotePopoverShown && (
+          <SelectQuotePopover
+            quoteDataRows={renderablePopoverData}
+            onClose={() => setSelectQuotePopoverShown(false)}
+            onSubmit={(aggId) => dispatch(swapsQuoteSelected(aggId))}
+            swapToSymbol={destinationTokenSymbol}
+            initialAggId={usedQuote.aggregator}
+            onQuoteDetailsIsOpened={trackQuoteDetailsOpened}
+            hideEstimatedGasFee={
+              smartTransactionsEnabled && smartTransactionsOptInStatus
+            }
+          />
+        )}
+
+        <div
+          className={classnames('view-quote__warning-wrapper', {
+            'view-quote__warning-wrapper--thin': !isShowingWarning,
+          })}
+        >
+          {viewQuotePriceDifferenceComponent}
+          {(showInsufficientWarning || tokenBalanceUnavailable) && (
+            <ActionableMessage
+              message={actionableBalanceErrorMessage}
+              onClose={() => setWarningHidden(true)}
+            />
+          )}
+        </div>
+        <div className="view-quote__countdown-timer-container">
+          <CountdownTimer
+            timeStarted={quotesLastFetched}
+            warningTime="0:10"
+            labelKey="swapNewQuoteIn"
+          />
+        </div>
+        <MainQuoteSummary
+          sourceValue={calcTokenValue(sourceTokenValue, sourceTokenDecimals)}
+          sourceDecimals={sourceTokenDecimals}
+          sourceSymbol={sourceTokenSymbol}
+          destinationValue={calcTokenValue(
+            destinationTokenValue,
+            destinationTokenDecimals,
+          )}
+          destinationDecimals={destinationTokenDecimals}
+          destinationSymbol={destinationTokenSymbol}
+          sourceIconUrl={sourceTokenIconUrl}
+          destinationIconUrl={destinationIconUrl}
+        />
+        {currentSmartTransactionsEnabled &&
+          smartTransactionsOptInStatus &&
+          !smartTransactionFees?.tradeTxFees && (
+            <Box marginTop={0} marginBottom={10}>
+              <PulseLoader />
+            </Box>
+          )}
+        {(!currentSmartTransactionsEnabled ||
+          !smartTransactionsOptInStatus ||
+          smartTransactionFees?.tradeTxFees) && (
           <div
-            className={classnames('view-quote__content', {
-              'view-quote__content_modal': disableSubmissionDueToPriceWarning,
+            className={classnames('view-quote__fee-card-container', {
+              'view-quote__fee-card-container--three-rows':
+                approveTxParams && (!balanceError || warningHidden),
             })}
           >
-            {selectQuotePopoverShown && (
-              <SelectQuotePopover
-                quoteDataRows={renderablePopoverData}
-                onClose={() => setSelectQuotePopoverShown(false)}
-                onSubmit={(aggId) => dispatch(swapsQuoteSelected(aggId))}
-                swapToSymbol={destinationTokenSymbol}
-                initialAggId={usedQuote.aggregator}
-                onQuoteDetailsIsOpened={trackQuoteDetailsOpened}
-                hideEstimatedGasFee={
-                  smartTransactionsEnabled && smartTransactionsOptInStatus
-                }
-              />
-            )}
-
-            <div
-              className={classnames('view-quote__warning-wrapper', {
-                'view-quote__warning-wrapper--thin': !isShowingWarning,
-              })}
-            >
-              {viewQuotePriceDifferenceComponent}
-              {(showInsufficientWarning || tokenBalanceUnavailable) && (
-                <ActionableMessage
-                  message={actionableBalanceErrorMessage}
-                  onClose={() => setWarningHidden(true)}
-                />
-              )}
-            </div>
-            <div className="view-quote__countdown-timer-container">
-              <CountdownTimer
-                timeStarted={quotesLastFetched}
-                warningTime="0:10"
-                labelKey="swapNewQuoteIn"
-              />
-            </div>
-            <MainQuoteSummary
-              sourceValue={calcTokenValue(
-                sourceTokenValue,
-                sourceTokenDecimals,
-              )}
-              sourceDecimals={sourceTokenDecimals}
-              sourceSymbol={sourceTokenSymbol}
-              destinationValue={calcTokenValue(
-                destinationTokenValue,
-                destinationTokenDecimals,
+            <FeeCard
+              primaryFee={{
+                fee: feeInEth,
+                maxFee: maxFeeInEth,
+              }}
+              secondaryFee={{
+                fee: feeInFiat,
+                maxFee: maxFeeInFiat,
+              }}
+              hideTokenApprovalRow={
+                !approveTxParams || (balanceError && !warningHidden)
+              }
+              tokenApprovalSourceTokenSymbol={sourceTokenSymbol}
+              onTokenApprovalClick={onFeeCardTokenApprovalClick}
+              metaMaskFee={String(metaMaskFee)}
+              numberOfQuotes={Object.values(quotes).length}
+              onQuotesClick={() => {
+                trackAllAvailableQuotesOpened();
+                setSelectQuotePopoverShown(true);
+              }}
+              chainId={chainId}
+              isBestQuote={isBestQuote}
+              maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI(
+                maxPriorityFeePerGas,
               )}
-              destinationDecimals={destinationTokenDecimals}
-              destinationSymbol={destinationTokenSymbol}
-              sourceIconUrl={sourceTokenIconUrl}
-              destinationIconUrl={destinationIconUrl}
+              maxFeePerGasDecGWEI={hexWEIToDecGWEI(maxFeePerGas)}
             />
-            {currentSmartTransactionsEnabled &&
-              smartTransactionsOptInStatus &&
-              !smartTransactionEstimatedGas?.txData && (
-                <Box marginTop={0} marginBottom={10}>
-                  <PulseLoader />
-                </Box>
-              )}
-            {(!currentSmartTransactionsEnabled ||
-              !smartTransactionsOptInStatus ||
-              smartTransactionEstimatedGas?.txData) && (
-              <div
-                className={classnames('view-quote__fee-card-container', {
-                  'view-quote__fee-card-container--three-rows':
-                    approveTxParams && (!balanceError || warningHidden),
-                })}
-              >
-                <FeeCard
-                  primaryFee={{
-                    fee: feeInEth,
-                    maxFee: maxFeeInEth,
-                  }}
-                  secondaryFee={{
-                    fee: feeInFiat,
-                    maxFee: maxFeeInFiat,
-                  }}
-                  hideTokenApprovalRow={
-                    !approveTxParams || (balanceError && !warningHidden)
-                  }
-                  tokenApprovalSourceTokenSymbol={sourceTokenSymbol}
-                  onTokenApprovalClick={onFeeCardTokenApprovalClick}
-                  metaMaskFee={String(metaMaskFee)}
-                  numberOfQuotes={Object.values(quotes).length}
-                  onQuotesClick={() => {
-                    trackAllAvailableQuotesOpened();
-                    setSelectQuotePopoverShown(true);
-                  }}
-                  chainId={chainId}
-                  isBestQuote={isBestQuote}
-                  supportsEIP1559V2={supportsEIP1559V2}
-                  networkAndAccountSupports1559={networkAndAccountSupports1559}
-                  maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI(
-                    maxPriorityFeePerGas,
-                  )}
-                  maxFeePerGasDecGWEI={hexWEIToDecGWEI(maxFeePerGas)}
-                  smartTransactionsEnabled={currentSmartTransactionsEnabled}
-                  smartTransactionsOptInStatus={smartTransactionsOptInStatus}
-                />
-              </div>
-            )}
           </div>
-          <SwapsFooter
-            onSubmit={() => {
-              setSubmitClicked(true);
-              if (!balanceError) {
-                if (
-                  currentSmartTransactionsEnabled &&
-                  smartTransactionsOptInStatus &&
-                  smartTransactionEstimatedGas?.txData
-                ) {
-                  dispatch(
-                    signAndSendSwapsSmartTransaction({
-                      unsignedTransaction,
-                      trackEvent,
-                      history,
-                      additionalTrackingParams,
-                    }),
-                  );
-                } else {
-                  dispatch(
-                    signAndSendTransactions(
-                      history,
-                      trackEvent,
-                      additionalTrackingParams,
-                    ),
-                  );
-                }
-              } else if (destinationToken.symbol === defaultSwapsToken.symbol) {
-                history.push(DEFAULT_ROUTE);
-              } else {
-                history.push(`${ASSET_ROUTE}/${destinationToken.address}`);
-              }
-            }}
-            submitText={
+        )}
+      </div>
+      <SwapsFooter
+        onSubmit={() => {
+          setSubmitClicked(true);
+          if (!balanceError) {
+            if (
               currentSmartTransactionsEnabled &&
               smartTransactionsOptInStatus &&
-              swapsSTXLoading
-                ? t('preparingSwap')
-                : t('swap')
+              smartTransactionFees?.tradeTxFees
+            ) {
+              dispatch(
+                signAndSendSwapsSmartTransaction({
+                  unsignedTransaction,
+                  trackEvent,
+                  history,
+                  additionalTrackingParams,
+                }),
+              );
+            } else {
+              dispatch(
+                signAndSendTransactions(
+                  history,
+                  trackEvent,
+                  additionalTrackingParams,
+                ),
+              );
             }
-            hideCancel
-            disabled={isSwapButtonDisabled}
-            className={isShowingWarning && 'view-quote__thin-swaps-footer'}
-            showTopBorder
-          />
-        </div>
-      </TransactionModalContextProvider>
-    </GasFeeContextProvider>
+          } else if (destinationToken.symbol === defaultSwapsToken.symbol) {
+            history.push(DEFAULT_ROUTE);
+          } else {
+            history.push(`${ASSET_ROUTE}/${destinationToken.address}`);
+          }
+        }}
+        submitText={
+          currentSmartTransactionsEnabled &&
+          smartTransactionsOptInStatus &&
+          swapsSTXLoading
+            ? t('preparingSwap')
+            : t('swap')
+        }
+        hideCancel
+        disabled={isSwapButtonDisabled}
+        className={isShowingWarning && 'view-quote__thin-swaps-footer'}
+        showTopBorder
+      />
+    </div>
   );
 }
diff --git a/ui/pages/swaps/view-quote/view-quote.test.js b/ui/pages/swaps/view-quote/view-quote.test.js
index 6ad976117e22..855ff0222789 100644
--- a/ui/pages/swaps/view-quote/view-quote.test.js
+++ b/ui/pages/swaps/view-quote/view-quote.test.js
@@ -64,6 +64,7 @@ describe('ViewQuote', () => {
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
+    expect(getByText('0.00008 ETH')).toBeInTheDocument();
     expect(getByText('Max fee')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
@@ -87,7 +88,7 @@ describe('ViewQuote', () => {
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
-    expect(getByText('0.00544 ETH')).toBeInTheDocument();
+    expect(getByText('0.00008 ETH')).toBeInTheDocument();
     expect(getByText('Max fee')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
diff --git a/ui/pages/token-details/token-details-page.js b/ui/pages/token-details/token-details-page.js
index 5b4d067ad624..fc7ce15f48a3 100644
--- a/ui/pages/token-details/token-details-page.js
+++ b/ui/pages/token-details/token-details-page.js
@@ -2,7 +2,7 @@ import React, { useContext } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { Redirect, useHistory, useParams } from 'react-router-dom';
 import { getTokens } from '../../ducks/metamask/metamask';
-import { getUseTokenDetection, getTokenList } from '../../selectors';
+import { getTokenList } from '../../selectors';
 import { useCopyToClipboard } from '../../hooks/useCopyToClipboard';
 import Identicon from '../../components/ui/identicon';
 import { I18nContext } from '../../contexts/i18n';
@@ -32,7 +32,6 @@ export default function TokenDetailsPage() {
   const t = useContext(I18nContext);
   const tokens = useSelector(getTokens);
   const tokenList = useSelector(getTokenList);
-  const useTokenDetection = useSelector(getUseTokenDetection);
 
   const { address: tokenAddress } = useParams();
   const tokenMetadata = Object.values(tokenList).find((token) =>
@@ -40,10 +39,7 @@ export default function TokenDetailsPage() {
   );
   const aggregators = tokenMetadata?.aggregators?.join(', ');
   const fileName = tokenMetadata?.iconUrl;
-  let imagePath = fileName;
-  if (!process.env.TOKEN_DETECTION_V2) {
-    imagePath = useTokenDetection ? fileName : `images/contract/${fileName}`;
-  }
+  const imagePath = fileName;
 
   const token = tokens.find(({ address }) =>
     isEqualCaseInsensitive(address, tokenAddress),
@@ -74,7 +70,8 @@ export default function TokenDetailsPage() {
       <Box marginLeft={5} marginRight={6}>
         <Typography
           fontWeight={FONT_WEIGHT.BOLD}
-          margin={[4, 0, 0, 0]}
+          margin={0}
+          marginTop={4}
           variant={TYPOGRAPHY.H6}
           color={COLORS.TEXT_DEFAULT}
           className="token-details__title"
@@ -90,7 +87,8 @@ export default function TokenDetailsPage() {
           <Typography
             align={TEXT_ALIGN.CENTER}
             fontWeight={FONT_WEIGHT.BOLD}
-            margin={[0, 5, 0, 0]}
+            margin={0}
+            marginRight={5}
             variant={TYPOGRAPHY.H4}
             color={COLORS.TEXT_DEFAULT}
             className="token-details__token-value"
@@ -106,14 +104,16 @@ export default function TokenDetailsPage() {
           </Box>
         </Box>
         <Typography
-          margin={[4, 0, 0, 0]}
+          margin={0}
+          marginTop={4}
           variant={TYPOGRAPHY.H7}
           color={COLORS.TEXT_ALTERNATIVE}
         >
           {tokenCurrencyBalance || ''}
         </Typography>
         <Typography
-          margin={[6, 0, 0, 0]}
+          margin={0}
+          marginTop={6}
           variant={TYPOGRAPHY.H9}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
@@ -123,7 +123,8 @@ export default function TokenDetailsPage() {
         <Box display={DISPLAY.FLEX}>
           <Typography
             variant={TYPOGRAPHY.H7}
-            margin={[2, 0, 0, 0]}
+            margin={0}
+            marginTop={2}
             color={COLORS.TEXT_DEFAULT}
             overflowWrap={OVERFLOW_WRAP.BREAK_WORD}
             className="token-details__token-address"
@@ -148,7 +149,8 @@ export default function TokenDetailsPage() {
         </Box>
         <Typography
           variant={TYPOGRAPHY.H9}
-          margin={[4, 0, 0, 0]}
+          margin={0}
+          marginTop={4}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
         >
@@ -156,14 +158,16 @@ export default function TokenDetailsPage() {
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H7}
-          margin={[1, 0, 0, 0]}
+          margin={0}
+          marginTop={1}
           color={COLORS.TEXT_DEFAULT}
         >
           {token.decimals}
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H9}
-          margin={[4, 0, 0, 0]}
+          margin={0}
+          marginTop={4}
           color={COLORS.TEXT_ALTERNATIVE}
           fontWeight={FONT_WEIGHT.BOLD}
         >
@@ -171,7 +175,8 @@ export default function TokenDetailsPage() {
         </Typography>
         <Typography
           variant={TYPOGRAPHY.H7}
-          margin={[1, 0, 0, 0]}
+          margin={1}
+          marginTop={0}
           color={COLORS.TEXT_DEFAULT}
         >
           {networkType === NETWORK_TYPE_RPC
@@ -182,7 +187,8 @@ export default function TokenDetailsPage() {
           <>
             <Typography
               variant={TYPOGRAPHY.H9}
-              margin={[4, 0, 0, 0]}
+              margin={0}
+              marginTop={4}
               color={COLORS.TEXT_ALTERNATIVE}
               fontWeight={FONT_WEIGHT.BOLD}
             >
@@ -190,7 +196,8 @@ export default function TokenDetailsPage() {
             </Typography>
             <Typography
               variant={TYPOGRAPHY.H7}
-              margin={[1, 0, 0, 0]}
+              margin={0}
+              marginTop={1}
               color={COLORS.TEXT_DEFAULT}
             >
               {`${aggregators}.`}
diff --git a/ui/pages/unlock-page/index.scss b/ui/pages/unlock-page/index.scss
index 8e3932715b2d..745b68350ea7 100644
--- a/ui/pages/unlock-page/index.scss
+++ b/ui/pages/unlock-page/index.scss
@@ -1,4 +1,5 @@
 .unlock-page {
+  color: var(--color-text-default);
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
@@ -6,14 +7,13 @@
   width: 357px;
   padding: 30px;
   font-weight: 400;
-  color: var(--color-text-default);
 
   &__container {
-    background: var(--color-background-default);
     display: flex;
     align-self: stretch;
     justify-content: center;
     flex: 1 0 auto;
+    background: var(--color-background-default);
   }
 
   &__mascot-container {
diff --git a/ui/selectors/confirm-transaction.js b/ui/selectors/confirm-transaction.js
index e3e8f6efb3f8..e502d473c8ea 100644
--- a/ui/selectors/confirm-transaction.js
+++ b/ui/selectors/confirm-transaction.js
@@ -117,6 +117,29 @@ export const unconfirmedTransactionsHashSelector = createSelector(
   },
 );
 
+export const unconfirmedMessagesHashSelector = createSelector(
+  unapprovedMsgsSelector,
+  unapprovedPersonalMsgsSelector,
+  unapprovedDecryptMsgsSelector,
+  unapprovedEncryptionPublicKeyMsgsSelector,
+  unapprovedTypedMessagesSelector,
+  (
+    unapprovedMsgs = {},
+    unapprovedPersonalMsgs = {},
+    unapprovedDecryptMsgs = {},
+    unapprovedEncryptionPublicKeyMsgs = {},
+    unapprovedTypedMessages = {},
+  ) => {
+    return {
+      ...unapprovedMsgs,
+      ...unapprovedPersonalMsgs,
+      ...unapprovedDecryptMsgs,
+      ...unapprovedEncryptionPublicKeyMsgs,
+      ...unapprovedTypedMessages,
+    };
+  },
+);
+
 const unapprovedMsgCountSelector = (state) => state.metamask.unapprovedMsgCount;
 const unapprovedPersonalMsgCountSelector = (state) =>
   state.metamask.unapprovedPersonalMsgCount;
diff --git a/ui/selectors/custom-gas.js b/ui/selectors/custom-gas.js
index ea72bf9aedd2..3edc9b20bf63 100644
--- a/ui/selectors/custom-gas.js
+++ b/ui/selectors/custom-gas.js
@@ -8,7 +8,7 @@ import { decEthToConvertedCurrency as ethTotalToConvertedCurrency } from '../hel
 import { formatETHFee } from '../helpers/utils/formatters';
 import { calcGasTotal } from '../pages/send/send.utils';
 
-import { getGasPrice } from '../ducks/send';
+import { getGasLimit, getGasPrice } from '../ducks/send';
 import {
   GAS_ESTIMATE_TYPES as GAS_FEE_CONTROLLER_ESTIMATE_TYPES,
   GAS_LIMITS,
@@ -321,8 +321,9 @@ export function getRenderableEstimateDataForSmallButtonsFromGWEI(state) {
     return [];
   }
   const showFiat = getShouldShowFiat(state);
+
   const gasLimit =
-    state.send.gas.gasLimit || getCustomGasLimit(state) || GAS_LIMITS.SIMPLE;
+    getGasLimit(state) ?? getCustomGasLimit(state) ?? GAS_LIMITS.SIMPLE;
   const { conversionRate } = state.metamask;
   const currentCurrency = getCurrentCurrency(state);
   const gasFeeEstimates = getGasFeeEstimates(state);
diff --git a/ui/selectors/custom-gas.test.js b/ui/selectors/custom-gas.test.js
index d41ec27c37cd..04733528203b 100644
--- a/ui/selectors/custom-gas.test.js
+++ b/ui/selectors/custom-gas.test.js
@@ -1,4 +1,5 @@
 import { GAS_ESTIMATE_TYPES, GAS_LIMITS } from '../../shared/constants/gas';
+import { getInitialSendStateWithExistingTxState } from '../../test/jest/mocks';
 import {
   getCustomGasLimit,
   getCustomGasPrice,
@@ -11,7 +12,9 @@ import {
 describe('custom-gas selectors', () => {
   describe('getCustomGasPrice()', () => {
     it('should return gas.customData.price', () => {
-      const mockState = { gas: { customData: { price: 'mockPrice' } } };
+      const mockState = {
+        gas: { customData: { price: 'mockPrice' } },
+      };
       expect(getCustomGasPrice(mockState)).toStrictEqual('mockPrice');
     });
   });
@@ -200,11 +203,11 @@ describe('custom-gas selectors', () => {
             EIPS: {},
           },
         },
-        send: {
+        send: getInitialSendStateWithExistingTxState({
           gas: {
             gasPrice: '0x28bed0160',
           },
-        },
+        }),
         gas: {
           customData: { price: null },
         },
@@ -222,11 +225,11 @@ describe('custom-gas selectors', () => {
             EIPS: {},
           },
         },
-        send: {
+        send: getInitialSendStateWithExistingTxState({
           gas: {
             gasPrice: '0x30e4f9b400',
           },
-        },
+        }),
         gas: {
           customData: { price: null },
         },
@@ -330,11 +333,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -379,11 +382,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -428,11 +431,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -477,11 +480,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
     ];
@@ -542,11 +545,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -591,11 +594,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -640,11 +643,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -689,11 +692,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x4',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
       {
@@ -738,11 +741,11 @@ describe('custom-gas selectors', () => {
               chainId: '0x1',
             },
           },
-          send: {
+          send: getInitialSendStateWithExistingTxState({
             gas: {
               gasLimit: GAS_LIMITS.SIMPLE,
             },
-          },
+          }),
         },
       },
     ];
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index a397c125da4c..1eca5bea3059 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -375,6 +375,10 @@ export function getAddressBook(state) {
   return Object.values(state.metamask.addressBook[chainId]);
 }
 
+export function getEnsResolutionByAddress(state, address) {
+  return state.metamask.ensResolutionsByAddress[address] || '';
+}
+
 export function getAddressBookEntry(state, address) {
   const addressBook = getAddressBook(state);
   const entry = addressBook.find((contact) =>
@@ -470,6 +474,24 @@ export function getTotalUnapprovedCount(state) {
   );
 }
 
+export function getTotalUnapprovedMessagesCount(state) {
+  const {
+    unapprovedMsgCount = 0,
+    unapprovedPersonalMsgCount = 0,
+    unapprovedDecryptMsgCount = 0,
+    unapprovedEncryptionPublicKeyMsgCount = 0,
+    unapprovedTypedMessagesCount = 0,
+  } = state.metamask;
+
+  return (
+    unapprovedMsgCount +
+    unapprovedPersonalMsgCount +
+    unapprovedDecryptMsgCount +
+    unapprovedEncryptionPublicKeyMsgCount +
+    unapprovedTypedMessagesCount
+  );
+}
+
 function getUnapprovedTxCount(state) {
   const { unapprovedTxs = {} } = state.metamask;
   return Object.keys(unapprovedTxs).length;
@@ -693,6 +715,15 @@ export function getIsBuyableMoonPayChain(state) {
   return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.moonPay);
 }
 
+export function getIsBuyableWyreChain(state) {
+  const chainId = getCurrentChainId(state);
+  return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.wyre);
+}
+export function getIsBuyableCoinbasePayChain(state) {
+  const chainId = getCurrentChainId(state);
+  return Boolean(BUYABLE_CHAINS_MAP?.[chainId]?.coinbasePayCurrencies);
+}
+
 export function getNativeCurrencyImage(state) {
   const nativeCurrency = getNativeCurrency(state).toUpperCase();
   return NATIVE_CURRENCY_TOKEN_IMAGE_MAP[nativeCurrency];
@@ -714,6 +745,7 @@ export function getSnaps(state) {
 export const getSnapsRouteObjects = createSelector(getSnaps, (snaps) => {
   return Object.values(snaps).map((snap) => {
     return {
+      id: snap.id,
       tabMessage: () => snap.manifest.proposedName,
       descriptionMessage: () => snap.manifest.description,
       sectionMessage: () => snap.manifest.description,
@@ -722,6 +754,50 @@ export const getSnapsRouteObjects = createSelector(getSnaps, (snaps) => {
     };
   });
 });
+
+/**
+ * @typedef {Object} Notification
+ * @property {string} id - A unique identifier for the notification
+ * @property {string} origin - A string identifing the snap origin
+ * @property {EpochTimeStamp} createdDate - A date in epochTimeStramps, identifying when the notification was first committed
+ * @property {EpochTimeStamp} readDate - A date in epochTimeStramps, identifying when the notification was read by the user
+ * @property {string} message - A string containing the notification message
+ */
+
+/**
+ * Notifications are managed by the notification controller and referenced by
+ * `state.metamask.notifications`. This function returns a list of notifications
+ * the can be shown to the user.
+ *
+ * The returned notifications are sorted by date.
+ *
+ * @param {Object} state - the redux state object
+ * @returns {Notification[]} An array of notifications that can be shown to the user
+ */
+
+export function getNotifications(state) {
+  const notifications = Object.values(state.metamask.notifications);
+
+  const notificationsSortedByDate = notifications.sort(
+    (a, b) => new Date(b.createdDate) - new Date(a.createdDate),
+  );
+  return notificationsSortedByDate;
+}
+
+export function getUnreadNotifications(state) {
+  const notifications = getNotifications(state);
+
+  const unreadNotificationCount = notifications.filter(
+    (notification) => notification.readDate === null,
+  );
+
+  return unreadNotificationCount;
+}
+
+export const getUnreadNotificationsCount = createSelector(
+  getUnreadNotifications,
+  (notifications) => notifications.length,
+);
 ///: END:ONLY_INCLUDE_IN
 
 /**
@@ -746,16 +822,17 @@ function getAllowedAnnouncementIds(state) {
     6: false,
     7: false,
     8: supportsWebHid && currentKeyringIsLedger && currentlyUsingLedgerLive,
-    9: getIsMainnet(state),
+    9: false,
     10: Boolean(process.env.TOKEN_DETECTION_V2) && !process.env.IN_TEST,
     11: Boolean(process.env.TOKEN_DETECTION_V2) && !process.env.IN_TEST,
-    12: true,
+    12: false,
+    13: true,
   };
 }
 
 /**
- * @typedef {Object} Notification
- * @property {number} id - A unique identifier for the notification
+ * @typedef {Object} Announcement
+ * @property {number} id - A unique identifier for the announcement
  * @property {string} date - A date in YYYY-MM-DD format, identifying when the notification was first committed
  */
 
@@ -986,3 +1063,13 @@ export function getDetectedTokensInCurrentNetwork(state) {
 export function getNewTokensImported(state) {
   return state.appState.newTokensImported;
 }
+
+/**
+ * To get the `customNetworkListEnabled` value which determines whether we use the custom network list
+ *
+ * @param {*} state
+ * @returns Boolean
+ */
+export function getIsCustomNetworkListEnabled(state) {
+  return state.metamask.customNetworkListEnabled;
+}
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index ca3f9c92f8bf..385bd2a56f3e 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -244,4 +244,27 @@ describe('Selectors', () => {
     const appIsLoading = selectors.getAppIsLoading(mockState);
     expect(appIsLoading).toStrictEqual(false);
   });
+  it('#getNotifications', () => {
+    const notifications = selectors.getNotifications(mockState);
+
+    expect(notifications).toStrictEqual([
+      mockState.metamask.notifications.test,
+      mockState.metamask.notifications.test2,
+    ]);
+  });
+  it('#getUnreadNotificationsCount', () => {
+    const unreadNotificationCount = selectors.getUnreadNotificationsCount(
+      mockState,
+    );
+
+    expect(unreadNotificationCount).toStrictEqual(1);
+  });
+
+  it('#getUnreadNotifications', () => {
+    const unreadNotifications = selectors.getUnreadNotifications(mockState);
+
+    expect(unreadNotifications).toStrictEqual([
+      mockState.metamask.notifications.test,
+    ]);
+  });
 });
diff --git a/ui/store/actionConstants.js b/ui/store/actionConstants.js
index 2a5528e72501..c9e673afadf8 100644
--- a/ui/store/actionConstants.js
+++ b/ui/store/actionConstants.js
@@ -92,6 +92,7 @@ export const SET_SELECTED_SETTINGS_RPC_URL = 'SET_SELECTED_SETTINGS_RPC_URL';
 export const SET_NEW_NETWORK_ADDED = 'SET_NEW_NETWORK_ADDED';
 export const SET_NEW_COLLECTIBLE_ADDED_MESSAGE =
   'SET_NEW_COLLECTIBLE_ADDED_MESSAGE';
+export const SET_NEW_CUSTOM_NETWORK_ADDED = 'SET_NEW_CUSTOM_NETWORK_ADDED';
 
 export const LOADING_METHOD_DATA_STARTED = 'LOADING_METHOD_DATA_STARTED';
 export const LOADING_METHOD_DATA_FINISHED = 'LOADING_METHOD_DATA_FINISHED';
diff --git a/ui/store/actions.js b/ui/store/actions.js
index db0e1cddbba4..308c4ea0ca0b 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -13,6 +13,7 @@ import {
   ENVIRONMENT_TYPE_NOTIFICATION,
   ORIGIN_METAMASK,
   POLLING_TOKEN_ENVIRONMENT_TYPES,
+  MESSAGE_TYPE,
 } from '../../shared/constants/app';
 import { hasUnconfirmedTransactions } from '../helpers/utils/confirm-tx.util';
 import txHelper from '../helpers/utils/tx-helper';
@@ -22,8 +23,15 @@ import {
   getMetaMaskAccounts,
   getPermittedAccountsForCurrentTab,
   getSelectedAddress,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  getNotifications,
+  ///: END:ONLY_INCLUDE_IN
 } from '../selectors';
-import { computeEstimatedGasLimit, resetSendState } from '../ducks/send';
+import {
+  computeEstimatedGasLimit,
+  initializeSendState,
+  resetSendState,
+} from '../ducks/send';
 import { switchedToUnconnectedAccount } from '../ducks/alerts/unconnected-account';
 import { getUnconnectedAccountAlertEnabledness } from '../ducks/metamask/metamask';
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
@@ -35,6 +43,10 @@ import {
 import { EVENT } from '../../shared/constants/metametrics';
 import { parseSmartTransactionsError } from '../pages/swaps/swaps.util';
 import { isEqualCaseInsensitive } from '../../shared/modules/string-utils';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import { NOTIFICATIONS_EXPIRATION_DELAY } from '../helpers/constants/notifications';
+///: END:ONLY_INCLUDE_IN
+import { setNewCustomNetworkAdded } from '../ducks/app/app';
 import * as actionConstants from './actionConstants';
 
 let background = null;
@@ -733,7 +745,7 @@ export function updateEditableParams(txId, editableParams) {
       log.error(error.message);
       throw error;
     }
-
+    await forceUpdateMetamaskState(dispatch);
     return updatedTransaction;
   };
 }
@@ -1001,6 +1013,44 @@ export function removeSnap(snapId) {
 export async function removeSnapError(msgData) {
   return promisifiedBackground.removeSnapError(msgData);
 }
+
+export function dismissNotifications(ids) {
+  return async (dispatch) => {
+    await promisifiedBackground.dismissNotifications(ids);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
+
+export function deleteExpiredNotifications() {
+  return async (dispatch, getState) => {
+    const state = getState();
+    const notifications = getNotifications(state);
+
+    const notificationIdsToDelete = notifications
+      .filter((notification) => {
+        const expirationTime = new Date(
+          Date.now() - NOTIFICATIONS_EXPIRATION_DELAY,
+        );
+
+        return Boolean(
+          notification.readDate &&
+            new Date(notification.readDate) < expirationTime,
+        );
+      })
+      .map(({ id }) => id);
+    if (notificationIdsToDelete.length) {
+      await promisifiedBackground.dismissNotifications(notificationIdsToDelete);
+      await forceUpdateMetamaskState(dispatch);
+    }
+  };
+}
+
+export function markNotificationsAsRead(ids) {
+  return async (dispatch) => {
+    await promisifiedBackground.markNotificationsAsRead(ids);
+    await forceUpdateMetamaskState(dispatch);
+  };
+}
 ///: END:ONLY_INCLUDE_IN
 
 export function cancelMsg(msgData) {
@@ -1021,6 +1071,96 @@ export function cancelMsg(msgData) {
   };
 }
 
+/**
+ * Cancels all of the given messages
+ *
+ * @param {Array<object>} msgDataList - a list of msg data objects
+ * @returns {function(*): Promise<void>}
+ */
+export function cancelMsgs(msgDataList) {
+  return async (dispatch) => {
+    dispatch(showLoadingIndication());
+
+    try {
+      const msgIds = msgDataList.map((id) => id);
+      const cancellations = msgDataList.map(
+        ({ id, type }) =>
+          new Promise((resolve, reject) => {
+            switch (type) {
+              case MESSAGE_TYPE.ETH_SIGN_TYPED_DATA:
+                background.cancelTypedMessage(id, (err) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  resolve();
+                });
+                return;
+              case MESSAGE_TYPE.PERSONAL_SIGN:
+                background.cancelPersonalMessage(id, (err) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  resolve();
+                });
+                return;
+              case MESSAGE_TYPE.ETH_DECRYPT:
+                background.cancelDecryptMessage(id, (err) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  resolve();
+                });
+                return;
+              case MESSAGE_TYPE.ETH_GET_ENCRYPTION_PUBLIC_KEY:
+                background.cancelEncryptionPublicKeyMsg(id, (err) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  resolve();
+                });
+                return;
+              case MESSAGE_TYPE.ETH_SIGN:
+                background.cancelMessage(id, (err) => {
+                  if (err) {
+                    reject(err);
+                    return;
+                  }
+                  resolve();
+                });
+                return;
+              default:
+                reject(
+                  new Error(
+                    `MetaMask Message Signature: Unknown message type: ${id}`,
+                  ),
+                );
+            }
+          }),
+      );
+
+      await Promise.all(cancellations);
+      const newState = await updateMetamaskStateFromBackground();
+      dispatch(updateMetamaskState(newState));
+
+      msgIds.forEach((id) => {
+        dispatch(completedTx(id));
+      });
+    } catch (err) {
+      log.error(err);
+    } finally {
+      if (getEnvironmentType() === ENVIRONMENT_TYPE_NOTIFICATION) {
+        closeNotificationPopup();
+      } else {
+        dispatch(hideLoadingIndication());
+      }
+    }
+  };
+}
+
 export function cancelPersonalMsg(msgData) {
   return async (dispatch) => {
     dispatch(showLoadingIndication());
@@ -1307,6 +1447,11 @@ export function updateMetamaskState(newState) {
         type: actionConstants.CHAIN_CHANGED,
         payload: newProvider.chainId,
       });
+      // We dispatch this action to ensure that the send state stays up to date
+      // after the chain changes. This async thunk will fail gracefully in the
+      // event that we are not yet on the send flow with a draftTransaction in
+      // progress.
+      dispatch(initializeSendState({ chainHasChanged: true }));
     }
     dispatch({
       type: actionConstants.UPDATE_METAMASK_STATE,
@@ -1509,10 +1654,10 @@ export function addDetectedTokens(newDetectedTokens) {
  *
  * @param tokensToImport
  */
-export function importTokens(tokensToImport) {
+export function addImportedTokens(tokensToImport) {
   return async (dispatch) => {
     try {
-      await promisifiedBackground.importTokens(tokensToImport);
+      await promisifiedBackground.addImportedTokens(tokensToImport);
     } catch (error) {
       log.error(error);
     } finally {
@@ -1522,18 +1667,32 @@ export function importTokens(tokensToImport) {
 }
 
 /**
- * To add ignored tokens to state
+ * To add ignored token addresses to state
  *
- * @param tokensToIgnore
+ * @param options
+ * @param options.tokensToIgnore
+ * @param options.dontShowLoadingIndicator
  */
-export function ignoreTokens(tokensToIgnore) {
+export function ignoreTokens({
+  tokensToIgnore,
+  dontShowLoadingIndicator = false,
+}) {
+  const _tokensToIgnore = Array.isArray(tokensToIgnore)
+    ? tokensToIgnore
+    : [tokensToIgnore];
+
   return async (dispatch) => {
+    if (!dontShowLoadingIndicator) {
+      dispatch(showLoadingIndication());
+    }
     try {
-      await promisifiedBackground.ignoreTokens(tokensToIgnore);
+      await promisifiedBackground.ignoreTokens(_tokensToIgnore);
     } catch (error) {
       log.error(error);
+      dispatch(displayWarning(error.message));
     } finally {
       await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
     }
   };
 }
@@ -1694,21 +1853,6 @@ export async function getTokenStandardAndDetails(
   );
 }
 
-export function removeToken(address) {
-  return async (dispatch) => {
-    dispatch(showLoadingIndication());
-    try {
-      await promisifiedBackground.removeToken(address);
-    } catch (error) {
-      log.error(error);
-      dispatch(displayWarning(error.message));
-    } finally {
-      await forceUpdateMetamaskState(dispatch);
-      dispatch(hideLoadingIndication());
-    }
-  };
-}
-
 export function addTokens(tokens) {
   return (dispatch) => {
     if (Array.isArray(tokens)) {
@@ -3421,36 +3565,16 @@ export async function setSmartTransactionsOptInStatus(
   await promisifiedBackground.setSmartTransactionsOptInStatus(optInState);
 }
 
-export function fetchSmartTransactionFees(unsignedTransaction) {
-  return async (dispatch) => {
-    try {
-      return await promisifiedBackground.fetchSmartTransactionFees(
-        unsignedTransaction,
-      );
-    } catch (e) {
-      log.error(e);
-      if (e.message.startsWith('Fetch error:')) {
-        const errorObj = parseSmartTransactionsError(e.message);
-        dispatch({
-          type: actionConstants.SET_SMART_TRANSACTIONS_ERROR,
-          payload: errorObj.type,
-        });
-      }
-      throw e;
-    }
-  };
-}
-
-export function estimateSmartTransactionsGas(
+export function fetchSmartTransactionFees(
   unsignedTransaction,
   approveTxParams,
 ) {
-  if (approveTxParams) {
-    approveTxParams.value = '0x0';
-  }
   return async (dispatch) => {
+    if (approveTxParams) {
+      approveTxParams.value = '0x0';
+    }
     try {
-      await promisifiedBackground.estimateSmartTransactionsGas(
+      return await promisifiedBackground.fetchSmartTransactionFees(
         unsignedTransaction,
         approveTxParams,
       );
@@ -3613,6 +3737,18 @@ export function setEnableEIP1559V2NoticeDismissed() {
   return promisifiedBackground.setEnableEIP1559V2NoticeDismissed(true);
 }
 
+export function setCustomNetworkListEnabled(customNetworkListEnabled) {
+  return async () => {
+    try {
+      await promisifiedBackground.setCustomNetworkListEnabled(
+        customNetworkListEnabled,
+      );
+    } catch (error) {
+      log.error(error);
+    }
+  };
+}
+
 // QR Hardware Wallets
 export async function submitQRHardwareCryptoHDKey(cbor) {
   await promisifiedBackground.submitQRHardwareCryptoHDKey(cbor);
@@ -3639,3 +3775,29 @@ export function cancelQRHardwareSignRequest() {
     await promisifiedBackground.cancelQRHardwareSignRequest();
   };
 }
+
+export function addCustomNetwork(customRpc) {
+  return async (dispatch) => {
+    try {
+      dispatch(setNewCustomNetworkAdded(customRpc));
+      await promisifiedBackground.addCustomNetwork(customRpc);
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning('Had a problem changing networks!'));
+    }
+  };
+}
+
+export function requestUserApproval(customRpc, originIsMetaMask) {
+  return async (dispatch) => {
+    try {
+      await promisifiedBackground.requestUserApproval(
+        customRpc,
+        originIsMetaMask,
+      );
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning('Had a problem changing networks!'));
+    }
+  };
+}
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index 727835ecff3f..d79b7d5c2330 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -1099,32 +1099,34 @@ describe('Actions', () => {
     });
   });
 
-  describe('#removeToken', () => {
+  describe('#ignoreTokens', () => {
     afterEach(() => {
       sinon.restore();
     });
 
-    it('calls removeToken in background', async () => {
+    it('calls ignoreTokens in background', async () => {
       const store = mockStore();
 
-      const removeTokenStub = sinon.stub().callsFake((_, cb) => cb());
+      const ignoreTokensStub = sinon.stub().callsFake((_, cb) => cb());
 
       background.getApi.returns({
-        removeToken: removeTokenStub,
+        ignoreTokens: ignoreTokensStub,
         getState: sinon.stub().callsFake((cb) => cb(null, baseMockState)),
       });
 
       actions._setBackgroundConnection(background.getApi());
 
-      await store.dispatch(actions.removeToken());
-      expect(removeTokenStub.callCount).toStrictEqual(1);
+      await store.dispatch(
+        actions.ignoreTokens({ tokensToIgnore: '0x0000001' }),
+      );
+      expect(ignoreTokensStub.callCount).toStrictEqual(1);
     });
 
-    it('should display warning when removeToken in background fails', async () => {
+    it('should display warning when ignoreTokens in background fails', async () => {
       const store = mockStore();
 
       background.getApi.returns({
-        removeToken: sinon.stub().callsFake((_, cb) => cb(new Error('error'))),
+        ignoreTokens: sinon.stub().callsFake((_, cb) => cb(new Error('error'))),
         getState: sinon.stub().callsFake((cb) => cb(null, baseMockState)),
       });
 
@@ -1140,7 +1142,9 @@ describe('Actions', () => {
         { type: 'HIDE_LOADING_INDICATION' },
       ];
 
-      await store.dispatch(actions.removeToken());
+      await store.dispatch(
+        actions.ignoreTokens({ tokensToIgnore: '0x0000001' }),
+      );
 
       expect(store.getActions()).toStrictEqual(expectedActions);
     });
@@ -1696,4 +1700,58 @@ describe('Actions', () => {
       expect(expectedAction.value.id).toStrictEqual(txId);
     });
   });
+
+  describe('#cancelMsgs', () => {
+    it('creates COMPLETED_TX with the cancelled messages IDs', async () => {
+      const store = mockStore();
+
+      const cancelTypedMessageStub = sinon.stub().callsFake((_, cb) => cb());
+
+      const cancelPersonalMessageStub = sinon.stub().callsFake((_, cb) => cb());
+
+      background.getApi.returns({
+        cancelTypedMessage: cancelTypedMessageStub,
+        cancelPersonalMessage: cancelPersonalMessageStub,
+        getState: sinon.stub().callsFake((cb) =>
+          cb(null, {
+            currentLocale: 'test',
+            selectedAddress: '0xFirstAddress',
+            provider: {
+              chainId: '0x1',
+            },
+            accounts: {
+              '0xFirstAddress': {
+                balance: '0x0',
+              },
+            },
+            cachedBalances: {
+              '0x1': {
+                '0xFirstAddress': '0x0',
+              },
+            },
+          }),
+        ),
+      });
+
+      const msgsList = [
+        { id: 7648683973086304, status: 'unapproved', type: 'personal_sign' },
+        {
+          id: 7648683973086303,
+          status: 'unapproved',
+          type: 'eth_signTypedData',
+        },
+      ];
+
+      actions._setBackgroundConnection(background.getApi());
+
+      await store.dispatch(actions.cancelMsgs(msgsList));
+      const resultantActions = store.getActions();
+      const expectedActions = resultantActions.filter(
+        (action) => action.type === 'COMPLETED_TX',
+      );
+
+      expect(expectedActions[0].value.id).toStrictEqual(msgsList[0]);
+      expect(expectedActions[1].value.id).toStrictEqual(msgsList[1]);
+    });
+  });
 });
diff --git a/yarn.lock b/yarn.lock
index e293734226e8..a3e11adcb8a1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1411,6 +1411,21 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@eslint/eslintrc@^1.2.2":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.3.tgz#fcaa2bcef39e13d6e9e7f6271f4cc7cae1174886"
+  integrity sha512-uGo44hIwoLGNyduRpjdEpovcbMdd+Nv7amtmJxnKmI8xj6yd5LncmSwDa5NgX/41lIFJtkjD6YdVfgEzPfJ5UA==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.3.2"
+    espree "^9.3.2"
+    globals "^13.9.0"
+    ignore "^5.2.0"
+    import-fresh "^3.2.1"
+    js-yaml "^4.1.0"
+    minimatch "^3.1.2"
+    strip-json-comments "^3.1.1"
+
 "@eth-optimism/contracts@0.0.0-2021919175625":
   version "0.0.0-2021919175625"
   resolved "https://registry.yarnpkg.com/@eth-optimism/contracts/-/contracts-0.0.0-2021919175625.tgz#551ed5d98ac4405596e97f723c28ee6376e65546"
@@ -1457,109 +1472,109 @@
     "@ethereumjs/common" "^2.4.0"
     ethereumjs-util "^7.1.0"
 
-"@ethersproject/abi@5.5.0", "@ethersproject/abi@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.5.0.tgz#fb52820e22e50b854ff15ce1647cc508d6660613"
-  integrity sha512-loW7I4AohP5KycATvc0MgujU6JyCHPqHdeoo9z3Nr9xEiNioxa65ccdm1+fsoJhkuhdRtfcL8cfyGamz2AxZ5w==
-  dependencies:
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/hash" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-
-"@ethersproject/abstract-provider@5.5.1", "@ethersproject/abstract-provider@^5.4.1", "@ethersproject/abstract-provider@^5.5.0":
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.5.1.tgz#2f1f6e8a3ab7d378d8ad0b5718460f85649710c5"
-  integrity sha512-m+MA/ful6eKbxpr99xUYeRvLkfnlqzrF8SZ46d/xFB1A7ZVknYc/sXJG0RcufF52Qn2jeFj1hhcoQ7IXjNKUqg==
-  dependencies:
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/networks" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
-    "@ethersproject/web" "^5.5.0"
-
-"@ethersproject/abstract-signer@5.5.0", "@ethersproject/abstract-signer@^5.4.1", "@ethersproject/abstract-signer@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.5.0.tgz#590ff6693370c60ae376bf1c7ada59eb2a8dd08d"
-  integrity sha512-lj//7r250MXVLKI7sVarXAbZXbv9P50lgmJQGr2/is82EwEb8r7HrxsmMqAjTsztMYy7ohrIhGMIml+Gx4D3mA==
+"@ethersproject/abi@5.6.1", "@ethersproject/abi@^5.6.0":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.6.1.tgz#f7de888edeb56b0a657b672bdd1b3a1135cd14f7"
+  integrity sha512-0cqssYh6FXjlwKWBmLm3+zH2BNARoS5u/hxbz+LpQmcDB3w0W553h2btWui1/uZp2GBM/SI3KniTuMcYyHpA5w==
+  dependencies:
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
+"@ethersproject/abstract-provider@5.6.0", "@ethersproject/abstract-provider@^5.4.1", "@ethersproject/abstract-provider@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.6.0.tgz#0c4ac7054650dbd9c476cf5907f588bbb6ef3061"
+  integrity sha512-oPMFlKLN+g+y7a79cLK3WiLcjWFnZQtXWgnLAbHZcN3s7L4v90UHpTOrLk+m3yr0gt+/h9STTM6zrr7PM8uoRw==
+  dependencies:
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/networks" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/web" "^5.6.0"
+
+"@ethersproject/abstract-signer@5.6.0", "@ethersproject/abstract-signer@^5.4.1", "@ethersproject/abstract-signer@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.6.0.tgz#9cd7ae9211c2b123a3b29bf47aab17d4d016e3e7"
+  integrity sha512-WOqnG0NJKtI8n0wWZPReHtaLkDByPL67tn4nBaDAhmVq8sjHTPbCdz4DRhVu/cfTOvfy9w3iq5QZ7BX7zw56BQ==
   dependencies:
-    "@ethersproject/abstract-provider" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
 
-"@ethersproject/address@5.5.0", "@ethersproject/address@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.5.0.tgz#bcc6f576a553f21f3dd7ba17248f81b473c9c78f"
-  integrity sha512-l4Nj0eWlTUh6ro5IbPTgbpT4wRbdH5l8CQf7icF7sb/SI3Nhd9Y9HzhonTSTi6CefI0necIw7LJqQPopPLZyWw==
+"@ethersproject/address@5.6.0", "@ethersproject/address@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.6.0.tgz#13c49836d73e7885fc148ad633afad729da25012"
+  integrity sha512-6nvhYXjbXsHPS+30sHZ+U4VMagFC/9zAk6Gd/h3S21YW4+yfb0WfRtaAIZ4kfM4rrVwqiy284LP0GtL5HXGLxQ==
   dependencies:
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/rlp" "^5.5.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
 
-"@ethersproject/base64@5.5.0", "@ethersproject/base64@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.5.0.tgz#881e8544e47ed976930836986e5eb8fab259c090"
-  integrity sha512-tdayUKhU1ljrlHzEWbStXazDpsx4eg1dBXUSI6+mHlYklOXoXF6lZvw8tnD6oVaWfnMxAgRSKROg3cVKtCcppA==
+"@ethersproject/base64@5.6.0", "@ethersproject/base64@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.6.0.tgz#a12c4da2a6fb86d88563216b0282308fc15907c9"
+  integrity sha512-2Neq8wxJ9xHxCF9TUgmKeSh9BXJ6OAxWfeGWvbauPh8FuHEjamgHilllx8KkSd5ErxyHIX7Xv3Fkcud2kY9ezw==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
 
-"@ethersproject/basex@5.5.0", "@ethersproject/basex@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.5.0.tgz#e40a53ae6d6b09ab4d977bd037010d4bed21b4d3"
-  integrity sha512-ZIodwhHpVJ0Y3hUCfUucmxKsWQA5TMnavp5j/UOuDdzZWzJlRmuOjcTMIGgHCYuZmHt36BfiSyQPSRskPxbfaQ==
+"@ethersproject/basex@5.6.0", "@ethersproject/basex@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.6.0.tgz#9ea7209bf0a1c3ddc2a90f180c3a7f0d7d2e8a69"
+  integrity sha512-qN4T+hQd/Md32MoJpc69rOwLYRUXwjTlhHDIeUkUmiN/JyWkkLLMoG0TqvSQKNqZOMgN5stbUYN6ILC+eD7MEQ==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
 
-"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.5.0.tgz#875b143f04a216f4f8b96245bde942d42d279527"
-  integrity sha512-6Xytlwvy6Rn3U3gKEc1vP7nR92frHkv6wtVr95LFR3jREXiCPzdWxKQ1cx4JGQBXxcguAwjA8murlYN2TSiEbg==
+"@ethersproject/bignumber@5.6.0", "@ethersproject/bignumber@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.6.0.tgz#116c81b075c57fa765a8f3822648cf718a8a0e26"
+  integrity sha512-VziMaXIUHQlHJmkv1dlcd6GY2PmT0khtAqaMctCIDogxkrarMzA9L94KN1NeXqqOfFD6r0sJT3vCTOFSmZ07DA==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
     bn.js "^4.11.9"
 
-"@ethersproject/bytes@5.5.0", "@ethersproject/bytes@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.5.0.tgz#cb11c526de657e7b45d2e0f0246fb3b9d29a601c"
-  integrity sha512-ABvc7BHWhZU9PNM/tANm/Qx4ostPGadAuQzWTr3doklZOhDlmcBqclrQe/ZXUIj3K8wC28oYeuRa+A37tX9kog==
+"@ethersproject/bytes@5.6.1", "@ethersproject/bytes@^5.6.0":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.6.1.tgz#24f916e411f82a8a60412344bf4a813b917eefe7"
+  integrity sha512-NwQt7cKn5+ZE4uDn+X5RAXLp46E1chXoaMmrxAyA0rblpxz8t58lVkrHXoRIn0lz1joQElQ8410GqhTqMOwc6g==
   dependencies:
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/constants@5.5.0", "@ethersproject/constants@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.5.0.tgz#d2a2cd7d94bd1d58377d1d66c4f53c9be4d0a45e"
-  integrity sha512-2MsRRVChkvMWR+GyMGY4N1sAX9Mt3J9KykCsgUFd/1mwS0UH1qw+Bv9k1UJb3X3YJYFco9H20pjSlOIfCG5HYQ==
+"@ethersproject/constants@5.6.0", "@ethersproject/constants@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.6.0.tgz#55e3eb0918584d3acc0688e9958b0cedef297088"
+  integrity sha512-SrdaJx2bK0WQl23nSpV/b1aq293Lh0sUaZT/yYKPDKn4tlAbkH96SPJwIhwSwTsoQQZxuh1jnqsKwyymoiBdWA==
   dependencies:
-    "@ethersproject/bignumber" "^5.5.0"
+    "@ethersproject/bignumber" "^5.6.0"
 
-"@ethersproject/contracts@5.5.0", "@ethersproject/contracts@^5.4.1":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.5.0.tgz#b735260d4bd61283a670a82d5275e2a38892c197"
-  integrity sha512-2viY7NzyvJkh+Ug17v7g3/IJC8HqZBDcOjYARZLdzRxrfGlRgmYgl6xPRKVbEzy1dWKw/iv7chDcS83pg6cLxg==
-  dependencies:
-    "@ethersproject/abi" "^5.5.0"
-    "@ethersproject/abstract-provider" "^5.5.0"
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
+"@ethersproject/contracts@5.6.0", "@ethersproject/contracts@^5.4.1":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.6.0.tgz#60f2cfc7addd99a865c6c8cfbbcec76297386067"
+  integrity sha512-74Ge7iqTDom0NX+mux8KbRUeJgu1eHZ3iv6utv++sLJG80FVuU9HnHeKVPfjd9s3woFhaFoQGf3B3iH/FrQmgw==
+  dependencies:
+    "@ethersproject/abi" "^5.6.0"
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
 
 "@ethersproject/hardware-wallets@^5.4.0":
   version "5.4.0"
@@ -1573,241 +1588,241 @@
   optionalDependencies:
     "@ledgerhq/hw-transport-node-hid" "5.26.0"
 
-"@ethersproject/hash@5.5.0", "@ethersproject/hash@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.5.0.tgz#7cee76d08f88d1873574c849e0207dcb32380cc9"
-  integrity sha512-dnGVpK1WtBjmnp3mUT0PlU2MpapnwWI0PibldQEq1408tQBAbZpPidkWoVVuNMOl/lISO3+4hXZWCL3YV7qzfg==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-
-"@ethersproject/hdnode@5.5.0", "@ethersproject/hdnode@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.5.0.tgz#4a04e28f41c546f7c978528ea1575206a200ddf6"
-  integrity sha512-mcSOo9zeUg1L0CoJH7zmxwUG5ggQHU1UrRf8jyTYy6HxdZV+r0PBoL1bxr+JHIPXRzS6u/UW4mEn43y0tmyF8Q==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/basex" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/pbkdf2" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/sha2" "^5.5.0"
-    "@ethersproject/signing-key" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
-    "@ethersproject/wordlists" "^5.5.0"
-
-"@ethersproject/json-wallets@5.5.0", "@ethersproject/json-wallets@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.5.0.tgz#dd522d4297e15bccc8e1427d247ec8376b60e325"
-  integrity sha512-9lA21XQnCdcS72xlBn1jfQdj2A1VUxZzOzi9UkNdnokNKke/9Ya2xA9aIK1SC3PQyBDLt4C+dfps7ULpkvKikQ==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/hdnode" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/pbkdf2" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/random" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
+"@ethersproject/hash@5.6.0", "@ethersproject/hash@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.6.0.tgz#d24446a5263e02492f9808baa99b6e2b4c3429a2"
+  integrity sha512-fFd+k9gtczqlr0/BruWLAu7UAOas1uRRJvOR84uDf4lNZ+bTkGl366qvniUZHKtlqxBRU65MkOobkmvmpHU+jA==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
+"@ethersproject/hdnode@5.6.0", "@ethersproject/hdnode@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.6.0.tgz#9dcbe8d629bbbcf144f2cae476337fe92d320998"
+  integrity sha512-61g3Jp3nwDqJcL/p4nugSyLrpl/+ChXIOtCEM8UDmWeB3JCAt5FoLdOMXQc3WWkc0oM2C0aAn6GFqqMcS/mHTw==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/basex" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/pbkdf2" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/sha2" "^5.6.0"
+    "@ethersproject/signing-key" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/wordlists" "^5.6.0"
+
+"@ethersproject/json-wallets@5.6.0", "@ethersproject/json-wallets@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.6.0.tgz#4c2fc27f17e36c583e7a252fb938bc46f98891e5"
+  integrity sha512-fmh86jViB9r0ibWXTQipxpAGMiuxoqUf78oqJDlCAJXgnJF024hOOX7qVgqsjtbeoxmcLwpPsXNU0WEe/16qPQ==
+  dependencies:
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/hdnode" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/pbkdf2" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/random" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
     aes-js "3.0.0"
     scrypt-js "3.0.1"
 
-"@ethersproject/keccak256@5.5.0", "@ethersproject/keccak256@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.5.0.tgz#e4b1f9d7701da87c564ffe336f86dcee82983492"
-  integrity sha512-5VoFCTjo2rYbBe1l2f4mccaRFN/4VQEYFwwn04aJV2h7qf4ZvI2wFxUE1XOX+snbwCLRzIeikOqtAoPwMza9kg==
+"@ethersproject/keccak256@5.6.0", "@ethersproject/keccak256@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.6.0.tgz#fea4bb47dbf8f131c2e1774a1cecbfeb9d606459"
+  integrity sha512-tk56BJ96mdj/ksi7HWZVWGjCq0WVl/QvfhFQNeL8fxhBlGoP+L80uDCiQcpJPd+2XxkivS3lwRm3E0CXTfol0w==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
     js-sha3 "0.8.0"
 
-"@ethersproject/logger@5.5.0", "@ethersproject/logger@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.5.0.tgz#0c2caebeff98e10aefa5aef27d7441c7fd18cf5d"
-  integrity sha512-rIY/6WPm7T8n3qS2vuHTUBPdXHl+rGxWxW5okDfo9J4Z0+gRRZT0msvUdIJkE4/HS29GUMziwGaaKO2bWONBrg==
-
-"@ethersproject/networks@5.5.2", "@ethersproject/networks@^5.5.0":
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.5.2.tgz#784c8b1283cd2a931114ab428dae1bd00c07630b"
-  integrity sha512-NEqPxbGBfy6O3x4ZTISb90SjEDkWYDUbEeIFhJly0F7sZjoQMnj5KYzMSkMkLKZ+1fGpx00EDpHQCy6PrDupkQ==
-  dependencies:
-    "@ethersproject/logger" "^5.5.0"
+"@ethersproject/logger@5.6.0", "@ethersproject/logger@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.6.0.tgz#d7db1bfcc22fd2e4ab574cba0bb6ad779a9a3e7a"
+  integrity sha512-BiBWllUROH9w+P21RzoxJKzqoqpkyM1pRnEKG69bulE9TSQD8SAIvTQqIMZmmCO8pUNkgLP1wndX1gKghSpBmg==
 
-"@ethersproject/pbkdf2@5.5.0", "@ethersproject/pbkdf2@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.5.0.tgz#e25032cdf02f31505d47afbf9c3e000d95c4a050"
-  integrity sha512-SaDvQFvXPnz1QGpzr6/HToLifftSXGoXrbpZ6BvoZhmx4bNLHrxDe8MZisuecyOziP1aVEwzC2Hasj+86TgWVg==
+"@ethersproject/networks@5.6.2", "@ethersproject/networks@^5.6.0":
+  version "5.6.2"
+  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.6.2.tgz#2bacda62102c0b1fcee408315f2bed4f6fbdf336"
+  integrity sha512-9uEzaJY7j5wpYGTojGp8U89mSsgQLc40PCMJLMCnFXTs7nhBveZ0t7dbqWUNrepWTszDbFkYD6WlL8DKx5huHA==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/sha2" "^5.5.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/properties@5.5.0", "@ethersproject/properties@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.5.0.tgz#61f00f2bb83376d2071baab02245f92070c59995"
-  integrity sha512-l3zRQg3JkD8EL3CPjNK5g7kMx4qSwiR60/uk5IVjd3oq1MZR5qUg40CNOoEJoX5wc3DyY5bt9EbMk86C7x0DNA==
+"@ethersproject/pbkdf2@5.6.0", "@ethersproject/pbkdf2@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.6.0.tgz#04fcc2d7c6bff88393f5b4237d906a192426685a"
+  integrity sha512-Wu1AxTgJo3T3H6MIu/eejLFok9TYoSdgwRr5oGY1LTLfmGesDoSx05pemsbrPT2gG4cQME+baTSCp5sEo2erZQ==
   dependencies:
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/sha2" "^5.6.0"
 
-"@ethersproject/providers@5.5.3", "@ethersproject/providers@^5.4.5":
-  version "5.5.3"
-  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.5.3.tgz#56c2b070542ac44eb5de2ed3cf6784acd60a3130"
-  integrity sha512-ZHXxXXXWHuwCQKrgdpIkbzMNJMvs+9YWemanwp1fA7XZEv7QlilseysPvQe0D7Q7DlkJX/w/bGA1MdgK2TbGvA==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.5.0"
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/basex" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/hash" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/networks" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/random" "^5.5.0"
-    "@ethersproject/rlp" "^5.5.0"
-    "@ethersproject/sha2" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
-    "@ethersproject/web" "^5.5.0"
+"@ethersproject/properties@5.6.0", "@ethersproject/properties@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.6.0.tgz#38904651713bc6bdd5bdd1b0a4287ecda920fa04"
+  integrity sha512-szoOkHskajKePTJSZ46uHUWWkbv7TzP2ypdEK6jGMqJaEt2sb0jCgfBo0gH0m2HBpRixMuJ6TBRaQCF7a9DoCg==
+  dependencies:
+    "@ethersproject/logger" "^5.6.0"
+
+"@ethersproject/providers@5.6.5", "@ethersproject/providers@^5.4.5":
+  version "5.6.5"
+  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.6.5.tgz#aefecf78459817a323452e05a16d56afcf807e27"
+  integrity sha512-TRS+c2Ud+cMpWodmGAc9xbnYRPWzRNYt2zkCSnj58nJoamBQ6x4cUbBeo0lTC3y+6RDVIBeJv18OqsDbSktLVg==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/basex" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/networks" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/random" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
+    "@ethersproject/sha2" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/web" "^5.6.0"
     bech32 "1.1.4"
     ws "7.4.6"
 
-"@ethersproject/random@5.5.1", "@ethersproject/random@^5.5.0":
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.5.1.tgz#7cdf38ea93dc0b1ed1d8e480ccdaf3535c555415"
-  integrity sha512-YaU2dQ7DuhL5Au7KbcQLHxcRHfgyNgvFV4sQOo0HrtW3Zkrc9ctWNz8wXQ4uCSfSDsqX2vcjhroxU5RQRV0nqA==
+"@ethersproject/random@5.6.0", "@ethersproject/random@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.6.0.tgz#1505d1ab6a250e0ee92f436850fa3314b2cb5ae6"
+  integrity sha512-si0PLcLjq+NG/XHSZz90asNf+YfKEqJGVdxoEkSukzbnBgC8rydbgbUgBbBGLeHN4kAJwUFEKsu3sCXT93YMsw==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/rlp@5.5.0", "@ethersproject/rlp@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.5.0.tgz#530f4f608f9ca9d4f89c24ab95db58ab56ab99a0"
-  integrity sha512-hLv8XaQ8PTI9g2RHoQGf/WSxBfTB/NudRacbzdxmst5VHAqd1sMibWG7SENzT5Dj3yZ3kJYx+WiRYEcQTAkcYA==
+"@ethersproject/rlp@5.6.0", "@ethersproject/rlp@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.6.0.tgz#55a7be01c6f5e64d6e6e7edb6061aa120962a717"
+  integrity sha512-dz9WR1xpcTL+9DtOT/aDO+YyxSSdO8YIS0jyZwHHSlAmnxA6cKU3TrTd4Xc/bHayctxTgGLYNuVVoiXE4tTq1g==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/sha2@5.5.0", "@ethersproject/sha2@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.5.0.tgz#a40a054c61f98fd9eee99af2c3cc6ff57ec24db7"
-  integrity sha512-B5UBoglbCiHamRVPLA110J+2uqsifpZaTmid2/7W5rbtYVz6gus6/hSDieIU/6gaKIDcOj12WnOdiymEUHIAOA==
+"@ethersproject/sha2@5.6.0", "@ethersproject/sha2@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.0.tgz#364c4c11cc753bda36f31f001628706ebadb64d9"
+  integrity sha512-1tNWCPFLu1n3JM9t4/kytz35DkuF9MxqkGGEHNauEbaARdm2fafnOyw1s0tIQDPKF/7bkP1u3dbrmjpn5CelyA==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
     hash.js "1.1.7"
 
-"@ethersproject/signing-key@5.5.0", "@ethersproject/signing-key@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.5.0.tgz#2aa37169ce7e01e3e80f2c14325f624c29cedbe0"
-  integrity sha512-5VmseH7qjtNmDdZBswavhotYbWB0bOwKIlOTSlX14rKn5c11QmJwGt4GHeo7NrL/Ycl7uo9AHvEqs5xZgFBTng==
+"@ethersproject/signing-key@5.6.1", "@ethersproject/signing-key@^5.6.0":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.6.1.tgz#31b0a531520616254eb0465b9443e49515c4d457"
+  integrity sha512-XvqQ20DH0D+bS3qlrrgh+axRMth5kD1xuvqUQUTeezxUTXBOeR6hWz2/C6FBEu39FRytyybIWrYf7YLSAKr1LQ==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
     bn.js "^4.11.9"
     elliptic "6.5.4"
     hash.js "1.1.7"
 
-"@ethersproject/solidity@5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.5.0.tgz#2662eb3e5da471b85a20531e420054278362f93f"
-  integrity sha512-9NgZs9LhGMj6aCtHXhtmFQ4AN4sth5HuFXVvAQtzmm0jpSCNOTGtrHZJAeYTh7MBjRR8brylWZxBZR9zDStXbw==
+"@ethersproject/solidity@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.6.0.tgz#64657362a596bf7f5630bdc921c07dd78df06dc3"
+  integrity sha512-YwF52vTNd50kjDzqKaoNNbC/r9kMDPq3YzDWmsjFTRBcIF1y4JCQJ8gB30wsTfHbaxgxelI5BfxQSxD/PbJOww==
   dependencies:
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/sha2" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/sha2" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
 
-"@ethersproject/strings@5.5.0", "@ethersproject/strings@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.5.0.tgz#e6784d00ec6c57710755699003bc747e98c5d549"
-  integrity sha512-9fy3TtF5LrX/wTrBaT8FGE6TDJyVjOvXynXJz5MT5azq+E6D92zuKNx7i29sWW2FjVOaWjAsiZ1ZWznuduTIIQ==
+"@ethersproject/strings@5.6.0", "@ethersproject/strings@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.6.0.tgz#9891b26709153d996bf1303d39a7f4bc047878fd"
+  integrity sha512-uv10vTtLTZqrJuqBZR862ZQjTIa724wGPWQqZrofaPI/kUsf53TBG0I0D+hQ1qyNtllbNzaW+PDPHHUI6/65Mg==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.5.0.tgz#7e9bf72e97bcdf69db34fe0d59e2f4203c7a2908"
-  integrity sha512-9RZYSKX26KfzEd/1eqvv8pLauCKzDTub0Ko4LfIgaERvRuwyaNV78mJs7cpIgZaDl6RJui4o49lHwwCM0526zA==
-  dependencies:
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/rlp" "^5.5.0"
-    "@ethersproject/signing-key" "^5.5.0"
-
-"@ethersproject/units@5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.5.0.tgz#104d02db5b5dc42cc672cc4587bafb87a95ee45e"
-  integrity sha512-7+DpjiZk4v6wrikj+TCyWWa9dXLNU73tSTa7n0TSJDxkYbV3Yf1eRh9ToMLlZtuctNYu9RDNNy2USq3AdqSbag==
+"@ethersproject/transactions@5.6.0", "@ethersproject/transactions@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.6.0.tgz#4b594d73a868ef6e1529a2f8f94a785e6791ae4e"
+  integrity sha512-4HX+VOhNjXHZyGzER6E/LVI2i6lf9ejYeWD6l4g50AdmimyuStKc39kvKf1bXWQMg7QNVh+uC7dYwtaZ02IXeg==
+  dependencies:
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/rlp" "^5.6.0"
+    "@ethersproject/signing-key" "^5.6.0"
+
+"@ethersproject/units@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.6.0.tgz#e5cbb1906988f5740254a21b9ded6bd51e826d9c"
+  integrity sha512-tig9x0Qmh8qbo1w8/6tmtyrm/QQRviBh389EQ+d8fP4wDsBrJBf08oZfoiz1/uenKK9M78yAP4PoR7SsVoTjsw==
   dependencies:
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/constants" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/constants" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
 
-"@ethersproject/wallet@5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.5.0.tgz#322a10527a440ece593980dca6182f17d54eae75"
-  integrity sha512-Mlu13hIctSYaZmUOo7r2PhNSd8eaMPVXe1wxrz4w4FCE4tDYBywDH+bAR1Xz2ADyXGwqYMwstzTrtUVIsKDO0Q==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.5.0"
-    "@ethersproject/abstract-signer" "^5.5.0"
-    "@ethersproject/address" "^5.5.0"
-    "@ethersproject/bignumber" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/hash" "^5.5.0"
-    "@ethersproject/hdnode" "^5.5.0"
-    "@ethersproject/json-wallets" "^5.5.0"
-    "@ethersproject/keccak256" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/random" "^5.5.0"
-    "@ethersproject/signing-key" "^5.5.0"
-    "@ethersproject/transactions" "^5.5.0"
-    "@ethersproject/wordlists" "^5.5.0"
-
-"@ethersproject/web@5.5.1", "@ethersproject/web@^5.5.0":
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.5.1.tgz#cfcc4a074a6936c657878ac58917a61341681316"
-  integrity sha512-olvLvc1CB12sREc1ROPSHTdFCdvMh0J5GSJYiQg2D0hdD4QmJDy8QYDb1CvoqD/bF1c++aeKv2sR5uduuG9dQg==
-  dependencies:
-    "@ethersproject/base64" "^5.5.0"
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
-
-"@ethersproject/wordlists@5.5.0", "@ethersproject/wordlists@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.5.0.tgz#aac74963aa43e643638e5172353d931b347d584f"
-  integrity sha512-bL0UTReWDiaQJJYOC9sh/XcRu/9i2jMrzf8VLRmPKx58ckSlOJiohODkECCO50dtLZHcGU6MLXQ4OOrgBwP77Q==
+"@ethersproject/wallet@5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.6.0.tgz#33d11a806d783864208f348709a5a3badac8e22a"
+  integrity sha512-qMlSdOSTyp0MBeE+r7SUhr1jjDlC1zAXB8VD84hCnpijPQiSNbxr6GdiLXxpUs8UKzkDiNYYC5DRI3MZr+n+tg==
+  dependencies:
+    "@ethersproject/abstract-provider" "^5.6.0"
+    "@ethersproject/abstract-signer" "^5.6.0"
+    "@ethersproject/address" "^5.6.0"
+    "@ethersproject/bignumber" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/hdnode" "^5.6.0"
+    "@ethersproject/json-wallets" "^5.6.0"
+    "@ethersproject/keccak256" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/random" "^5.6.0"
+    "@ethersproject/signing-key" "^5.6.0"
+    "@ethersproject/transactions" "^5.6.0"
+    "@ethersproject/wordlists" "^5.6.0"
+
+"@ethersproject/web@5.6.0", "@ethersproject/web@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.6.0.tgz#4bf8b3cbc17055027e1a5dd3c357e37474eaaeb8"
+  integrity sha512-G/XHj0hV1FxI2teHRfCGvfBUHFmU+YOSbCxlAMqJklxSa7QMiHFQfAxvwY2PFqgvdkxEKwRNr/eCjfAPEm2Ctg==
+  dependencies:
+    "@ethersproject/base64" "^5.6.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
+
+"@ethersproject/wordlists@5.6.0", "@ethersproject/wordlists@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.6.0.tgz#79e62c5276e091d8575f6930ba01a29218ded032"
+  integrity sha512-q0bxNBfIX3fUuAo9OmjlEYxP40IB8ABgb7HjEZCL5IKubzV3j30CWi2rqQbjTS2HfoyQbfINoKcTVWP4ejwR7Q==
   dependencies:
-    "@ethersproject/bytes" "^5.5.0"
-    "@ethersproject/hash" "^5.5.0"
-    "@ethersproject/logger" "^5.5.0"
-    "@ethersproject/properties" "^5.5.0"
-    "@ethersproject/strings" "^5.5.0"
+    "@ethersproject/bytes" "^5.6.0"
+    "@ethersproject/hash" "^5.6.0"
+    "@ethersproject/logger" "^5.6.0"
+    "@ethersproject/properties" "^5.6.0"
+    "@ethersproject/strings" "^5.6.0"
 
 "@formatjs/intl-relativetimeformat@^5.2.6":
   version "5.2.6"
@@ -2197,6 +2212,20 @@
     ws "*"
     xtend "^4.0.0"
 
+"@humanwhocodes/config-array@^0.9.2":
+  version "0.9.5"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
+  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.1"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
+
 "@inquirer/confirm@^0.0.14-alpha.0":
   version "0.0.14-alpha.0"
   resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-0.0.14-alpha.0.tgz#4a759c6def5ecd73bc239e090ee6197f74f52dbd"
@@ -2704,6 +2733,11 @@
     prop-types "^15.7.2"
     react-is "^16.8.0"
 
+"@mdn/browser-compat-data@4.1.19":
+  version "4.1.19"
+  resolved "https://registry.yarnpkg.com/@mdn/browser-compat-data/-/browser-compat-data-4.1.19.tgz#33f8c6c63a14a3acc50062df93eaa92f33a10a0a"
+  integrity sha512-zDrdjvX2dwunW4HOGwpibLHvfnDRQOJ89bGnkQ7TXZ7H7JSehbg2Gf0zNbML+R/03QItZ7EI6QHloOJ2znFSdA==
+
 "@mdx-js/loader@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/loader/-/loader-1.6.22.tgz#d9e8fe7f8185ff13c9c8639c048b123e30d322c4"
@@ -2749,70 +2783,44 @@
   integrity sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==
 
 "@metamask/auto-changelog@^2.1.0":
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/@metamask/auto-changelog/-/auto-changelog-2.5.0.tgz#078f38142a3086fdb5556c758969a015c71dfdc9"
-  integrity sha512-39FeU98Poll3eTqv/bggqo3Yisza0WQJ8l9IiYloMVa2LV8XqTNqVkS4cNEU/5yq62n47JSAv6lZBtWCqeAjZQ==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/@metamask/auto-changelog/-/auto-changelog-2.6.0.tgz#3cef14905635b144b0fc86aed8957e0942a91cc4"
+  integrity sha512-YzZ/Uc/3nfvDxZxZT9YMa0CJn8/kpxif/2y8TXi5blzxBiaYop9zUh9a+7PV3C4EQVUNZuTvkE816Ua3AZ0jHA==
   dependencies:
     diff "^5.0.0"
     execa "^5.1.1"
     semver "^7.3.5"
     yargs "^17.0.1"
 
-"@metamask/contract-metadata@^1.31.0", "@metamask/contract-metadata@^1.33.0":
-  version "1.33.0"
-  resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.33.0.tgz#3f0501d5c6d9119ce09c1edb075fc0a8fed7d09c"
-  integrity sha512-sWfzsUe59UH2Y1A7czRjhPmYrWlg4UQDOUPdf+lY7kbXwYrlF/ZUvhQYajdgJVchv2yDzr+cFhWF7DmNb5NyTQ==
-
-"@metamask/controllers@^27.1.1":
-  version "27.1.1"
-  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-27.1.1.tgz#b3288bfd05e381e9e32ed60b68a09b2855db1140"
-  integrity sha512-RzQ4zKsqmieYqAiVsIIazLTo9GYMcm9fDhYPJklP1M+bzm1k49GRFnZEfru3w/dPVY+wWgcDo/0ZWlOILbu3hg==
+"@metamask/bip39@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/bip39/-/bip39-4.0.0.tgz#1cb867a8454e3d45d065107b4e070d58bdb64aac"
+  integrity sha512-xH2g8mFe9p2WePnKeQJH4U8MB6pWPyvwpsz4stb0YdnMOR7cKA6Jm/KOSFiPKr1i9+AzNDImt/XxhwF5ej4jXQ==
   dependencies:
-    "@ethereumjs/common" "^2.3.1"
-    "@ethereumjs/tx" "^3.2.1"
-    "@keystonehq/metamask-airgapped-keyring" "^0.3.0"
-    "@metamask/contract-metadata" "^1.33.0"
-    "@metamask/metamask-eth-abis" "3.0.0"
-    "@metamask/types" "^1.1.0"
-    "@types/uuid" "^8.3.0"
-    abort-controller "^3.0.0"
-    async-mutex "^0.2.6"
-    babel-runtime "^6.26.0"
-    deep-freeze-strict "^1.1.1"
-    eth-ens-namehash "^2.0.8"
-    eth-json-rpc-infura "^5.1.0"
-    eth-keyring-controller "^6.2.1"
-    eth-method-registry "1.1.0"
-    eth-phishing-detect "^1.1.16"
-    eth-query "^2.1.2"
-    eth-rpc-errors "^4.0.0"
-    eth-sig-util "^3.0.0"
-    ethereumjs-util "^7.0.10"
-    ethereumjs-wallet "^1.0.1"
-    ethers "^5.4.1"
-    ethjs-unit "^0.1.6"
-    fast-deep-equal "^3.1.3"
-    immer "^9.0.6"
-    isomorphic-fetch "^3.0.0"
-    json-rpc-engine "^6.1.0"
-    jsonschema "^1.2.4"
-    multiformats "^9.5.2"
-    nanoid "^3.1.31"
-    punycode "^2.1.1"
-    single-call-balance-checker-abi "^1.0.0"
-    uuid "^8.3.2"
-    web3 "^0.20.7"
-    web3-provider-engine "^16.0.3"
+    "@types/node" "11.11.6"
+    create-hash "^1.1.0"
+    pbkdf2 "^3.0.9"
+    randombytes "^2.0.1"
+
+"@metamask/browser-passworder@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/browser-passworder/-/browser-passworder-3.0.0.tgz#c06744e66a968ffa13f70cc71a7d3b15d86b0ee7"
+  integrity sha512-hD10mgvhcDkZX8wnauw8udp1K2MzcbZfrN7Yon9sQ+OqVK9kiQ4VhZAyZNZTy9KJLtfoVD9Y2F6L4gEese7hDA==
 
-"@metamask/controllers@^28.0.0":
-  version "28.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-28.0.0.tgz#dbde11df635daeb9d73ff989cb274f94f913ff39"
-  integrity sha512-ABIZ5OO6g9DzyKrDB0yr1KzyleqVZ4V2d9S8jaToz5AaDZ0tnVkcKptCtRfhzV8xC23xynKjoO7cU9ZkDXBbjw==
+"@metamask/contract-metadata@^1.31.0", "@metamask/contract-metadata@^1.35.0":
+  version "1.35.0"
+  resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.35.0.tgz#2bf2b8f2b6fdbd5132f0bcfa594b6c02dc71c42e"
+  integrity sha512-zfZKwLFOVrQS8vTFoeoNCG9JhqmK4oyembGiGVVpUAYD9BHVZnd9WpicGoUC07ROXLEyQuAK9AJZNBtqwwzfEQ==
+
+"@metamask/controllers@^30.0.0", "@metamask/controllers@^30.0.2":
+  version "30.0.2"
+  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-30.0.2.tgz#0a5512598d2997e34d3542889cae7088fe1fa4b8"
+  integrity sha512-nIUQaaGPzy9whcAvzwHCRsMtw3YWdBv6mUiN9EA2CKdYUesnVj4bpXSSMEso1oEhsNRa2/XTZSb6i+Odo/raJw==
   dependencies:
     "@ethereumjs/common" "^2.3.1"
     "@ethereumjs/tx" "^3.2.1"
     "@keystonehq/metamask-airgapped-keyring" "^0.3.0"
-    "@metamask/contract-metadata" "^1.33.0"
+    "@metamask/contract-metadata" "^1.35.0"
     "@metamask/metamask-eth-abis" "3.0.0"
     "@metamask/types" "^1.1.0"
     "@types/uuid" "^8.3.0"
@@ -2822,9 +2830,9 @@
     deep-freeze-strict "^1.1.1"
     eth-ens-namehash "^2.0.8"
     eth-json-rpc-infura "^5.1.0"
-    eth-keyring-controller "^6.2.1"
+    eth-keyring-controller "^7.0.2"
     eth-method-registry "1.1.0"
-    eth-phishing-detect "^1.1.16"
+    eth-phishing-detect "^1.2.0"
     eth-query "^2.1.2"
     eth-rpc-errors "^4.0.0"
     eth-sig-util "^3.0.0"
@@ -2845,10 +2853,10 @@
     web3 "^0.20.7"
     web3-provider-engine "^16.0.3"
 
-"@metamask/design-tokens@^1.5.1":
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/@metamask/design-tokens/-/design-tokens-1.5.1.tgz#723f10bc5fe03ce14d47b1ad6190a835df62745a"
-  integrity sha512-HLXpuzQGnVPZHOvHpzOVQoe/1mvjNOTNxvAgR1na3BAUiO3NhnUxhYE2RzV0rpbc3UUUGbjVB+dceMZ4FtFfRw==
+"@metamask/design-tokens@^1.6.0", "@metamask/design-tokens@^1.8.0":
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/@metamask/design-tokens/-/design-tokens-1.8.0.tgz#072f455d23e4650ee81681ef066a99a56a9b573a"
+  integrity sha512-EO0WaMRPcegh2EPWdmAqtFX0aZ7hO0NyJasUQyVrYeN1XNGUC2WzXfqwaI0wSV79NE/WEE3c9g5se+MQMExLew==
 
 "@metamask/eslint-config-jest@^9.0.0":
   version "9.0.0"
@@ -2875,10 +2883,21 @@
   resolved "https://registry.yarnpkg.com/@metamask/eslint-config/-/eslint-config-9.0.0.tgz#22d4911b705f7e4e566efbdda0e37912da33e30f"
   integrity sha512-mWlLGQKjXXFOj9EtDClKSoTLeQuPW2kM1w3EpUMf4goYAQ+kLXCCa8pEff6h8ApWAnjhYmXydA1znQ2J4XvD+A==
 
-"@metamask/eth-ledger-bridge-keyring@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.12.0.tgz#d3986e0dbbfeab713f4e0338bf4e5c74a2265bdd"
-  integrity sha512-kceBQc/wKCAdChZeI1P0Fs0FS15WtiD2Q87MqmfuJYpOriWRx/RmjKZoa6EJe2vy20KurlZRcKIiU8nFQ0e/ag==
+"@metamask/eth-hd-keyring@^4.0.2":
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-hd-keyring/-/eth-hd-keyring-4.0.2.tgz#0a81556a556b361755c8d6fb5aced1ce5be0331c"
+  integrity sha512-v47VOTCCmZUZ6uxM5tQNoasQjLdrZADmgph2fhk4m7zKVUxDvYFU7FJT3Rm55fk8mg+dKSbEObDriqbdWeBbcA==
+  dependencies:
+    "@metamask/bip39" "^4.0.0"
+    "@metamask/eth-sig-util" "^4.0.0"
+    eth-simple-keyring "^4.2.0"
+    ethereumjs-util "^7.0.9"
+    ethereumjs-wallet "^1.0.1"
+
+"@metamask/eth-ledger-bridge-keyring@^0.13.0":
+  version "0.13.0"
+  resolved "https://registry.yarnpkg.com/@metamask/eth-ledger-bridge-keyring/-/eth-ledger-bridge-keyring-0.13.0.tgz#586b705d92339d08650f9eef42ab2388c4dd2675"
+  integrity sha512-Xtze0Itc2Z6hLOlCaUjmuRlG97vtx6bPcWHcV1TWWOAKwLgatymUvBB3LTVIjJ/vxo8vysxp3sDf0jlGGlo7OA==
   dependencies:
     "@ethereumjs/tx" "^3.2.0"
     eth-sig-util "^2.0.0"
@@ -2914,15 +2933,16 @@
   resolved "https://registry.yarnpkg.com/@metamask/etherscan-link/-/etherscan-link-2.1.0.tgz#c0be8e68445b7b83cf85bcc03a56cdf8e256c973"
   integrity sha512-ADuWlTUkFfN2vXlz81Bg/0BA+XRor+CdK1055p6k7H6BLIPoDKn9SBOFld9haQFuR9cKh/JYHcnlSIv5R4fUEw==
 
-"@metamask/execution-environments@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.12.0.tgz#b621eb1a5bb854e9b7b43a0888dc5ab9f12f1e5a"
-  integrity sha512-UJXft9jt6OCFFFfEFT/0i3HZ8aGrtp4APDtOVVbf/CHUqVj9FFUruzwydN9KdFbZlBnU7/Von0UmaudlSgVrow==
+"@metamask/execution-environments@^0.18.1":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@metamask/execution-environments/-/execution-environments-0.18.1.tgz#46853241fc0dda4e92b358d56fea927745efef42"
+  integrity sha512-PnEPvcIBsNq2rYshrZePAPL3vGaWPrJyztHlSn+dP9vM2XR1M+Qc0/QrgGy6hnOidQIkhn2ZuFfsnm72dJFmUA==
   dependencies:
     "@metamask/object-multiplex" "^1.2.0"
-    "@metamask/post-message-stream" "^4.0.0"
-    "@metamask/providers" "^8.1.1"
-    "@metamask/snap-types" "^0.12.0"
+    "@metamask/post-message-stream" "^6.0.0"
+    "@metamask/providers" "^9.0.0"
+    "@metamask/snap-types" "^0.18.1"
+    "@metamask/utils" "^2.0.0"
     eth-rpc-errors "^4.0.3"
     pump "^3.0.0"
     ses "^0.15.15"
@@ -2941,14 +2961,16 @@
     color "^0.11.3"
     mersenne-twister "^1.1.0"
 
-"@metamask/key-tree@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@metamask/key-tree/-/key-tree-3.0.1.tgz#e59b6c9c124c74382477f51a389815e849a16de7"
-  integrity sha512-CcpbQua96/CF+KKItrfw9Y6azrlkzFhoVAkyfUl7iq5qldA8xi4CilNjzIqnK8YJcLU44d7nRs5i5/9atY4Beg==
+"@metamask/key-tree@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/key-tree/-/key-tree-4.0.0.tgz#2de20618793e85ee300b4b3d4ca4de9d7f40e276"
+  integrity sha512-Pj5nN6Ko15rei6dSgQnTH64JEN1I8JuTM6Q06/1V7Xp3Fw3g3Nf1scr/u7cQnL17YxXALMCDYaEPdQveo70kSA==
   dependencies:
-    bip39 "^3.0.4"
-    keccak "^3.0.2"
-    secp256k1 "^4.0.2"
+    "@noble/ed25519" "^1.6.0"
+    "@noble/hashes" "^1.0.0"
+    "@noble/secp256k1" "^1.5.5"
+    "@scure/base" "^1.0.0"
+    "@scure/bip39" "^1.0.0"
 
 "@metamask/logo@^3.1.1":
   version "3.1.1"
@@ -2989,17 +3011,45 @@
     "@metamask/safe-event-emitter" "^2.0.0"
     through2 "^2.0.3"
 
-"@metamask/post-message-stream@4.0.0", "@metamask/post-message-stream@^4.0.0":
+"@metamask/phishing-warning@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@metamask/phishing-warning/-/phishing-warning-1.2.1.tgz#75554f8653a32c8d101c5b315707dd7990daf156"
+  integrity sha512-VfQLwiQmXg9YrJzBmDKN6eknNEkxYEAssTpoObVrDYiS91LjuDU59IjoIc1SN9IzDNxIP6ZI95dOculsm/o4qw==
+  dependencies:
+    "@metamask/design-tokens" "^1.6.0"
+    "@metamask/post-message-stream" "^5.1.0"
+    globalthis "1.0.1"
+    obj-multiplex "^1.0.0"
+    pump "^3.0.0"
+    ses "0.12.4"
+
+"@metamask/post-message-stream@^4.0.0":
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-4.0.0.tgz#72f120e562346ca86ccc9b3684023ad44265f0df"
   integrity sha512-r0JcoWXNuHycProx8ClxiIElJY/GVb/0/WWXTMsZu7qDejLo52VNXlwfydCdVjbMXeoT2nK1Yt3d5gjmHy5BWw==
   dependencies:
     readable-stream "2.3.3"
 
-"@metamask/providers@^8.1.1":
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@metamask/providers/-/providers-8.1.1.tgz#7b0dbb54700c949aafba24c9b98e6f4e9d81f325"
-  integrity sha512-CG1sAuD6Mp4MZ5U90anf1FT0moDbStGXT+80TQFYXJbBeTQjhp321WgC/F2IgIJ3mFqOiByC3MQHLuunEVMQOA==
+"@metamask/post-message-stream@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-5.1.0.tgz#3e9a2ed11b540b3868a0a28ffa8ec5a6e5fca29d"
+  integrity sha512-BQi/H67iM7wdtmvoPfgW9bazk/WjvRhXRa5lQ1FpgDlASv1bsCDJaQQ83Q3BwYyisnpnjgJRuC/2bRmas0LMxA==
+  dependencies:
+    "@metamask/utils" "^2.0.0"
+    readable-stream "2.3.3"
+
+"@metamask/post-message-stream@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/post-message-stream/-/post-message-stream-6.0.0.tgz#e8c26b1ef41452b2f1862004651ae3970b944868"
+  integrity sha512-z0l6UMW3z6W4qIhKSh48/6n2Q9AG1oOh9tus+Ncs9w6dAbkElKke+mXZ7tT6oAyE3T4JZLnDfGKbPWYoq+nrsA==
+  dependencies:
+    "@metamask/utils" "^2.0.0"
+    readable-stream "2.3.3"
+
+"@metamask/providers@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/providers/-/providers-9.0.0.tgz#644684f9eceb952138e80afb9103c7e39d8350fe"
+  integrity sha512-9qUkaFafZUROK0CAUBqjsut+7mqKOXFhBCpAhAPVRBqj5TfUTdPI4t8S7GYzPVaDbC7M6kH/YLNCgcfaFWAS+w==
   dependencies:
     "@metamask/object-multiplex" "^1.1.0"
     "@metamask/safe-event-emitter" "^2.0.0"
@@ -3014,15 +3064,16 @@
     pump "^3.0.0"
     webextension-polyfill-ts "^0.25.0"
 
-"@metamask/rpc-methods@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.12.0.tgz#f86208ddb1e864058815f7eff2f1d6bca9ebf618"
-  integrity sha512-lqsmQRaeqye6KyBmAmA4t1T5unUw/guw3DNAvY3u4HxYKR0uQktTxPus9TuxPj3xK3G+IVnplWLQCojOlPE6vA==
+"@metamask/rpc-methods@^0.18.1":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@metamask/rpc-methods/-/rpc-methods-0.18.1.tgz#7fa7ff15fd70f6e5ae9f06f0caa719683f52f4f3"
+  integrity sha512-ZBGeg1HOF/k+nSzi2oXvKM5nm8jjRtV3bc6m3db0hlsy12KooMkdy0Q8ZiOkkqLWn0g8ivvHdxXU7LNhPZ8eBw==
   dependencies:
-    "@metamask/controllers" "^28.0.0"
-    "@metamask/key-tree" "^3.0.1"
-    "@metamask/snap-controllers" "^0.12.0"
+    "@metamask/controllers" "^30.0.0"
+    "@metamask/key-tree" "^4.0.0"
+    "@metamask/snap-controllers" "^0.18.1"
     "@metamask/types" "^1.1.0"
+    "@metamask/utils" "^2.0.0"
     eth-rpc-errors "^4.0.2"
 
 "@metamask/safe-event-emitter@^2.0.0":
@@ -3035,12 +3086,12 @@
   resolved "https://registry.yarnpkg.com/@metamask/slip44/-/slip44-2.1.0.tgz#f76764ca54afc162fbfe563f1994b79ed4711bba"
   integrity sha512-wkFDdY4XtpF+XCqbgwhsrLRgEM/bYfIt47927JTQZQ2QxQYRbSZ6u0QygnVjIR1eqMteRGx2jtUUZ+bxYQTo/w==
 
-"@metamask/smart-transactions-controller@^1.10.0":
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-1.10.0.tgz#230f611eaf9eefc41bac0e7af78101a215c6acba"
-  integrity sha512-Bx2zT7UJJF2f11yANpC3OYCXYt2gpdqXj+RC4hnf18CELeF9Sp52xwQEkO6ig+3isrj6NsyVVmoo5PRcrU++cA==
+"@metamask/smart-transactions-controller@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/smart-transactions-controller/-/smart-transactions-controller-2.1.0.tgz#a1bfbdab05c0ecd93bac5587b8bc56336bc28cc5"
+  integrity sha512-nhvR44ELv/8iBVHaMT8D6B1KLwm9PAb7BSSLAiteDfncxHj7syNGD0nOFynzKp7TPQuRlPXdFo6Z8zXt6O/krg==
   dependencies:
-    "@metamask/controllers" "^27.1.1"
+    "@metamask/controllers" "^30.0.0"
     "@types/lodash" "^4.14.176"
     bignumber.js "^9.0.1"
     ethers "^5.5.1"
@@ -3048,17 +3099,19 @@
     isomorphic-fetch "^3.0.0"
     lodash "^4.17.21"
 
-"@metamask/snap-controllers@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.12.0.tgz#789793f860471bcc856abfdd46b8693afe3041a7"
-  integrity sha512-EG8/VytoYy2RBHdv+CHXbd91j4ibbV1SKKDTRc3b3iUBrp4FMVvQiuaL+pvXtPHCpEKL7doh6KVoAEgib5tHyw==
+"@metamask/snap-controllers@^0.18.1":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-controllers/-/snap-controllers-0.18.1.tgz#081da8664436aed5d3a0ff5f682807de7424fcff"
+  integrity sha512-hoozCeKVV+HCMIPmDg2F5KcIyBEsbIFTM5xL4dmkf5i16+yWDkdNN2iCIfePk+gtpcWyUK6bsevOdu2KwVgEHg==
   dependencies:
-    "@metamask/controllers" "^28.0.0"
-    "@metamask/execution-environments" "^0.12.0"
+    "@metamask/browser-passworder" "^3.0.0"
+    "@metamask/controllers" "^30.0.0"
+    "@metamask/execution-environments" "^0.18.1"
     "@metamask/object-multiplex" "^1.1.0"
     "@metamask/obs-store" "^7.0.0"
-    "@metamask/post-message-stream" "4.0.0"
+    "@metamask/post-message-stream" "^6.0.0"
     "@metamask/safe-event-emitter" "^2.0.0"
+    "@metamask/utils" "^2.0.0"
     "@types/deep-freeze-strict" "^1.1.0"
     "@types/semver" "^7.3.9"
     ajv "^8.8.2"
@@ -3076,23 +3129,30 @@
     semver "^7.3.5"
     tar-stream "^2.2.0"
 
-"@metamask/snap-types@^0.12.0":
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.12.0.tgz#240c92029d3cf6d826c023d4460148f278ad593c"
-  integrity sha512-ZK9gOAc8uNWFN+cdHcGk6OSpQjqKY8i4PdQLFRPQxZfFJfAT4qV2fXXOPOZpnFwYZoAVuFuzHWGV4YnrQbfFvA==
+"@metamask/snap-types@^0.18.1":
+  version "0.18.1"
+  resolved "https://registry.yarnpkg.com/@metamask/snap-types/-/snap-types-0.18.1.tgz#3e5e07a14d69ae43b246ae1abb24d7d1d40eca0f"
+  integrity sha512-ri9vznetbO2TjZjWUqfONgXyPEXP9j8VBgU8xCxCqqiyCi/sMIwSCemp81wnDN+kt7m7zXlC8TmEV3MkSnqGmw==
   dependencies:
-    "@metamask/controllers" "^28.0.0"
+    "@metamask/controllers" "^30.0.0"
 
-"@metamask/test-dapp@^5.0.0":
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-5.0.0.tgz#ecea832b57ff97782bfdd57a4af3408c7c64c02d"
-  integrity sha512-eR9JQ0jPOeP/hdQj9hUkqbvinfjVLYTtdHV+mDCN1tsNxiTdninZbltg9bx6Gqp91v9/9YPhlhXCmMQPq/AMxQ==
+"@metamask/test-dapp@^5.1.1":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@metamask/test-dapp/-/test-dapp-5.1.1.tgz#aadebf28542809650c57aa8f5a3489c748e1414f"
+  integrity sha512-Vast76cYR9vOvSH9Ut8y8LXZbDledUE2BkiLX+PGP5AOTp8Pn8V6jiYg1D/slBh7M8/Q/1AmdW9D0B+fw7esBQ==
 
 "@metamask/types@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@metamask/types/-/types-1.1.0.tgz#9bd14b33427932833c50c9187298804a18c2e025"
   integrity sha512-EEV/GjlYkOSfSPnYXfOosxa3TqYtIW3fhg6jdw+cok/OhMgNn4wCfbENFqjytrHMU2f7ZKtBAvtiP5V8H44sSw==
 
+"@metamask/utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/utils/-/utils-2.0.0.tgz#fe7e970416a256751c429f4a5e96aec6c4366ba7"
+  integrity sha512-AZ63AhRxAZXll+/SEiyEXgrxuAL4yOj0ny4V36VgPmTDvt+7GrmVJWrQF3o5PZZWV6ooaHZ9291RZHRcKZm0HA==
+  dependencies:
+    fast-deep-equal "^3.1.3"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -3119,6 +3179,21 @@
     jsbi "^3.1.5"
     sha.js "^2.4.11"
 
+"@noble/ed25519@^1.6.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@noble/ed25519/-/ed25519-1.6.0.tgz#b55f7c9e532b478bf1d7c4f609e1f3a37850b583"
+  integrity sha512-UKju89WV37IUALIMfKhKW3psO8AqmrE/GvH6QbPKjzolQ98zM7WmGUeY+xdIgSf5tqPFf75ZCYMgym6E9Jsw3Q==
+
+"@noble/hashes@^1.0.0", "@noble/hashes@~1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.0.0.tgz#d5e38bfbdaba174805a4e649f13be9a9ed3351ae"
+  integrity sha512-DZVbtY62kc3kkBtMHqwCOfXrT/hnoORy5BJ4+HU1IR59X0KWAOqsfzQPcUl/lQLlG7qXbe/fZ3r/emxtAl+sqg==
+
+"@noble/secp256k1@^1.5.5":
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.5.5.tgz#315ab5745509d1a8c8e90d0bdf59823ccf9bcfc3"
+  integrity sha512-sZ1W6gQzYnu45wPrWx8D3kwI2/U29VYTx9OjbDAd7jwRItJ0cSTMPRL/C8AWZFn9kWFLQGqEXVEE86w4Z8LpIQ==
+
 "@nodelib/fs.scandir@2.1.3":
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz#3a582bdb53804c6ba6d146579c46e52130cf4a3b"
@@ -3266,6 +3341,19 @@
     redux-thunk "^2.3.0"
     reselect "^4.0.0"
 
+"@scure/base@^1.0.0", "@scure/base@~1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.0.0.tgz#109fb595021de285f05a7db6806f2f48296fcee7"
+  integrity sha512-gIVaYhUsy+9s58m/ETjSJVKHhKTBMmcRb9cEV5/5dwvfDlfORjKrFsDeDHWRrm6RjcPvCLZFwGJjAjLj1gg4HA==
+
+"@scure/bip39@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@scure/bip39/-/bip39-1.0.0.tgz#47504e58de9a56a4bbed95159d2d6829fa491bb0"
+  integrity sha512-HrtcikLbd58PWOkl02k9V6nXWQyoa7A0+Ek9VF7z17DDk9XZAFUcIdqfh0jJXLypmizc5/8P6OxoUeKliiWv4w==
+  dependencies:
+    "@noble/hashes" "~1.0.0"
+    "@scure/base" "~1.0.0"
+
 "@segment/loosely-validate-event@^2.0.0":
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz#87dfc979e5b4e7b82c5f1d8b722dfd5d77644681"
@@ -4873,7 +4961,7 @@
   dependencies:
     "@types/yargs-parser" "*"
 
-"@types/yauzl@^2.9.1":
+"@types/yauzl@2.9.2", "@types/yauzl@^2.9.1":
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
   integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
@@ -5316,17 +5404,10 @@ acorn-globals@^6.0.0:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
-acorn-jsx@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b"
-  integrity sha1-r9+UiPsezvyDSPb7IvRk4ypYs2s=
-  dependencies:
-    acorn "^3.0.4"
-
-acorn-jsx@^5.0.0, acorn-jsx@^5.0.2, acorn-jsx@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b"
-  integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==
+acorn-jsx@^5.3.1, acorn-jsx@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1:
   version "1.8.2"
@@ -5352,17 +5433,12 @@ acorn-walk@^8.2.0:
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
-acorn@^3.0.4:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
-  integrity sha1-ReN/s56No/JbruP/U2niu18iAXo=
-
-acorn@^5.1.2, acorn@^5.2.1:
+acorn@^5.1.2:
   version "5.7.4"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.4.tgz#3e8d8a9947d0599a1796d10225d7432f4a4acf5e"
   integrity sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==
 
-acorn@^6.0.1, acorn@^6.0.7, acorn@^6.4.1:
+acorn@^6.0.1, acorn@^6.4.1:
   version "6.4.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
@@ -5372,53 +5448,64 @@ acorn@^7.0.0, acorn@^7.1.1, acorn@^7.4.0, acorn@^7.4.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.2.4, acorn@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+acorn@^8.2.4, acorn@^8.7.0, acorn@^8.7.1:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
-addons-linter@1.14.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/addons-linter/-/addons-linter-1.14.0.tgz#611f8d9e8c4cc84646ebd0b61c016f758225bf13"
-  integrity sha512-Of7A53J2ltaIZzD8RPH1hVxOR+DmLDuHBtwfhXJw8JTXwzpDIvOKn/i6XDtPgfFlj5wIWxpUGV+tFb/kE/K9gg==
-  dependencies:
-    ajv "6.10.2"
-    ajv-merge-patch "4.1.0"
-    chalk "2.4.2"
-    cheerio "1.0.0-rc.3"
-    columnify "1.5.4"
-    common-tags "1.8.0"
-    deepmerge "4.0.0"
-    dispensary "0.40.0"
-    es6-promisify "6.0.2"
-    eslint "5.16.0"
-    eslint-plugin-no-unsafe-innerhtml "1.0.16"
-    eslint-visitor-keys "1.1.0"
-    espree "6.1.1"
+addons-linter@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/addons-linter/-/addons-linter-5.2.0.tgz#a1a36cdb72f5df359e246c25e1261d2183b4f6a7"
+  integrity sha512-wMKD9aJYYIVXK/grrHErqbGFX0uvEehEiMlAkUA/4M3a9zJDvNrpW0OwZxLEAlNpFISOtKPaQTlt0MHKwQTGFQ==
+  dependencies:
+    "@mdn/browser-compat-data" "4.1.19"
+    addons-moz-compare "1.2.0"
+    addons-scanner-utils "7.0.0"
+    ajv "8.11.0"
+    ajv-merge-patch "5.0.1"
+    chalk "4.1.2"
+    cheerio "1.0.0-rc.10"
+    columnify "1.6.0"
+    common-tags "1.8.2"
+    deepmerge "4.2.2"
+    eslint "8.14.0"
+    eslint-plugin-no-unsanitized "4.0.1"
+    eslint-visitor-keys "3.3.0"
+    espree "9.3.1"
     esprima "4.0.1"
-    first-chunk-stream "3.0.0"
     fluent-syntax "0.13.0"
-    glob "7.1.4"
+    glob "8.0.1"
+    image-size "1.0.1"
     is-mergeable-object "1.1.1"
     jed "1.1.1"
-    mdn-browser-compat-data "0.0.94"
-    os-locale "4.0.0"
-    pino "5.13.3"
-    po2json "0.4.5"
-    postcss "7.0.18"
-    probe-image-size "5.0.0"
-    regenerator-runtime "0.13.3"
+    os-locale "5.0.0"
+    pino "7.11.0"
+    postcss "8.4.13"
     relaxed-json "1.0.3"
-    semver "6.3.0"
-    source-map-support "0.5.13"
-    strip-bom-stream "4.0.0"
+    semver "7.3.7"
+    sha.js "2.4.11"
+    source-map-support "0.5.21"
     tosource "1.0.0"
-    upath "1.2.0"
-    whatwg-url "7.0.0"
-    yargs "14.0.0"
+    upath "2.0.1"
+    yargs "17.4.1"
+    yauzl "2.10.0"
+
+addons-moz-compare@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/addons-moz-compare/-/addons-moz-compare-1.2.0.tgz#d6246cbae224ab629cb7da397b2b9602938ea085"
+  integrity sha512-COG8qk2/dubPqabfcoJW4E7pm2EQDI43iMrHnhlobvq/uRMEzx/PYJ1KaUZ97Vgg44R3QdRG5CvDsTRbMUHcDw==
+
+addons-scanner-utils@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/addons-scanner-utils/-/addons-scanner-utils-7.0.0.tgz#8528b184f51e6552f43676221ce2a7e0aa6de15d"
+  integrity sha512-5j/qMzL13uGSiaFKvUNiMwyWMYD2YtEeY477q7Ahan3c90wLCwXIGCdpCfstgT3hpl44r+d6lqTIo2j2FW6uJQ==
+  dependencies:
+    "@types/yauzl" "2.9.2"
+    common-tags "1.8.2"
+    first-chunk-stream "3.0.0"
+    strip-bom-stream "4.0.0"
+    upath "2.0.1"
     yauzl "2.10.0"
-  optionalDependencies:
-    fsevents "2.0.7"
 
 address@1.1.2, address@^1.0.1:
   version "1.1.2"
@@ -5519,43 +5606,30 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-keywords@^1.0.0:
-  version "1.5.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-1.5.1.tgz#314dd0a4b3368fad3dfcdc54ede6171b886daf3c"
-  integrity sha1-MU3QpLM2j609/NxU7eYXG4htrzw=
-
 ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv-merge-patch@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-merge-patch/-/ajv-merge-patch-4.1.0.tgz#cd580e5860ac53431d6aa901fa3d5e2eb2b74a6c"
-  integrity sha512-0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw==
+ajv-merge-patch@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-merge-patch/-/ajv-merge-patch-5.0.1.tgz#0aba921a2ea8632813478aa3d039d8134b58f876"
+  integrity sha512-0UP3aJCzfzBOkmLR+EinJDCfg6DNtprj3bVPo7JJNgUpZMKt097t9xxQOWFGRoB4JvKKIHE2qe0HkVaS/HyrjQ==
   dependencies:
     fast-json-patch "^2.0.6"
-    json-merge-patch "^0.2.3"
+    json-merge-patch "^1.0.2"
 
-ajv@6.10.2:
-  version "6.10.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
-  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+ajv@8.11.0, ajv@^8.0.1, ajv@^8.8.2:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f"
+  integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==
   dependencies:
-    fast-deep-equal "^2.0.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^4.7.0:
-  version "4.11.8"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536"
-  integrity sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=
-  dependencies:
-    co "^4.6.0"
-    json-stable-stringify "^1.0.1"
-
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -5565,16 +5639,6 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.1, ajv@^8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
-  integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
@@ -5630,16 +5694,6 @@ ansi-colors@^4.1.0, ansi-colors@^4.1.1:
   resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
   integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
 
-ansi-escapes@^1.1.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
-  integrity sha1-06ioOzGapneTZisT52HHkRQiMG4=
-
-ansi-escapes@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b"
-  integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==
-
 ansi-escapes@^4.2.1:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
@@ -5674,16 +5728,11 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
-ansi-regex@^5.0.0:
+ansi-regex@^5.0.0, ansi-regex@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
@@ -5699,11 +5748,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-ansi-styles@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178"
-  integrity sha1-yxAt8cVvUSPquLZ817mAJ6AnkXg=
-
 ansi-to-html@^0.6.11:
   version "0.6.13"
   resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.13.tgz#c72eae8b63e5ca0643aab11bfc6e6f2217425833"
@@ -5794,6 +5838,11 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 args@^5.0.0:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/args/-/args-5.0.1.tgz#4bf298df90a4799a09521362c579278cc2fdd761"
@@ -5986,7 +6035,7 @@ arraybuffer.slice@~0.0.7:
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-arrify@^1.0.0, arrify@^1.0.1:
+arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
@@ -6200,11 +6249,6 @@ async@^2.0.1, async@^2.1.2, async@^2.1.4, async@^2.4.0, async@^2.5.0, async@^2.6
   dependencies:
     lodash "^4.17.14"
 
-async@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.1.0.tgz#42b3b12ae1b74927b5217d8c0016baaf62463772"
-  integrity sha512-4vx/aaY6j/j3Lw3fbCHNWP0pPaTCew3F6F3hYyl/tHs/ndmV1q7NW9T5yuJ2XAGwdQrP+6Wu20x06U4APo/iQQ==
-
 asynckit@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
@@ -6220,6 +6264,11 @@ atob@^2.0.0, atob@^2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+atomic-sleep@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
+  integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
+
 autoprefixer@^8.0.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.1.0.tgz#374cf35be1c0e8fce97408d876f95f66f5cb4641"
@@ -6284,21 +6333,13 @@ axios@^0.19.2, axios@^0.21.2:
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.24.0:
-  version "0.24.0"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.24.0.tgz#804e6fa1e4b9c5288501dd9dff56a7a0940d20d6"
-  integrity sha512-Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA==
+axios@^0.27.2:
+  version "0.27.2"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
+  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
   dependencies:
-    follow-redirects "^1.14.4"
-
-babel-code-frame@^6.16.0:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
-  integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=
-  dependencies:
-    chalk "^1.1.3"
-    esutils "^2.0.2"
-    js-tokens "^3.0.2"
+    follow-redirects "^1.14.9"
+    form-data "^4.0.0"
 
 babel-jest@^26.6.3:
   version "26.6.3"
@@ -6740,27 +6781,6 @@ bip32@^2.0.4:
     typeforce "^1.11.5"
     wif "^2.0.6"
 
-bip39@^2.2.0, bip39@^2.4.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-2.5.0.tgz#51cbd5179460504a63ea3c000db3f787ca051235"
-  integrity sha512-xwIx/8JKoT2+IPJpFEfXoWdYwP7UVAoUxxLNfGCfVowaJE7yg1Y5B1BVPqlUNsBq5/nGwmFkwRJ8xDW4sX8OdA==
-  dependencies:
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-    safe-buffer "^5.0.1"
-    unorm "^1.3.3"
-
-bip39@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/bip39/-/bip39-3.0.4.tgz#5b11fed966840b5e1b8539f0f54ab6392969b2a0"
-  integrity sha512-YZKQlb752TrUWqHWj7XAwCSjYEgGAk+/Aas3V7NyjQeZYsztO8JnQUaCWhcnL4T+jL8nvB8typ2jRPzTlgugNw==
-  dependencies:
-    "@types/node" "11.11.6"
-    create-hash "^1.1.0"
-    pbkdf2 "^3.0.9"
-    randombytes "^2.0.1"
-
 bip66@^1.1.0, bip66@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/bip66/-/bip66-1.1.5.tgz#01fa8748785ca70955d5011217d1b3139969ca22"
@@ -6843,7 +6863,7 @@ blob@0.0.5:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bluebird@3.7.2, bluebird@^3.3.5, bluebird@^3.5.0, bluebird@^3.5.5, bluebird@^3.7.2:
+bluebird@3.7.2, bluebird@^3.3.5, bluebird@^3.5.5, bluebird@^3.7.2:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
@@ -6920,7 +6940,7 @@ body@^5.1.0:
     raw-body "~1.1.0"
     safe-json-parse "~1.0.1"
 
-boolbase@~1.0.0:
+boolbase@^1.0.0, boolbase@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -7004,6 +7024,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -7626,18 +7653,6 @@ callbackify@^1.1.0:
   resolved "https://registry.yarnpkg.com/callbackify/-/callbackify-1.1.0.tgz#d2a36986d28aa69714526c111209beeb9979d31e"
   integrity sha1-0qNphtKKppcUUmwREgm+65l50x4=
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -7796,7 +7811,7 @@ chain-function@^1.0.0:
   resolved "https://registry.yarnpkg.com/chain-function/-/chain-function-1.0.1.tgz#c63045e5b4b663fb86f1c6e186adaf1de402a1cc"
   integrity sha512-SxltgMwL9uCko5/ZCLiyG2B7R9fY4pDZUw7hJ4MhirdjBLosoDqkWABi3XMucddHdLiFJMb7PD2MZifZriuMTg==
 
-chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -7805,16 +7820,13 @@ chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+chalk@4.1.2, chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
 
 chalk@^3.0.0:
   version "3.0.0"
@@ -7824,23 +7836,6 @@ chalk@^3.0.0:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
-  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@~0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
-  integrity sha1-UZmj3c0MHv4jvAjBsCewYXbgxk8=
-  dependencies:
-    ansi-styles "~1.0.0"
-    has-color "~0.1.0"
-    strip-ansi "~0.1.0"
-
 change-case@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/change-case/-/change-case-3.0.2.tgz#fd48746cce02f03f0a672577d1d3a8dc2eceb037"
@@ -7890,11 +7885,6 @@ character-reference-invalid@^1.0.0:
   resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.1.tgz#942835f750e4ec61a308e60c2ef8cc1011202efc"
   integrity sha1-lCg191Dk7GGjCOYMLvjMEBEgLvw=
 
-chardet@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
-  integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
-
 charenc@0.0.2:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
@@ -7912,17 +7902,29 @@ checkpoint-store@^1.1.0:
   dependencies:
     functional-red-black-tree "^1.0.1"
 
-cheerio@1.0.0-rc.3, cheerio@^1.0.0-rc.2:
-  version "1.0.0-rc.3"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6"
-  integrity sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==
-  dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.1"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash "^4.15.0"
-    parse5 "^3.0.1"
+cheerio-select@^1.5.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696"
+  integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==
+  dependencies:
+    css-select "^4.3.0"
+    css-what "^6.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
+
+cheerio@1.0.0-rc.10, cheerio@^1.0.0-rc.2:
+  version "1.0.0-rc.10"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+  integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
+  dependencies:
+    cheerio-select "^1.5.0"
+    dom-serializer "^1.3.2"
+    domhandler "^4.2.0"
+    htmlparser2 "^6.1.0"
+    parse5 "^6.0.1"
+    parse5-htmlparser2-tree-adapter "^6.0.1"
+    tslib "^2.2.0"
 
 chokidar@3.3.0:
   version "3.3.0"
@@ -7990,13 +7992,13 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^101.0.0:
-  version "101.0.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-101.0.0.tgz#ad19003008dd5df1770a1ad96059a9c5fe78e365"
-  integrity sha512-LkkWxy6KM/0YdJS8qBeg5vfkTZTRamhBfOttb4oic4echDgWvCU1E8QcBbUBOHqZpSrYMyi7WMKmKMhXFUaZ+w==
+chromedriver@^103.0.0:
+  version "103.0.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-103.0.0.tgz#2ef086d62076e3ff6df6cfb84895d11d2c18d9cf"
+  integrity sha512-7BHf6HWt0PeOHCzWO8qlnD13sARzr5AKTtG8Csn+czsuAsajwPxdLNtry5GPh8HYFyl+i0M+yg3bT43AGfgU9w==
   dependencies:
     "@testim/chrome-version" "^1.1.2"
-    axios "^0.24.0"
+    axios "^0.27.2"
     del "^6.0.0"
     extract-zip "^2.0.1"
     https-proxy-agent "^5.0.0"
@@ -8062,11 +8064,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 cjs-module-lexer@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f"
@@ -8114,20 +8111,6 @@ cli-boxes@^2.2.0:
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.0.tgz#538ecae8f9c6ca508e3c3c95b453fe93cb4c168d"
   integrity sha512-gpaBrMAizVEANOpfZp/EEUixTXDyGt7DFzdK5hU+UbWt/J0lB0w20ncZj59Z9a93xHb9u12zF5BS6i9RKbtg4w==
 
-cli-cursor@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987"
-  integrity sha1-ZNo/fValRBLll5S9Ytw1KV6PKYc=
-  dependencies:
-    restore-cursor "^1.0.1"
-
-cli-cursor@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
-  integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=
-  dependencies:
-    restore-cursor "^2.0.0"
-
 cli-spinners@^2.6.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
@@ -8143,11 +8126,6 @@ cli-table3@0.6.0:
   optionalDependencies:
     colors "^1.1.2"
 
-cli-width@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639"
-  integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=
-
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
@@ -8367,11 +8345,6 @@ color@^0.11.3:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
-colorette@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
-  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
-
 colors@0.5.x:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
@@ -8382,12 +8355,12 @@ colors@^1.1.2, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-columnify@1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
-  integrity sha1-Rzfd8ce2mop8NAVweC6UfuyOeLs=
+columnify@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.6.0.tgz#6989531713c9008bb29735e61e37acf5bd553cf3"
+  integrity sha512-lomjuFZKfM6MSAnV9aCZC9sc0qGbmZdfygNv+nCpqVkSKdCxCklLtd16O0EILGkImHw9ZpHkAnHaB+8Zxq5W6Q==
   dependencies:
-    strip-ansi "^3.0.0"
+    strip-ansi "^6.0.1"
     wcwidth "^1.0.0"
 
 combine-source-map@^0.8.0, combine-source-map@~0.8.0:
@@ -8437,12 +8410,7 @@ comment-parser@1.2.4:
   resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.2.4.tgz#489f3ee55dfd184a6e4bffb31baba284453cb760"
   integrity sha512-pm0b+qv+CkWNriSTMsfnjChF9kH0kxz55y44Wo5le9qLxMj5xDQAaEd9ZN1ovSuk9CsrncWaFwgpOMg7ClJwkw==
 
-common-tags@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
-  integrity sha512-6P6g0uetGpW/sdyUy/iQQCbFF0kWVMSIVSyYz7Zgjcgh8mgw8PQzDNZeyZ5DQ2gM7LBoZPHmnjz8rUthkBG5tw==
-
-common-tags@^1.8.0:
+common-tags@1.8.2, common-tags@^1.8.0:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
@@ -8514,7 +8482,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.0, concat-stream@^1.5.2, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@^1.6.2, concat-stream@~1.6.0:
+concat-stream@^1.5.0, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@^1.6.2, concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -9011,7 +8979,7 @@ css-loader@^3.6.0:
     schema-utils "^2.7.0"
     semver "^6.3.0"
 
-css-select@^1.1.0, css-select@~1.2.0:
+css-select@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858"
   integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=
@@ -9021,6 +8989,17 @@ css-select@^1.1.0, css-select@~1.2.0:
     domutils "1.5.1"
     nth-check "~1.0.1"
 
+css-select@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^6.0.1"
+    domhandler "^4.3.1"
+    domutils "^2.8.0"
+    nth-check "^2.0.1"
+
 css-to-xpath@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/css-to-xpath/-/css-to-xpath-0.1.0.tgz#ac0d1c26cef023f7bd8cf2e1fc1f77134bc70c47"
@@ -9042,6 +9021,11 @@ css-what@2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
+css-what@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
+
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -9253,7 +9237,7 @@ debug-fabulous@^1.0.0:
     memoizee "0.4.X"
     object-assign "4.X"
 
-debug@2, debug@2.6.9, debug@^2.1.1, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -9407,12 +9391,7 @@ deep-object-diff@^1.1.0:
   resolved "https://registry.yarnpkg.com/deep-object-diff/-/deep-object-diff-1.1.0.tgz#d6fabf476c2ed1751fc94d5ca693d2ed8c18bc5a"
   integrity sha512-b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw==
 
-deepmerge@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.0.0.tgz#3e3110ca29205f120d7cb064960a39c3d2087c09"
-  integrity sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==
-
-deepmerge@^4.0.0, deepmerge@^4.2.2:
+deepmerge@4.2.2, deepmerge@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
   integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
@@ -9515,19 +9494,6 @@ degenerator@^3.0.1:
     esprima "^4.0.0"
     vm2 "^3.9.3"
 
-del@^2.0.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/del/-/del-2.2.2.tgz#c12c981d067846c84bcaf862cff930d907ffd1a8"
-  integrity sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
-  dependencies:
-    globby "^5.0.0"
-    is-path-cwd "^1.0.0"
-    is-path-in-cwd "^1.0.0"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    rimraf "^2.2.8"
-
 del@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
@@ -9889,19 +9855,6 @@ discontinuous-range@1.0.0:
   resolved "https://registry.yarnpkg.com/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a"
   integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo=
 
-dispensary@0.40.0:
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/dispensary/-/dispensary-0.40.0.tgz#dedc4a4e4aebae7afcb6ae91f03e292ba107fe67"
-  integrity sha512-ttKDQvGBf+ygQ4rXuLBLErp3kMJIS+Gfmy+nJ6N/EfV8/RQdjd9SORpc729YK5SYAI+IuBo88S2xGUjKjU2jYw==
-  dependencies:
-    async "~3.1.0"
-    natural-compare-lite "~1.4.0"
-    pino "~5.13.0"
-    request "~2.88.0"
-    sha.js "~2.4.4"
-    source-map-support "~0.5.4"
-    yargs "~14.0.0"
-
 disposables@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/disposables/-/disposables-1.0.2.tgz#36c6a674475f55a2d6913567a601444e487b4b6e"
@@ -9957,7 +9910,7 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.0.0, doctrine@^2.1.0:
+doctrine@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
   integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
@@ -9998,7 +9951,7 @@ dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
-dom-serializer@0, dom-serializer@~0.1.1:
+dom-serializer@0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
   integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -10006,6 +9959,15 @@ dom-serializer@0, dom-serializer@~0.1.1:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
 dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
@@ -10021,6 +9983,11 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.3.0.tgz#5c45e8e869952626331d7aab326d01daf65d589d"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
+
 domexception@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.0.tgz#81fe5df81b3f057052cde3a9fa9bf536a85b9ab0"
@@ -10040,6 +10007,13 @@ domhandler@^2.3.0:
   dependencies:
     domelementtype "1"
 
+domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
+  dependencies:
+    domelementtype "^2.2.0"
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -10056,6 +10030,15 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^2.5.2, domutils@^2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-case@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
@@ -10154,10 +10137,10 @@ duplexify@^3.1.2, duplexify@^3.4.2, duplexify@^3.5.0, duplexify@^3.5.1:
     readable-stream "^2.0.0"
     stream-shift "^1.0.0"
 
-duplexify@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.1.tgz#7027dc374f157b122a8ae08c2d3ea4d2d953aa61"
-  integrity sha512-DY3xVEmVHTv1wSzKNbwoU6nVjzI369Y6sPoqfYr0/xlx3IdX2n94xIszTcjPO8W8ZIv0Wb0PXNcjuZyT4wiICA==
+duplexify@^4.1.1, duplexify@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-4.1.2.tgz#18b4f8d28289132fa0b9573c898d9f903f81c7b0"
+  integrity sha512-fz3OjcNCHmRP12MJoZMPglx8m4rrFP8rovnk4vT8Fs+aonZoCwGg10dSsQsfP/E62eZcPTMSMP6686fu9Qlqtw==
   dependencies:
     end-of-stream "^1.4.1"
     inherits "^2.0.3"
@@ -10291,13 +10274,6 @@ encoding-down@~5.0.0:
     level-errors "^2.0.0"
     xtend "^4.0.1"
 
-encoding@^0.1.11:
-  version "0.1.12"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb"
-  integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=
-  dependencies:
-    iconv-lite "~0.4.13"
-
 end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
@@ -10386,11 +10362,16 @@ enquirer@^2.3.5:
   dependencies:
     ansi-colors "^4.1.1"
 
-entities@^1.1.1, entities@^1.1.2, entities@~1.1.1:
+entities@^1.1.1, entities@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 env-paths@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.0.tgz#cdca557dc009152917d6166e2febe1f039685e43"
@@ -10563,7 +10544,7 @@ es6-iterator@2.0.3, es6-iterator@^2.0.1, es6-iterator@~2.0.1, es6-iterator@~2.0.
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
-es6-map@^0.1.3, es6-map@^0.1.5:
+es6-map@^0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0"
   integrity sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=
@@ -10585,11 +10566,6 @@ es6-promise@^4.2.8:
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
   integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
 
-es6-promisify@6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.0.2.tgz#525c23725b8510f5f1f2feb5a1fbad93a93e29b4"
-  integrity sha512-eO6vFm0JvqGzjWIQA6QVKjxpmELfhWbDUWHm1rPfIbn55mhKPiAa5xpLmQWJrNa629ZIeQ8ZvMAi13kvrjK6Mg==
-
 es6-set@^0.1.5, es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -10673,16 +10649,6 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-escope@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/escope/-/escope-3.6.0.tgz#e01975e812781a163a6dadfdd80398dc64c889c3"
-  integrity sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=
-  dependencies:
-    es6-map "^0.1.3"
-    es6-weak-map "^2.0.1"
-    esrecurse "^4.1.0"
-    estraverse "^4.1.1"
-
 eslint-config-prettier@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6"
@@ -10772,12 +10738,10 @@ eslint-plugin-mocha@^8.1.0:
     eslint-utils "^2.1.0"
     ramda "^0.27.1"
 
-eslint-plugin-no-unsafe-innerhtml@1.0.16:
-  version "1.0.16"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsafe-innerhtml/-/eslint-plugin-no-unsafe-innerhtml-1.0.16.tgz#7d02878c8e9bf7916b88836d5ac122b42f151932"
-  integrity sha1-fQKHjI6b95FriINtWsEitC8VGTI=
-  dependencies:
-    eslint "^3.7.1"
+eslint-plugin-no-unsanitized@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-4.0.1.tgz#e2343265467ba2270ade478cbe07bbafeaea412d"
+  integrity sha512-y/lAMWnPPC7RYuUdxlEL/XiCL8FehN9h9s3Kjqbp/Kv0i9NZs+IXSC2kS546Fa4Bumwy31HlVS/OdWX0Kxb5Xg==
 
 eslint-plugin-node@^11.1.0:
   version "11.1.0"
@@ -10842,12 +10806,13 @@ eslint-scope@^5.1.0, eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-utils@^1.3.1:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
-  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+eslint-scope@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
-    eslint-visitor-keys "^1.1.0"
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
 
 eslint-utils@^2.0.0, eslint-utils@^2.1.0:
   version "2.1.0"
@@ -10863,12 +10828,12 @@ eslint-utils@^3.0.0:
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
-eslint-visitor-keys@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
-  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+eslint-visitor-keys@3.3.0, eslint-visitor-keys@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
+  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
 
-eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
@@ -10878,88 +10843,46 @@ eslint-visitor-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8"
   integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==
 
-eslint@5.16.0:
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
-  integrity sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==
+eslint@8.14.0:
+  version "8.14.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.14.0.tgz#62741f159d9eb4a79695b28ec4989fcdec623239"
+  integrity sha512-3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw==
   dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.9.1"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
+    "@eslint/eslintrc" "^1.2.2"
+    "@humanwhocodes/config-array" "^0.9.2"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.3.2"
     doctrine "^3.0.0"
-    eslint-scope "^4.0.3"
-    eslint-utils "^1.3.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^5.0.1"
-    esquery "^1.0.1"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^7.1.1"
+    eslint-utils "^3.0.0"
+    eslint-visitor-keys "^3.3.0"
+    espree "^9.3.1"
+    esquery "^1.4.0"
     esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
     functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.7.0"
-    ignore "^4.0.6"
+    glob-parent "^6.0.1"
+    globals "^13.6.0"
+    ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
-    inquirer "^6.2.2"
-    js-yaml "^3.13.0"
+    is-glob "^4.0.0"
+    js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.11"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
     minimatch "^3.0.4"
-    mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^5.5.1"
-    strip-ansi "^4.0.0"
-    strip-json-comments "^2.0.1"
-    table "^5.2.3"
+    optionator "^0.9.1"
+    regexpp "^3.2.0"
+    strip-ansi "^6.0.1"
+    strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-
-eslint@^3.7.1:
-  version "3.19.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-3.19.0.tgz#c8fc6201c7f40dd08941b87c085767386a679acc"
-  integrity sha1-yPxiAcf0DdCJQbh8CFdnOGpnmsw=
-  dependencies:
-    babel-code-frame "^6.16.0"
-    chalk "^1.1.3"
-    concat-stream "^1.5.2"
-    debug "^2.1.1"
-    doctrine "^2.0.0"
-    escope "^3.6.0"
-    espree "^3.4.0"
-    esquery "^1.0.0"
-    estraverse "^4.2.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    glob "^7.0.3"
-    globals "^9.14.0"
-    ignore "^3.2.0"
-    imurmurhash "^0.1.4"
-    inquirer "^0.12.0"
-    is-my-json-valid "^2.10.0"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.5.1"
-    json-stable-stringify "^1.0.0"
-    levn "^0.3.0"
-    lodash "^4.0.0"
-    mkdirp "^0.5.0"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.1"
-    pluralize "^1.2.1"
-    progress "^1.1.8"
-    require-uncached "^1.0.2"
-    shelljs "^0.7.5"
-    strip-bom "^3.0.0"
-    strip-json-comments "~2.0.1"
-    table "^3.7.8"
-    text-table "~0.2.0"
-    user-home "^2.0.0"
+    v8-compile-cache "^2.0.3"
 
 eslint@^7.23.0:
   version "7.23.0"
@@ -11009,31 +10932,14 @@ esm@^3.2.25:
   resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.1.tgz#7f80e5f7257fc47db450022d723e356daeb1e5de"
-  integrity sha512-EYbr8XZUhWbYCqQRW0duU5LxzL5bETN6AjKBGy1302qqzPaCH10QbRg3Wvco79Z8x9WbiE8HYB4e75xl6qUYvQ==
-  dependencies:
-    acorn "^7.0.0"
-    acorn-jsx "^5.0.2"
-    eslint-visitor-keys "^1.1.0"
-
-espree@^3.4.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.2.tgz#756ada8b979e9dcfcdb30aad8d1a9304a905e1ca"
-  integrity sha512-sadKeYwaR/aJ3stC2CdvgXu1T16TdYN+qwCpcWbMnGJ8s0zNWemzrvb2GbD4OhmJ/fwpJjudThAlLobGbWZbCQ==
-  dependencies:
-    acorn "^5.2.1"
-    acorn-jsx "^3.0.0"
-
-espree@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
-  integrity sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==
+espree@9.3.1:
+  version "9.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
+  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
   dependencies:
-    acorn "^6.0.7"
-    acorn-jsx "^5.0.0"
-    eslint-visitor-keys "^1.0.0"
+    acorn "^8.7.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^3.3.0"
 
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
@@ -11044,12 +10950,21 @@ espree@^7.3.0, espree@^7.3.1:
     acorn-jsx "^5.3.1"
     eslint-visitor-keys "^1.3.0"
 
+espree@^9.3.1, espree@^9.3.2:
+  version "9.3.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.2.tgz#f58f77bd334731182801ced3380a8cc859091596"
+  integrity sha512-D211tC7ZwouTIuY5x9XnS0E9sWNChB7IYKX/Xp5eQj3nFXhqmiUDB9q27y76oFl8jTg3pXcQx/bpxMfs3CIZbA==
+  dependencies:
+    acorn "^8.7.1"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.3.0"
+
 esprima@4.0.1, esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.0.0, esquery@^1.0.1, esquery@^1.4.0:
+esquery@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
   integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
@@ -11123,14 +11038,6 @@ eth-eip712-util-browser@^0.0.3:
     buffer "^6.0.3"
     js-sha3 "^0.8.0"
 
-eth-ens-namehash@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-1.0.2.tgz#05ecdd6bac2d7fd7bc5ca84a993c6bad9da4edb9"
-  integrity sha1-Bezda6wtf9e8XKhKmTxrrZ2k7bk=
-  dependencies:
-    idna-uts46 "^1.0.1"
-    js-sha3 "^0.5.7"
-
 eth-ens-namehash@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/eth-ens-namehash/-/eth-ens-namehash-2.0.8.tgz#229ac46eca86d52e0c991e7cb2aef83ff0f68bcf"
@@ -11139,17 +11046,6 @@ eth-ens-namehash@^2.0.8:
     idna-uts46-hx "^2.3.1"
     js-sha3 "^0.5.7"
 
-eth-hd-keyring@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/eth-hd-keyring/-/eth-hd-keyring-3.6.0.tgz#6835d30aa411b8d3ef098e82f6427b5325082abb"
-  integrity sha512-n2CwE9VNXsxLrXQa6suv0Umt4NT6+HtoahKgWx3YviXx4rQFwVT5nDwZfjhwrT31ESuoXYNIeJgz5hKLD96QeQ==
-  dependencies:
-    bip39 "^2.2.0"
-    eth-sig-util "^3.0.1"
-    eth-simple-keyring "^4.2.0"
-    ethereumjs-util "^7.0.9"
-    ethereumjs-wallet "^1.0.1"
-
 eth-json-rpc-filters@^4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/eth-json-rpc-filters/-/eth-json-rpc-filters-4.2.1.tgz#82204a13c99927dbf42cbb3962846650c6281f33"
@@ -11204,19 +11100,16 @@ eth-json-rpc-middleware@^8.0.0:
     node-fetch "^2.6.7"
     pify "^3.0.0"
 
-eth-keyring-controller@^6.2.0, eth-keyring-controller@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-6.2.1.tgz#61901071fc74059ed37cb5ae93870fdcae6e3781"
-  integrity sha512-x2gTM1iHp2Kbvdtd9Eslysw0qzVZiqOzpVB3AU/ni2Xiit+rlcv2H80zYKjrEwlfWFDj4YILD3bOqlnEMmRJOA==
+eth-keyring-controller@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/eth-keyring-controller/-/eth-keyring-controller-7.0.2.tgz#c4d7f9be179f08b3bb18410066bc4c8e91f50552"
+  integrity sha512-U4bqbXkTn7js/47rnFtVyBYQcvOKtmraD/YReBwuy4R56bFSJN8kinP0JJRl3WTtVfVS1l5A/jjsF3qk5TaTeg==
   dependencies:
-    bip39 "^2.4.0"
-    bluebird "^3.5.0"
+    "@metamask/bip39" "^4.0.0"
+    "@metamask/eth-hd-keyring" "^4.0.2"
     browser-passworder "^2.0.3"
-    eth-hd-keyring "^3.6.0"
     eth-sig-util "^3.0.1"
     eth-simple-keyring "^4.2.0"
-    ethereumjs-util "^7.0.9"
-    loglevel "^1.5.0"
     obs-store "^4.0.3"
 
 eth-lattice-keyring@^0.7.3:
@@ -11255,10 +11148,10 @@ eth-method-registry@^2.0.0:
   dependencies:
     ethjs "^0.4.0"
 
-eth-phishing-detect@^1.1.16:
-  version "1.1.16"
-  resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.1.16.tgz#637158d5774819e1a861f6d169e6d77d076a47fd"
-  integrity sha512-/o9arK5qFOKVdfZK9hJVAQP0eKXjAvImIKNBMfF9Nj1HGicD3wfsVuXDu1OHrxuEi6+4kYtD9wyAn/3G7g7VrA==
+eth-phishing-detect@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/eth-phishing-detect/-/eth-phishing-detect-1.2.0.tgz#11b357776b2d1b98a9ac594a1343e5184fc26bf0"
+  integrity sha512-+M7D4dhu5tkSA9b5eiBwDeJCjwy+7Lv49nuTEw8fNZIZUAVZC3d2XHatBq1MOW7J8kxNGbBdgBuIf65opI7Tkg==
   dependencies:
     fast-levenshtein "^2.0.6"
 
@@ -11371,7 +11264,7 @@ ethereum-cryptography@^0.1.3:
     secp256k1 "^4.0.1"
     setimmediate "^1.0.5"
 
-ethereum-ens-network-map@^1.0.0, ethereum-ens-network-map@^1.0.2:
+ethereum-ens-network-map@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/ethereum-ens-network-map/-/ethereum-ens-network-map-1.0.2.tgz#4e27bad18dae7bd95d84edbcac2c9e739fc959b9"
   integrity sha512-5qwJ5n3YhjSpE6O/WEBXCAb2nagUgyagJ6C0lGUBWC4LjKp/rRzD+pwtDJ6KCiITFEAoX4eIrWOjRy0Sylq5Hg==
@@ -11542,41 +11435,41 @@ ethers@^4.0.20, ethers@^4.0.28:
     uuid "2.0.1"
     xmlhttprequest "1.8.0"
 
-ethers@^5.0.8, ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1:
-  version "5.5.4"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.4.tgz#e1155b73376a2f5da448e4a33351b57a885f4352"
-  integrity sha512-N9IAXsF8iKhgHIC6pquzRgPBJEzc9auw3JoRkaKe+y4Wl/LFBtDDunNe7YmdomontECAcC5APaAgWZBiu1kirw==
-  dependencies:
-    "@ethersproject/abi" "5.5.0"
-    "@ethersproject/abstract-provider" "5.5.1"
-    "@ethersproject/abstract-signer" "5.5.0"
-    "@ethersproject/address" "5.5.0"
-    "@ethersproject/base64" "5.5.0"
-    "@ethersproject/basex" "5.5.0"
-    "@ethersproject/bignumber" "5.5.0"
-    "@ethersproject/bytes" "5.5.0"
-    "@ethersproject/constants" "5.5.0"
-    "@ethersproject/contracts" "5.5.0"
-    "@ethersproject/hash" "5.5.0"
-    "@ethersproject/hdnode" "5.5.0"
-    "@ethersproject/json-wallets" "5.5.0"
-    "@ethersproject/keccak256" "5.5.0"
-    "@ethersproject/logger" "5.5.0"
-    "@ethersproject/networks" "5.5.2"
-    "@ethersproject/pbkdf2" "5.5.0"
-    "@ethersproject/properties" "5.5.0"
-    "@ethersproject/providers" "5.5.3"
-    "@ethersproject/random" "5.5.1"
-    "@ethersproject/rlp" "5.5.0"
-    "@ethersproject/sha2" "5.5.0"
-    "@ethersproject/signing-key" "5.5.0"
-    "@ethersproject/solidity" "5.5.0"
-    "@ethersproject/strings" "5.5.0"
-    "@ethersproject/transactions" "5.5.0"
-    "@ethersproject/units" "5.5.0"
-    "@ethersproject/wallet" "5.5.0"
-    "@ethersproject/web" "5.5.1"
-    "@ethersproject/wordlists" "5.5.0"
+ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.5, ethers@^5.5.1, ethers@^5.6.4:
+  version "5.6.5"
+  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.6.5.tgz#3185ac7815dc640993408adf6f133ffabfbcbb63"
+  integrity sha512-9CTmplO9bv0s/aPw3HB3txGzKz3tUSI2EfO4dJo0W2WvaEq1ArgsEX6obV+bj5X3yY+Zgb1kAux8TDtJKe1FaA==
+  dependencies:
+    "@ethersproject/abi" "5.6.1"
+    "@ethersproject/abstract-provider" "5.6.0"
+    "@ethersproject/abstract-signer" "5.6.0"
+    "@ethersproject/address" "5.6.0"
+    "@ethersproject/base64" "5.6.0"
+    "@ethersproject/basex" "5.6.0"
+    "@ethersproject/bignumber" "5.6.0"
+    "@ethersproject/bytes" "5.6.1"
+    "@ethersproject/constants" "5.6.0"
+    "@ethersproject/contracts" "5.6.0"
+    "@ethersproject/hash" "5.6.0"
+    "@ethersproject/hdnode" "5.6.0"
+    "@ethersproject/json-wallets" "5.6.0"
+    "@ethersproject/keccak256" "5.6.0"
+    "@ethersproject/logger" "5.6.0"
+    "@ethersproject/networks" "5.6.2"
+    "@ethersproject/pbkdf2" "5.6.0"
+    "@ethersproject/properties" "5.6.0"
+    "@ethersproject/providers" "5.6.5"
+    "@ethersproject/random" "5.6.0"
+    "@ethersproject/rlp" "5.6.0"
+    "@ethersproject/sha2" "5.6.0"
+    "@ethersproject/signing-key" "5.6.1"
+    "@ethersproject/solidity" "5.6.0"
+    "@ethersproject/strings" "5.6.0"
+    "@ethersproject/transactions" "5.6.0"
+    "@ethersproject/units" "5.6.0"
+    "@ethersproject/wallet" "5.6.0"
+    "@ethersproject/web" "5.6.0"
+    "@ethersproject/wordlists" "5.6.0"
 
 ethjs-abi@0.2.0:
   version "0.2.0"
@@ -11617,48 +11510,11 @@ ethjs-contract@0.2.3, ethjs-contract@^0.2.1, ethjs-contract@^0.2.3:
     ethjs-util "0.1.3"
     js-sha3 "0.5.5"
 
-ethjs-contract@^0.1.7:
-  version "0.1.9"
-  resolved "https://registry.yarnpkg.com/ethjs-contract/-/ethjs-contract-0.1.9.tgz#1c2766896a56d47ec1d6d661829c49cc38a5520a"
-  integrity sha1-HCdmiWpW1H7B1tZhgpxJzDilUgo=
-  dependencies:
-    ethjs-abi "0.2.0"
-    ethjs-filter "0.1.5"
-    ethjs-util "0.1.3"
-    js-sha3 "0.5.5"
-
-ethjs-ens@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ethjs-ens/-/ethjs-ens-2.0.1.tgz#eda0a21aacbdac2f60c4a01034df21c48a5a325b"
-  integrity sha1-7aCiGqy9rC9gxKAQNN8hxIpaMls=
-  dependencies:
-    eth-ens-namehash "^1.0.2"
-    ethereum-ens-network-map "^1.0.0"
-    ethjs-contract "^0.1.7"
-    ethjs-query "^0.2.4"
-
-ethjs-filter@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/ethjs-filter/-/ethjs-filter-0.1.5.tgz#0112af6017c24677e32b8fdeb20e6196019b7598"
-  integrity sha1-ARKvYBfCRnfjK4/esg5hlgGbdZg=
-
 ethjs-filter@0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/ethjs-filter/-/ethjs-filter-0.1.8.tgz#2b02726b820ed4dd3860614d185c0c0f7ed1747f"
   integrity sha512-qTDPskDL2UadHwjvM8A+WG9HwM4/FoSY3p3rMJORkHltYcAuiQZd2otzOYKcL5w2Q3sbAkW/E3yt/FPFL/AVXA==
 
-ethjs-format@0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.2.tgz#d73b3a605c2e1257079f7077fd5448e998ce0fcd"
-  integrity sha1-1zs6YFwuElcHn3B3/VRI6ZjOD80=
-  dependencies:
-    bn.js "4.11.6"
-    ethjs-schema "0.1.5"
-    ethjs-util "0.1.3"
-    is-hex-prefixed "1.0.0"
-    number-to-bn "1.7.0"
-    strip-hex-prefix "1.0.0"
-
 ethjs-format@0.2.7:
   version "0.2.7"
   resolved "https://registry.yarnpkg.com/ethjs-format/-/ethjs-format-0.2.7.tgz#20c92f31c259a381588d069830d838b489774b86"
@@ -11697,19 +11553,6 @@ ethjs-query@0.3.8, ethjs-query@^0.3.4, ethjs-query@^0.3.7, ethjs-query@^0.3.8:
     ethjs-rpc "0.2.0"
     promise-to-callback "^1.0.0"
 
-ethjs-query@^0.2.4:
-  version "0.2.9"
-  resolved "https://registry.yarnpkg.com/ethjs-query/-/ethjs-query-0.2.9.tgz#a26e6b4f38699e92f34b2184e75c7894329c42f1"
-  integrity sha1-om5rTzhpnpLzSyGE51x4lDKcQvE=
-  dependencies:
-    ethjs-format "0.2.2"
-    ethjs-rpc "0.1.5"
-
-ethjs-rpc@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.1.5.tgz#099e22f27dc4c18b6978a485fc36b1b0f7969080"
-  integrity sha1-CZ4i8n3EwYtpeKSF/DaxsPeWkIA=
-
 ethjs-rpc@0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/ethjs-rpc/-/ethjs-rpc-0.2.0.tgz#3d0011e32cfff156ed6147818c6fb8f801701b4c"
@@ -11717,11 +11560,6 @@ ethjs-rpc@0.2.0:
   dependencies:
     promise-to-callback "^1.0.0"
 
-ethjs-schema@0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.1.5.tgz#59740e3b3977bcdbb9b11bc3068201e8aceabb0d"
-  integrity sha1-WXQOOzl3vNu5sRvDBoIB6Kzquw0=
-
 ethjs-schema@0.2.1:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/ethjs-schema/-/ethjs-schema-0.2.1.tgz#47e138920421453617069034684642e26bb310f4"
@@ -11905,11 +11743,6 @@ execall@^2.0.0:
   dependencies:
     clone-regexp "^2.1.0"
 
-exit-hook@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8"
-  integrity sha1-8FyiM7SMBdVP/wd2XfhQfpXAL/g=
-
 exit-on-epipe@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/exit-on-epipe/-/exit-on-epipe-1.0.1.tgz#0bdd92e87d5285d267daa8171d0eb06159689692"
@@ -12037,7 +11870,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@3.0.2, extend@^3.0.0, extend@~3.0.2:
+extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -12049,15 +11882,6 @@ extension-port-stream@^2.0.0, extension-port-stream@^2.0.1:
   dependencies:
     webextension-polyfill-ts "^0.22.0"
 
-external-editor@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.0.3.tgz#5866db29a97826dbe4bf3afd24070ead9ea43a27"
-  integrity sha512-bn71H9+qWoOQKyZDo25mOMVpSmXROAsTJVVVYzrrtol3d4y+AsKjf4Iwl2Q+IuT0kFSQ1qo166UuIwqYq7mGnA==
-  dependencies:
-    chardet "^0.7.0"
-    iconv-lite "^0.4.24"
-    tmp "^0.0.33"
-
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -12224,6 +12048,11 @@ fast-redact@^1.4.4:
   resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-1.5.0.tgz#302892f566750c4f5eec7b830bfc9bc473484034"
   integrity sha512-Afo61CgUjkzdvOKDHn08qnZ0kwck38AOGcMlvSGzvJbIab6soAP5rdoQayecGCDsD69AiF9vJBXyq31eoEO2tQ==
 
+fast-redact@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.1.1.tgz#790fcff8f808c2e12fabbfb2be5cb2deda448fa0"
+  integrity sha512-odVmjC8x8jNeMZ3C+rPMESzXVSEU8tSWSHv9HFxP2mm89G/1WwqhrerJDQm9Zus8X6aoRgQDThKqptdNA6bt+A==
+
 fast-safe-stringify@^2.0.6, fast-safe-stringify@^2.0.7:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884"
@@ -12288,29 +12117,6 @@ figgy-pudding@^3.5.1:
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
   integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
 
-figures@^1.3.5:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"
-  integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-    object-assign "^4.1.0"
-
-figures@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
-  integrity sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=
-  dependencies:
-    escape-string-regexp "^1.0.5"
-
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -12582,16 +12388,6 @@ flagged-respawn@^1.0.0:
   resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"
   integrity sha1-Tnmumy6zi/hrO7Vr8+ClaqX8q9c=
 
-flat-cache@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.0.tgz#d3030b32b38154f4e3b7e9c709f490f7ef97c481"
-  integrity sha1-0wMLMrOBVPTjt+nHCfSQ9++XxIE=
-  dependencies:
-    circular-json "^0.3.1"
-    del "^2.0.2"
-    graceful-fs "^4.1.2"
-    write "^0.2.1"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -12659,10 +12455,10 @@ fnv1a@^1.0.1:
   resolved "https://registry.yarnpkg.com/fnv1a/-/fnv1a-1.0.1.tgz#915e2d6d023c43d5224ad9f6d2a3c4156f5712f5"
   integrity sha1-kV4tbQI8Q9UiStn20qPEFW9XEvU=
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.4:
-  version "1.14.8"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc"
-  integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA==
+follow-redirects@^1.14.0, follow-redirects@^1.14.9:
+  version "1.15.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.1.tgz#0ca6a452306c9b276e4d3127483e29575e207ad5"
+  integrity sha512-yLAMQs+k0b2m7cVxpS1VKJVvoz7SS9Td1zss3XRwXj+ZDH00RJgnuLx7E44wx02kQLrdM3aOOy+FpzS7+8OizA==
 
 for-each@^0.3.3:
   version "0.3.3"
@@ -12763,6 +12559,15 @@ form-data@^3.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+form-data@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
+  dependencies:
+    asynckit "^0.4.0"
+    combined-stream "^1.0.8"
+    mime-types "^2.1.12"
+
 format@^0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/format/-/format-0.2.2.tgz#d6170107e9efdc4ed30c9dc39016df942b5cb58b"
@@ -12894,11 +12699,6 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
-  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
-
 fsevents@^1.2.7:
   version "1.2.9"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.9.tgz#3f5ed66583ccd6f400b5a00db6f7e861363e388f"
@@ -13021,20 +12821,6 @@ geckodriver@^1.21.0:
     https-proxy-agent "5.0.0"
     tar "6.0.2"
 
-generate-function@^2.0.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/generate-function/-/generate-function-2.3.1.tgz#f069617690c10c868e73b8465746764f97c3479f"
-  integrity sha512-eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==
-  dependencies:
-    is-property "^1.0.2"
-
-generate-object-property@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/generate-object-property/-/generate-object-property-1.2.0.tgz#9c0e1c40308ce804f4783618b937fa88f99d50d0"
-  integrity sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=
-  dependencies:
-    is-property "^1.0.0"
-
 generic-names@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-2.0.1.tgz#f8a378ead2ccaa7a34f0317b05554832ae41b872"
@@ -13165,13 +12951,6 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gettext-parser@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/gettext-parser/-/gettext-parser-1.1.0.tgz#2c5a6638d893934b9b55037d0ad82cb7004b2679"
-  integrity sha1-LFpmONiTk0ubVQN9CtgstwBLJnk=
-  dependencies:
-    encoding "^0.1.11"
-
 git-up@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
@@ -13237,6 +13016,13 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0,
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@^6.0.1:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
+  dependencies:
+    is-glob "^4.0.3"
+
 glob-promise@^3.4.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/glob-promise/-/glob-promise-3.4.0.tgz#b6b8f084504216f702dc2ce8c9bc9ac8866fdb20"
@@ -13289,15 +13075,15 @@ glob@7.1.3:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-8.0.1.tgz#00308f5c035aa0b2a447cd37ead267ddff1577d3"
+  integrity sha512-cF7FYZZ47YzmCu7dDy50xSRRfO3ErRfrXuLZcNIuyiJEco0XSrGtuilG19L5xp3NcwTx7Gn+X6Tv3fmsUPTbow==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^5.0.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
@@ -13395,7 +13181,7 @@ global@~4.3.0:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
@@ -13407,19 +13193,14 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-globals@^13.6.0:
-  version "13.7.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.7.0.tgz#aed3bcefd80ad3ec0f0be2cf0c895110c0591795"
-  integrity sha512-Aipsz6ZKRxa/xQkZhNg0qIWXT6x6rD46f6x/PCnBomlttdIyAPak4YD9jTmKpZ72uROSMU87qJtcgpgHaVchiA==
+globals@^13.6.0, globals@^13.9.0:
+  version "13.15.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.15.0.tgz#38113218c907d2f7e98658af246cef8b77e90bac"
+  integrity sha512-bpzcOlgDhMG070Av0Vy5Owklpv1I6+j96GhUI7Rh7IzDCKLzboflLrrfqMu8NquDbiR4EOQk7XzJwqVJxicxog==
   dependencies:
     type-fest "^0.20.2"
 
-globals@^9.14.0:
-  version "9.18.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
-  integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-
-globalthis@^1.0.0, globalthis@^1.0.1:
+globalthis@1.0.1, globalthis@^1.0.0, globalthis@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.1.tgz#40116f5d9c071f9e8fb0037654df1ab3a83b7ef9"
   integrity sha512-mJPRTc/P39NH/iNG4mXa9aIhNymaQikTrnspeCa2ZuJ+mH2QN/rXwtX3XwKrHqWgUQFbNZKtHM105aHzJalElw==
@@ -13450,18 +13231,6 @@ globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-5.0.0.tgz#ebd84667ca0dbb330b99bcfc68eac2bc54370e0d"
-  integrity sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
-  dependencies:
-    array-union "^1.0.1"
-    arrify "^1.0.0"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 globby@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
@@ -13846,13 +13615,6 @@ hard-rejection@^2.1.0:
   resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883"
   integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA==
 
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 has-bigints@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
@@ -13865,11 +13627,6 @@ has-binary2@~1.0.2:
   dependencies:
     isarray "2.0.1"
 
-has-color@~0.1.0:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/has-color/-/has-color-0.1.7.tgz#67144a5260c34fc3cca677d041daf52fe7b78b2f"
-  integrity sha1-ZxRKUmDDT8PMpnfQQdr1L+e3iy8=
-
 has-cors@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
@@ -14238,7 +13995,7 @@ htmlescape@^1.1.0, htmlescape@^1.1.1:
   resolved "https://registry.yarnpkg.com/htmlescape/-/htmlescape-1.1.1.tgz#3a03edc2214bca3b66424a3e7959349509cb0351"
   integrity sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=
 
-htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1:
+htmlparser2@^3.10.0, htmlparser2@^3.3.0:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -14250,6 +14007,16 @@ htmlparser2@^3.10.0, htmlparser2@^3.3.0, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 http-assert@^1.3.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/http-assert/-/http-assert-1.4.1.tgz#c5f725d677aa7e873ef736199b89686cceb37878"
@@ -14414,7 +14181,7 @@ hyphenate-style-name@^1.0.3:
   resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.3.tgz#097bb7fa0b8f1a9cf0bd5c734cf95899981a9b48"
   integrity sha512-EcuixamT82oplpoJ2XU4pDtKGWQ7b00CD9f1ug9IaQ3p1bkHMiKCZ9ut9QDI6qsa6cpUuB+A/I+zLtdNK4n2DQ==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4, iconv-lite@~0.4.13:
+iconv-lite@0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -14452,13 +14219,6 @@ idna-uts46-hx@^2.3.1:
   dependencies:
     punycode "2.1.0"
 
-idna-uts46@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/idna-uts46/-/idna-uts46-1.1.0.tgz#be098b2b7c1cabfbef87a8b80f626fac37366aea"
-  integrity sha1-vgmLK3wcq/vvh6i4D2JvrDc2auo=
-  dependencies:
-    punycode "^2.1.0"
-
 ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -14476,20 +14236,22 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.2.0:
-  version "3.3.7"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021"
-  integrity sha512-YGG3ejvBNHRqu0559EOxxNFihD0AjpvHlC/pdGKd3X3ofe+CoJkYazwNJYTNebqpPKN+VVQbh4ZFn1DivMNuHA==
-
 ignore@^4.0.3, ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
-ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8:
-  version "5.1.8"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
-  integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==
+ignore@^5.1.1, ignore@^5.1.4, ignore@^5.1.8, ignore@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
+  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+
+image-size@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.0.1.tgz#86d6cfc2b1d19eab5d2b368d4b9194d9e48541c5"
+  integrity sha512-VAwkvNSNGClRw9mDHhc5Efax8PLlsOGcUTh0T/LIriC8vPA3U5PdqXWqkz406MoYHMKW8Uf9gWr05T/rYB44kQ==
+  dependencies:
+    queue "6.0.2"
 
 immediate@^3.2.3, immediate@~3.2.3:
   version "3.2.3"
@@ -14607,44 +14369,6 @@ inline-style-parser@0.1.1:
   resolved "https://registry.yarnpkg.com/inline-style-parser/-/inline-style-parser-0.1.1.tgz#ec8a3b429274e9c0a1f1c4ffa9453a7fef72cea1"
   integrity sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==
 
-inquirer@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-0.12.0.tgz#1ef2bfd63504df0bc75785fff8c2c41df12f077e"
-  integrity sha1-HvK/1jUE3wvHV4X/+MLEHfEvB34=
-  dependencies:
-    ansi-escapes "^1.1.0"
-    ansi-regex "^2.0.0"
-    chalk "^1.0.0"
-    cli-cursor "^1.0.1"
-    cli-width "^2.0.0"
-    figures "^1.3.5"
-    lodash "^4.3.0"
-    readline2 "^1.0.1"
-    run-async "^0.1.0"
-    rx-lite "^3.1.2"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.0"
-    through "^2.3.6"
-
-inquirer@^6.2.2:
-  version "6.3.1"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.3.1.tgz#7a413b5e7950811013a3db491c61d1f3b776e8e7"
-  integrity sha512-MmL624rfkFt4TG9y/Jvmt8vdmOo836U7Y0Hxr2aFk3RelZEGX4Igk0KabWrcaaZaTv9uzglOqWh1Vly+FAWAXA==
-  dependencies:
-    ansi-escapes "^3.2.0"
-    chalk "^2.4.2"
-    cli-cursor "^2.1.0"
-    cli-width "^2.0.0"
-    external-editor "^3.0.3"
-    figures "^2.0.0"
-    lodash "^4.17.11"
-    mute-stream "0.0.7"
-    run-async "^2.2.0"
-    rxjs "^6.4.0"
-    string-width "^2.1.0"
-    strip-ansi "^5.1.0"
-    through "^2.3.6"
-
 insert-module-globals@^7.0.0, insert-module-globals@^7.2.1:
   version "7.2.1"
   resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.1.tgz#d5e33185181a4e1f33b15f7bf100ee91890d5cb3"
@@ -15549,10 +15273,10 @@ is-glob@^3.0.0, is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
-  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
@@ -15625,22 +15349,6 @@ is-mergeable-object@1.1.1:
   resolved "https://registry.yarnpkg.com/is-mergeable-object/-/is-mergeable-object-1.1.1.tgz#faaa3ed1cfce87d6f7d2f5885e92cc30af3e2ebf"
   integrity sha512-CPduJfuGg8h8vW74WOxHtHmtQutyQBzR+3MjQ6iDHIYdbOnm1YC7jv43SqCoU8OPGTJD4nibmiryA4kmogbGrA==
 
-is-my-ip-valid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824"
-  integrity sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==
-
-is-my-json-valid@^2.10.0:
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.20.0.tgz#1345a6fca3e8daefc10d0fa77067f54cedafd59a"
-  integrity sha512-XTHBZSIIxNsIsZXg7XB5l8z/OBFosl1Wao4tXLpeC7eKU4Vm/kdop2azkPqULwnfGQjmeDIyey9g7afMMtdWAA==
-  dependencies:
-    generate-function "^2.0.0"
-    generate-object-property "^1.1.0"
-    is-my-ip-valid "^1.0.0"
-    jsonpointer "^4.0.0"
-    xtend "^4.0.0"
-
 is-nan@^1.2.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
@@ -15801,11 +15509,6 @@ is-promise@~1, is-promise@~1.0.0:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-1.0.1.tgz#31573761c057e33c2e91aab9e96da08cefbe76e5"
   integrity sha1-MVc3YcBX4zwukaq56W2gjO++duU=
 
-is-property@^1.0.0, is-property@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"
-  integrity sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=
-
 is-pull-stream@0.0.0, is-pull-stream@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/is-pull-stream/-/is-pull-stream-0.0.0.tgz#a3bc3d1c6d3055151c46bde6f399efed21440ca9"
@@ -15846,11 +15549,6 @@ is-relative@^1.0.0:
   dependencies:
     is-unc-path "^1.0.0"
 
-is-resolvable@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.0.1.tgz#acca1cd36dbe44b974b924321555a70ba03b1cf4"
-  integrity sha512-y5CXYbzvB3jTnWAZH1Nl7ykUWb6T3BcTs56HUruwBf8MhF56n1HWqhDWnVFo8GHrUPDgvUUNVhrc2U8W7iqz5g==
-
 is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz#d778488bd0a4666a3be8a1482b9f2baafedea8b4"
@@ -16586,11 +16284,6 @@ js-string-escape@^1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-tokens@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
-  integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
-
 js-yaml@3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
@@ -16599,7 +16292,7 @@ js-yaml@3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.5.1:
+js-yaml@^3.13.1, js-yaml@^3.14.0:
   version "3.14.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
@@ -16607,6 +16300,13 @@ js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.14.0, js-yaml@^3.5.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsan@^3.1.13:
   version "3.1.13"
   resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.13.tgz#4de8c7bf8d1cfcd020c313d438f930cec4b91d86"
@@ -16710,12 +16410,12 @@ json-buffer@3.0.0:
   resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
   integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
 
-json-merge-patch@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/json-merge-patch/-/json-merge-patch-0.2.3.tgz#fa2c6b5af87da77bae2966a589d52e23ed81fe40"
-  integrity sha1-+ixrWvh9p3uuKWalidUuI+2B/kA=
+json-merge-patch@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-merge-patch/-/json-merge-patch-1.0.2.tgz#c4626811943b2f362f8607ae8f03d528875465b0"
+  integrity sha512-M6Vp2GN9L7cfuMXiWOmHj9bEFbeC250iVtcKQbqVgEsDVYnIsrNsbU+h/Y/PkbBQCtEa4Bez+Ebv0zfbC8ObLg==
   dependencies:
-    deep-equal "^1.0.0"
+    fast-deep-equal "^3.1.3"
 
 json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
@@ -16869,11 +16569,6 @@ jsonparse@^1.2.0:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonpointer@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
-  integrity sha1-T9kss04OnbPInIYi7PUfm5eMbLk=
-
 jsonschema@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
@@ -16972,15 +16667,15 @@ jss@^10.0.3, jss@^10.3.0:
     array-includes "^3.1.2"
     object.assign "^4.1.2"
 
-jszip@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
+jszip@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.10.0.tgz#faf3db2b4b8515425e34effcdbb086750a346061"
+  integrity sha512-LDfVtOLtOxb9RXkYOwPyNBTQDL4eUbqahtoY6x07GiDJHwSYvn8sHHIw8wINImV3MqbMNve2gSuM1DDqEKk09Q==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
     readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
+    setimmediate "^1.0.5"
 
 junk@^3.1.0:
   version "3.1.0"
@@ -17037,7 +16732,7 @@ keccak@3.0.1:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-keccak@^3.0.0, keccak@^3.0.2:
+keccak@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.2.tgz#4c2c6e8c54e04f2670ee49fa734eb9da152206e0"
   integrity sha512-PyKKjkH53wDMLGrvmRGSNWgmSxZOUqbnXwKL9tmgbFYA1iAYqW21kfR7mZXV0MlESiefxQQE9X9fTa3X+2MPDQ==
@@ -17262,9 +16957,9 @@ lavamoat-tofu@^5.1.3:
     "@babel/traverse" "^7.10.1"
 
 lavamoat-tofu@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.1.tgz#df3a1d09021790d5a4ccc1039751e9b3c2df85f6"
-  integrity sha512-QotLOiEcGBlWBJPYSZKDRRFchpwN9s3Ra8DDTuxJ57dGTBKOvvvfA+BpAjH/w1JcEhFkl5Wkc57Hl1oVzE8D2A==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/lavamoat-tofu/-/lavamoat-tofu-6.0.2.tgz#eed3031e31fac37b36eb42a7bad9ec7ef824ea34"
+  integrity sha512-za9lWVdB5hk1Clt77Sfb81x425sOi9nnZvJcsCfhQaojNJSn8B/3MQR9D7HmmNw4jJE+4B0ILqZoz/MNaABEYg==
   dependencies:
     "@babel/parser" "^7.10.1"
     "@babel/traverse" "^7.10.1"
@@ -17578,14 +17273,6 @@ leven@^3.1.0:
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
   integrity sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==
 
-levn@^0.3.0, levn@~0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
-  dependencies:
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-
 levn@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
@@ -17594,6 +17281,14 @@ levn@^0.4.1:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
+levn@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  dependencies:
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+
 libp2p-bootstrap@~0.9.3:
   version "0.9.7"
   resolved "https://registry.yarnpkg.com/libp2p-bootstrap/-/libp2p-bootstrap-0.9.7.tgz#eabedab24775a6175f07ce035b716e8114d84a76"
@@ -18268,6 +17963,11 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
 lodash.partition@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.partition/-/lodash.partition-4.6.0.tgz#a38e46b73469e0420b0da1212e66d414be364ba4"
@@ -18303,7 +18003,7 @@ lodash.uniqby@^4.7.0:
   resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
   integrity sha1-2ZwHpmnp5tJOE2Lf4mbGdhavEwI=
 
-lodash@=3.10.1, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.3.0, lodash@^4.7.0, lodash@~4.17.2:
+lodash@=3.10.1, lodash@^4.13.1, lodash@^4.16.4, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.7.0, lodash@~4.17.2:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -18329,7 +18029,7 @@ log-symbols@^4.0.0:
   dependencies:
     chalk "^4.0.0"
 
-loglevel@^1.4.1, loglevel@^1.5.0:
+loglevel@^1.4.1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.0.tgz#ae0caa561111498c5ba13723d6fb631d24003934"
   integrity sha1-rgyqVhERSYxboTcj1vtjHSQAOTQ=
@@ -18660,13 +18360,6 @@ mdast-util-to-string@^1.0.0:
   resolved "https://registry.yarnpkg.com/mdast-util-to-string/-/mdast-util-to-string-1.1.0.tgz#27055500103f51637bd07d01da01eb1967a43527"
   integrity sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==
 
-mdn-browser-compat-data@0.0.94:
-  version "0.0.94"
-  resolved "https://registry.yarnpkg.com/mdn-browser-compat-data/-/mdn-browser-compat-data-0.0.94.tgz#eaa1653761ce95881ea1858a8c0ce6066d85f94b"
-  integrity sha512-O3zJqbmehz0Hn3wpk62taA0+jNF7yn6BDWqQ9Wh2bEoO9Rx1BYiTmNX565eNVbW0ixfQkY6Sp9FvY/rr79Qmyg==
-  dependencies:
-    extend "3.0.2"
-
 mdurl@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
@@ -18963,11 +18656,6 @@ mime@^2.4.4:
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-mimic-fn@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
-  integrity sha1-5md4PZLonb00KBi1IwudYqZyrRg=
-
 mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -19014,13 +18702,27 @@ minimalistic-crypto-utils@^1.0.1:
   resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
   integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=
 
-minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimatch@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist-options@^4.0.2:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -19030,10 +18732,10 @@ minimist-options@^4.0.2:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
+  version "1.2.6"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
+  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
@@ -19547,16 +19249,6 @@ mute-stdout@^1.0.0:
   resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-1.0.1.tgz#acb0300eb4de23a7ddeec014e3e96044b3472331"
   integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
 
-mute-stream@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
-  integrity sha1-j7+rsKmKJT0xhDMfno3rc3L6xsA=
-
-mute-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
-  integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
-
 mute-stream@^0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
@@ -19572,10 +19264,10 @@ nanoid@^2.0.0, nanoid@^2.1.6:
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
   integrity sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==
 
-nanoid@^3.1.23, nanoid@^3.1.31:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.2.0.tgz#62667522da6673971cca916a6d3eff3f415ff80c"
-  integrity sha512-fmsZYa9lpn69Ad5eDn7FMcnnSR+8R34W9qJEijxYhTbfOWzr22n1QxCMzXLK+ODyW2973V3Fux959iQoUxzUIA==
+nanoid@^3.1.31, nanoid@^3.3.3:
+  version "3.3.4"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
+  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
 
 nanomatch@^1.2.9:
   version "1.2.9"
@@ -19622,11 +19314,6 @@ native-url@^0.2.6:
   dependencies:
     querystring "^0.2.0"
 
-natural-compare-lite@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4"
-  integrity sha1-F7CVgZiJef3a/gIB6TG6kzyWy7Q=
-
 natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
@@ -19974,14 +19661,6 @@ nofilter@^1.0.4:
   resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-1.0.4.tgz#78d6f4b6a613e7ced8b015cec534625f7667006e"
   integrity sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==
 
-nomnom@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.8.1.tgz#2151f722472ba79e50a76fc125bb8c8f2e4dc2a7"
-  integrity sha1-IVH3Ikcrp55Qp2/BJbuMjy5Nwqc=
-  dependencies:
-    chalk "~0.4.0"
-    underscore "~1.6.0"
-
 nomnom@~1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/nomnom/-/nomnom-1.6.2.tgz#84a66a260174408fc5b77a18f888eccc44fb6971"
@@ -20118,6 +19797,13 @@ npmlog@^4.0.1, npmlog@^4.0.2, npmlog@^4.1.2:
     gauge "~2.7.3"
     set-blocking "~2.0.0"
 
+nth-check@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
+  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  dependencies:
+    boolbase "^1.0.0"
+
 nth-check@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -20371,6 +20057,11 @@ observable-webworkers@^1.0.0:
   resolved "https://registry.yarnpkg.com/observable-webworkers/-/observable-webworkers-1.0.0.tgz#dcbd484a9644d512accc351962c6e710313fbb68"
   integrity sha512-+cECwCR8IEh8UY5nefQVLO9Cydqpk1izO+o7BABmKjXfJZyEOzBWY3ss5jbOPM6KmEa9aQExvAtTW6tVTOsNAQ==
 
+on-exit-leak-free@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/on-exit-leak-free/-/on-exit-leak-free-0.2.0.tgz#b39c9e3bf7690d890f4861558b0d7b90a442d209"
+  integrity sha512-dqaz3u44QbRXQooZLTUKU41ZrzYrcvLISVgbrzbyCMxpmSLJvZ3ZamIJIZ29P6OhZIkNIQKosdeM6t1LYbA9hg==
+
 on-finished@^2.3.0, on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -20390,18 +20081,6 @@ once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.3.3, once@^1.4.0:
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
-onetime@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
-  integrity sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=
-  dependencies:
-    mimic-fn "^1.0.0"
-
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
@@ -20439,7 +20118,7 @@ optional@^0.1.3:
   resolved "https://registry.yarnpkg.com/optional/-/optional-0.1.4.tgz#cdb1a9bedc737d2025f690ceeb50e049444fd5b3"
   integrity sha512-gtvrrCfkE08wKcgXaVwQVgwEQ8vel2dc5DDBn9RLQZ3YtmtkBss6A2HY6BnJH4N/4Ku97Ri/SF8sNWE2225WJw==
 
-optionator@^0.8.1, optionator@^0.8.2:
+optionator@^0.8.1:
   version "0.8.2"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
   integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
@@ -20617,12 +20296,12 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-locale@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-4.0.0.tgz#06e4fb102f38f33e9e904f41af3c34a5aa3b2b7b"
-  integrity sha512-HsSR1+2l6as4Wp2SGZxqLnuFHxVvh1Ir9pvZxyujsC13egZVe7P0YeBLN0ijQzM/twrO5To3ia3jzBXAvpMTEA==
+os-locale@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-5.0.0.tgz#6d26c1d95b6597c5d5317bf5fba37eccec3672e0"
+  integrity sha512-tqZcNEDAIZKBEPnHPlVDvKrp7NzgLi7jRmhKiUoa2NUmhl13FtkAGLUVR+ZsYvApBQdBfYm43A4tXXQ4IrYLBA==
   dependencies:
-    execa "^1.0.0"
+    execa "^4.0.0"
     lcid "^3.0.0"
     mem "^5.0.0"
 
@@ -21065,12 +20744,19 @@ parse-url@^5.0.0:
     parse-path "^4.0.0"
     protocols "^1.4.0"
 
-parse5@6.0.1, parse5@^6.0.0:
+parse5-htmlparser2-tree-adapter@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
+  dependencies:
+    parse5 "^6.0.1"
+
+parse5@6.0.1, parse5@^6.0.0, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^3.0.1, parse5@^3.0.2:
+parse5@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c"
   integrity sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==
@@ -21176,7 +20862,7 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1:
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
   integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
 
-path-is-inside@1.0.2, path-is-inside@^1.0.1, path-is-inside@^1.0.2:
+path-is-inside@1.0.2, path-is-inside@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-is-inside/-/path-is-inside-1.0.2.tgz#365417dede44430d1c11af61027facf074bdfc53"
   integrity sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
@@ -21425,6 +21111,14 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
+pino-abstract-transport@v0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/pino-abstract-transport/-/pino-abstract-transport-0.5.0.tgz#4b54348d8f73713bfd14e3dc44228739aa13d9c0"
+  integrity sha512-+KAgmVeqXYbTtU2FScx1XS3kNyfZ5TrXY07V96QnUSFqo2gAqlvmaxH67Lj7SWazqsMabf+58ctdTcBgnOLUOQ==
+  dependencies:
+    duplexify "^4.1.2"
+    split2 "^4.0.0"
+
 pino-pretty@^2.5.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-2.6.1.tgz#b5a8e28137deb1629428931d98c708b51f0e9555"
@@ -21445,7 +21139,29 @@ pino-std-serializers@^2.3.0:
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz#cb5e3e58c358b26f88969d7e619ae54bdfcc1ae1"
   integrity sha512-WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ==
 
-pino@5.13.3, pino@^5.12.3, pino@~5.13.0:
+pino-std-serializers@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-4.0.0.tgz#1791ccd2539c091ae49ce9993205e2cd5dbba1e2"
+  integrity sha512-cK0pekc1Kjy5w9V2/n+8MkZwusa6EyyxfeQCB799CQRhRt/CqYKiWs5adeu8Shve2ZNffvfC/7J64A2PJo1W/Q==
+
+pino@7.11.0:
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-7.11.0.tgz#0f0ea5c4683dc91388081d44bff10c83125066f6"
+  integrity sha512-dMACeu63HtRLmCG8VKdy4cShCPKaYDR4youZqoSWLxl5Gu99HUw8bw75thbPv9Nip+H+QYX8o3ZJbTdVZZ2TVg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+    fast-redact "^3.0.0"
+    on-exit-leak-free "^0.2.0"
+    pino-abstract-transport v0.5.0
+    pino-std-serializers "^4.0.0"
+    process-warning "^1.0.0"
+    quick-format-unescaped "^4.0.3"
+    real-require "^0.1.0"
+    safe-stable-stringify "^2.1.0"
+    sonic-boom "^2.2.1"
+    thread-stream "^0.15.1"
+
+pino@^5.12.3:
   version "5.13.3"
   resolved "https://registry.yarnpkg.com/pino/-/pino-5.13.3.tgz#26cd6f69b4bd03d6408af28eddcd9313687f143d"
   integrity sha512-FL12DKlPwBlbhztlUz6kseR03PRR8nD+wvLdN/Sji9UiBYYfSjX+k8ocU7/NwW55JdFRONTn3iACoelXnMFVVQ==
@@ -21516,11 +21232,6 @@ plugin-error@1.0.1, plugin-error@^1.0.1:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
-pluralize@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
-  integrity sha1-0aIUg/0iu0HlihL6NCGCMUCJfEU=
-
 pn@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb"
@@ -21533,14 +21244,6 @@ pnp-webpack-plugin@1.6.4:
   dependencies:
     ts-pnp "^1.1.6"
 
-po2json@0.4.5:
-  version "0.4.5"
-  resolved "https://registry.yarnpkg.com/po2json/-/po2json-0.4.5.tgz#47bb2952da32d58a1be2f256a598eebc0b745118"
-  integrity sha1-R7spUtoy1Yob4vJWpZjuvAt0URg=
-  dependencies:
-    gettext-parser "1.1.0"
-    nomnom "1.8.1"
-
 polished@^4.0.5:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/polished/-/polished-4.1.3.tgz#7a3abf2972364e7d97770b827eec9a9e64002cfc"
@@ -21777,15 +21480,6 @@ postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss@7.0.18:
-  version "7.0.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.18.tgz#4b9cda95ae6c069c67a4d933029eddd4838ac233"
-  integrity sha512-/7g1QXXgegpF+9GJj4iN7ChGF40sYuGYJ8WZu8DZWnmhQ/G36hfdk3q9LBJmoK+lZ+yzZ5KYpOoxq7LF1BxE8g==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 postcss@7.0.21:
   version "7.0.21"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17"
@@ -21795,6 +21489,15 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
+postcss@8.4.13, postcss@^8.1.10, postcss@^8.1.7:
+  version "8.4.13"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.13.tgz#7c87bc268e79f7f86524235821dfdf9f73e5d575"
+  integrity sha512-jtL6eTBrza5MPzy8oJLFuUscHDXTV5KcLlqAWHl5q5WYRfnNRGSmOZmOZ1T6Gy7A99mOZfqungmZMpMmCVJ8ZA==
+  dependencies:
+    nanoid "^3.3.3"
+    picocolors "^1.0.0"
+    source-map-js "^1.0.2"
+
 postcss@^6.0.1, postcss@^6.0.19, postcss@^6.0.23:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
@@ -21812,15 +21515,6 @@ postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.1.10, postcss@^8.1.7:
-  version "8.3.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
-  integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.23"
-    source-map-js "^0.6.2"
-
 postmsg-rpc@^2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/postmsg-rpc/-/postmsg-rpc-2.4.0.tgz#4e2daf6851852364696debd5d6bf6936d1424cdf"
@@ -21993,17 +21687,6 @@ prismjs@^1.21.0, prismjs@~1.22.0:
   optionalDependencies:
     clipboard "^2.0.0"
 
-probe-image-size@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-5.0.0.tgz#1b87d20340ab8fcdb4324ec77fbc8a5f53419878"
-  integrity sha512-V6uBYw5eBc5UVIE7MUZD6Nxg0RYuGDWLDenEn0B1WC6PcTvn1xdQ6HLDDuznefsiExC6rNrCz7mFRBo0f3Xekg==
-  dependencies:
-    deepmerge "^4.0.0"
-    inherits "^2.0.3"
-    next-tick "^1.0.0"
-    request "^2.83.0"
-    stream-parser "~0.3.1"
-
 process-nextick-args@^1.0.6, process-nextick-args@^1.0.7, process-nextick-args@~1.0.6:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@@ -22021,6 +21704,11 @@ process-on-spawn@^1.0.0:
   dependencies:
     fromentries "^1.2.0"
 
+process-warning@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/process-warning/-/process-warning-1.0.0.tgz#980a0b25dc38cd6034181be4b7726d89066b4616"
+  integrity sha512-du4wfLyj4yCZq1VupnVSZmRsPJsNuxoDQFdCFHLaYiEbFBD7QE0a+I4D7hOxrVnh78QE/YipFAj9lXHiXocV+Q==
+
 process@^0.11.10, process@~0.11.0:
   version "0.11.10"
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
@@ -22031,11 +21719,6 @@ process@~0.5.1:
   resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
   integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
 
-progress@^1.1.8:
-  version "1.1.8"
-  resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be"
-  integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=
-
 progress@^2.0.0, progress@^2.0.1, progress@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
@@ -22173,9 +21856,9 @@ proto-list@~1.2.1:
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
 protobufjs@^6.11.2:
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.2.tgz#de39fabd4ed32beaa08e9bb1e30d08544c1edf8b"
-  integrity sha512-4BQJoPooKJl2G9j3XftkIXjoC9C0Av2NOrWmbLWT1vH32GcSUHjM0Arra6UfTsVyfMAuFzaLucXn1sadxJydAw==
+  version "6.11.3"
+  resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.11.3.tgz#637a527205a35caa4f3e2a9a4a13ddffe0e7af74"
+  integrity sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==
   dependencies:
     "@protobufjs/aspromise" "^1.1.2"
     "@protobufjs/base64" "^1.1.2"
@@ -22603,11 +22286,23 @@ queue-microtask@^1.2.3:
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+queue@6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65"
+  integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==
+  dependencies:
+    inherits "~2.0.3"
+
 quick-format-unescaped@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-3.0.2.tgz#0137e94d8fb37ffeb70040535111c378e75396fb"
   integrity sha512-FXTaCkwvpIlkdKeGDNgcq07SXWS383noQUuZjvdE1QcTt+eLuqof6/BDiEPqB59FWLie/l91+HtlJSw7iCViSA==
 
+quick-format-unescaped@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.4.tgz#93ef6dd8d3453cbc7970dd614fad4c5954d6b5a7"
+  integrity sha512-tYC1Q1hgyRuHgloV/YXs2w15unPVh8qfu/qCTfhTYamaw7fyhumKa2yGpdSo87vY32rIclj+4fWYQXUMs9EHvg==
+
 quick-lru@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
@@ -23338,14 +23033,10 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
-readline2@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
-  integrity sha1-QQWWCP/BVHV7cV2ZidGZ/783LjU=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    mute-stream "0.0.5"
+real-require@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/real-require/-/real-require-0.1.0.tgz#736ac214caa20632847b7ca8c1056a0767df9381"
+  integrity sha512-r/H9MzAWtrv8aSVjPCMFpDMl5q66GqtmmRkRjpHTsp4zBAa+snZyiQNlMONiUmEJcsnaw0wCauJ2GWODr/aFkg==
 
 receptacle@^1.3.2:
   version "1.3.2"
@@ -23440,7 +23131,7 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@0.13.3, regenerator-runtime@^0.11.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
+regenerator-runtime@^0.11.0, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7:
   version "0.13.7"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
   integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
@@ -23480,15 +23171,10 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-regexpp@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
-  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-
-regexpp@^3.0.0, regexpp@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
-  integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.0.0, regexpp@^3.1.0, regexpp@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
 regexpu-core@^4.7.1:
   version "4.7.1"
@@ -23773,7 +23459,7 @@ request-promise-native@^1.0.3:
     stealthy-require "^1.1.0"
     tough-cookie ">=2.3.3"
 
-request@^2.83.0, request@^2.85.0, request@^2.88.2, request@~2.88.0:
+request@^2.83.0, request@^2.85.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -23824,14 +23510,6 @@ require-package-name@^2.0.1:
   resolved "https://registry.yarnpkg.com/require-package-name/-/require-package-name-2.0.1.tgz#c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"
   integrity sha1-wR6XJ2tluOKSP3Xav1+y7ww4Qbk=
 
-require-uncached@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requirejs-config-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/requirejs-config-file/-/requirejs-config-file-4.0.0.tgz#4244da5dd1f59874038cc1091d078d620abb6ebc"
@@ -23880,11 +23558,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
@@ -23956,22 +23629,6 @@ responselike@^1.0.2:
   dependencies:
     lowercase-keys "^1.0.0"
 
-restore-cursor@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
-  integrity sha1-NGYfRohjJ/7SmRR5FSJS35LapUE=
-  dependencies:
-    exit-hook "^1.0.0"
-    onetime "^1.0.0"
-
-restore-cursor@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
-  integrity sha1-n37ih/gv0ybU/RYpI9YhKe7g368=
-  dependencies:
-    onetime "^2.0.0"
-    signal-exit "^3.0.2"
-
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -24158,14 +23815,7 @@ rtlcss@^2.4.0:
     postcss "^6.0.23"
     strip-json-comments "^2.0.0"
 
-run-async@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"
-  integrity sha1-yK1KXhEGYeQCp9IbUw4AnyX444k=
-  dependencies:
-    once "^1.3.0"
-
-run-async@^2.2.0, run-async@^2.3.0:
+run-async@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -24192,12 +23842,7 @@ rustbn.js@~0.2.0:
   resolved "https://registry.yarnpkg.com/rustbn.js/-/rustbn.js-0.2.0.tgz#8082cb886e707155fd1cb6f23bd591ab8d55d0ca"
   integrity sha512-4VlvkRUuCJvr2J6Y0ImW7NvTCriMi7ErOAqWk1y69vAdoNIzCF3yPmgeNzx+RQTLEDFq5sHfscn1MwHxP9hNfA==
 
-rx-lite@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
-  integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI=
-
-rxjs@6, rxjs@^6.4.0, rxjs@^6.5.2:
+rxjs@6, rxjs@^6.5.2:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
@@ -24238,6 +23883,11 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+safe-stable-stringify@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz#ab67cbe1fe7d40603ca641c5e765cb942d04fc73"
+  integrity sha512-kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg==
+
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
@@ -24431,7 +24081,7 @@ secp256k1@^3.0.1, secp256k1@^3.6.1, secp256k1@^3.6.2:
     nan "^2.14.0"
     safe-buffer "^5.1.2"
 
-secp256k1@^4.0.0, secp256k1@^4.0.1, secp256k1@^4.0.2:
+secp256k1@^4.0.0, secp256k1@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303"
   integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA==
@@ -24445,14 +24095,14 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-selenium-webdriver@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.1.0.tgz#d11e5d43674e2718265a30684bcbf6ec734fd3bd"
-  integrity sha512-kUDH4N8WruYprTzvug4Pl73Th+WKb5YiLz8z/anOpHyUNUdM3UzrdTOxmSNaf9AczzBeY+qXihzku8D1lMaKOg==
+selenium-webdriver@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-4.3.1.tgz#5e9c6c4adee65e57776b5bd4c07c59b65b8f056d"
+  integrity sha512-TjH/ls1WKRQoFEHcqtn6UtwcLnA3yvx08v9cSSFYvyhp8hJWRtbe9ae2I8uXPisEZ2EaGKKoxBZ4EHv0BJM15g==
   dependencies:
-    jszip "^3.6.0"
+    jszip "^3.10.0"
     tmp "^0.2.1"
-    ws ">=7.4.6"
+    ws ">=8.7.0"
 
 semaphore@>=1.0.1, semaphore@^1.0.3:
   version "1.1.0"
@@ -24483,23 +24133,23 @@ semver-greatest-satisfied-range@^1.1.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@6.3.0, semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 semver@7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+semver@7.3.7, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.7.tgz#12c5b649afdbf9049707796e22a4028814ce523f"
+  integrity sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
+  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+
 semver@~5.4.1:
   version "5.4.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
@@ -24588,7 +24238,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-ses@^0.12.4:
+ses@0.12.4, ses@^0.12.4:
   version "0.12.4"
   resolved "https://registry.yarnpkg.com/ses/-/ses-0.12.4.tgz#f466f7199292b5c4454949c7d497f5569ade5805"
   integrity sha512-qbtkhuuAXNXb390yiaNUdNvDg/QmX7W2cO+srIUJllINMYADc/8m0vt7DNBmq+rqOBRrjVRPPeyQq8ZTLK3Rmw==
@@ -24607,7 +24257,7 @@ set-blocking@^2.0.0, set-blocking@~2.0.0:
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
 
-set-immediate-shim@^1.0.1, set-immediate-shim@~1.0.1:
+set-immediate-shim@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
   integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
@@ -24642,7 +24292,7 @@ setprototypeof@1.2.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
-sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8, sha.js@~2.4.4:
+sha.js@2.4.11, sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8, sha.js@~2.4.4:
   version "2.4.11"
   resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
   integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
@@ -24723,15 +24373,6 @@ shell-quote@1.7.2, shell-quote@^1.4.2, shell-quote@^1.6.1:
   resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2"
   integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==
 
-shelljs@^0.7.5:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 shelljs@^0.8.1:
   version "0.8.4"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
@@ -24837,11 +24478,6 @@ slash@^3.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slice-ansi@0.0.4:
-  version "0.0.4"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35"
-  integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU=
-
 slice-ansi@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
@@ -25009,6 +24645,13 @@ sonic-boom@^0.7.5:
   dependencies:
     flatstr "^1.0.12"
 
+sonic-boom@^2.2.1:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/sonic-boom/-/sonic-boom-2.8.0.tgz#c1def62a77425090e6ad7516aad8eb402e047611"
+  integrity sha512-kuonw1YOYYNOve5iHdSahXPOK49GqwA+LZhI6Wz/l0rP57iKyXXIHaRagOBHAPmGwJC6od2Z9zgvZ5loSgMlVg==
+  dependencies:
+    atomic-sleep "^1.0.0"
+
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -25039,10 +24682,10 @@ source-map-explorer@^2.4.2:
     temp "^0.9.1"
     yargs "^15.3.1"
 
-source-map-js@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e"
-  integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug==
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.1:
   version "0.5.1"
@@ -25063,18 +24706,10 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@0.5.13:
-  version "0.5.13"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.13.tgz#31b24a9c2e73c2de85066c0feb7d44767ed52932"
-  integrity sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20, source-map-support@~0.5.4:
-  version "0.5.20"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.20.tgz#12166089f8f5e5e8c56926b377633392dd2cb6c9"
-  integrity sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==
+source-map-support@0.5.21, source-map-support@^0.5.11, source-map-support@^0.5.16, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
@@ -25197,6 +24832,11 @@ split2@^3.0.0, split2@^3.1.0:
   dependencies:
     readable-stream "^3.0.0"
 
+split2@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/split2/-/split2-4.1.0.tgz#101907a24370f85bb782f08adaabe4e281ecf809"
+  integrity sha512-VBiJxFkxiXRlUIeyMQi8s4hgvKCSjtknJv/LVYbrgALPwf5zSKmEwV9Lst25AkvMDnvxODugjdl6KZgwKM1WYQ==
+
 split@0.3, split@~0.3.0:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/split/-/split-0.3.3.tgz#cd0eea5e63a211dfff7eb0f091c4133e2d0dd28f"
@@ -25414,13 +25054,6 @@ stream-http@^3.0.0:
     readable-stream "^3.6.0"
     xtend "^4.0.2"
 
-stream-parser@~0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
-  integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=
-  dependencies:
-    debug "2"
-
 stream-shift@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
@@ -25491,7 +25124,7 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1:
+"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -25508,14 +25141,14 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
-    strip-ansi "^6.0.0"
+    strip-ansi "^6.0.1"
 
 "string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.4:
   version "4.0.4"
@@ -25619,7 +25252,7 @@ stringify-object@^3.2.1:
     is-obj "^1.0.1"
     is-regexp "^1.0.0"
 
-strip-ansi@6.0.0, strip-ansi@^6.0.0:
+strip-ansi@6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
   integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
@@ -25647,10 +25280,12 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
-strip-ansi@~0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.1.1.tgz#39e8a98d044d150660abe4a6808acf70bb7bc991"
-  integrity sha1-OeipjQRNFQZgq+SmgIrPcLt7yZE=
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
 
 strip-bom-buf@^2.0.0:
   version "2.0.0"
@@ -25721,7 +25356,7 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-strip-json-comments@2.0.1, strip-json-comments@^2.0.0, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -25893,11 +25528,6 @@ supports-color@6.0.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -25982,19 +25612,7 @@ syntax-error@^1.1.1:
   dependencies:
     acorn-node "^1.2.0"
 
-table@^3.7.8:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/table/-/table-3.8.3.tgz#2bbc542f0fda9861a755d3947fefd8b3f513855f"
-  integrity sha1-K7xULw/amGGnVdOUf+/Ys/UThV8=
-  dependencies:
-    ajv "^4.7.0"
-    ajv-keywords "^1.0.0"
-    chalk "^1.1.1"
-    lodash "^4.0.0"
-    slice-ansi "0.0.4"
-    string-width "^2.0.0"
-
-table@^5.2.3, table@^5.4.6:
+table@^5.4.6:
   version "5.4.6"
   resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
   integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
@@ -26205,7 +25823,7 @@ text-encoding@^0.6.4:
   resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.6.4.tgz#e399a982257a276dae428bb92845cb71bdc26d19"
   integrity sha1-45mpgiV6J22uQou5KEXLcb3CbRk=
 
-text-table@0.2.0, text-table@^0.2.0, text-table@~0.2.0:
+text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
@@ -26215,6 +25833,13 @@ textarea-caret@^3.0.1:
   resolved "https://registry.yarnpkg.com/textarea-caret/-/textarea-caret-3.0.2.tgz#f360c48699aa1abf718680a43a31a850665c2caf"
   integrity sha1-82DEhpmqGr9xhoCkOjGoUGZcLK8=
 
+thread-stream@^0.15.1:
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/thread-stream/-/thread-stream-0.15.2.tgz#fb95ad87d2f1e28f07116eb23d85aba3bc0425f4"
+  integrity sha512-UkEhKIg2pD+fjkHQKyJO3yoIvAP3N6RlNFt2dUhcS1FGvCD1cQa1M/PGknCLFIyZdtJOWQjejp7bdNqmN7zwdA==
+  dependencies:
+    real-require "^0.1.0"
+
 throat@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
@@ -26505,7 +26130,7 @@ tough-cookie@^2.3.3, tough-cookie@~2.5.0:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tr46@^1.0.0, tr46@^1.0.1:
+tr46@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
   integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=
@@ -26617,10 +26242,10 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.2.0, tslib@^2.3.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
+  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
 
 tslib@~2.0.1:
   version "2.0.3"
@@ -26843,11 +26468,6 @@ underscore@~1.4.4:
   resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.4.4.tgz#61a6a32010622afa07963bf325203cf12239d604"
   integrity sha1-YaajIBBiKvoHljvzJSA88SI51gQ=
 
-underscore@~1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.6.0.tgz#8b38b10cacdef63337b8b24e4ff86d45aea529a8"
-  integrity sha1-izixDKze9jM3uLJOT/htRa6lKag=
-
 undertaker-registry@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-1.0.1.tgz#5e4bda308e4a8a2ae584f9b9a4359a499825cc50"
@@ -27045,11 +26665,6 @@ universalify@^2.0.0:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
-unorm@^1.3.3:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/unorm/-/unorm-1.5.0.tgz#01fa9b76f1c60f7916834605c032aa8962c3f00a"
-  integrity sha512-sMfSWoiRaXXeDZSXC+YRZ23H4xchQpwxjpw1tmfR+kgbBCaOgln4NI0LXejJIhnBuKINrB3WRn+ZI8IWssirVw==
-
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
@@ -27078,7 +26693,12 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
   integrity sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=
 
-upath@1.2.0, upath@^1.1.1:
+upath@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
+  integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
+
+upath@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
   integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
@@ -27234,13 +26854,6 @@ use@^3.1.0:
   dependencies:
     kind-of "^6.0.2"
 
-user-home@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/user-home/-/user-home-2.0.0.tgz#9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"
-  integrity sha1-nHC/2Babwdy/SGBODwS4tJzenp8=
-  dependencies:
-    os-homedir "^1.0.0"
-
 utf-8-validate@5.0.7:
   version "5.0.7"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.7.tgz#c15a19a6af1f7ad9ec7ddc425747ca28c3644922"
@@ -27872,15 +27485,6 @@ whatwg-mimetype@^2.3.0:
   resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
-whatwg-url@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd"
-  integrity sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==
-  dependencies:
-    lodash.sortby "^4.7.0"
-    tr46 "^1.0.1"
-    webidl-conversions "^4.0.2"
-
 whatwg-url@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
@@ -28083,14 +27687,7 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
-ws@*, ws@7.1.0, ws@7.4.6, ws@>=7.4.6, ws@^1.1.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.3.1, ws@^7.4.0, ws@^7.4.6, ws@~7.4.2:
+ws@*, ws@7.1.0, ws@7.4.6, ws@>=8.7.0, ws@^1.1.0, ws@^5.1.1, ws@^7, ws@^7.2.0, ws@^7.3.1, ws@^7.4.0, ws@^7.4.6, ws@~7.4.2:
   version "7.4.6"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
   integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
@@ -28234,7 +27831,7 @@ yaml@^1.10.0, yaml@^1.7.2:
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@13.1.2, yargs-parser@^13.1.1, yargs-parser@^13.1.2:
+yargs-parser@13.1.2, yargs-parser@^13.1.2:
   version "13.1.2"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38"
   integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==
@@ -28263,6 +27860,11 @@ yargs-parser@^20.2.2:
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
   integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
 
+yargs-parser@^21.0.0:
+  version "21.0.1"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
+  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+
 yargs-promise@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/yargs-promise/-/yargs-promise-1.1.0.tgz#97ebb5198df734bb3b11745133ae5b501b16ab1f"
@@ -28293,22 +27895,18 @@ yargs@13.3.2, yargs@^13.2.2, yargs@^13.2.4, yargs@^13.3.0:
     y18n "^4.0.0"
     yargs-parser "^13.1.2"
 
-yargs@14.0.0, yargs@~14.0.0:
-  version "14.0.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-14.0.0.tgz#ba4cacc802b3c0b3e36a9e791723763d57a85066"
-  integrity sha512-ssa5JuRjMeZEUjg7bEL99AwpitxU/zWGAGpdj0di41pOEmJti8NR6kyUIJBkR78DTYNPZOU08luUo0GTHuB+ow==
+yargs@17.4.1, yargs@^17.0.1:
+  version "17.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.4.1.tgz#ebe23284207bb75cee7c408c33e722bfb27b5284"
+  integrity sha512-WSZD9jgobAg3ZKuCQZSa3g9QOJeCCqLoLAykiWgmXnDo9EPnn4RPf5qVTtzgOx66o6/oqhcA5tHtJXpG8pMt3g==
   dependencies:
-    cliui "^5.0.0"
-    decamelize "^1.2.0"
-    find-up "^3.0.0"
-    get-caller-file "^2.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^3.0.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^13.1.1"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.0.0"
 
 yargs@^15.0.0, yargs@^15.0.2, yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
@@ -28340,19 +27938,6 @@ yargs@^16.0.0, yargs@^16.1.0, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.1:
-  version "17.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
-  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
-  dependencies:
-    cliui "^7.0.2"
-    escalade "^3.1.1"
-    get-caller-file "^2.0.5"
-    require-directory "^2.1.1"
-    string-width "^4.2.0"
-    y18n "^5.0.5"
-    yargs-parser "^20.2.2"
-
 yargs@^7.1.0:
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.1.tgz#67f0ef52e228d4ee0d6311acede8850f53464df6"

From ef46ee1ce03a04048c017275d9419239307c243b Mon Sep 17 00:00:00 2001
From: ryanml <ryanlanese@gmail.com>
Date: Thu, 29 Sep 2022 21:38:22 -0700
Subject: [PATCH 10/10] Addressing review feedback

---
 app/_locales/de/messages.json                 |   6 -
 app/_locales/el/messages.json                 |   6 -
 app/_locales/en/messages.json                 |  21 +-
 app/_locales/es/messages.json                 |   6 -
 app/_locales/es_419/messages.json             |   3 -
 app/_locales/fr/messages.json                 |   6 -
 app/_locales/hi/messages.json                 |   6 -
 app/_locales/id/messages.json                 |   6 -
 app/_locales/ja/messages.json                 |   6 -
 app/_locales/ko/messages.json                 |   6 -
 app/_locales/pt/messages.json                 |   6 -
 app/_locales/pt_BR/messages.json              |   3 -
 app/_locales/ru/messages.json                 |   6 -
 app/_locales/tl/messages.json                 |   6 -
 app/_locales/tr/messages.json                 |   6 -
 app/_locales/vi/messages.json                 |   6 -
 app/_locales/zh_CN/messages.json              |   6 -
 shared/constants/hardware-wallets.js          |  25 ++
 .../connect-hardware/index.scss               |   1 -
 .../connect-hardware/select-hardware.js       | 290 +++++++++---------
 20 files changed, 181 insertions(+), 246 deletions(-)

diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index 76c3c75ada7c..05d837044888 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap-Tresor"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutorials)"
-  },
   "alertDisableTooltip": {
     "message": "Dies kann in \"Einstellungen > Warnungen\" geändert werden"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutorials)"
-  },
   "knownAddressRecipient": {
     "message": "Bekannte Vertragsadresse."
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 8080b314f7d6..d4209734572b 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "Θησαυροφυλάκιο AirGap"
   },
-  "airgapVaultTutorial": {
-    "message": " (Μαθήματα)"
-  },
   "alertDisableTooltip": {
     "message": "Αυτό μπορεί να αλλάξει στο \"Ρυθμίσεις > Ειδοποιήσεις\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Εκμάθηση)"
-  },
   "knownAddressRecipient": {
     "message": "Γνωστή διεύθυνση συμβολαίου."
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 66240575566c..426bcd814394 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -98,9 +98,6 @@
   "SIWEWarningTitle": {
     "message": "Are you sure?"
   },
-  "QRHardwareWalletSteps3Description": {
-    "message": "CoolWallet (Coming Soon)"
-  },
   "about": {
     "message": "About"
   },
@@ -266,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutorials)"
-  },
   "alertDisableTooltip": {
     "message": "This can be changed in \"Settings > Alerts\""
   },
@@ -774,6 +768,9 @@
   "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!"
   },
@@ -903,6 +900,9 @@
   "dataHex": {
     "message": "Hex"
   },
+  "dcent": {
+    "message": "D'Cent"
+  },
   "decimal": {
     "message": "Token decimal"
   },
@@ -1807,9 +1807,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutorials)"
-  },
   "knownAddressRecipient": {
     "message": "Known contract address."
   },
@@ -4119,15 +4116,15 @@
   "tryAgain": {
     "message": "Try again"
   },
-  "tutorial": {
-    "message": "Tutorial"
-  },
   "tryOur": {
     "message": "Try our"
   },
   "turnOnTokenDetection": {
     "message": "Turn on enhanced token detection"
   },
+  "tutorial": {
+    "message": "Tutorial"
+  },
   "twelveHrTitle": {
     "message": "12hr:"
   },
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index b0250932b568..c8f10fb99707 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "Bóveda AirGap"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutoriales)"
-  },
   "alertDisableTooltip": {
     "message": "Esto se puede modificar en \"Configuración > Alertas\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutoriales)"
-  },
   "knownAddressRecipient": {
     "message": "Dirección de contrato conocida."
   },
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 738d515369f2..92fd1dcec5ae 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -1392,9 +1392,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutoriales)"
-  },
   "knownAddressRecipient": {
     "message": "Dirección de contrato conocida."
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 101698d354bf..6c98ad3366a4 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "Coffre-fort AirGap"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutoriels)"
-  },
   "alertDisableTooltip": {
     "message": "Vous pouvez modifier ceci dans « Paramètres > Alertes »"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutoriels)"
-  },
   "knownAddressRecipient": {
     "message": "Adresse contractuelle connue."
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index cb2c66d3ca65..76664e7fc67a 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap का वॉल्ट"
   },
-  "airgapVaultTutorial": {
-    "message": " (ट्यूटोरियल्स)"
-  },
   "alertDisableTooltip": {
     "message": "इसे \"सेटिंग > अलर्ट\" में बदला जा सकता है"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (ट्यूटोरियल)"
-  },
   "knownAddressRecipient": {
     "message": "ज्ञात अनुबंध पता।"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 4d577cb2a66b..974073843a70 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "Brankas AirGap"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutorial)"
-  },
   "alertDisableTooltip": {
     "message": "Ini dapat diubah dalam \"Pengaturan > Peringatan\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutorial)"
-  },
   "knownAddressRecipient": {
     "message": "Alamat kontrak yang diketahui."
   },
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index 781b55da8d31..e1023b070019 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " (チュートリアル)"
-  },
   "alertDisableTooltip": {
     "message": "これは、[設定 > 警告] で変更できます"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": "(チュートリアル)"
-  },
   "knownAddressRecipient": {
     "message": "既知のコントラクトアドレスです。"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index 00d49f4470cc..ecfa861203c3 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "에어갭 볼트"
   },
-  "airgapVaultTutorial": {
-    "message": " (튜토리얼)"
-  },
   "alertDisableTooltip": {
     "message": "\"설정 > 경고\"에서 변경할 수 있습니다."
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (튜토리얼)"
-  },
   "knownAddressRecipient": {
     "message": "알려진 계약 주소입니다."
   },
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
index 21f8d79a7529..eb4fdd630619 100644
--- a/app/_locales/pt/messages.json
+++ b/app/_locales/pt/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " (Tutoriais)"
-  },
   "alertDisableTooltip": {
     "message": "Isso pode ser alterado em \"Configurações > Alertas\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutoriais)"
-  },
   "knownAddressRecipient": {
     "message": "Endereço de contrato conhecido."
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index 245a0ad7b2a2..2755f4967aa5 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -1376,9 +1376,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Tutoriais)"
-  },
   "knownAddressRecipient": {
     "message": "Endereço de contrato conhecido."
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 82410531b006..f4542bd32e23 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "Хранилище AirGap"
   },
-  "airgapVaultTutorial": {
-    "message": "(Руководства)"
-  },
   "alertDisableTooltip": {
     "message": "Это можно изменить в разделе «Настройки» > «Предупреждения»"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Руководства)"
-  },
   "knownAddressRecipient": {
     "message": "Известный адрес контракта."
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index 5ef6c7fbcc37..a08952f65632 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " (Mga Tutorial)"
-  },
   "alertDisableTooltip": {
     "message": "Puwede itong baguhin sa \"Mga Setting > Mga Alerto\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Mga Tutorial)"
-  },
   "knownAddressRecipient": {
     "message": "Kilalang address ng kontrata."
   },
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
index fd9e1ebe2f9c..c0b7c054aa4e 100644
--- a/app/_locales/tr/messages.json
+++ b/app/_locales/tr/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Kasası"
   },
-  "airgapVaultTutorial": {
-    "message": "(Öğreticiler)"
-  },
   "alertDisableTooltip": {
     "message": "\"Ayarlar > Uyarılar\" kısmında değiştirilebilir"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Ana İlke"
   },
-  "keystoneTutorial": {
-    "message": " (Öğreticiler)"
-  },
   "knownAddressRecipient": {
     "message": "Bilinen sözleşme adresi."
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index ad00eb4b4d39..e7f5d4cf8249 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " (Hướng dẫn)"
-  },
   "alertDisableTooltip": {
     "message": "Bạn có thể thay đổi trong phần \"Cài đặt > Cảnh báo\""
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " (Hướng dẫn)"
-  },
   "knownAddressRecipient": {
     "message": "Địa chỉ hợp đồng đã biết."
   },
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index eb1e1be9cc00..981cbcdfe654 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -263,9 +263,6 @@
   "airgapVault": {
     "message": "AirGap Vault"
   },
-  "airgapVaultTutorial": {
-    "message": " （使用教程）"
-  },
   "alertDisableTooltip": {
     "message": "这可以在“设置 > 提醒”中进行更改"
   },
@@ -1782,9 +1779,6 @@
   "keystone": {
     "message": "Keystone"
   },
-  "keystoneTutorial": {
-    "message": " （使用教程）"
-  },
   "knownAddressRecipient": {
     "message": "已知合约地址。"
   },
diff --git a/shared/constants/hardware-wallets.js b/shared/constants/hardware-wallets.js
index 48bc65d3d176..aa4d86d58b3e 100644
--- a/shared/constants/hardware-wallets.js
+++ b/shared/constants/hardware-wallets.js
@@ -48,3 +48,28 @@ export const TRANSPORT_STATES = {
   DEVICE_OPEN_FAILURE: 'DEVICE_OPEN_FAILURE',
   UNKNOWN_FAILURE: 'UNKNOWN_FAILURE',
 };
+
+export const AFFILIATE_LINKS = {
+  LEDGER: 'https://shop.ledger.com/?r=17c4991a03fa',
+  GRIDPLUS: 'https://gridplus.io/?afmc=7p',
+  TREZOR:
+    'https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009',
+  KEYSTONE:
+    'https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9',
+  AIRGAP: 'https://airgap.it/',
+  COOLWALLET: 'https://www.coolwallet.io/',
+  DCENT: 'https://dcentwallet.com/',
+};
+
+export const AFFILIATE_TUTORIAL_LINKS = {
+  LEDGER:
+    'https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true',
+  GRIDPLUS: 'https://docs.gridplus.io/setup/metamask',
+  TREZOR: 'https://wiki.trezor.io/Apps:MetaMask',
+  KEYSTONE:
+    'https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone',
+  AIRGAP: 'https://support.airgap.it/guides/metamask/',
+  COOLWALLET: 'https://www.coolwallet.io/metamask-step-by-step-guides/',
+  DCENT:
+    'https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f',
+};
diff --git a/ui/pages/create-account/connect-hardware/index.scss b/ui/pages/create-account/connect-hardware/index.scss
index 2a380affb017..5bed01b4d520 100644
--- a/ui/pages/create-account/connect-hardware/index.scss
+++ b/ui/pages/create-account/connect-hardware/index.scss
@@ -55,7 +55,6 @@
     width: auto;
     display: inline;
     margin-top: 10px;
-    
     margin-right: 20px;
   }
 
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index e4a975a5cfaf..d91a716c14a5 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -10,12 +10,16 @@ import LogoLattice from '../../../components/ui/logo/logo-lattice';
 import {
   DEVICE_NAMES,
   LEDGER_TRANSPORT_TYPES,
+  AFFILIATE_LINKS,
+  AFFILIATE_TUTORIAL_LINKS,
 } from '../../../../shared/constants/hardware-wallets';
 import ZENDESK_URLS from '../../../helpers/constants/zendesk-url';
+import { EVENT } from '../../../../shared/constants/metametrics';
 
 export default class SelectHardware extends Component {
   static contextTypes = {
     t: PropTypes.func,
+    trackEvent: PropTypes.func,
   };
 
   static propTypes = {
@@ -195,7 +199,7 @@ export default class SelectHardware extends Component {
     steps.push({
       asset: 'plug-in-wallet',
       dimensions: { width: '225px', height: '75px' },
-      title: this.context.t('step2LedgerWallet'), 
+      title: this.context.t('step2LedgerWallet'),
       message: this.context.t('step2LedgerWalletMsg', [
         <a
           className="hw-connect__msg-link"
@@ -215,33 +219,31 @@ export default class SelectHardware extends Component {
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked Ledger Buy Now',
-              })
-              window.open("https://shop.ledger.com/?r=17c4991a03fa", "_blank")
-            }
-            }
-          >
-           {this.context.t('buyNow')}
-          </Button>
-          <Button
-            className="hw-connect__external-btn"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked Ledger Tutorial',
-              })
-              window.open("https://support.ledger.com/hc/en-us/articles/4404366864657-Set-up-and-use-MetaMask-to-access-your-Ledger-Ethereum-ETH-account?docs=true", "_blank")
-            }
-            }
-          >
-           {this.context.t('tutorial')}
-          </Button>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Ledger Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.LEDGER, '_blank');
+              }}
+            >
+              {this.context.t('buyNow')}
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Ledger Tutorial',
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.LEDGER, '_blank');
+              }}
+            >
+              {this.context.t('tutorial')}
+            </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -283,33 +285,31 @@ export default class SelectHardware extends Component {
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked GridPlus Buy Now',
-              })
-              window.open("https://gridplus.io/?afmc=7p", "_blank")
-            }
-            }
-          >
-          {this.context.t('buyNow')}
-          </Button>
-          <Button
-            className="hw-connect__external-btn"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked GidPlus Tutorial',
-              })
-              window.open("https://docs.gridplus.io/setup/metamask", "_blank")
-            }
-            }
-          >
-           {this.context.t('tutorial')}
-          </Button>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked GridPlus Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.GRIDPLUS, '_blank');
+              }}
+            >
+              {this.context.t('buyNow')}
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked GidPlus Tutorial',
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.GRIDPLUS, '_blank');
+              }}
+            >
+              {this.context.t('tutorial')}
+            </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -351,33 +351,31 @@ export default class SelectHardware extends Component {
           <div className="hw-connect" key={index}>
             <h3 className="hw-connect__title">{step.title}</h3>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked Trezor Buy Now',
-              })
-              window.open("https://shop.trezor.io/product/trezor-one-black?offer_id=35&aff_id=11009", "_blank")
-            }
-            }
-          >
-           {this.context.t('buyNow')}
-          </Button>
-          <Button
-            className="hw-connect__external-btn"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked Trezor Tutorial',
-              })
-              window.open("https://wiki.trezor.io/Apps:MetaMask", "_blank")
-            }
-            }
-          >
-           {this.context.t('tutorial')}
-          </Button>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Trezor Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.TREZOR, '_blank');
+              }}
+            >
+              {this.context.t('buyNow')}
+            </Button>
+            <Button
+              className="hw-connect__external-btn"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Trezor Tutorial',
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.TREZOR, '_blank');
+              }}
+            >
+              {this.context.t('tutorial')}
+            </Button>
             <p className="hw-connect__msg">{step.message}</p>
             {step.asset && (
               <img
@@ -403,31 +401,33 @@ export default class SelectHardware extends Component {
       {
         message: (
           <>
-            <p className="hw-connect__QR-subtitle">Keystone</p>
+            <p className="hw-connect__QR-subtitle">
+              {this.context.t('keystone')}
+            </p>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked Keystone Buy Now',
-              })
-              window.open("https://shop.keyst.one/?rfsn=6088257.656b3e9&utm_source=refersion&utm_medium=affiliate&utm_campaign=6088257.656b3e9", "_blank")
-            }
-            }>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked Keystone Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.KEYSTONE, '_blank');
+              }}
+            >
               {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => {
-                trackEvent({
+                this.context.trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
-                  event: 'Clicked Keystone Buy Now',
-                })
-                window.open("https://support.keyst.one/3rd-party-wallets/eth-and-web3-wallets-keystone/bind-metamask-with-keystone", "_blank")
-              }
-              }>
+                  event: 'Clicked Keystone Tutorial',
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.KEYSTONE, '_blank');
+              }}
+            >
               {this.context.t('tutorial')}
             </Button>
           </>
@@ -436,31 +436,33 @@ export default class SelectHardware extends Component {
       {
         message: (
           <>
-            <p className="hw-connect__QR-subtitle">AirGap Vault</p>
+            <p className="hw-connect__QR-subtitle">
+              {this.context.t('airgapVault')}
+            </p>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked AirGap Vault Buy Now',
-              })
-              window.open("https://airgap.it/", "_blank")
-            }
-            }>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked AirGap Vault Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.AIRGAP, '_blank');
+              }}
+            >
               {this.context.t('downloadNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => {
-                trackEvent({
+                this.context.trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
                   event: 'Clicked AirGap Vault Tutorial',
-                })
-                window.open("https://support.airgap.it/guides/metamask/", "_blank")
-              }
-              }>
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.AIRGAP, '_blank');
+              }}
+            >
               {this.context.t('tutorial')}
             </Button>
           </>
@@ -469,31 +471,33 @@ export default class SelectHardware extends Component {
       {
         message: (
           <>
-            <p className="hw-connect__QR-subtitle">CoolWallet</p>
+            <p className="hw-connect__QR-subtitle">
+              {this.context.t('coolWallet')}
+            </p>
             <Button
               className="hw-connect__external-btn-first"
               type="secondary"
               onClick={() => {
-                trackEvent({
+                this.context.trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
                   event: 'Clicked CoolWallet Buy Now',
-                })
-                window.open("https://www.coolwallet.io/", "_blank")
-              }
-            }>
+                });
+                window.open(AFFILIATE_LINKS.COOLWALLET, '_blank');
+              }}
+            >
               {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => {
-                trackEvent({
+                this.context.trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
                   event: 'Clicked CoolWallet Tutorial',
-                })
-                window.open("https://www.coolwallet.io/metamask-step-by-step-guides/", "_blank")
-              }
-              }>
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.COOLWALLET, '_blank');
+              }}
+            >
               {this.context.t('tutorial')}
             </Button>
           </>
@@ -502,32 +506,32 @@ export default class SelectHardware extends Component {
       {
         message: (
           <>
-            <p className="hw-connect__QR-subtitle">D'Cent</p>
+            <p className="hw-connect__QR-subtitle">{this.context.t('dcent')}</p>
             <Button
-            className="hw-connect__external-btn-first"
-            type="secondary"
-            onClick={() => {
-              trackEvent({
-                category: EVENT.CATEGORIES.NAVIGATION,
-                event: 'Clicked DCent Buy Now',
-              })
-              window.open("https://dcentwallet.com/", "_blank")
-            }
-            }>
+              className="hw-connect__external-btn-first"
+              type="secondary"
+              onClick={() => {
+                this.context.trackEvent({
+                  category: EVENT.CATEGORIES.NAVIGATION,
+                  event: 'Clicked DCent Buy Now',
+                });
+                window.open(AFFILIATE_LINKS.DCENT, '_blank');
+              }}
+            >
               {this.context.t('buyNow')}
             </Button>
             <Button
               className="hw-connect__external-btn"
               type="secondary"
               onClick={() => {
-                trackEvent({
+                this.context.trackEvent({
                   category: EVENT.CATEGORIES.NAVIGATION,
                   event: 'Clicked DCent Tutorial',
-                })
-                window.open("https://medium.com/dcentwallet/dcent-wallet-now-supports-qr-based-protocol-to-link-with-metamask-57555f02603f", "_blank")
-              }
-              }>
-                {this.context.t('tutorial')}
+                });
+                window.open(AFFILIATE_TUTORIAL_LINKS.DCENT, '_blank');
+              }}
+            >
+              {this.context.t('tutorial')}
             </Button>
           </>
         ),