diff --git a/.circleci/config.yml b/.circleci/config.yml
index ec7b51d1c..c6ca6e21e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ executors:
       NODE_OPTIONS: --max_old_space_size=2048
   shellcheck:
     docker:
-      - image: koalaman/shellcheck-alpine@sha256:35882cba254810c7de458528011e935ba2c4f3ebcb224275dfa7ebfa930ef294
+      - image: koalaman/shellcheck-alpine@sha256:dfaf08fab58c158549d3be64fb101c626abc5f16f341b569092577ae207db199
 
 workflows:
   test_and_release:
@@ -25,10 +25,15 @@ workflows:
               only:
                 - /^Version-v(\d+)[.](\d+)[.](\d+)/
       - prep-deps
-      - test-deps-audit
+      - test-deps-audit:
+          requires:
+            - prep-deps
       - test-deps-depcheck:
           requires:
             - prep-deps
+      - test-yarn-dedupe:
+          requires:
+            - prep-deps
       - validate-lavamoat-config:
           filters:
             branches:
@@ -51,9 +56,12 @@ workflows:
       - prep-build-test-metrics:
           requires:
             - prep-deps
-      - prep-build-storybook:
+      - test-storybook:
           requires:
             - prep-deps
+      - prep-build-storybook:
+          requires:
+            - test-storybook
       - test-lint:
           requires:
             - prep-deps
@@ -330,6 +338,26 @@ jobs:
           root: .
           paths:
             - storybook-build
+  
+  test-storybook:
+    executor: node-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Test Storybook
+          command: yarn storybook:test
+
+  test-yarn-dedupe:
+    executor: node-browsers
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Detect yarn lock deduplications
+          command: yarn yarn-deduplicate && git diff --exit-code yarn.lock
 
   test-lint:
     executor: node-browsers
diff --git a/.circleci/scripts/chrome-install.sh b/.circleci/scripts/chrome-install.sh
index ccf458111..3ba70ddbe 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='95.0.4638.69-1'
+CHROME_VERSION='96.0.4664.45-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='f07d16ec0a41120c40064d030e9e5240ed740b9b24c50eaede7b9bfd9a9678821c0252b40bfcd57e933a708b08d761482c3be5b3006eee605c41f5dc9e21f456'
+CHROME_BINARY_SHA512SUM='98433b003d43627e221faad212cba3df42d7f3d6e31894b1e14a9058069cbcd2bd3c83b3c59ecc1733dab11e36b181fa1d89e33b841a21fd53a8e82bbddc39aa'
 
 wget -O "${CHROME_BINARY}" -t 5 "${CHROME_BINARY_URL}"
 
diff --git a/.circleci/scripts/yarn-audit.sh b/.circleci/scripts/yarn-audit.sh
index 48bed3ce6..0f2de7123 100755
--- a/.circleci/scripts/yarn-audit.sh
+++ b/.circleci/scripts/yarn-audit.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 
+set -e
 set -u
+set -x
 set -o pipefail
 
 # use `improved-yarn-audit` since that allows for exclude
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7e3a21d36..8ed943b0e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,13 +6,32 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.8.0]
+### Added
+- [#12881](https://github.com/MetaMask/metamask-extension/pull/12881): Feature: Transaction Insights
+  - Users can now see much greater details on contract interaction transactions
+  - These transaction details are integrated with new popups for viewing and editing address book information
+  - These details are also viewable within the transaction details popup
+- [#12627](https://github.com/MetaMask/metamask-extension/pull/12627): Add support for eip-1559 on Trezor Model T and Trezor Model One
+- [#12065](https://github.com/MetaMask/metamask-extension/pull/12065): Support QR code based hardware wallet signing
+  - Includes specific support for the Keystone hardware wallet
+
+### Changed
+- [#12842](https://github.com/MetaMask/metamask-extension/pull/12842): Improve performance of the swaps feature
+- [#12776](https://github.com/MetaMask/metamask-extension/pull/12776): Hide the token detection announcement when the token detection is ON
+- [#12828](https://github.com/MetaMask/metamask-extension/pull/12828): Clear the clipboard after the seed phrase is pasted into the import flow
+- [#12576](https://github.com/MetaMask/metamask-extension/pull/12576): Show warning message when gas estimation estimates fail
+
+### Fixed
+- [#12802](https://github.com/MetaMask/metamask-extension/pull/12802): Fix bug causing occasional swaps failures for token pairs with highly precise exchange rates
+- [#12679](https://github.com/MetaMask/metamask-extension/pull/12679): Ensure eth_sign callback fires even when data submitted is invalid
+
 ## [10.7.1]
 ### Fixed
 - [#13005](https://github.com/MetaMask/metamask-extension/pull/13005): Fix connection to RPC urls with query strings.
 
 ## [10.7.0]
 ### Changed
-- [#12643](https://github.com/MetaMask/metamask-extension/pull/12643): Reject popup confirmations on close
 - [#12566](https://github.com/MetaMask/metamask-extension/pull/12566): Enable LavaMoat for the webapp background
 - [#12399](https://github.com/MetaMask/metamask-extension/pull/12399): Update the "Account Details" view
   - Change "Close" icon color from gray -> black
@@ -2633,7 +2652,8 @@ 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.7.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.8.0...HEAD
+[10.8.0]: https://github.com/MetaMask/metamask-extension/compare/v10.7.1...v10.8.0
 [10.7.1]: https://github.com/MetaMask/metamask-extension/compare/v10.7.0...v10.7.1
 [10.7.0]: https://github.com/MetaMask/metamask-extension/compare/v10.6.4...v10.7.0
 [10.6.4]: https://github.com/MetaMask/metamask-extension/compare/v10.6.3...v10.6.4
diff --git a/README.md b/README.md
index 4045873cf..76ce67bda 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,5 @@
 # MetaMask Browser Extension
 
-Hey! We are hiring JavaScript Engineers! [Apply here](https://boards.greenhouse.io/consensys/jobs/2572388)!
----
-
 You can find the latest version of MetaMask on [our official website](https://metamask.io/). For help using MetaMask, visit our [User Support Site](https://metamask.zendesk.com/hc/en-us).
 
 For [general questions](https://community.metamask.io/c/learn/26), [feature requests](https://community.metamask.io/c/feature-requests-ideas/13), or [developer questions](https://community.metamask.io/c/developer-questions/11), visit our [Community Forum](https://community.metamask.io/).
diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
index aa341612d..1d962c06e 100644
--- a/app/_locales/am/messages.json
+++ b/app/_locales/am/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "ተቀድቷል"
   },
-  "copiedTransactionId": {
-    "message": "የተቀዳ የግብይት መለያ ቁጥር"
-  },
   "copyAddress": {
     "message": "አድራሻን ወደ ቅንጥብ ሰሌዳ ቅዳ"
   },
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
index aa6a76276..1966aab0b 100644
--- a/app/_locales/ar/messages.json
+++ b/app/_locales/ar/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "تم النسخ."
   },
-  "copiedTransactionId": {
-    "message": "تم نسخ معرف المعاملة"
-  },
   "copyAddress": {
     "message": "نسخ العنوان إلى الحافظة"
   },
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
index f9cabde5d..ab7c09e24 100644
--- a/app/_locales/bg/messages.json
+++ b/app/_locales/bg/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Копирано!"
   },
-  "copiedTransactionId": {
-    "message": "Копиран идентификационен номер на транзакцията"
-  },
   "copyAddress": {
     "message": "Копирайте адреса в клипборда"
   },
diff --git a/app/_locales/bn/messages.json b/app/_locales/bn/messages.json
index 5d36aabe9..ff4fe49a6 100644
--- a/app/_locales/bn/messages.json
+++ b/app/_locales/bn/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "কপি করা হয়েছে!"
   },
-  "copiedTransactionId": {
-    "message": "কপি করা লেনদেনের আইডি"
-  },
   "copyAddress": {
     "message": "ক্লিপবোর্ডে ঠিকানা কপি করুন"
   },
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
index b29188344..beea7d58a 100644
--- a/app/_locales/ca/messages.json
+++ b/app/_locales/ca/messages.json
@@ -215,9 +215,6 @@
   "copiedExclamation": {
     "message": "S'ha copiat!"
   },
-  "copiedTransactionId": {
-    "message": "ID de transacció copiada"
-  },
   "copyAddress": {
     "message": "Copiar adreça al porta-retalls"
   },
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
index 8d288c33f..72fd08ac5 100644
--- a/app/_locales/da/messages.json
+++ b/app/_locales/da/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kopieret!"
   },
-  "copiedTransactionId": {
-    "message": "Kopieret transaktions-id"
-  },
   "copyAddress": {
     "message": "Kopier adresse til udklipsholder"
   },
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
index bca6b887a..88a3b99c7 100644
--- a/app/_locales/de/messages.json
+++ b/app/_locales/de/messages.json
@@ -209,9 +209,6 @@
   "copiedExclamation": {
     "message": "Kopiert!"
   },
-  "copiedTransactionId": {
-    "message": "Transaktions-ID kopiert"
-  },
   "copyAddress": {
     "message": "Adresse in die Zwischenablage kopieren"
   },
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
index 1b880074b..c74b44875 100644
--- a/app/_locales/el/messages.json
+++ b/app/_locales/el/messages.json
@@ -215,9 +215,6 @@
   "copiedExclamation": {
     "message": "Έγινε αντιγραφή!"
   },
-  "copiedTransactionId": {
-    "message": "Αντιγράφηκε το Αναγνωριστικό Συναλλαγής"
-  },
   "copyAddress": {
     "message": "Αντιγράψτε τη διεύθυνση στο πρόχειρο"
   },
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index b3cbda168..5fd049c23 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -1,4 +1,49 @@
 {
+  "QRHardwareInvalidTransactionTitle": {
+    "message": "Error"
+  },
+  "QRHardwareMismatchedSignId": {
+    "message": "Incongruent transaction data. Please check the transaction details."
+  },
+  "QRHardwarePubkeyAccountOutOfRange": {
+    "message": "No more accounts. If you would like to access another account unlisted below, please reconnect your hardware wallet and select it."
+  },
+  "QRHardwareScanInstructions": {
+    "message": "Place the QR code in front of your camera. The screen is blurred, but it will not affect the reading."
+  },
+  "QRHardwareSignRequestCancel": {
+    "message": "Reject"
+  },
+  "QRHardwareSignRequestDescription": {
+    "message": "After you’ve signed with your wallet, click on 'Get Signature' to receive the signature"
+  },
+  "QRHardwareSignRequestGetSignature": {
+    "message": "Get Signature"
+  },
+  "QRHardwareSignRequestSubtitle": {
+    "message": "Scan the QR code with your wallet"
+  },
+  "QRHardwareSignRequestTitle": {
+    "message": "Request Signature"
+  },
+  "QRHardwareUnknownQRCodeTitle": {
+    "message": "Error"
+  },
+  "QRHardwareUnknownWalletQRCode": {
+    "message": "Invalid QR code. Please scan the sync QR code of the hardware wallet."
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "Scan QR Code"
+  },
+  "QRHardwareWalletSteps1Description": {
+    "message": "Connect an airgapped hardware wallet that communicates through QR-codes. Officially supported airgapped hardware wallets include:"
+  },
+  "QRHardwareWalletSteps1Title": {
+    "message": "QR-based HW Wallet"
+  },
+  "QRHardwareWalletSteps2Description": {
+    "message": "AirGap Vault & Ngrave (Coming Soon)"
+  },
   "about": {
     "message": "About"
   },
@@ -41,7 +86,7 @@
     "message": "Activity"
   },
   "activityLog": {
-    "message": "activity log"
+    "message": "Activity log"
   },
   "add": {
     "message": "Add"
@@ -49,6 +94,9 @@
   "addANetwork": {
     "message": "Add a network"
   },
+  "addANickname": {
+    "message": "Add a nickname"
+  },
   "addAcquiredTokens": {
     "message": "Add the tokens you've acquired using MetaMask"
   },
@@ -85,9 +133,15 @@
   "addFriendsAndAddresses": {
     "message": "Add friends and addresses you trust"
   },
+  "addMemo": {
+    "message": "Add memo"
+  },
   "addNFT": {
     "message": "Add NFT"
   },
+  "addNFTLowerCase": {
+    "message": "add NFT"
+  },
   "addNetwork": {
     "message": "Add Network"
   },
@@ -112,12 +166,21 @@
   "advanced": {
     "message": "Advanced"
   },
+  "advancedBaseGasFeeToolTip": {
+    "message": "Any difference between your max base fee and the current base fee will be refunded after completion."
+  },
+  "advancedGasFeeModalTitle": {
+    "message": "Advanced gas fee"
+  },
   "advancedGasPriceTitle": {
     "message": "Gas price"
   },
   "advancedOptions": {
     "message": "Advanced Options"
   },
+  "advancedPriorityFeeToolTip": {
+    "message": "Priority fee (aka “miner tip”) goes directly to miners and incentivizes them to prioritize your transaction."
+  },
   "advancedSettingsDescription": {
     "message": "Access developer features, download State Logs, Reset Account, setup test networks and custom RPC"
   },
@@ -291,10 +354,6 @@
     "message": "Swap",
     "description": "This is used with viewOnEtherscan e.g View Swap on Etherscan"
   },
-  "blockExplorerTransactionAction": {
-    "message": "Transaction",
-    "description": "This is used with viewOnCustomBlockExplorer and viewOnEtherscan e.g View Transaction on Etherscan"
-  },
   "blockExplorerUrl": {
     "message": "Block Explorer URL"
   },
@@ -317,6 +376,9 @@
   "builtAroundTheWorld": {
     "message": "MetaMask is designed and built around the world."
   },
+  "busy": {
+    "message": "Busy"
+  },
   "buy": {
     "message": "Buy"
   },
@@ -347,6 +409,9 @@
   "cancelPopoverTitle": {
     "message": "Cancel transaction"
   },
+  "cancelSpeedUp": {
+    "message": "cancel or speed up a tranaction."
+  },
   "cancellationGasFee": {
     "message": "Cancellation Gas Fee"
   },
@@ -512,15 +577,15 @@
   "copiedExclamation": {
     "message": "Copied!"
   },
-  "copiedTransactionId": {
-    "message": "Copied Transaction ID"
-  },
   "copyAddress": {
     "message": "Copy address to clipboard"
   },
   "copyPrivateKey": {
     "message": "This is your private key (click to copy)"
   },
+  "copyRawTransactionData": {
+    "message": "Copy raw transaction data"
+  },
   "copyToClipboard": {
     "message": "Copy to clipboard"
   },
@@ -560,6 +625,9 @@
   "currentLanguage": {
     "message": "Current Language"
   },
+  "currentTitle": {
+    "message": "Current:"
+  },
   "currentlyUnavailable": {
     "message": "Unavailable on this network"
   },
@@ -581,6 +649,9 @@
   "dappSuggested": {
     "message": "Site suggested"
   },
+  "dappSuggestedShortLabel": {
+    "message": "Site"
+  },
   "dappSuggestedTooltip": {
     "message": "$1 has recommended this price.",
     "description": "$1 represents the Dapp's origin"
@@ -591,6 +662,9 @@
   "dataBackupFoundInfo": {
     "message": "Some of your account data was backed up during a previous installation of MetaMask. This could include your settings, contacts, and tokens. Would you like to restore this data now?"
   },
+  "dataHex": {
+    "message": "Hex"
+  },
   "decimal": {
     "message": "Token Decimal"
   },
@@ -689,6 +763,12 @@
   "edit": {
     "message": "Edit"
   },
+  "editANickname": {
+    "message": "Edit nickname"
+  },
+  "editAddressNickname": {
+    "message": "Edit address nickname"
+  },
   "editContact": {
     "message": "Edit Contact"
   },
@@ -710,6 +790,9 @@
   "editGasEducationModalTitle": {
     "message": "How to choose?"
   },
+  "editGasFeeModalTitle": {
+    "message": "Edit gas fee"
+  },
   "editGasHigh": {
     "message": "High"
   },
@@ -755,21 +838,12 @@
   "editGasPriceTooltip": {
     "message": "This network requires a “Gas price” field when submitting a transaction. Gas price is the amount you will pay pay per unit of gas."
   },
-  "editGasSubTextAmount": {
-    "message": "$1 $2",
-    "description": "$1 will be passed the editGasSubTextAmountLabel and $2 will be passed the amount in either cryptocurrency or fiat"
-  },
   "editGasSubTextAmountLabel": {
     "message": "Max amount:",
     "description": "This is meant to be used as the $1 substitution editGasSubTextAmount"
   },
-  "editGasSubTextFee": {
-    "message": "$1 $2",
-    "description": "$1 will be passed the editGasSubTextFeeLabel and $2 will be passed the fee amount in either cryptocurrency or fiat"
-  },
   "editGasSubTextFeeLabel": {
-    "message": "Max fee:",
-    "description": "$1 represents a dollar amount"
+    "message": "Max fee:"
   },
   "editGasTitle": {
     "message": "Edit priority"
@@ -783,6 +857,12 @@
   "editGasTooLowWarningTooltip": {
     "message": "This lowers your maximum fee but if network traffic increases your transaction may be delayed or fail."
   },
+  "editInGwei": {
+    "message": "Edit in GWEI"
+  },
+  "editInMultiplier": {
+    "message": "Edit in multiplier"
+  },
   "editNonceField": {
     "message": "Edit Nonce"
   },
@@ -795,6 +875,16 @@
   "enableFromSettings": {
     "message": " Enable it from Settings."
   },
+  "enableOpenSeaAPI": {
+    "message": "Enable OpenSea API"
+  },
+  "enableOpenSeaAPIDescription": {
+    "message": "Use OpenSea's API to fetch NFT data. NFT auto-detection relies on OpenSea's API, and will not be available when this is turned off."
+  },
+  "enableToken": {
+    "message": "enable $1",
+    "description": "$1 is a token symbol, e.g. ETH"
+  },
   "encryptionPublicKeyNotice": {
     "message": "$1 would like your public encryption key. By consenting, this site will be able to compose encrypted messages to you.",
     "description": "$1 is the web3 site name"
@@ -966,6 +1056,21 @@
     "message": "File import not working? Click here!",
     "description": "Helps user import their account from a JSON file"
   },
+  "flaskExperimentalText1": {
+    "message": "Using Flask can greatly increase your risk of fund loss:"
+  },
+  "flaskExperimentalText2": {
+    "message": "if you use it to install non-trustworthy Snaps"
+  },
+  "flaskExperimentalText3": {
+    "message": "if you do not review confirmations before approving changes"
+  },
+  "flaskExperimentalText4": {
+    "message": "if you interact with unfamiliar smart contracts"
+  },
+  "flaskExperimentalText5": {
+    "message": "Using Flask gives you much greater discretion in using the power of MetaMask, and that discretion is yours. Do you accept these risks as well as extra responsibility for your wallet's safety?"
+  },
   "followUsOnTwitter": {
     "message": "Follow us on Twitter"
   },
@@ -1011,6 +1116,9 @@
     "message": "Gas limit must be at least $1",
     "description": "$1 is the custom gas limit, in decimal."
   },
+  "gasOption": {
+    "message": "Gas option"
+  },
   "gasPrice": {
     "message": "Gas Price (GWEI)"
   },
@@ -1029,13 +1137,18 @@
   "gasPriceInfoTooltipContent": {
     "message": "Gas price specifies the amount of Ether you are willing to pay for each unit of gas."
   },
-  "gasPriceLabel": {
-    "message": "Gas price"
+  "gasTimingHoursShort": {
+    "message": "$1 hrs",
+    "description": "$1 represents a number of hours"
   },
   "gasTimingMinutes": {
     "message": "$1 minutes",
     "description": "$1 represents a number of minutes"
   },
+  "gasTimingMinutesShort": {
+    "message": "$1 min",
+    "description": "$1 represents a number of minutes"
+  },
   "gasTimingNegative": {
     "message": "Maybe in $1",
     "description": "$1 represents an amount of time"
@@ -1048,6 +1161,10 @@
     "message": "$1 seconds",
     "description": "$1 represents a number of seconds"
   },
+  "gasTimingSecondsShort": {
+    "message": "$1 sec",
+    "description": "$1 represents a number of seconds"
+  },
   "gasTimingVeryPositive": {
     "message": "Very likely in < $1",
     "description": "$1 represents an amount of time"
@@ -1276,6 +1393,12 @@
     "message": "JSON File",
     "description": "format for importing an account"
   },
+  "keystone": {
+    "message": "Keystone"
+  },
+  "keystoneTutorial": {
+    "message": " (Tutorials)"
+  },
   "knownAddressRecipient": {
     "message": "Known contract address."
   },
@@ -1291,8 +1414,15 @@
   "layer1Fees": {
     "message": "Layer 1 fees"
   },
+  "learmMoreAboutGas": {
+    "message": "Want to $1 about gas?"
+  },
+  "learnCancelSpeeedup": {
+    "message": "Learn how to $1",
+    "description": "$1 is link to cancel or speed up transactions"
+  },
   "learnMore": {
-    "message": "Learn more"
+    "message": "learn more"
   },
   "learnScamRisk": {
     "message": "scams and security risks."
@@ -1496,6 +1626,9 @@
   "mobileSyncWarning": {
     "message": "The 'Sync with extension' feature is temporarily disabled. If you want to use your extension wallet on MetaMask mobile, then on your mobile app: go back to the wallet setup options and select the 'Import with Secret Recovery Phrase' option. Use your extension wallet's secret phrase to then import your wallet into mobile."
   },
+  "multiplier": {
+    "message": "multiplier"
+  },
   "mustSelectOne": {
     "message": "Must select at least 1 token."
   },
@@ -1558,6 +1691,9 @@
   "networkSettingsDescription": {
     "message": "Add and edit custom RPC networks"
   },
+  "networkStatus": {
+    "message": "Network status"
+  },
   "networkURL": {
     "message": "Network URL"
   },
@@ -1580,12 +1716,24 @@
     "message": "Account $1",
     "description": "Default name of next account to be created on create account screen"
   },
+  "newCollectibleAddFailed": {
+    "message": "Collectible was not added because: $1"
+  },
+  "newCollectibleAddedMessage": {
+    "message": "Collectible was successfully added!"
+  },
   "newContact": {
     "message": "New Contact"
   },
   "newContract": {
     "message": "New Contract"
   },
+  "newNFTsDetected": {
+    "message": "New NFTs detected"
+  },
+  "newNFTsDetectedInfo": {
+    "message": "One or more new NFTs were detected in your wallet."
+  },
   "newNetworkAdded": {
     "message": "“$1” was successfully added!"
   },
@@ -1614,6 +1762,9 @@
   "nfts": {
     "message": "NFTs"
   },
+  "nickname": {
+    "message": "Nickname"
+  },
   "noAccountsFound": {
     "message": "No accounts found for the given search query"
   },
@@ -1653,6 +1804,9 @@
   "nonceFieldHeading": {
     "message": "Custom Nonce"
   },
+  "notBusy": {
+    "message": "Not busy"
+  },
   "notCurrentAccount": {
     "message": "Is this the correct account? It's different from the currently selected account in your wallet"
   },
@@ -1739,6 +1893,15 @@
     "message": "Ledger connection improvement",
     "description": "Title for a notification in the 'See What's New' popup. Notifies ledger users that there is an improvement in how they can connect their device."
   },
+  "notifications9DescriptionOne": {
+    "message": "We now provide you with more insights on the 'Data' tab when confirming smart contract transactions."
+  },
+  "notifications9DescriptionTwo": {
+    "message": "You can now get a better understanding of your transaction’s details before confirming, and more easily add transaction addresses to your address book, helping you make safe and informed decisions."
+  },
+  "notifications9Title": {
+    "message": "👓 We are making transactions easier to read."
+  },
   "ofTextNofM": {
     "message": "of"
   },
@@ -1861,6 +2024,16 @@
   "pending": {
     "message": "Pending"
   },
+  "pendingTransactionInfo": {
+    "message": "This transaction will not process until that one is complete."
+  },
+  "pendingTransactionMultiple": {
+    "message": "You have ($1) pending transactions."
+  },
+  "pendingTransactionSingle": {
+    "message": "You have (1) pending transaction.",
+    "description": "$1 is count of pending transactions"
+  },
   "permissionCheckedIconDescription": {
     "message": "You have approved this permission"
   },
@@ -1893,6 +2066,9 @@
   "primaryCurrencySettingDescription": {
     "message": "Select native to prioritize displaying values in the native currency of the chain (e.g. ETH). Select Fiat to prioritize displaying values in your selected fiat currency."
   },
+  "priorityFee": {
+    "message": "Priority Fee"
+  },
   "privacyMsg": {
     "message": "Privacy Policy"
   },
@@ -1906,6 +2082,9 @@
   "privateNetwork": {
     "message": "Private Network"
   },
+  "proceedWithTransaction": {
+    "message": "I want to proceed anyway"
+  },
   "proposedApprovalLimit": {
     "message": "Proposed Approval Limit"
   },
@@ -2180,6 +2359,9 @@
   "selectHdPath": {
     "message": "Select HD Path"
   },
+  "selectNFTPrivacyPreference": {
+    "message": "Select NFT privacy preference"
+  },
   "selectPathHelp": {
     "message": "If you don't see the accounts you expect, try switching the HD path."
   },
@@ -2287,6 +2469,12 @@
   "signed": {
     "message": "Signed"
   },
+  "simulationErrorMessage": {
+    "message": "This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended."
+  },
+  "simulationErrorMessageV2": {
+    "message": "We were not able to estimate gas. There might be an error in the contract and this transaction may fail."
+  },
   "skip": {
     "message": "Skip"
   },
@@ -2339,6 +2527,9 @@
   "spendLimitTooLarge": {
     "message": "Spend limit too large"
   },
+  "stable": {
+    "message": "Stable"
+  },
   "stateLogError": {
     "message": "Error in retrieving state logs."
   },
@@ -2427,8 +2618,9 @@
     "message": "You need $1 more $2 to complete this swap",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "A better quote is available"
+  "swapBestOfNQuotes": {
+    "message": "Best of $1 quotes.",
+    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
   },
   "swapBuildQuotePlaceHolderText": {
     "message": "No tokens available matching $1",
@@ -2459,12 +2651,9 @@
     "message": "This is required and gives MetaMask permission to swap your $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Estimated network fee"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "The “$1” is what we expect the actual fee to be. The exact amount depends on network conditions.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
+  "swapEnableTokenForSwapping": {
+    "message": "This will $1 for swapping",
+    "description": "$1 is for the 'enableToken' key, e.g. 'enable ETH'"
   },
   "swapEstimatedNetworkFees": {
     "message": "Estimated network fees"
@@ -2511,16 +2700,13 @@
   "swapHighSlippageWarning": {
     "message": "Slippage amount is very high."
   },
+  "swapIncludesMMFee": {
+    "message": "Includes a $1% MetaMask fee.",
+    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
+  },
   "swapLowSlippageError": {
     "message": "Transaction may fail, max slippage too low."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” is the most you’ll spend. When the network is volatile this can be a large amount.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Max network fee"
-  },
   "swapMaxSlippage": {
     "message": "Max slippage"
   },
@@ -2531,13 +2717,10 @@
     "message": "We find the best price from the top liquidity sources, every time. A fee of $1% is automatically factored into this quote.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 quotes",
+  "swapNQuotesWithDot": {
+    "message": "$1 quotes.",
     "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
   },
-  "swapNetworkFeeSummary": {
-    "message": "The network fee covers the cost of processing your swap and storing it on the $1 network. MetaMask does not profit from this fee."
-  },
   "swapNewQuoteIn": {
     "message": "New quotes in $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -2572,10 +2755,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "If the price changes between the time your order is placed and confirmed it’s called \"slippage\". Your Swap will automatically cancel if slippage exceeds your \"slippage tolerance\" setting."
   },
-  "swapQuoteIncludesRate": {
-    "message": "Quote includes a $1% MetaMask fee",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Quote $1 of $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -2583,9 +2762,6 @@
   "swapQuoteSource": {
     "message": "Quote source"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Quotes are refreshed often to reflect current market conditions."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Please request new quotes to get the latest rates."
   },
@@ -2646,9 +2822,6 @@
   "swapSwapTo": {
     "message": "Swap to"
   },
-  "swapThisWillAllowApprove": {
-    "message": "This will allow $1 to be swapped."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "to confirm with your hardware wallet"
   },
@@ -2691,9 +2864,6 @@
   "swapUnknown": {
     "message": "Unknown"
   },
-  "swapUsingBestQuote": {
-    "message": "Using the best quote"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Multiple tokens can use the same name and symbol. Check $1 to verify this is the token you're looking for.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
@@ -2793,6 +2963,9 @@
   "thisWillCreate": {
     "message": "This will create a new wallet and Secret Recovery Phrase"
   },
+  "time": {
+    "message": "Time"
+  },
   "tips": {
     "message": "Tips"
   },
@@ -2846,6 +3019,18 @@
   "transactionCreated": {
     "message": "Transaction created with a value of $1 at $2."
   },
+  "transactionData": {
+    "message": "Transaction data"
+  },
+  "transactionDecodingAccreditationDecoded": {
+    "message": "Decoded by Truffle"
+  },
+  "transactionDecodingAccreditationVerified": {
+    "message": "Verified contract on $1"
+  },
+  "transactionDecodingUnsupportedNetworkError": {
+    "message": "Transaction decoding is not available for chainId $1"
+  },
   "transactionDetailDappGasMoreInfo": {
     "message": "Site suggested"
   },
@@ -2947,9 +3132,18 @@
   "tryAgain": {
     "message": "Try again"
   },
+  "tryAnywayOption": {
+    "message": "I will try anyway"
+  },
   "turnOnTokenDetection": {
     "message": "Turn on enhanced token detection"
   },
+  "twelveHrTitle": {
+    "message": "12hr:"
+  },
+  "txInsightsNotSupported": {
+    "message": "Transaction insights not supported for this contract at this time."
+  },
   "typePassword": {
     "message": "Type your MetaMask password"
   },
@@ -3008,6 +3202,12 @@
   "urlExistsErrorMsg": {
     "message": "This URL is currently used by the $1 network."
   },
+  "useCollectibleDetection": {
+    "message": "Autodetect NFTs"
+  },
+  "useCollectibleDetectionDescription": {
+    "message": "Displaying NFTs media & data may expose your IP address to centralized servers. Third-party APIs (like OpenSea) are used to detect NFTs in your wallet. This exposes your account address with those services. Leave this disabled if you don’t want the app to pull data from those those services."
+  },
   "usePhishingDetection": {
     "message": "Use Phishing Detection"
   },
@@ -3023,6 +3223,9 @@
   "usedByClients": {
     "message": "Used by a variety of different clients"
   },
+  "userAccepts": {
+    "message": "I accept"
+  },
   "userName": {
     "message": "Username"
   },
@@ -3053,6 +3256,9 @@
   "viewMore": {
     "message": "View More"
   },
+  "viewOnBlockExplorer": {
+    "message": "View on block explorer"
+  },
   "viewOnCustomBlockExplorer": {
     "message": "View $1 at $2",
     "description": "$1 is the action type. e.g (Account, Transaction, Swap) and $2 is the Custom Block Exporer URL"
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
index 8418ba8e6..195bff8c7 100644
--- a/app/_locales/es/messages.json
+++ b/app/_locales/es/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "¡Copiado!"
   },
-  "copiedTransactionId": {
-    "message": "Id. de transacción copiado"
-  },
   "copyAddress": {
     "message": "Copiar dirección al Portapapeles"
   },
@@ -1816,9 +1813,6 @@
     "message": "Necesita $1 más $2 para completar este canje",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Hay una mejor cotización disponible"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Esta acción es obligatoria y le da permiso a MetaMask para canjear su $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Cuota de red estimada"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” es la cuota real que esperamos que sea. El monto exacto depende de las condiciones de la red.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Cuotas de red estimadas"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Es posible que la transacción tenga errores, el desfase máximo es demasiado bajo."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” es el máximo que gastará. Cuando la red es volátil, puede ser un monto grande.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Cuota máxima de red"
-  },
   "swapMaxSlippage": {
     "message": "Desfase máximo"
   },
@@ -1904,13 +1884,6 @@
     "message": "Buscamos el mejor precio en las fuentes de liquidez más importantes, todo el tiempo. Se incorpora de manera automática a esta cotización una cuota del $1 %.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 cotizaciones",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "La cuota de red cubre el costo de procesamiento del canje y su almacenamiento en la red de $1. MetaMask no se beneficia de esta cuota."
-  },
   "swapNewQuoteIn": {
     "message": "Cotizaciones nuevas en $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Si el precio cambia entre el momento en que hace el pedido y cuando se confirma, se denomina \"desfase\". El canje se cancelará automáticamente si el desfase supera lo establecido en la configuración \"tolerancia de desfase\"."
   },
-  "swapQuoteIncludesRate": {
-    "message": "La cotización incluye una cuota de MetaMask de $1 %",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Cotización $1 de $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Fuente de la cotización"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Las cotizaciones se actualizan con frecuencia para reflejar las condiciones actuales del mercado."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Solicite cotizaciones nuevas para tener los costos más recientes."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Canjear a"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Esto permitirá canjear $1."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "confirmar con la cartera de hardware"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Desconocido"
   },
-  "swapUsingBestQuote": {
-    "message": "Uso de la mejor cotización"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Varios tokens pueden usar el mismo nombre y símbolo. Revise $1 para comprobar que este es el token que busca.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
index 8418ba8e6..195bff8c7 100644
--- a/app/_locales/es_419/messages.json
+++ b/app/_locales/es_419/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "¡Copiado!"
   },
-  "copiedTransactionId": {
-    "message": "Id. de transacción copiado"
-  },
   "copyAddress": {
     "message": "Copiar dirección al Portapapeles"
   },
@@ -1816,9 +1813,6 @@
     "message": "Necesita $1 más $2 para completar este canje",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Hay una mejor cotización disponible"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Esta acción es obligatoria y le da permiso a MetaMask para canjear su $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Cuota de red estimada"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” es la cuota real que esperamos que sea. El monto exacto depende de las condiciones de la red.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Cuotas de red estimadas"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Es posible que la transacción tenga errores, el desfase máximo es demasiado bajo."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” es el máximo que gastará. Cuando la red es volátil, puede ser un monto grande.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Cuota máxima de red"
-  },
   "swapMaxSlippage": {
     "message": "Desfase máximo"
   },
@@ -1904,13 +1884,6 @@
     "message": "Buscamos el mejor precio en las fuentes de liquidez más importantes, todo el tiempo. Se incorpora de manera automática a esta cotización una cuota del $1 %.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 cotizaciones",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "La cuota de red cubre el costo de procesamiento del canje y su almacenamiento en la red de $1. MetaMask no se beneficia de esta cuota."
-  },
   "swapNewQuoteIn": {
     "message": "Cotizaciones nuevas en $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Si el precio cambia entre el momento en que hace el pedido y cuando se confirma, se denomina \"desfase\". El canje se cancelará automáticamente si el desfase supera lo establecido en la configuración \"tolerancia de desfase\"."
   },
-  "swapQuoteIncludesRate": {
-    "message": "La cotización incluye una cuota de MetaMask de $1 %",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Cotización $1 de $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Fuente de la cotización"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Las cotizaciones se actualizan con frecuencia para reflejar las condiciones actuales del mercado."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Solicite cotizaciones nuevas para tener los costos más recientes."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Canjear a"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Esto permitirá canjear $1."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "confirmar con la cartera de hardware"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Desconocido"
   },
-  "swapUsingBestQuote": {
-    "message": "Uso de la mejor cotización"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Varios tokens pueden usar el mismo nombre y símbolo. Revise $1 para comprobar que este es el token que busca.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/et/messages.json b/app/_locales/et/messages.json
index 66ce15ec5..a3297815c 100644
--- a/app/_locales/et/messages.json
+++ b/app/_locales/et/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kopeeritud!"
   },
-  "copiedTransactionId": {
-    "message": "Kopeeritud tehingu ID"
-  },
   "copyAddress": {
     "message": "Kopeeri aadress lõikelauale"
   },
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
index f6fd7e476..d76b2f99c 100644
--- a/app/_locales/fa/messages.json
+++ b/app/_locales/fa/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "کپی شد!"
   },
-  "copiedTransactionId": {
-    "message": "آی دی معامله کاپی شده"
-  },
   "copyAddress": {
     "message": "کاپی آدرس به کلیپ بورد"
   },
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json
index 8260f9ad4..1f453fb70 100644
--- a/app/_locales/fi/messages.json
+++ b/app/_locales/fi/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kopioitu"
   },
-  "copiedTransactionId": {
-    "message": "Kopioitu tapahtuman tunnus"
-  },
   "copyAddress": {
     "message": "Kopioi osoite leikepöydälle"
   },
diff --git a/app/_locales/fil/messages.json b/app/_locales/fil/messages.json
index 23001c136..2a12119cf 100644
--- a/app/_locales/fil/messages.json
+++ b/app/_locales/fil/messages.json
@@ -197,9 +197,6 @@
   "copiedExclamation": {
     "message": "Nakopya!"
   },
-  "copiedTransactionId": {
-    "message": "Nakopya ang Transaction ID"
-  },
   "copyAddress": {
     "message": "Kopyahin ang address sa clipboard"
   },
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json
index 7ed3dbcdd..8fd682d8c 100644
--- a/app/_locales/fr/messages.json
+++ b/app/_locales/fr/messages.json
@@ -209,9 +209,6 @@
   "copiedExclamation": {
     "message": "Copié!"
   },
-  "copiedTransactionId": {
-    "message": "ID de transaction copié"
-  },
   "copyAddress": {
     "message": "Copier l'addresse dans le presse-papier"
   },
diff --git a/app/_locales/he/messages.json b/app/_locales/he/messages.json
index 905020755..1e49f42db 100644
--- a/app/_locales/he/messages.json
+++ b/app/_locales/he/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "הועתק!"
   },
-  "copiedTransactionId": {
-    "message": "מזהה עסקה הועתק"
-  },
   "copyAddress": {
     "message": "העתק כתובת ללוח"
   },
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
index 65f6640c1..29d19a07a 100644
--- a/app/_locales/hi/messages.json
+++ b/app/_locales/hi/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "कॉपी किया गया!"
   },
-  "copiedTransactionId": {
-    "message": "कॉपी की गई लेनदेन ID"
-  },
   "copyAddress": {
     "message": "क्लिपबोर्ड पर पता कॉपी करें"
   },
@@ -1816,9 +1813,6 @@
     "message": "इस स्वैप को पूरा करने के लिए आपको $1 और $2 की आवश्यकता होगी",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "एक बेहतर उद्धरण उपलब्ध है"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "यह आवश्यक है और MetaMask को आपके $1 को स्वैप करने की अनुमति देता है।",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "अनुमानित नेटवर्क शुल्क"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” वह शुल्क है, जिसकी हम वास्तविक रूप से उम्मीद करते हैं। सटीक राशि नेटवर्क की स्थितियों पर निर्भर करती है।",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "अनुमानित नेटवर्क शुल्क"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "लेनदेन विफल हो सकता है, अधिकतम स्लिपेज बहुत कम हो सकता है।"
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "आप सबसे अधिक “$1” खर्च करते हैं। जब नेटवर्क अस्थिर होता है, तो यह एक बड़ी राशि हो सकती है।",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "अधिकतम नेटवर्क शुल्क"
-  },
   "swapMaxSlippage": {
     "message": "अधिकतम स्लिपेज"
   },
@@ -1904,13 +1884,6 @@
     "message": "हम हर बार शीर्ष चलनिधि स्रोतों से सबसे अच्छे मूल्य पाते हैं। इस उद्धरण में $1% का शुल्क स्वतः ही शामिल हो जाता है।",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 उद्धरण",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "नेटवर्क शुल्क आपके स्वैप को संसाधित करने के शुल्क और उसे $1 नेटवर्क पर संग्रह करने को कवर करता है। MetaMask इस शुल्क से लाभ नहीं कमाता है।"
-  },
   "swapNewQuoteIn": {
     "message": "$1 में नए उद्धरण",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "यदि आपके ऑर्डर किए जाने और पुष्टि किए जाने के समय के बीच मूल्य में परिवर्तन होता है, तो इसे \"स्लिपेज\" कहा जाता है। यदि स्लिपेज आपकी \"स्लिपेज टॉलरेंस\" सेटिंग से अधिक हो जाता है, तो आपका स्वैप स्वतः रद्द हो जाएगा।"
   },
-  "swapQuoteIncludesRate": {
-    "message": "उद्धरण में $1% का MetaMask शुल्क शामिल है",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "$2 में से $1 उद्धरण",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "उद्धरण का स्रोत"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "वर्तमान बाजार की स्थितियों को प्रतिबिंबित करने के लिए उद्धरण अक्सर ताज़ा होते रहते हैं।"
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "कृपया नवीनतम दरों को प्राप्त करने के लिए नए उद्धरणों का अनुरोध करें।"
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "इसमें स्वैप करें"
   },
-  "swapThisWillAllowApprove": {
-    "message": "यह $1 को स्वैप करने की अनुमति देगा।"
-  },
   "swapToConfirmWithHwWallet": {
     "message": "अपने हार्डवेयर वॉलेट से पुष्टि करने के लिए"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "अज्ञात"
   },
-  "swapUsingBestQuote": {
-    "message": "सर्वोत्तम उद्धरण का उपयोग करना"
-  },
   "swapVerifyTokenExplanation": {
     "message": "एकाधिक टोकन एक ही नाम और प्रतीक का उपयोग कर सकते हैं। यह सत्यापित करने के लिए $1 की जाँच करें कि यह वही टोकन है, जिसकी आप तलाश कर रहे हैं।",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/hr/messages.json b/app/_locales/hr/messages.json
index 7a3a94c8f..39d3f0f0e 100644
--- a/app/_locales/hr/messages.json
+++ b/app/_locales/hr/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kopirano!"
   },
-  "copiedTransactionId": {
-    "message": "Kopirana identifikacijska oznaka transakcije"
-  },
   "copyAddress": {
     "message": "Kopiraj adresu u međuspremnik"
   },
diff --git a/app/_locales/hu/messages.json b/app/_locales/hu/messages.json
index 18f2cf317..9a36bbaa4 100644
--- a/app/_locales/hu/messages.json
+++ b/app/_locales/hu/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kimásolva!"
   },
-  "copiedTransactionId": {
-    "message": "Másolt tranzakció-azonosító"
-  },
   "copyAddress": {
     "message": "Másolja a címet a vágólapra"
   },
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
index 9f0744379..eeee31329 100644
--- a/app/_locales/id/messages.json
+++ b/app/_locales/id/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "Disalin!"
   },
-  "copiedTransactionId": {
-    "message": "ID Transaksi yang Disalin"
-  },
   "copyAddress": {
     "message": "Salin alamat ke clipboard"
   },
@@ -1816,9 +1813,6 @@
     "message": "Anda memerlukan $1 lagi $2 untuk menyelesaikan penukaran ini",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Kuota yang lebih baik tersedia"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Ini wajib dan memberikan MetaMask izin untuk menukar $1 Anda.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Biaya jaringan yang diperkirakan"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” adalah yang kami harapkan untuk biaya yang seharusnya. Jumlah yang tepat tergantung pada kondisi jaringan.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Biaya jaringan yang diperkirakan"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Transaksi bisa gagal, slippage maks. terlalu rendah."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” adalah yang paling banyak yang akan Anda gunakan. Bila jaringan tidak stabil ini bisa menjadi jumlah yang besar.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Biaya jaringan maks."
-  },
   "swapMaxSlippage": {
     "message": "Maks. slippage"
   },
@@ -1904,13 +1884,6 @@
     "message": "Kami menemukan harga terbaik dari sumber likuiditas teratas, setiap waktu. Biaya sebesar $1% otomatis diperhitungkan ke kuota ini.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 kuota",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "Biaya jaringan mencakup biaya pemrosesan penukaran Anda dan menyimpannya di jaringan $1. MetaMask tidak mendapatkan keuntungan dari biaya ini."
-  },
   "swapNewQuoteIn": {
     "message": "Kuota baru di $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Jika harga berubah antara waktu pesanan Anda ditempatkan dan dikonfirmasi, ini disebut \"slippage\". Penukaran Anda akan otomatis dibatalkan jika slippage melebihi pengaturan \"toleransi slippage\"."
   },
-  "swapQuoteIncludesRate": {
-    "message": "Kuota mencakup biaya MetaMask $1%",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Kuota $1 dari $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Sumber kuota"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Kuota disegarkan sering kali untuk menerapkan kondisi pasar terkini."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Silakan minta kuota baru untuk mendapatkan tarif terbaru."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Tukar untuk"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Ini akan memungkinkan $1 untuk ditukar."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "untuk mengonfirmasikan dengan dompet perangkat keras Anda"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Tidak diketahui"
   },
-  "swapUsingBestQuote": {
-    "message": "Menggunakan kuota terbaik"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Beberapa token dapat menggunakan simbol dan nama yang sama. Periksa $1 untuk memverifikasi inilah token yang Anda cari.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
index 1e8c000de..2e3c5720b 100644
--- a/app/_locales/it/messages.json
+++ b/app/_locales/it/messages.json
@@ -356,9 +356,6 @@
   "copiedExclamation": {
     "message": "Copiato!"
   },
-  "copiedTransactionId": {
-    "message": "ID Transazione Copiato"
-  },
   "copyAddress": {
     "message": "Copia l'indirizzo"
   },
@@ -1478,9 +1475,6 @@
     "message": "Devi avere $1 $2 in più per completare lo scambio",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "È disponibile una quotazione migliore"
-  },
   "swapBuildQuotePlaceHolderText": {
     "message": "Non ci sono token disponibile con questo nome $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"
@@ -1498,13 +1492,6 @@
     "message": "Questo è richiesto e darà a MetaMask il permesso di scambiare $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Tassa di rete stimata"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "La “$1” è ciò che ci aspettiamo possa essere la tassa reale. L'importo esatto dipende dalle condizioni della rete.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Tasse di rete stimate"
   },
@@ -1526,13 +1513,6 @@
   "swapLowSlippageError": {
     "message": "La transazione può fallire, il massimo slippage è troppo basso."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” è il massimo che spenderai. Quando la rete è volatile può essere un importo alto.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Tassa di rete massima"
-  },
   "swapMaxSlippage": {
     "message": "Slippage massimo"
   },
@@ -1543,13 +1523,6 @@
     "message": "Troviamo i migliori prezzi dalle sorgenti di liquidità migliori, sempre. Una tassa del $1% è automaticamente aggiunta ad ogni quotazione, ciò serve a supportare lo sviluppo in modo da rendere MetaMask sempre migliore.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 quotazioni",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "La tassa di rete copre il costo di processamento dello scambio e della memorizzazione nella rete $1. MetaMask non trae profitto da questa tassa."
-  },
   "swapNewQuoteIn": {
     "message": "Nuove quotazioni in $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1575,10 +1548,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Si chiama \"slippage\" la differenza tra il prezzo quando il tuo ordine viene inserito e quando viene confermato. Lo scambio sarà annullato automaticamente se lo slippage supera il \"massimo slippage\" impostato."
   },
-  "swapQuoteIncludesRate": {
-    "message": "La quotazione include la tassa del $1% di MetaMask",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Quotazione $1 di $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1586,9 +1555,6 @@
   "swapQuoteSource": {
     "message": "Sorgente della quota"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Le quotazioni sono aggiornate spesso per riflettere le condizioni di mercato correnti."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Richiedi nuove quotazioni per ottenere le ultime tariffe."
   },
@@ -1646,9 +1612,6 @@
   "swapSwapTo": {
     "message": "Scambia a"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Questo permetterà di scambiare $1."
-  },
   "swapTokenAvailable": {
     "message": "I $1 sono stati aggiunti al tuo account.",
     "description": "This message is shown after a swap is successful and communicates the exact amount of tokens the user has received for a swap. The $1 is a decimal number of tokens followed by the token symbol."
@@ -1674,9 +1637,6 @@
   "swapUnknown": {
     "message": "Sconosciuto"
   },
-  "swapUsingBestQuote": {
-    "message": "Quotazione migliore"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Più token possono usare lo stesso nome e simbolo. Verifica su $1 che questo sia il token che stai cercando.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
index cea2eda8c..7c74d8f5f 100644
--- a/app/_locales/ja/messages.json
+++ b/app/_locales/ja/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "コピーされました!"
   },
-  "copiedTransactionId": {
-    "message": "コピーされたトランザクション ID"
-  },
   "copyAddress": {
     "message": "アドレスをクリップボードにコピー"
   },
@@ -1816,9 +1813,6 @@
     "message": "このスワップを完了するには、さらに $1 個の $2 が必要です。",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "より適切な見積もりが利用可能です"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "これは必須であり、$1 をスワップするための MetaMask 許可を付与します。",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "推定のネットワーク手数料"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” は予定する実際の手数料です。正確な額はネットワークの状態によって異なります。",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "推定のネットワーク手数料"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "トランザクションが失敗する可能性があります。最大スリッページが低すぎます。"
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” は使用する最大量です。ネットワークが不安定なときは、これは大きな量になることがあります。",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "最大ネットワーク手数料"
-  },
   "swapMaxSlippage": {
     "message": "最大スリッページ"
   },
@@ -1904,13 +1884,6 @@
     "message": "当社は毎回最上位の流動性のソースから最良の価格を見つけます。$1 の手数料が自動的にこの見積もりに含まれます。",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 の見積もり",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "ネットワーク手数料には、スワップを処理して $1 ネットワーク上に保管する費用も含まれています。MetaMask は手数料から利益を得ません。"
-  },
   "swapNewQuoteIn": {
     "message": "$1 での新規の見積もり",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "注文した時点と注文が承認された時点で価格が変わることを \"スリッページ\" と呼びます。スリッページが \"最大スリッページ\" 設定を超える場合、スワップは自動的にキャンセルされます。"
   },
-  "swapQuoteIncludesRate": {
-    "message": "見積もりには $1% の MetaMask 手数料が含まれています",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "$2 個中の $1 個の見積もり",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "見積もりのソース"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "現在のマーケット状態を反映するために、見積もりはたびたび更新されます。"
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "最新のレートを取得するには、新しい見積もりを要求してください。"
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "スワップ先"
   },
-  "swapThisWillAllowApprove": {
-    "message": "これにより、$1 のスワップが可能になります。"
-  },
   "swapToConfirmWithHwWallet": {
     "message": "ハードウェア ウォレットで確認する"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "不明です"
   },
-  "swapUsingBestQuote": {
-    "message": "最良の見積もりを使用する"
-  },
   "swapVerifyTokenExplanation": {
     "message": "複数のトークンが同じ名前とシンボルを使用できます。$1 をチェックして、これが探しているトークンであることを確認します。",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/kn/messages.json b/app/_locales/kn/messages.json
index bf17d9ce0..25f870717 100644
--- a/app/_locales/kn/messages.json
+++ b/app/_locales/kn/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "ನಕಲಿಸಲಾಗಿದೆ!"
   },
-  "copiedTransactionId": {
-    "message": "ವ್ಯವಹಾರ ID ಅನ್ನು ನಕಲಿಸಲಾಗಿದೆ"
-  },
   "copyAddress": {
     "message": "ವಿಳಾಸವನ್ನು ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ನಕಲಿಸಿ"
   },
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
index f4c30767d..167e3f48d 100644
--- a/app/_locales/ko/messages.json
+++ b/app/_locales/ko/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "복사 완료!"
   },
-  "copiedTransactionId": {
-    "message": "거래 ID 복사됨"
-  },
   "copyAddress": {
     "message": "주소를 클립보드에 복사"
   },
@@ -1816,9 +1813,6 @@
     "message": "이 스왑을 완료하려면 $1개의 추가 $2이(가) 필요합니다.",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "더 나은 견적이 있습니다."
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "필수이며 MetaMask에게 $1을(를) 스왑할 권한을 부여합니다.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "예상 네트워크 수수료"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "'$1'은(는) 당사가 예상하는 실제 수수료입니다. 정확한 금액은 네트워크 상태에 따라 달라집니다.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "예상 네트워크 수수료"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "거래가 실패할 수도 있습니다. 최대 슬리패지가 너무 낮습니다."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1”이(가) 최대 지출 금액입니다. 네트워크가 불안정한 경우 금액이 증가할 수 있습니다.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "최대 네트워크 수수료"
-  },
   "swapMaxSlippage": {
     "message": "최대 슬리패지"
   },
@@ -1904,13 +1884,6 @@
     "message": "당사는 매번 최상의 유동성 소스에서 최적의 가격을 찾습니다. 이 견적에는 $1%의 수수료가 자동으로 반영됩니다.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 견적",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "네트워크 수수료에는 스왑을 처리하고 $1 네트워크에 보관하는 비용이 포함됩니다. MetaMask는 이 수수료로 수익을 얻지 않습니다."
-  },
   "swapNewQuoteIn": {
     "message": "$1의 새 견적",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "주문 시점과 확인 시점 사이에 가격이 변동되는 현상을 \"슬리패지\"라고 합니다. 슬리패지가 \"최대 슬리패지\" 설정을 초과하면 스왑이 자동으로 취소됩니다."
   },
-  "swapQuoteIncludesRate": {
-    "message": "견적에는 $1% MetaMask 요금이 포함됩니다.",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "$2의 $1 견적",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "견적 소스"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "견적은 현재 시장 상황을 반영하도록 자주 갱신됩니다."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "새 견적을 요청해 최신 요율을 확인하세요."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "다음으로 스왑"
   },
-  "swapThisWillAllowApprove": {
-    "message": "$1이(가) 스왑될 수 있도록 허용합니다."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "하드웨어 지갑으로 확인하기 위해"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "알 수 없음"
   },
-  "swapUsingBestQuote": {
-    "message": "최고 견적을 사용 중"
-  },
   "swapVerifyTokenExplanation": {
     "message": "여러 토큰이 같은 이름과 기호를 사용할 수 있습니다. $1을(를) 확인하여 원하는 토큰인지 확인하세요.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/lt/messages.json b/app/_locales/lt/messages.json
index 80536f454..702c4784d 100644
--- a/app/_locales/lt/messages.json
+++ b/app/_locales/lt/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Nukopijuota!"
   },
-  "copiedTransactionId": {
-    "message": "Nukopijuotas operacijos ID"
-  },
   "copyAddress": {
     "message": "Kopijuoti adresą į iškarpinę"
   },
diff --git a/app/_locales/lv/messages.json b/app/_locales/lv/messages.json
index 4531820a4..4de401ac7 100644
--- a/app/_locales/lv/messages.json
+++ b/app/_locales/lv/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Nokopēts!"
   },
-  "copiedTransactionId": {
-    "message": "Nokopētais darījuma ID"
-  },
   "copyAddress": {
     "message": "Iekopēt adresi starpliktuvē"
   },
diff --git a/app/_locales/ms/messages.json b/app/_locales/ms/messages.json
index 85d021235..10ea16960 100644
--- a/app/_locales/ms/messages.json
+++ b/app/_locales/ms/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Disalin!"
   },
-  "copiedTransactionId": {
-    "message": "ID Transaksi yang Disalin"
-  },
   "copyAddress": {
     "message": "Salin alamat kepada papan klip"
   },
diff --git a/app/_locales/no/messages.json b/app/_locales/no/messages.json
index 249ea5d10..a567c8762 100644
--- a/app/_locales/no/messages.json
+++ b/app/_locales/no/messages.json
@@ -215,9 +215,6 @@
   "copiedExclamation": {
     "message": "Kopiert!"
   },
-  "copiedTransactionId": {
-    "message": "Kopiert transaksjonsidentifikasjon"
-  },
   "copyAddress": {
     "message": "Kopier adresse til  utklippstavlen "
   },
diff --git a/app/_locales/ph/messages.json b/app/_locales/ph/messages.json
index 571178bc1..d1d5110aa 100644
--- a/app/_locales/ph/messages.json
+++ b/app/_locales/ph/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "Nakopya na!"
   },
-  "copiedTransactionId": {
-    "message": "Nakopya ang Transaction ID"
-  },
   "copyAddress": {
     "message": "Kopyahin ang address sa clipboard"
   },
@@ -1816,9 +1813,6 @@
     "message": "Kailangan mo ng $1 pa $2 para makumpleto ang pag-swap na ito",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "May available na mas magandang quote"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Kinakailangan ito at nagbibigay ito ng pahintulot sa MetaMask na i-swap ang iyong $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Tinatayang bayarin sa network"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "Ang “$1” ay ang inaasahan naming magiging aktuwal na bayarin. Ang eksaktong halaga ay nakadepende sa mga kundisyon ng network.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Mga tinatayang bayarin sa network"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Posibleng hindi magtagumpay ang transaksyon, masyadong mababa ang max na slippage."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” ang pinakamalaking gagastusin mo. Kapag volatile ang network, maaaring malaking halaga ito.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Max na bayarin sa network"
-  },
   "swapMaxSlippage": {
     "message": "Max na slippage"
   },
@@ -1904,13 +1884,6 @@
     "message": "Hinahanap namin ang pinakasulit na presyo mula sa mga nangungunang pinagkukunan ng liquidity, sa lahat ng pagkakataon. Awtomatikong fina-factor ang bayaring $1% sa quote na ito.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 quote",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "Kasama sa bayarin sa network ang gastusin sa pagproseso ng iyong pag-swap at pag-store nito sa $1 network. Hindi kumikita ang MetaMask mula sa bayaring ito."
-  },
   "swapNewQuoteIn": {
     "message": "Mga bagong quote sa $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Kung magbabago ang presyo sa pagitan ng oras ng pag-order mo at sa oras na nakumpirma ito, tinatawag itong \"slippage\". Awtomatikong makakansela ang iyong Pag-swap kung lalampas ang slippage sa iyong setting na \"tolerance ng slippage.\""
   },
-  "swapQuoteIncludesRate": {
-    "message": "Kasama sa quote ang $1% bayarin sa MetaMask",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Quote $1 ng $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Pinagkunan ng quote"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Madalas na nire-refresh ang mga quote para maipakita ang mga kasalukuyang kundisyon ng market."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Mag-request ng mga bagong quote para makuha ang mga pinakabagong rate."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "I-swap sa"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Mabibigyang-daan nito ang $1 na ma-swap."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "para kumpirmahin ang iyong hardware wallet"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Hindi Alam"
   },
-  "swapUsingBestQuote": {
-    "message": "Gamit ang pinakamagandang quote"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Maaaring gamitin ng maraming token ang iisang pangalan at simbolo. Suriin ang $1 para ma-verify na ito ang token na hinahanap mo.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/pl/messages.json b/app/_locales/pl/messages.json
index 0d0f59571..c58abc6f2 100644
--- a/app/_locales/pl/messages.json
+++ b/app/_locales/pl/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Skopiowane!"
   },
-  "copiedTransactionId": {
-    "message": "Skopiowano identyfikator transakcji"
-  },
   "copyAddress": {
     "message": "Skopiuj adres do schowka"
   },
diff --git a/app/_locales/pt_BR/messages.json b/app/_locales/pt_BR/messages.json
index bd2e54f12..7300e2ee7 100644
--- a/app/_locales/pt_BR/messages.json
+++ b/app/_locales/pt_BR/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "Copiado!"
   },
-  "copiedTransactionId": {
-    "message": "ID da transação copiado"
-  },
   "copyAddress": {
     "message": "Copiar endereço para área de transferência"
   },
@@ -1816,9 +1813,6 @@
     "message": "Você precisa de $1 mais $2 para concluir este swap",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Uma cotação melhor está disponível"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Isso é obrigatório e dá ao MetaMask permissão para fazer o swap do seu $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Taxa de rede estimada"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "O “$1” é o que esperamos que a taxa real seja. O valor exato depende das condições de rede.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Taxas de rede estimadas"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "A transação pode falhar; slippage máximo baixo demais."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” é o máximo que você gastará. Quando a rede for volátil, esse poderá ser um grande valor.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Taxa máxima de rede"
-  },
   "swapMaxSlippage": {
     "message": "Slippage máximo"
   },
@@ -1904,13 +1884,6 @@
     "message": "Encontramos o melhor preço das principais fontes de liquidez – todas as vezes. Uma taxa de $1% é automaticamente fatorada nesta cotação.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 cotações",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "A taxa de rede abrange o custo de processamento do seu swap e o armazenamento dele na rede $1. O MetaMask não lucra com essa taxa."
-  },
   "swapNewQuoteIn": {
     "message": "Novas cotações em $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Quando o preço varia entre o momento em que seu pedido é feito e o momento em que é confirmado, isso recebe o nome de \"slippage\". Seu swap será automaticamente cancelado se o slippage for superior à configuração \"tolerância de slippage\"."
   },
-  "swapQuoteIncludesRate": {
-    "message": "A cotação inclui uma taxa de $1% do MetaMask",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Cotação $1 de $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Fonte da cotação"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "As cotações são atualizadas com frequência para refletir as condições atuais do mercado."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Solicite novas cotações para obter as tarifas mais recentes."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Swap para"
   },
-  "swapThisWillAllowApprove": {
-    "message": "isso permitirá o swap de $1."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "para confirmar com sua carteira de hardware"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Desconhecido"
   },
-  "swapUsingBestQuote": {
-    "message": "Usando a melhor cotação"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Vários tokens podem usar o mesmo nome e símbolo. Confira $1 para verificar se esse é o token que você está buscando.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/ro/messages.json b/app/_locales/ro/messages.json
index 167fb1c26..0aa456017 100644
--- a/app/_locales/ro/messages.json
+++ b/app/_locales/ro/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Copiat!"
   },
-  "copiedTransactionId": {
-    "message": "ID-ul tranzacției a fost copiat"
-  },
   "copyAddress": {
     "message": "Copiere adresă în clipboard"
   },
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
index 40ccc7d45..ad5817696 100644
--- a/app/_locales/ru/messages.json
+++ b/app/_locales/ru/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "Скопировано!"
   },
-  "copiedTransactionId": {
-    "message": "Скопированный идентификатор транзакции"
-  },
   "copyAddress": {
     "message": "Скопировать адрес в буфер обмена"
   },
@@ -1816,9 +1813,6 @@
     "message": "Вам нужно еще $1 $2 для завершения этого свопа",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Есть лучшая котировка"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Это необходимо и дает MetaMask разрешение на своп вашего $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Ориентировочная комиссия сети"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "«$1» — это ожидаемая нами реальная комиссия. Точная сумма зависит от условий сети.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Ориентировочные комиссии сети"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Транзакции могут завершиться неудачей, максимальное проскальзывание слишком мало."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "«$1» — это максимальная сумма, которую вы потратите. Когда сеть нестабильна, это может быть большая сумма.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Максимальная комиссия за сеть"
-  },
   "swapMaxSlippage": {
     "message": "Максимальное проскальзывание"
   },
@@ -1904,13 +1884,6 @@
     "message": "Мы всегда находим лучшую цену из лучших источников ликвидности. В эту котировку автоматически включается комиссия в размере $1%.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "Котировок: $1",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "Сетевая комиссия покрывает стоимость обработки вашего свопа и его хранения в сети $1. MetaMask не получает прибыли от этой комиссии."
-  },
   "swapNewQuoteIn": {
     "message": "Новые котировки в $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Изменение цены в период между размещением заказа и подтверждением называется проскальзыванием. Своп будет автоматически отменен, если фактическое проскальзывание превысит установленное допустимое значение."
   },
-  "swapQuoteIncludesRate": {
-    "message": "Котировка включает $1% MetaMask fee",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Котировка $1 из $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Источник котировки"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Котировки часто обновляются, чтобы отражать текущие рыночные условия."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Запрашивайте новые котировки, чтобы узнать последние цены."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Своп на"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Это позволит обмен $1."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "подтвердить с помощью аппаратного кошелька"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Неизвестный"
   },
-  "swapUsingBestQuote": {
-    "message": "Используется лучшая котировка"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Несколько токенов могут использовать одно и то же имя и символ. Убедитесь, что это именно тот токен, который вы ищете, на $1.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/sk/messages.json b/app/_locales/sk/messages.json
index 47097b3d1..c4d6facaa 100644
--- a/app/_locales/sk/messages.json
+++ b/app/_locales/sk/messages.json
@@ -212,9 +212,6 @@
   "copiedExclamation": {
     "message": "Zkopírováno!"
   },
-  "copiedTransactionId": {
-    "message": "Kopírované ID transakcie"
-  },
   "copyAddress": {
     "message": "Kopírovať adresu do schránky"
   },
diff --git a/app/_locales/sl/messages.json b/app/_locales/sl/messages.json
index e5b7b9e44..6d6bef812 100644
--- a/app/_locales/sl/messages.json
+++ b/app/_locales/sl/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Kopirano!"
   },
-  "copiedTransactionId": {
-    "message": "ID transakcije skopirana"
-  },
   "copyAddress": {
     "message": "Kopiraj naslov v odložišče"
   },
diff --git a/app/_locales/sr/messages.json b/app/_locales/sr/messages.json
index 08eed9bf0..ce980b88e 100644
--- a/app/_locales/sr/messages.json
+++ b/app/_locales/sr/messages.json
@@ -215,9 +215,6 @@
   "copiedExclamation": {
     "message": "Kopirano!"
   },
-  "copiedTransactionId": {
-    "message": "Kopiran identifikator transakcije"
-  },
   "copyAddress": {
     "message": "Kopirajte adresu u ostavu"
   },
diff --git a/app/_locales/sv/messages.json b/app/_locales/sv/messages.json
index 1c07f7dfc..f3e651032 100644
--- a/app/_locales/sv/messages.json
+++ b/app/_locales/sv/messages.json
@@ -212,9 +212,6 @@
   "copiedExclamation": {
     "message": "Kopierades!"
   },
-  "copiedTransactionId": {
-    "message": "Kopierade transaktions-ID"
-  },
   "copyAddress": {
     "message": "Kopiera adress till urklipp"
   },
diff --git a/app/_locales/sw/messages.json b/app/_locales/sw/messages.json
index 05436654c..ec712cc65 100644
--- a/app/_locales/sw/messages.json
+++ b/app/_locales/sw/messages.json
@@ -212,9 +212,6 @@
   "copiedExclamation": {
     "message": "Imenakiliwa!"
   },
-  "copiedTransactionId": {
-    "message": "Imenakili Utambulisho wa Muamala"
-  },
   "copyAddress": {
     "message": "Nakili anwani kwenye ubao wa kunakilia"
   },
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
index cbd9275ce..498379837 100644
--- a/app/_locales/tl/messages.json
+++ b/app/_locales/tl/messages.json
@@ -344,9 +344,6 @@
   "copiedExclamation": {
     "message": "Nakopya na!"
   },
-  "copiedTransactionId": {
-    "message": "Nakopya ang ID ng Transaksyon"
-  },
   "copyAddress": {
     "message": "Kopyahin ang address sa clipboard"
   },
@@ -1486,13 +1483,6 @@
     "message": "Kinakailangan ito at nagbibigay ito ng pahintulot sa MetaMask na i-swap ang iyong $1.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Tinatayang bayarin sa network"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "Ang “$1” ay ang inaasahan naming magiging aktuwal na bayarin. Ang eksaktong halaga ay nakadepende sa mga kundisyon ng network.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Mga tinatayang bayarin sa network"
   },
@@ -1514,13 +1504,6 @@
   "swapLowSlippageError": {
     "message": "Maaaring hindi magtagumpay ang transaksyon, masyadong mababa ang max na slippage."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "Aang “$1” ay ang pinakamalaking gagastusin mo. Kapag volatile ang network, maaaring malaking halaga ito.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Max na bayarin sa network"
-  },
   "swapMaxSlippage": {
     "message": "Max na slippage"
   },
@@ -1531,9 +1514,6 @@
     "message": "Hinahanap namin ang pinakasulit na presyo mula sa mga nangungunang pinagkukunan ng liquidity, sa lahat ng pagkakataon. Ang bayarin na $1% ay awtomatikong fina-factor sa bawat quote, na sumusuporta sa kasalukuyang development para mas mapahusay ang MetaMask.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNetworkFeeSummary": {
-    "message": "Kasama sa bayarin sa network ang gastusin sa pagproseso ng iyong pag-swap at pag-store nito sa $1 network. Hindi kumikita ang MetaMask mula sa bayaring ito."
-  },
   "swapNewQuoteIn": {
     "message": "Mga bagong quote sa $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1551,10 +1531,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Kung magbabago ang presyo sa pagitan ng oras ng pag-order mo at sa oras na nakumpirma ito, tinatawag itong \"slippage\". Awtomatikong makakansela ang iyong Pag-swap kung lalampas ang slippage sa iyong setting na \"max slippage\"."
   },
-  "swapQuoteIncludesRate": {
-    "message": "Kasama sa quote ang $1% bayarin sa MetaMask",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Quote $1 ng $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1562,9 +1538,6 @@
   "swapQuoteSource": {
     "message": "Pinagkunan ng quote"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Madalas na nire-refresh ang mga quote para maipakita ang mga kasalukuyang kundisyon ng market."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Mag-request ng mga bagong quote para makuha ang mga pinakabagong rate."
   },
@@ -1619,9 +1592,6 @@
   "swapSwapTo": {
     "message": "Palitan ng"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Mabibigyang-daan nito ang $1 na ma-swap."
-  },
   "swapTokenAvailable": {
     "message": "Naidagdag na ang $1 sa iyong account.",
     "description": "This message is shown after a swap is successful and communicates the exact amount of tokens the user has received for a swap. The $1 is a decimal number of tokens followed by the token symbol."
diff --git a/app/_locales/uk/messages.json b/app/_locales/uk/messages.json
index 8968e2f2e..c18062e0b 100644
--- a/app/_locales/uk/messages.json
+++ b/app/_locales/uk/messages.json
@@ -218,9 +218,6 @@
   "copiedExclamation": {
     "message": "Скопійовано!"
   },
-  "copiedTransactionId": {
-    "message": "ID Скопійованої транзакції"
-  },
   "copyAddress": {
     "message": "Копіювати адресу в буфер обміну"
   },
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
index 584c892c3..bb6bda25d 100644
--- a/app/_locales/vi/messages.json
+++ b/app/_locales/vi/messages.json
@@ -416,9 +416,6 @@
   "copiedExclamation": {
     "message": "Đã sao chép!"
   },
-  "copiedTransactionId": {
-    "message": "Đã sao chép mã giao dịch"
-  },
   "copyAddress": {
     "message": "Sao chép địa chỉ vào khay nhớ tạm"
   },
@@ -1816,9 +1813,6 @@
     "message": "Bạn cần $1 $2 nữa để hoàn tất giao dịch hoán đổi này",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "Có một báo giá tốt hơn"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1845,13 +1839,6 @@
     "message": "Thao tác này là bắt buộc và cấp cho MetaMask quyền hoán đổi $1 của bạn.",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "Phí mạng ước tính"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1” là giá trị mà chúng tôi dự kiến sẽ là khoản phí thực sự. Số tiền chính xác phụ thuộc vào tình trạng mạng.",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "Phí mạng ước tính"
   },
@@ -1887,13 +1874,6 @@
   "swapLowSlippageError": {
     "message": "Giao dịch có thể không thành công, mức trượt giá tối đa quá thấp."
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1” là mức chi tiêu cao nhất của bạn. Khi mạng không ổn định, đây có thể là số tiền lớn.",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "Phí mạng tối đa"
-  },
   "swapMaxSlippage": {
     "message": "Mức trượt giá tối đa"
   },
@@ -1904,13 +1884,6 @@
     "message": "Chúng tôi luôn tìm giá tốt nhất từ các nguồn thanh khoản hàng đầu. Phí $1% được tự động tính vào báo giá này.",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 báo giá",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "Phí mạng dùng để chi trả chi phí xử lý giao dịch hoán đổi của bạn và lưu trữ giao dịch đó trên mạng $1. MetaMask không thu lợi từ khoản phí này."
-  },
   "swapNewQuoteIn": {
     "message": "Báo giá mới sẽ có sau $1",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1945,10 +1918,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "Khi giá giữa thời điểm đặt lệnh và thời điểm xác nhận lệnh thay đổi, hiện tượng này được gọi là \"trượt giá\". Giao dịch hoán đổi của bạn sẽ tự động hủy nếu mức trượt giá vượt quá \"mức trượt giá cho phép\" đã đặt."
   },
-  "swapQuoteIncludesRate": {
-    "message": "Báo giá có bao gồm khoản phí $1% cho MetaMask",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "Báo giá $1/$2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1956,9 +1925,6 @@
   "swapQuoteSource": {
     "message": "Nguồn báo giá"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "Báo giá được làm mới thường xuyên để thể hiện tình trạng hiện tại của thị trường."
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "Vui lòng yêu cầu báo giá mới để biết các mức tỷ lệ mới nhất."
   },
@@ -2019,9 +1985,6 @@
   "swapSwapTo": {
     "message": "Hoán đổi sang"
   },
-  "swapThisWillAllowApprove": {
-    "message": "Thao tác này sẽ cho phép hoán đổi $1."
-  },
   "swapToConfirmWithHwWallet": {
     "message": "để xác nhận ví cứng của bạn"
   },
@@ -2060,9 +2023,6 @@
   "swapUnknown": {
     "message": "Không xác định"
   },
-  "swapUsingBestQuote": {
-    "message": "Sử dụng báo giá tốt nhất"
-  },
   "swapVerifyTokenExplanation": {
     "message": "Nhiều token có thể dùng cùng một tên và ký hiệu. Hãy kiểm tra $1 để xác minh xem đây có phải là token bạn đang tìm kiếm không.",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json
index 8555b89a4..539a4c29d 100644
--- a/app/_locales/zh_CN/messages.json
+++ b/app/_locales/zh_CN/messages.json
@@ -1,4 +1,46 @@
 {
+  "QRHardwareInvalidTransactionTitle": {
+    "message": "非法交易"
+  },
+  "QRHardwareMismatchedSignId": {
+    "message": "扫描的签名二维码不属于当前交易，请检查交易详情后重试。"
+  },
+  "QRHardwarePubkeyAccountOutOfRange": {
+    "message": "暂无更多账户，若想切换到其他账户，请在硬件钱包中选择想要的账户重新同步。"
+  },
+  "QRHardwareScanInstructions": {
+    "message": "为了保护您的隐私，屏幕是模糊的，但不影响对二维码的读取。"
+  },
+  "QRHardwareSignRequestCancel": {
+    "message": "拒绝该交易"
+  },
+  "QRHardwareSignRequestDescription": {
+    "message": "硬件钱包扫描上方二维码完成签名后，点击“获取签名”按钮扫描已签名的二维码"
+  },
+  "QRHardwareSignRequestGetSignature": {
+    "message": "获取签名"
+  },
+  "QRHardwareSignRequestSubtitle": {
+    "message": "用硬件钱包扫描二维码"
+  },
+  "QRHardwareSignRequestTitle": {
+    "message": "获取签名"
+  },
+  "QRHardwareUnknownQRCodeTitle": {
+    "message": "非法二维码"
+  },
+  "QRHardwareUnknownWalletQRCode": {
+    "message": "请扫描硬件钱包的同步二维码。"
+  },
+  "QRHardwareWalletImporterTitle": {
+    "message": "扫描二维码"
+  },
+  "QRHardwareWalletSteps1Description": {
+    "message": "该类硬件钱包通过二维码实现通讯交互，做到完全脱网。官方支持的钱包有："
+  },
+  "QRHardwareWalletSteps2Description": {
+    "message": "AirGap Vault & Ngrave (即将上线)"
+  },
   "about": {
     "message": "关于"
   },
@@ -353,9 +395,6 @@
   "copiedExclamation": {
     "message": "已复制"
   },
-  "copiedTransactionId": {
-    "message": "交易 ID 复制成功"
-  },
   "copyAddress": {
     "message": "复制地址到剪贴板"
   },
@@ -835,6 +874,12 @@
     "message": "JSON 文件",
     "description": "format for importing an account"
   },
+  "keystone": {
+    "message": "铠石钱包"
+  },
+  "keystoneTutorial": {
+    "message": " （使用教程）"
+  },
   "knownAddressRecipient": {
     "message": "已知接收方地址。"
   },
@@ -1472,9 +1517,6 @@
     "message": "您还需 $1 $2 来完成这笔兑换",
     "description": "Tells the user how many more of a given token they need for a specific swap. $1 is an amount of tokens and $2 is the token symbol."
   },
-  "swapBetterQuoteAvailable": {
-    "message": "有一个可用的更优报价"
-  },
   "swapBuildQuotePlaceHolderText": {
     "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"
@@ -1492,13 +1534,6 @@
     "message": "这是必须的，并且允许 MetaMask 兑换您的 $1。",
     "description": "Gives the user info about the required approval transaction for swaps. $1 will be the symbol of a token being approved for swaps."
   },
-  "swapEstimatedNetworkFee": {
-    "message": "预计网络手续费"
-  },
-  "swapEstimatedNetworkFeeSummary": {
-    "message": "“$1”是我们预计的实际产生费用。具体数额视网络情况而定。",
-    "description": "$1 will be the translation of swapEstimatedNetworkFee, with the font bolded"
-  },
   "swapEstimatedNetworkFees": {
     "message": "预计网络手续费"
   },
@@ -1520,13 +1555,6 @@
   "swapLowSlippageError": {
     "message": "交易可能失败，最大滑点过低。"
   },
-  "swapMaxNetworkFeeInfo": {
-    "message": "“$1”是您最多所话费的数量，当网络不稳定时，这可能是一个大的数额。",
-    "description": "$1 will be the translation of swapMaxNetworkFees, with the font bolded"
-  },
-  "swapMaxNetworkFees": {
-    "message": "最大网络手续费"
-  },
   "swapMaxSlippage": {
     "message": "最大滑点"
   },
@@ -1537,13 +1565,6 @@
     "message": "我们每次都能从顶级流动性资源中找到最好的价格。每次报价都会自动收取1%的手续费用，以支持 MetaMask 的持续发展，使其更加完善。",
     "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
   },
-  "swapNQuotes": {
-    "message": "$1 个报价",
-    "description": "$1 is the number of quotes that the user can select from when opening the list of quotes on the 'view quote' screen"
-  },
-  "swapNetworkFeeSummary": {
-    "message": "网络手续费包括处理您的兑换和在以太坊（$1）网络上存储的成本。MetaMask 不从这笔费用中获利。"
-  },
   "swapNewQuoteIn": {
     "message": "$1 后更新报价",
     "description": "Tells the user the amount of time until the currently displayed quotes are update. $1 is a time that is counting down from 1:00 to 0:00"
@@ -1569,10 +1590,6 @@
   "swapQuoteDetailsSlippageInfo": {
     "message": "如果在您下订单和确认订单之间的价格发生了变化，这就叫做\"滑点\"。如果滑点超过您的\"最大滑点\"设置，您的兑换将自动取消。"
   },
-  "swapQuoteIncludesRate": {
-    "message": "报价包含 $1% MetaMask 手续费",
-    "description": "Provides information about the fee that metamask takes for swaps. $1 is a decimal number."
-  },
   "swapQuoteNofN": {
     "message": "报价 $1 / $2",
     "description": "A count of loaded quotes shown to the user while they are waiting for quotes to be fetched. $1 is the number of quotes already loaded, and $2 is the total number of quotes to load."
@@ -1580,9 +1597,6 @@
   "swapQuoteSource": {
     "message": "报价来源"
   },
-  "swapQuotesAreRefreshed": {
-    "message": "报价会经常刷新，以反映当前的市场状况。"
-  },
   "swapQuotesExpiredErrorDescription": {
     "message": "请请求新的报价，以获得最新的价格。"
   },
@@ -1637,9 +1651,6 @@
   "swapSwapTo": {
     "message": "兑换到"
   },
-  "swapThisWillAllowApprove": {
-    "message": "这样将允许 $1 用于兑换。"
-  },
   "swapTokenAvailable": {
     "message": "您的 $1 已添加到您的账户。",
     "description": "This message is shown after a swap is successful and communicates the exact amount of tokens the user has received for a swap. The $1 is a decimal number of tokens followed by the token symbol."
@@ -1654,9 +1665,6 @@
   "swapUnknown": {
     "message": "未知的"
   },
-  "swapUsingBestQuote": {
-    "message": "使用最好的报价"
-  },
   "swapVerifyTokenExplanation": {
     "message": "多个代币可以使用相同的名称和符号。检查 $1（以太坊浏览器）以确认这是您正在寻找的代币。",
     "description": "This appears in a tooltip next to the verifyThisTokenOn message. It gives the user more information about why they should check the token on a block explorer. $1 will be the name or url of the block explorer, which will be the translation of 'etherscan' or a block explorer url specified for a custom network."
diff --git a/app/_locales/zh_TW/messages.json b/app/_locales/zh_TW/messages.json
index 91a527f48..966e0d924 100644
--- a/app/_locales/zh_TW/messages.json
+++ b/app/_locales/zh_TW/messages.json
@@ -227,9 +227,6 @@
   "copiedExclamation": {
     "message": "已複製！"
   },
-  "copiedTransactionId": {
-    "message": "已複製的交易 ID"
-  },
   "copyAddress": {
     "message": "複製到剪貼簿"
   },
diff --git a/app/images/high-arrow.svg b/app/images/high-arrow.svg
new file mode 100644
index 000000000..76449fe0d
--- /dev/null
+++ b/app/images/high-arrow.svg
@@ -0,0 +1 @@
+<svg width="14" height="14" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M4.022 4.82c0 .275.22.469.483.482l3.26-.082L3.8 9.183a.451.451 0 0 0 0 .663l.442.442c.18.18.47.193.663 0l3.963-3.964-.082 3.232a.49.49 0 0 0 .47.497h.607a.484.484 0 0 0 .47-.47V4.199a.46.46 0 0 0-.456-.456H4.49a.484.484 0 0 0-.47.47v.607Z" fill="#219E37"/></svg>
diff --git a/app/images/icons/collapse.svg b/app/images/icons/collapse.svg
new file mode 100644
index 000000000..74d6207c9
--- /dev/null
+++ b/app/images/icons/collapse.svg
@@ -0,0 +1,26 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" fill="#E5E5E5"/>
+<g clip-path="url(#clip0_0_1)">
+<rect width="413" height="679" transform="translate(-57 -402)" fill="white"/>
+<g filter="url(#filter0_d_0_1)">
+<path d="M-31 -376C-31 -380.418 -27.4183 -384 -23 -384H321C325.418 -384 329 -380.418 329 -376V252C329 256.418 325.418 260 321 260H-23C-27.4183 260 -31 256.418 -31 252V-376Z" fill="white"/>
+</g>
+<circle cx="8" cy="8" r="7.5" fill="#F2F3F4" stroke="#D6D9DC"/>
+<line x1="4.1001" y1="7.83325" x2="11.7668" y2="7.83325" stroke="#D6D9DC" stroke-linecap="round"/>
+</g>
+<rect x="-2918.5" y="-1621.5" width="9747" height="4874" stroke="black"/>
+<defs>
+<filter id="filter0_d_0_1" x="-58" y="-409" width="414" height="698" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="13.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.12594 0 0 0 0 0.182502 0 0 0 0 0.305378 0 0 0 0.26 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_0_1"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_0_1" result="shape"/>
+</filter>
+<clipPath id="clip0_0_1">
+<rect width="413" height="679" fill="white" transform="translate(-57 -402)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/images/icons/expand.svg b/app/images/icons/expand.svg
new file mode 100644
index 000000000..6a6146840
--- /dev/null
+++ b/app/images/icons/expand.svg
@@ -0,0 +1,28 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="16" height="16" fill="#E5E5E5"/>
+<g clip-path="url(#clip0_0_1)">
+<rect width="413" height="679" transform="translate(-57 -546)" fill="white"/>
+<g filter="url(#filter0_d_0_1)">
+<path d="M-31 -520C-31 -524.418 -27.4183 -528 -23 -528H321C325.418 -528 329 -524.418 329 -520V108C329 112.418 325.418 116 321 116H-23C-27.4183 116 -31 112.418 -31 108V-520Z" fill="white"/>
+</g>
+<line x1="7.5" y1="-128" x2="7.49999" y2="8" stroke="#D6D9DC"/>
+<circle cx="8" cy="8" r="7.5" fill="white" stroke="#D6D9DC"/>
+<line x1="4.1001" y1="7.83325" x2="11.7668" y2="7.83325" stroke="#D6D9DC" stroke-linecap="round"/>
+<line x1="8.1001" y1="4.16699" x2="8.1001" y2="11.8337" stroke="#D6D9DC" stroke-linecap="round"/>
+</g>
+<rect x="-2918.5" y="-1765.5" width="9747" height="4874" stroke="black"/>
+<defs>
+<filter id="filter0_d_0_1" x="-58" y="-553" width="414" height="698" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="13.5"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.12594 0 0 0 0 0.182502 0 0 0 0 0.305378 0 0 0 0.26 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_0_1"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_0_1" result="shape"/>
+</filter>
+<clipPath id="clip0_0_1">
+<rect width="413" height="679" fill="white" transform="translate(-57 -546)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/app/images/low-arrow.svg b/app/images/low-arrow.svg
new file mode 100644
index 000000000..da51d636f
--- /dev/null
+++ b/app/images/low-arrow.svg
@@ -0,0 +1 @@
+<svg width="13" height="13" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M9.296 8.42c0-.276-.22-.47-.483-.483l-3.26.083 3.964-3.964a.451.451 0 0 0 0-.663l-.442-.442a.463.463 0 0 0-.662 0L4.449 6.915l.083-3.232a.49.49 0 0 0-.47-.497h-.607a.484.484 0 0 0-.47.47v5.386a.46.46 0 0 0 .456.456h5.386a.484.484 0 0 0 .47-.47V8.42Z" fill="#D73A49"/></svg>
diff --git a/app/images/qrcode-wallet-demo.svg b/app/images/qrcode-wallet-demo.svg
new file mode 100644
index 000000000..61ed69eee
--- /dev/null
+++ b/app/images/qrcode-wallet-demo.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="297px" height="101px" viewBox="0 0 297 101" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>png-chahua</title>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="png-chahua" transform="translate(1.000000, 0.000000)">
+            <g id="P-1">
+                <g id="png-key" transform="translate(0.000000, 22.000000)">
+                    <circle id="oval" stroke="#3098DC" fill="#D9F0FF" cx="32" cy="32" r="32"></circle>
+                    <g id="png_logo" transform="translate(15.850003, 11.617735)">
+                        <path d="M13.4677287,26.0869239 C13.6814978,26.2099569 13.8780148,26.3607837 14.0521451,26.5354635 L20.8323207,33.3370367 C22.2800205,34.7893053 22.3263651,37.1092074 20.9740009,38.6170536 L20.8237527,38.7754247 C20.8235032,38.7756734 20.8232537,38.7759221 20.8230041,38.7761707 L19.8377351,39.7578004 C18.7942353,40.7974458 17.2102004,41.0696737 15.8794816,40.438055 L8.37983921,36.8783886 C6.63920381,36.052205 5.89789413,33.9713871 6.7240777,32.2307517 C6.76351709,32.1476593 6.80622708,32.066159 6.85210754,31.986442 L9.6565953,27.1136614 C10.425485,25.7777203 12.1317875,25.3180342 13.4677287,26.0869239 Z M16.4259709,0.276152586 C16.7491885,0.460847609 17.0173036,0.728398213 17.2026794,1.05122584 L18.5283228,3.35980278 C19.1466826,4.43666186 19.1460308,5.76104031 18.5266115,6.83729026 L3.68360588,32.6272236 C3.39176095,33.1343083 2.7441005,33.3087947 2.23701577,33.0169497 C2.07620665,32.9243985 1.94252531,32.7912356 1.8493499,32.6307873 C1.23868219,31.579216 0.773046665,30.4498818 0.465104842,29.2734937 L0.222743083,28.3476321 C-0.230049649,26.6178897 0.0132040067,24.7795765 0.900309637,23.2271354 L13.5700193,1.05505383 C14.1435809,0.0513169242 15.422234,-0.297409042 16.4259709,0.276152586 Z M22.314756,10.7149284 C22.7424128,10.9610537 23.0971746,11.3161563 23.3428892,11.7440492 L26.2513718,16.8089476 C27.0189573,18.1456385 26.5576062,19.8514916 25.2209153,20.6190771 C24.7979802,20.8619446 24.3187864,20.9897452 23.8310788,20.9897452 L17.4043388,20.9897452 C16.0556092,20.9897452 14.9622479,19.8963838 14.9622479,18.5476542 C14.9622479,18.1201149 15.0744902,17.7000673 15.2877511,17.3295143 L18.5036388,11.7417258 C19.2725074,10.4057726 20.9788028,9.94605968 22.314756,10.7149284 Z" id="combine" fill="#000000"></path>
+                        <path d="M31.1744255,25.3821635 C31.8384048,26.538444 31.6433147,27.9964878 30.6987072,28.937535 L27.4928953,32.1312641 C26.2639847,33.3541704 24.2764867,33.3507256 23.0518226,32.1235666 L17.3441941,26.3978915 C16.6640589,25.7156057 16.6658022,24.6111453 17.348088,23.9310101 C17.6750575,23.6050712 18.1179052,23.422047 18.5795817,23.422047 L27.7885506,23.422047 C29.1867243,23.422047 30.4781713,24.1696784 31.1744255,25.3821635 Z" id="path" fill="#2161FF"></path>
+                    </g>
+                </g>
+                <path d="M83,17.0235687 L73.4978847,30 L64.0002855,17.0235687 L73.4973317,22.4634417 L73.4978847,22.4646936 L83,17.0235687 Z M73.4973317,11.0923553 L82.9936676,15.2782188 L73.4978847,20.720593 L64.0002855,15.2782188 L73.4973317,11.0923553 Z M73.4970462,0 L82.9936676,15.2781544 L73.4978847,11.0897901 L64,15.2781544 L73.4970462,0 Z" id="combine" fill="#3098DC" fill-rule="nonzero"></path>
+                <g id="png-key" transform="translate(64.000000, 77.000000)" fill-rule="nonzero">
+                    <g id="Airgap_Logo_sideways_color-xs">
+                        <path d="M9.79205788,0.504426266 C9.79205788,0.0716219234 9.47417837,-0.113865652 9.09272297,0.0716219234 C9.09272297,0.0716219234 7.56690134,0.937230609 6.35895922,1.49369334 C4.96028939,2.11198525 2.73513285,2.73027717 1.33646303,2.97759394 C0.446400413,3.16308152 0.319248611,3.71954424 0.25567271,4.21417778 C0.192096809,5.01795727 0.128520908,6.00722434 0.128520908,6.81100384 C0.0649450067,8.91319636 -0.125782697,11.0772181 0.128520908,13.1175814 C0.25567271,14.3541652 0.637128117,15.7762367 1.20931123,16.8891621 C2.09937384,18.4967211 3.24374006,19.9806217 4.57883399,21.2172055 C5.97750381,22.4537894 9.02914707,23.8758608 9.02914707,23.8758608 C9.47417837,24.0613484 9.79205788,23.8758608 9.79205788,23.3812273 L9.79205788,0.504426266 Z" id="path" fill="#3098DC"></path>
+                        <path d="M12.2079421,23.4430564 C12.2079421,23.8758608 12.5258216,24.1231776 12.9708529,23.93769 C12.9708529,23.93769 16.0224962,22.5156186 17.421166,21.2790347 C18.8198358,20.0424509 19.9642021,18.5585503 20.7906888,16.9509913 C21.3628719,15.8380658 21.7443273,14.4159944 21.8714791,13.1794106 C22.1257827,11.1390473 21.935055,8.91319636 21.8714791,6.87283303 C21.8714791,6.06905353 21.8079032,5.07978646 21.7443273,4.27600697 C21.6807514,3.71954424 21.5535996,3.16308152 20.663537,3.03942313 C19.2648671,2.79210637 17.0397106,2.17381445 15.6410408,1.55552253 C14.4966746,0.999059801 12.907277,0.133451115 12.907277,0.133451115 C12.5258216,-0.113865652 12.2079421,0.0716219234 12.2079421,0.566255458 L12.2079421,23.4430564 L12.2079421,23.4430564 Z" id="path" fill="#3098DC"></path>
+                        <path d="M9.85563378,1.18454738 L9.8542943,3.37036304 C9.98221357,3.6905739 10.2954143,3.90503182 10.6821205,3.90503182 L10.6821205,3.90503182 L11.3814554,3.90503182 L11.3814554,4.09051939 L9.85479032,4.08954738 L9.85479032,8.54154738 L12.8437011,8.54222121 L12.8437011,13.7358733 L9.85479032,13.7355474 L9.85479032,17.8165474 L12.907277,17.8166 C13.8609156,17.8166 14.5602505,18.5585503 14.5602505,19.424159 C14.5602505,20.2897677 13.8609156,21.031718 12.907277,21.031718 L9.85479032,21.0315474 L9.85563378,22.9484229 L9.53775427,22.8247645 C8.01193265,22.1446434 6.42253512,21.4026931 5.214593,20.2897677 C3.94307498,19.1768422 2.92586056,17.6929416 2.16294974,16.2708702 C1.65434253,15.2816031 1.33646303,14.0450193 1.20931123,12.9320938 C0.955007622,11.0772181 1.14573533,9.16051313 1.20931123,7.30563737 C1.20931123,6.3163703 1.27288713,5.26527404 1.40003893,4.21417778 C1.40003893,4.21417778 4.26095448,3.53405667 6.29538332,2.79210637 C7.50332544,2.29747283 8.64769166,1.8028393 9.85563378,1.18454738 Z" id="combine" fill="#FFFFFF"></path>
+                        <path d="M12.3350939,1.18454738 C13.4158842,1.8028393 14.5602505,2.35930202 15.7681926,2.79210637 C17.7390455,3.59588586 20.663537,4.21417778 20.663537,4.21417778 L20.663537,4.21417778 L20.8542647,7.36746656 C20.9178406,9.22234232 21.0449924,11.1390473 20.8542647,12.993923 C20.7271129,14.1068485 20.4092334,15.3434323 19.9006262,16.3326994 C19.0741394,17.7547708 18.1205009,19.2386714 16.8489829,20.3515969 C15.5774649,21.4645223 14.0516433,22.2064726 12.5258216,22.8865937 L12.5258216,22.8865937 L12.3350939,23.0102521 L12.3343299,17.8165474 L8.32981215,17.8166 C7.56690134,17.8166 6.99471823,17.1983081 6.99471823,16.4563578 C6.99471823,15.7144075 7.63047724,15.1579447 8.32981215,15.1579447 L12.3343299,15.1575474 L12.3343299,12.3135474 L10.8728482,12.3138019 C10.3006651,12.3138019 9.85563378,11.8191684 9.85563378,11.2627056 C9.85563378,10.9631464 9.98460231,10.699423 10.1929484,10.5197638 L8.39338805,10.5207553 C7.24902183,10.5207553 6.35895922,9.59331747 6.42253512,8.54222121 C6.42253512,7.49112495 7.31259773,6.62551626 8.39338805,6.62551626 L12.3343299,6.62454738 Z" id="combine" fill="#3098DC"></path>
+                        <path d="M14.5602505,6.56368707 L4.83313759,6.56368707 C4.07022678,6.56368707 3.49804367,5.94539515 3.49804367,5.20344485 C3.49804367,4.46149455 4.13380268,3.90503182 4.83313759,3.90503182 L14.5602505,3.90503182 C15.3231613,3.90503182 15.8953444,4.52332374 15.8953444,5.26527404 C15.8317685,6.00722434 15.2595854,6.56368707 14.5602505,6.56368707 Z" id="path" fill="#FFFFFF"></path>
+                        <path d="M14.0516433,15.1579447 L4.83313759,15.1579447 C4.00665088,15.1579447 3.37089187,14.5396528 3.37089187,13.7358733 C3.37089187,12.9320938 4.00665088,12.3138019 4.83313759,12.3138019 L14.1152192,12.3138019 C14.9417059,12.3138019 15.5774649,12.9320938 15.5774649,13.7358733 C15.5774649,14.5396528 14.87813,15.1579447 14.0516433,15.1579447 L14.0516433,15.1579447 Z" id="path" fill="#FFFFFF"></path>
+                    </g>
+                </g>
+            </g>
+            <g id="Group" transform="translate(187.000000, 17.000000)">
+                <g id="cp" stroke="#3098DC">
+                    <path d="M10,0 L98,0 C100.209139,-4.05812251e-16 102,1.790861 102,4 L102,69 L102,69 L6,69 L6,4 C6,1.790861 7.790861,2.18216909e-15 10,0 Z" id="rectangle" fill="#FFFFFF"></path>
+                    <rect id="rectangle" fill="#FFFFFF" x="10.5" y="4.5" width="87" height="57"></rect>
+                    <rect id="rectangle" fill="#D9F0FF" x="0" y="66" width="108" height="7" rx="1"></rect>
+                </g>
+                <g id="5" transform="translate(35.000000, 17.000000)" fill-rule="nonzero">
+                    <g id="4">
+                        <path d="M35.7940726,0.865647154 L37.3076975,5.33187939 L36.0572619,11.2664578 L35.3130052,12.3918268 L36.2488109,13.108213 L35.0978726,14.1466087 L35.8822714,14.7050297 L34.478956,16.3199413 L37.0166977,24.0476925 L34.9619918,30.9406553 L27.2570674,28.8445942 L25.4588663,30.2992958 L22.489449,32.3310811 L15.4970666,32.3310811 L12.5415596,30.2997394 L10.7428766,28.8445914 L3.03908343,30.9403669 L0.996819559,24.0470926 L3.50539453,16.3206129 L2.11516087,14.7068706 L2.90215816,14.146619 L1.74643066,13.1038982 L2.66706954,12.387498 L1.5590983,11.552182 L0.692123065,5.33103555 L2.19338019,0.865960951 L13.1228366,4.89862071 L24.8771779,4.89862071 L35.7940726,0.865647154 Z" id="symbol" stroke="#3098DC" stroke-width="1.33783784"></path>
+                        <path d="M20.5,27.5 L21,30 L16.5,30 L17,27.5 L20.5,27.5 Z M14.3439693,19.0321194 L15.8156414,22.0321194 L10.8156414,20.6010552 L14.3439693,19.0321194 Z M23.2820965,19.0321194 L26.8156414,20.6010552 L21.8156414,22.0321194 L23.2820965,19.0321194 Z" id="combine" fill="#3098DC"></path>
+                    </g>
+                </g>
+            </g>
+            <g id="code" transform="translate(82.000000, 37.000000)">
+                <g id="p-2" transform="translate(26.000000, 0.000000)" fill="#3098DC" fill-rule="nonzero">
+                    <g id="qr_code">
+                        <path d="M1.94444444,11.6666667 L9.72222222,11.6666667 C10.7961092,11.6666667 11.6666667,10.7961092 11.6666667,9.72222222 L11.6666667,1.94444444 C11.6666667,0.870557431 10.7961092,0 9.72222222,0 L1.94444444,0 C0.870557431,0 0,0.870557431 0,1.94444444 L0,9.72222222 C0,10.7961092 0.870557431,11.6666667 1.94444444,11.6666667 Z M3.88888889,3.88888889 L7.77777778,3.88888889 L7.77777778,7.77777778 L3.88888889,7.77777778 L3.88888889,3.88888889 Z M0.972222222,19.4444444 L2.91666667,19.4444444 C3.45361017,19.4444444 3.88888889,19.0091657 3.88888889,18.4722222 L3.88888889,16.5277778 C3.88888889,15.9908343 3.45361017,15.5555556 2.91666667,15.5555556 L0.972222222,15.5555556 C0.435278715,15.5555556 0,15.9908343 0,16.5277778 L0,18.4722222 C0,19.0091657 0.435278715,19.4444444 0.972222222,19.4444444 Z M9.72222222,23.3333333 L1.94444444,23.3333333 C0.870557431,23.3333333 0,24.2038908 0,25.2777778 L0,33.0555556 C0,34.1294426 0.870557431,35 1.94444444,35 L9.72222222,35 C10.7961092,35 11.6666667,34.1294426 11.6666667,33.0555556 L11.6666667,25.2777778 C11.6666667,24.2038908 10.7961092,23.3333333 9.72222222,23.3333333 Z M7.77777778,31.1111111 L3.88888889,31.1111111 L3.88888889,27.2222222 L7.77777778,27.2222222 L7.77777778,31.1111111 Z M28.1944444,35 L34.0277778,35 C34.5647213,35 35,34.5647213 35,34.0277778 L35,28.1944444 C35,27.6575009 34.5647213,27.2222222 34.0277778,27.2222222 L32.0833333,27.2222222 C31.5463898,27.2222222 31.1111111,27.6575009 31.1111111,28.1944444 L31.1111111,31.1111111 L27.2222222,31.1111111 L27.2222222,34.0277778 C27.2222222,34.5647213 27.6575009,35 28.1944444,35 Z M33.0555556,0 L25.2777778,0 C24.2038908,0 23.3333333,0.870557431 23.3333333,1.94444444 L23.3333333,9.72222222 C23.3333333,10.7961092 24.2038908,11.6666667 25.2777778,11.6666667 L33.0555556,11.6666667 C34.1294426,11.6666667 35,10.7961092 35,9.72222222 L35,1.94444444 C35,0.870557431 34.1294426,0 33.0555556,0 Z M31.1111111,7.77777778 L27.2222222,7.77777778 L27.2222222,3.88888889 L31.1111111,3.88888889 L31.1111111,7.77777778 Z M8.75,15.5555556 C8.21305649,15.5555556 7.77777778,15.9908343 7.77777778,16.5277778 L7.77777778,18.4722222 C7.77777778,19.0091657 8.21305649,19.4444444 8.75,19.4444444 L15.5555556,19.4444444 L15.5555556,15.5555556 L8.75,15.5555556 Z M15.5555556,22.3611111 C15.5555556,22.8980546 15.9908343,23.3333333 16.5277778,23.3333333 L19.4444444,23.3333333 L19.4444444,26.25 C19.4444444,26.7869435 19.8797232,27.2222222 20.4166667,27.2222222 L23.3333333,27.2222222 L23.3333333,19.4444444 L15.5555556,19.4444444 L15.5555556,22.3611111 Z M15.5555556,32.0833333 L15.5555556,34.0277778 C15.5555556,34.5647213 15.9908343,35 16.5277778,35 L22.3611111,35 C22.8980546,35 23.3333333,34.5647213 23.3333333,34.0277778 L23.3333333,31.1111111 L16.5277778,31.1111111 C15.9908343,31.1111111 15.5555556,31.5463898 15.5555556,32.0833333 Z M34.0277778,15.5555556 L24.3055556,15.5555556 C23.768612,15.5555556 23.3333333,15.9908343 23.3333333,16.5277778 L23.3333333,19.4444444 L27.2222222,19.4444444 L27.2222222,22.3611111 C27.2222222,22.8980546 27.6575009,23.3333333 28.1944444,23.3333333 L30.1388889,23.3333333 C30.6758324,23.3333333 31.1111111,22.8980546 31.1111111,22.3611111 L31.1111111,19.4444444 L34.0277778,19.4444444 C34.5647213,19.4444444 35,19.0091657 35,18.4722222 L35,16.5277778 C35,15.9908343 34.5647213,15.5555556 34.0277778,15.5555556 Z M27.2222222,31.1111111 L27.2222222,27.2222222 L23.3333333,27.2222222 L23.3333333,31.1111111 L27.2222222,31.1111111 Z M16.5277778,7.77777778 L18.4722222,7.77777778 C19.0091657,7.77777778 19.4444444,7.34249906 19.4444444,6.80555556 L19.4444444,0.972222222 C19.4444444,0.435278715 19.0091657,0 18.4722222,0 L16.5277778,0 C15.9908343,0 15.5555556,0.435278715 15.5555556,0.972222222 L15.5555556,6.80555556 C15.5555556,7.34249906 15.9908343,7.77777778 16.5277778,7.77777778 Z M19.4444444,14.5833333 L19.4444444,12.6388889 C19.4444444,12.1019454 19.0091657,11.6666667 18.4722222,11.6666667 L16.5277778,11.6666667 C15.9908343,11.6666667 15.5555556,12.1019454 15.5555556,12.6388889 L15.5555556,15.5555556 L18.4722222,15.5555556 C19.0091657,15.5555556 19.4444444,15.1202768 19.4444444,14.5833333 Z" id="Icon-color"></path>
+                    </g>
+                </g>
+                <g id="4" transform="translate(73.000000, 12.000000)">
+                    <rect id="path" fill="#3098DC" x="0" y="5" width="14" height="1"></rect>
+                    <polyline id="path" stroke="#3098DC" points="8 0 14 5.5 8 10.5"></polyline>
+                </g>
+                <g id="4" transform="translate(7.000000, 17.250000) scale(-1, 1) translate(-7.000000, -17.250000) translate(0.000000, 12.000000)">
+                    <rect id="path" fill="#3098DC" x="0" y="5" width="14" height="1"></rect>
+                    <polyline id="path" stroke="#3098DC" points="8 0 14 5.5 8 10.5"></polyline>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/images/qrcode-wallet-logo.svg b/app/images/qrcode-wallet-logo.svg
new file mode 100644
index 000000000..a88a7635e
--- /dev/null
+++ b/app/images/qrcode-wallet-logo.svg
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="107px" height="89px" viewBox="0 0 107 89" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>qr-logo的副本2</title>
+    <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="qr-logo的副本2" fill-rule="nonzero">
+            <rect id="矩形" fill="#FBFBFB" x="0" y="0" width="107" height="89"></rect>
+            <path d="M1.3333,41 L6.6667,41 C7.403,41 8,40.403 8,39.6667 L8,34.3333 C8,33.597 7.403,33 6.6667,33 L1.3333,33 C0.597,33 0,33.597 0,34.3333 L0,39.6667 C0,40.403 0.597,41 1.3333,41 Z M2.6667,35.6667 L5.3333,35.6667 L5.3333,38.3333 L2.6667,38.3333 L2.6667,35.6667 Z M0.6667,46.3333 L2,46.3333 C2.3682,46.3333 2.6667,46.0349 2.6667,45.6667 L2.6667,44.3333 C2.6667,43.9651 2.3682,43.6667 2,43.6667 L0.6667,43.6667 C0.2985,43.6667 0,43.9651 0,44.3333 L0,45.6667 C0,46.0349 0.2985,46.3333 0.6667,46.3333 Z M6.6667,49 L1.3333,49 C0.597,49 0,49.597 0,50.3333 L0,55.6667 C0,56.403 0.597,57 1.3333,57 L6.6667,57 C7.403,57 8,56.403 8,55.6667 L8,50.3333 C8,49.597 7.403,49 6.6667,49 Z M5.3333,54.3333 L2.6667,54.3333 L2.6667,51.6667 L5.3333,51.6667 L5.3333,54.3333 Z M19.3333,57 L23.3333,57 C23.7015,57 24,56.7015 24,56.3333 L24,52.3333 C24,51.9651 23.7015,51.6667 23.3333,51.6667 L22,51.6667 C21.6318,51.6667 21.3333,51.9651 21.3333,52.3333 L21.3333,54.3333 L18.6667,54.3333 L18.6667,56.3333 C18.6667,56.7015 18.9651,57 19.3333,57 Z M22.6667,33 L17.3333,33 C16.597,33 16,33.597 16,34.3333 L16,39.6667 C16,40.403 16.597,41 17.3333,41 L22.6667,41 C23.403,41 24,40.403 24,39.6667 L24,34.3333 C24,33.597 23.403,33 22.6667,33 Z M21.3333,38.3333 L18.6667,38.3333 L18.6667,35.6667 L21.3333,35.6667 L21.3333,38.3333 Z M6,43.6667 C5.6318,43.6667 5.3333,43.9651 5.3333,44.3333 L5.3333,45.6667 C5.3333,46.0349 5.6318,46.3333 6,46.3333 L10.6667,46.3333 L10.6667,43.6667 L6,43.6667 Z M10.6667,48.3333 C10.6667,48.7015 10.9651,49 11.3333,49 L13.3333,49 L13.3333,51 C13.3333,51.3682 13.6318,51.6667 14,51.6667 L16,51.6667 L16,46.3333 L10.6667,46.3333 L10.6667,48.3333 Z M10.6667,55 L10.6667,56.3333 C10.6667,56.7015 10.9651,57 11.3333,57 L15.3333,57 C15.7015,57 16,56.7015 16,56.3333 L16,54.3333 L11.3333,54.3333 C10.9651,54.3333 10.6667,54.6318 10.6667,55 Z M23.3333,43.6667 L16.6667,43.6667 C16.2985,43.6667 16,43.9651 16,44.3333 L16,46.3333 L18.6667,46.3333 L18.6667,48.3333 C18.6667,48.7015 18.9651,49 19.3333,49 L20.6667,49 C21.0349,49 21.3333,48.7015 21.3333,48.3333 L21.3333,46.3333 L23.3333,46.3333 C23.7015,46.3333 24,46.0349 24,45.6667 L24,44.3333 C24,43.9651 23.7015,43.6667 23.3333,43.6667 Z M18.6667,54.3333 L18.6667,51.6667 L16,51.6667 L16,54.3333 L18.6667,54.3333 Z M11.3333,38.3333 L12.6667,38.3333 C13.0349,38.3333 13.3333,38.0349 13.3333,37.6667 L13.3333,33.6667 C13.3333,33.2985 13.0349,33 12.6667,33 L11.3333,33 C10.9651,33 10.6667,33.2985 10.6667,33.6667 L10.6667,37.6667 C10.6667,38.0349 10.9651,38.3333 11.3333,38.3333 Z M13.3333,43 L13.3333,41.6667 C13.3333,41.2985 13.0349,41 12.6667,41 L11.3333,41 C10.9651,41 10.6667,41.2985 10.6667,41.6667 L10.6667,43.6667 L12.6667,43.6667 C13.0349,43.6667 13.3333,43.3682 13.3333,43 Z" id="形状" fill="#000000"></path>
+            <path d="M38.592,51.192 C37.7707,51.192 37.0027,51.0427 36.288,50.744 C35.584,50.4347 34.9653,50.0187 34.432,49.496 C33.8987,48.9627 33.4773,48.3387 33.168,47.624 C32.8693,46.9093 32.72,46.1413 32.72,45.32 C32.72,44.4987 32.8693,43.7307 33.168,43.016 C33.4773,42.3013 33.8987,41.6827 34.432,41.16 C34.9653,40.6267 35.584,40.2107 36.288,39.912 C37.0027,39.6027 37.7707,39.448 38.592,39.448 C39.4133,39.448 40.1813,39.6027 40.896,39.912 C41.6107,40.2107 42.2293,40.6267 42.752,41.16 C43.2853,41.6827 43.7013,42.3013 44,43.016 C44.3093,43.7307 44.464,44.4987 44.464,45.32 C44.464,46.0347 44.3467,46.7067 44.112,47.336 C43.888,47.9653 43.5733,48.536 43.168,49.048 L45.28,51 L43.248,51 L42.16,50.008 C41.6693,50.3813 41.12,50.6747 40.512,50.888 C39.904,51.0907 39.264,51.192 38.592,51.192 Z M38.592,49.784 C39.5413,49.784 40.3787,49.528 41.104,49.016 L39.296,47.336 L40.208,46.312 L42.08,48.056 C42.3573,47.6827 42.576,47.2667 42.736,46.808 C42.896,46.3387 42.976,45.8427 42.976,45.32 C42.976,44.7013 42.864,44.12 42.64,43.576 C42.416,43.032 42.1067,42.5573 41.712,42.152 C41.328,41.7467 40.864,41.432 40.32,41.208 C39.7867,40.9733 39.2107,40.856 38.592,40.856 C37.9733,40.856 37.3973,40.9733 36.864,41.208 C36.3307,41.432 35.8667,41.7467 35.472,42.152 C35.088,42.5573 34.784,43.032 34.56,43.576 C34.336,44.12 34.224,44.7013 34.224,45.32 C34.224,45.9493 34.336,46.536 34.56,47.08 C34.784,47.6133 35.088,48.0827 35.472,48.488 C35.8667,48.8933 36.3307,49.2133 36.864,49.448 C37.3973,49.672 37.9733,49.784 38.592,49.784 Z M46.9259,39.64 L50.7979,39.64 C51.3205,39.64 51.7899,39.7147 52.2059,39.864 C52.6325,40.0133 52.9899,40.2267 53.2779,40.504 C53.5765,40.7813 53.8005,41.112 53.9499,41.496 C54.1099,41.88 54.1899,42.3067 54.1899,42.776 C54.1899,43.608 53.9392,44.2907 53.4379,44.824 C52.9472,45.3573 52.2592,45.688 51.3739,45.816 L55.7579,51 L53.8859,51 L49.5179,45.832 L48.4139,45.832 L48.4139,51 L46.9259,51 L46.9259,39.64 Z M50.6219,44.504 C51.2725,44.504 51.7792,44.36 52.1419,44.072 C52.5152,43.784 52.7019,43.352 52.7019,42.776 C52.7019,42.2 52.5152,41.7627 52.1419,41.464 C51.7792,41.1653 51.2725,41.016 50.6219,41.016 L48.4139,41.016 L48.4139,44.504 L50.6219,44.504 Z M55.8681,45.832 L59.948,45.832 L59.948,47.208 L55.8681,47.208 L55.8681,45.832 Z M66.488,51.16 C65.88,51.16 65.325,51.0267 64.824,50.76 C64.323,50.4827 63.939,50.152 63.672,49.768 L63.672,51 L62.296,51 L62.296,39 L63.672,39 L63.672,44.232 C63.939,43.848 64.323,43.5227 64.824,43.256 C65.325,42.9787 65.88,42.84 66.488,42.84 C67.043,42.84 67.56,42.952 68.04,43.176 C68.52,43.3893 68.936,43.688 69.288,44.072 C69.64,44.4453 69.912,44.8827 70.104,45.384 C70.307,45.8853 70.408,46.424 70.408,47 C70.408,47.576 70.307,48.1147 70.104,48.616 C69.912,49.1173 69.64,49.56 69.288,49.944 C68.936,50.3173 68.52,50.616 68.04,50.84 C67.56,51.0533 67.043,51.16 66.488,51.16 Z M66.28,49.896 C66.685,49.896 67.053,49.8213 67.384,49.672 C67.715,49.5227 67.997,49.32 68.232,49.064 C68.477,48.7973 68.664,48.488 68.792,48.136 C68.931,47.784 69,47.4053 69,47 C69,46.5947 68.931,46.216 68.792,45.864 C68.664,45.512 68.477,45.208 68.232,44.952 C67.997,44.6853 67.715,44.4773 67.384,44.328 C67.053,44.1787 66.685,44.104 66.28,44.104 C65.875,44.104 65.507,44.1787 65.176,44.328 C64.845,44.4773 64.557,44.6853 64.312,44.952 C64.077,45.208 63.891,45.512 63.752,45.864 C63.624,46.216 63.56,46.5947 63.56,47 C63.56,47.4053 63.624,47.784 63.752,48.136 C63.891,48.488 64.077,48.7973 64.312,49.064 C64.557,49.32 64.845,49.5227 65.176,49.672 C65.507,49.8213 65.875,49.896 66.28,49.896 Z M75.67,51.16 C75.105,51.16 74.582,51.0533 74.102,50.84 C73.633,50.616 73.222,50.3173 72.87,49.944 C72.518,49.56 72.241,49.1173 72.038,48.616 C71.846,48.1147 71.75,47.576 71.75,47 C71.75,46.424 71.846,45.8853 72.038,45.384 C72.241,44.8827 72.518,44.4453 72.87,44.072 C73.222,43.688 73.633,43.3893 74.102,43.176 C74.582,42.952 75.105,42.84 75.67,42.84 C76.278,42.84 76.833,42.9787 77.334,43.256 C77.835,43.5227 78.219,43.848 78.486,44.232 L78.486,43 L79.862,43 L79.862,51 L78.486,51 L78.486,49.768 C78.219,50.152 77.835,50.4827 77.334,50.76 C76.833,51.0267 76.278,51.16 75.67,51.16 Z M75.878,49.896 C76.283,49.896 76.651,49.8213 76.982,49.672 C77.313,49.5227 77.595,49.32 77.83,49.064 C78.075,48.7973 78.262,48.488 78.39,48.136 C78.529,47.784 78.598,47.4053 78.598,47 C78.598,46.5947 78.529,46.216 78.39,45.864 C78.262,45.512 78.075,45.208 77.83,44.952 C77.595,44.6853 77.313,44.4773 76.982,44.328 C76.651,44.1787 76.283,44.104 75.878,44.104 C75.473,44.104 75.099,44.1787 74.758,44.328 C74.427,44.4773 74.139,44.6853 73.894,44.952 C73.659,45.208 73.473,45.512 73.334,45.864 C73.206,46.216 73.142,46.5947 73.142,47 C73.142,47.4053 73.206,47.784 73.334,48.136 C73.473,48.488 73.659,48.7973 73.894,49.064 C74.139,49.32 74.427,49.5227 74.758,49.672 C75.099,49.8213 75.473,49.896 75.878,49.896 Z M85.028,51.16 C84.602,51.16 84.196,51.1067 83.812,51 C83.428,50.8933 83.092,50.7387 82.804,50.536 C82.516,50.3227 82.282,50.0613 82.1,49.752 C81.919,49.4427 81.812,49.0853 81.78,48.68 L83.188,48.68 C83.231,48.9253 83.311,49.1333 83.428,49.304 C83.556,49.464 83.706,49.5973 83.876,49.704 C84.047,49.8107 84.228,49.8853 84.42,49.928 C84.623,49.9707 84.831,49.992 85.044,49.992 C85.482,49.992 85.844,49.9067 86.132,49.736 C86.431,49.5547 86.58,49.288 86.58,48.936 C86.58,48.616 86.479,48.3547 86.276,48.152 C86.074,47.9493 85.732,47.784 85.252,47.656 L84.1,47.352 C83.407,47.1707 82.89,46.8773 82.548,46.472 C82.207,46.0667 82.036,45.576 82.036,45 C82.036,44.6693 82.106,44.3707 82.244,44.104 C82.383,43.8373 82.575,43.6133 82.82,43.432 C83.066,43.24 83.354,43.096 83.684,43 C84.026,42.8933 84.399,42.84 84.804,42.84 C85.231,42.84 85.615,42.8987 85.956,43.016 C86.298,43.1333 86.591,43.2987 86.836,43.512 C87.092,43.7147 87.295,43.9547 87.444,44.232 C87.594,44.5093 87.684,44.808 87.716,45.128 L86.34,45.128 C86.234,44.776 86.042,44.4987 85.764,44.296 C85.498,44.0933 85.178,43.992 84.804,43.992 C84.42,43.992 84.095,44.0827 83.828,44.264 C83.562,44.4347 83.428,44.6747 83.428,44.984 C83.428,45.2827 83.524,45.5227 83.716,45.704 C83.908,45.8747 84.218,46.0187 84.644,46.136 L85.924,46.472 C86.596,46.6427 87.103,46.9307 87.444,47.336 C87.796,47.7307 87.972,48.232 87.972,48.84 C87.972,49.2347 87.898,49.5813 87.748,49.88 C87.599,50.168 87.391,50.408 87.124,50.6 C86.858,50.792 86.543,50.9307 86.18,51.016 C85.828,51.112 85.444,51.16 85.028,51.16 Z M93.329,51.16 C92.742,51.16 92.204,51.0587 91.713,50.856 C91.222,50.6427 90.796,50.3493 90.433,49.976 C90.081,49.6027 89.804,49.1653 89.601,48.664 C89.398,48.152 89.297,47.5973 89.297,47 C89.297,46.4133 89.388,45.8693 89.569,45.368 C89.761,44.856 90.033,44.4133 90.385,44.04 C90.737,43.6667 91.164,43.3733 91.665,43.16 C92.166,42.9467 92.732,42.84 93.361,42.84 C93.99,42.84 94.55,42.9627 95.041,43.208 C95.542,43.4427 95.958,43.768 96.289,44.184 C96.63,44.5893 96.876,45.0693 97.025,45.624 C97.185,46.168 97.244,46.7493 97.201,47.368 L90.689,47.368 C90.7,47.7307 90.774,48.0667 90.913,48.376 C91.062,48.6853 91.254,48.9573 91.489,49.192 C91.724,49.416 92.001,49.592 92.321,49.72 C92.641,49.848 92.982,49.912 93.345,49.912 C93.846,49.912 94.294,49.8107 94.689,49.608 C95.094,49.3947 95.42,49.048 95.665,48.568 L97.073,48.568 C96.977,48.92 96.822,49.256 96.609,49.576 C96.396,49.8853 96.129,50.1573 95.809,50.392 C95.5,50.6267 95.137,50.8133 94.721,50.952 C94.305,51.0907 93.841,51.16 93.329,51.16 Z M93.313,44.056 C93.025,44.056 92.742,44.0987 92.465,44.184 C92.188,44.2693 91.932,44.4027 91.697,44.584 C91.473,44.7653 91.276,44.9947 91.105,45.272 C90.934,45.5493 90.817,45.8853 90.753,46.28 L95.745,46.28 C95.617,45.5333 95.329,44.9787 94.881,44.616 C94.433,44.2427 93.91,44.056 93.313,44.056 Z M102.483,51.16 C101.917,51.16 101.395,51.0533 100.915,50.84 C100.445,50.616 100.035,50.3173 99.683,49.944 C99.331,49.56 99.053,49.1173 98.851,48.616 C98.659,48.1147 98.563,47.576 98.563,47 C98.563,46.424 98.659,45.8853 98.851,45.384 C99.053,44.8827 99.331,44.4453 99.683,44.072 C100.035,43.688 100.445,43.3893 100.915,43.176 C101.395,42.952 101.917,42.84 102.483,42.84 C103.091,42.84 103.645,42.9787 104.147,43.256 C104.648,43.5227 105.032,43.848 105.299,44.232 L105.299,39 L106.675,39 L106.675,51 L105.299,51 L105.299,49.768 C105.032,50.152 104.648,50.4827 104.147,50.76 C103.645,51.0267 103.091,51.16 102.483,51.16 Z M102.691,49.896 C103.096,49.896 103.464,49.8213 103.795,49.672 C104.125,49.5227 104.408,49.32 104.643,49.064 C104.888,48.7973 105.075,48.488 105.203,48.136 C105.341,47.784 105.411,47.4053 105.411,47 C105.411,46.5947 105.341,46.216 105.203,45.864 C105.075,45.512 104.888,45.208 104.643,44.952 C104.408,44.6853 104.125,44.4773 103.795,44.328 C103.464,44.1787 103.096,44.104 102.691,44.104 C102.285,44.104 101.912,44.1787 101.571,44.328 C101.24,44.4773 100.952,44.6853 100.707,44.952 C100.472,45.208 100.285,45.512 100.147,45.864 C100.019,46.216 99.955,46.5947 99.955,47 C99.955,47.4053 100.019,47.784 100.147,48.136 C100.285,48.488 100.472,48.7973 100.707,49.064 C100.952,49.32 101.24,49.5227 101.571,49.672 C101.912,49.8213 102.285,49.896 102.691,49.896 Z" id="形状" fill="#000000"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/app/images/txinsights.png b/app/images/txinsights.png
new file mode 100644
index 000000000..bbe848289
Binary files /dev/null and b/app/images/txinsights.png differ
diff --git a/app/scripts/controllers/app-state.js b/app/scripts/controllers/app-state.js
index f68579bad..9bea8f193 100644
--- a/app/scripts/controllers/app-state.js
+++ b/app/scripts/controllers/app-state.js
@@ -16,6 +16,7 @@ export default class AppStateController extends EventEmitter {
       onInactiveTimeout,
       showUnlockRequest,
       preferencesStore,
+      qrHardwareStore,
     } = opts;
     super();
 
@@ -31,7 +32,9 @@ export default class AppStateController extends EventEmitter {
       recoveryPhraseReminderHasBeenShown: false,
       recoveryPhraseReminderLastShown: new Date().getTime(),
       showTestnetMessageInDropdown: true,
+      trezorModel: null,
       ...initState,
+      qrHardware: {},
     });
     this.timer = null;
 
@@ -48,6 +51,10 @@ export default class AppStateController extends EventEmitter {
       }
     });
 
+    qrHardwareStore.subscribe((state) => {
+      this.store.updateState({ qrHardware: state });
+    });
+
     const { preferences } = preferencesStore.getState();
     this._setInactiveTimeout(preferences.autoLockTimeLimit);
   }
@@ -237,4 +244,12 @@ export default class AppStateController extends EventEmitter {
   setShowTestnetMessageInDropdown(showTestnetMessageInDropdown) {
     this.store.updateState({ showTestnetMessageInDropdown });
   }
+
+  /**
+   * Sets a property indicating the model of the user's Trezor hardware wallet
+   * @returns {void}
+   */
+  setTrezorModel(trezorModel) {
+    this.store.updateState({ trezorModel });
+  }
 }
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index a53cf8993..738432e73 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -37,6 +37,8 @@ export default class PreferencesController {
       // set to true means the dynamic list from the API is being used
       // set to false will be using the static list from contract-metadata
       useTokenDetection: false,
+      useCollectibleDetection: false,
+      openSeaEnabled: false,
       advancedGasFee: null,
 
       // WARNING: Do not use feature flags for security-sensitive things.
@@ -130,6 +132,35 @@ export default class PreferencesController {
     this.store.updateState({ useTokenDetection: val });
   }
 
+  /**
+   * Setter for the `useCollectibleDetection` property
+   *
+   * @param {boolean} val - Whether or not the user prefers to autodetect collectibles.
+   *
+   */
+  setUseCollectibleDetection(val) {
+    const { openSeaEnabled } = this.store.getState();
+    if (val && !openSeaEnabled) {
+      throw new Error(
+        'useCollectibleDetection cannot be enabled if openSeaEnabled is false',
+      );
+    }
+    this.store.updateState({ useCollectibleDetection: val });
+  }
+
+  /**
+   * Setter for the `openSeaEnabled` property
+   *
+   * @param {boolean} val - Whether or not the user prefers to use the OpenSea API for collectibles data.
+   *
+   */
+  setOpenSeaEnabled(val) {
+    this.store.updateState({ openSeaEnabled: val });
+    if (!val) {
+      this.store.updateState({ useCollectibleDetection: false });
+    }
+  }
+
   /**
    * Setter for the `advancedGasFee` property
    *
diff --git a/app/scripts/controllers/preferences.test.js b/app/scripts/controllers/preferences.test.js
index bce64e1a9..3afaba4ea 100644
--- a/app/scripts/controllers/preferences.test.js
+++ b/app/scripts/controllers/preferences.test.js
@@ -267,6 +267,42 @@ describe('preferences controller', function () {
     });
   });
 
+  describe('setUseCollectibleDetection', function () {
+    it('should default to false', function () {
+      const state = preferencesController.store.getState();
+      assert.equal(state.useCollectibleDetection, false);
+    });
+
+    it('should set the useCollectibleDetection property in state', function () {
+      assert.equal(
+        preferencesController.store.getState().useCollectibleDetection,
+        false,
+      );
+      preferencesController.setOpenSeaEnabled(true);
+      preferencesController.setUseCollectibleDetection(true);
+      assert.equal(
+        preferencesController.store.getState().useCollectibleDetection,
+        true,
+      );
+    });
+  });
+
+  describe('setOpenSeaEnabled', function () {
+    it('should default to false', function () {
+      const state = preferencesController.store.getState();
+      assert.equal(state.openSeaEnabled, false);
+    });
+
+    it('should set the openSeaEnabled property in state', function () {
+      assert.equal(
+        preferencesController.store.getState().openSeaEnabled,
+        false,
+      );
+      preferencesController.setOpenSeaEnabled(true);
+      assert.equal(preferencesController.store.getState().openSeaEnabled, true);
+    });
+  });
+
   describe('setAdvancedGasFee', function () {
     it('should default to null', function () {
       const state = preferencesController.store.getState();
diff --git a/app/scripts/controllers/swaps.js b/app/scripts/controllers/swaps.js
index 397883b72..fc55b54a9 100644
--- a/app/scripts/controllers/swaps.js
+++ b/app/scripts/controllers/swaps.js
@@ -79,7 +79,6 @@ const initialState = {
     topAggId: null,
     routeState: '',
     swapsFeatureIsLive: true,
-    useNewSwapsApi: false,
     saveFetchedQuotes: false,
     swapsQuoteRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
     swapsQuotePrefetchingRefreshTime: FALLBACK_QUOTE_REFRESH_TIME,
@@ -123,9 +122,9 @@ export default class SwapsController {
     });
   }
 
-  async fetchSwapsRefreshRates(chainId, useNewSwapsApi) {
+  async fetchSwapsRefreshRates(chainId) {
     const response = await fetchWithCache(
-      getBaseApi('network', chainId, useNewSwapsApi),
+      getBaseApi('network', chainId),
       { method: 'GET' },
       { cacheRefreshTime: 600000 },
     );
@@ -149,13 +148,9 @@ export default class SwapsController {
   // Sets the refresh rate for quote updates from the MetaSwap API
   async _setSwapsRefreshRates() {
     const chainId = this._getCurrentChainId();
-    const { swapsState } = this.store.getState();
     let swapsRefreshRates;
     try {
-      swapsRefreshRates = await this.fetchSwapsRefreshRates(
-        chainId,
-        swapsState.useNewSwapsApi,
-      );
+      swapsRefreshRates = await this.fetchSwapsRefreshRates(chainId);
     } catch (e) {
       console.error('Request for swaps quote refresh time failed: ', e);
     }
@@ -210,11 +205,7 @@ export default class SwapsController {
   ) {
     const { chainId } = fetchParamsMetaData;
     const {
-      swapsState: {
-        useNewSwapsApi,
-        quotesPollingLimitEnabled,
-        saveFetchedQuotes,
-      },
+      swapsState: { quotesPollingLimitEnabled, saveFetchedQuotes },
     } = this.store.getState();
 
     if (!fetchParams) {
@@ -242,7 +233,6 @@ export default class SwapsController {
     let [newQuotes] = await Promise.all([
       this._fetchTradesInfo(fetchParams, {
         ...fetchParamsMetaData,
-        useNewSwapsApi,
       }),
       this._setSwapsRefreshRates(),
     ]);
@@ -574,9 +564,9 @@ export default class SwapsController {
 
   setSwapsLiveness(swapsLiveness) {
     const { swapsState } = this.store.getState();
-    const { swapsFeatureIsLive, useNewSwapsApi } = swapsLiveness;
+    const { swapsFeatureIsLive } = swapsLiveness;
     this.store.updateState({
-      swapsState: { ...swapsState, swapsFeatureIsLive, useNewSwapsApi },
+      swapsState: { ...swapsState, swapsFeatureIsLive },
     });
   }
 
@@ -588,7 +578,6 @@ export default class SwapsController {
         tokens: swapsState.tokens,
         fetchParams: swapsState.fetchParams,
         swapsFeatureIsLive: swapsState.swapsFeatureIsLive,
-        useNewSwapsApi: swapsState.useNewSwapsApi,
         swapsQuoteRefreshTime: swapsState.swapsQuoteRefreshTime,
         swapsQuotePrefetchingRefreshTime:
           swapsState.swapsQuotePrefetchingRefreshTime,
diff --git a/app/scripts/controllers/swaps.test.js b/app/scripts/controllers/swaps.test.js
index d0f4556ab..3bc5b4e0d 100644
--- a/app/scripts/controllers/swaps.test.js
+++ b/app/scripts/controllers/swaps.test.js
@@ -131,7 +131,6 @@ const EMPTY_INIT_STATE = {
     topAggId: null,
     routeState: '',
     swapsFeatureIsLive: true,
-    useNewSwapsApi: false,
     swapsQuoteRefreshTime: 60000,
     swapsQuotePrefetchingRefreshTime: 60000,
     swapsUserFeeLevel: '',
@@ -707,7 +706,6 @@ describe('SwapsController', function () {
         assert.strictEqual(
           fetchTradesInfoStub.calledOnceWithExactly(MOCK_FETCH_PARAMS, {
             ...MOCK_FETCH_METADATA,
-            useNewSwapsApi: false,
           }),
           true,
         );
@@ -885,7 +883,6 @@ describe('SwapsController', function () {
         const tokens = 'test';
         const fetchParams = 'test';
         const swapsFeatureIsLive = false;
-        const useNewSwapsApi = false;
         const swapsQuoteRefreshTime = 0;
         const swapsQuotePrefetchingRefreshTime = 0;
         swapsController.store.updateState({
@@ -893,7 +890,6 @@ describe('SwapsController', function () {
             tokens,
             fetchParams,
             swapsFeatureIsLive,
-            useNewSwapsApi,
             swapsQuoteRefreshTime,
             swapsQuotePrefetchingRefreshTime,
           },
diff --git a/app/scripts/controllers/transactions/index.js b/app/scripts/controllers/transactions/index.js
index 0f1d15961..c2655a6d7 100644
--- a/app/scripts/controllers/transactions/index.js
+++ b/app/scripts/controllers/transactions/index.js
@@ -33,6 +33,7 @@ import {
   GAS_ESTIMATE_TYPES,
   GAS_RECOMMENDATIONS,
   CUSTOM_GAS_ESTIMATE,
+  PRIORITY_LEVELS,
 } from '../../../../shared/constants/gas';
 import { decGWEIToHexWEI } from '../../../../shared/modules/conversion.utils';
 import {
@@ -438,7 +439,11 @@ export default class TransactionController extends EventEmitter {
       ) {
         txMeta.txParams.maxFeePerGas = txMeta.txParams.gasPrice;
         txMeta.txParams.maxPriorityFeePerGas = txMeta.txParams.gasPrice;
-        txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
+        if (process.env.EIP_1559_V2) {
+          txMeta.userFeeLevel = PRIORITY_LEVELS.DAPP_SUGGESTED;
+        } else {
+          txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
+        }
       } else {
         if (
           (defaultMaxFeePerGas &&
@@ -448,6 +453,8 @@ export default class TransactionController extends EventEmitter {
           txMeta.origin === 'metamask'
         ) {
           txMeta.userFeeLevel = GAS_RECOMMENDATIONS.MEDIUM;
+        } else if (process.env.EIP_1559_V2) {
+          txMeta.userFeeLevel = PRIORITY_LEVELS.DAPP_SUGGESTED;
         } else {
           txMeta.userFeeLevel = CUSTOM_GAS_ESTIMATE;
         }
diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
index 0a83a2214..ba349da67 100644
--- a/app/scripts/lib/message-manager.js
+++ b/app/scripts/lib/message-manager.js
@@ -79,9 +79,9 @@ export default class MessageManager extends EventEmitter {
    * @returns {promise} after signature has been
    *
    */
-  addUnapprovedMessageAsync(msgParams, req) {
-    return new Promise((resolve, reject) => {
-      const msgId = this.addUnapprovedMessage(msgParams, req);
+  async addUnapprovedMessageAsync(msgParams, req) {
+    const msgId = this.addUnapprovedMessage(msgParams, req);
+    return await new Promise((resolve, reject) => {
       // await finished
       this.once(`${msgId}:finished`, (data) => {
         switch (data.status) {
@@ -93,6 +93,10 @@ export default class MessageManager extends EventEmitter {
                 'MetaMask Message Signature: User denied message signature.',
               ),
             );
+          case 'errored':
+            return reject(
+              new Error(`MetaMask Message Signature: ${data.error}`),
+            );
           default:
             return reject(
               new Error(
@@ -233,6 +237,19 @@ export default class MessageManager extends EventEmitter {
     this._setMsgStatus(msgId, 'rejected');
   }
 
+  /**
+   * Sets a Message status to 'errored' via a call to this._setMsgStatus.
+   *
+   * @param {number} msgId - The id of the Message to error
+   *
+   */
+  errorMessage(msgId, error) {
+    const msg = this.getMsg(msgId);
+    msg.error = error;
+    this._updateMsg(msg);
+    this._setMsgStatus(msgId, 'errored');
+  }
+
   /**
    * Clears all unapproved messages from memory.
    */
@@ -304,7 +321,7 @@ export default class MessageManager extends EventEmitter {
  * @returns {string} A hex string conversion of the buffer data
  *
  */
-function normalizeMsgData(data) {
+export function normalizeMsgData(data) {
   if (data.slice(0, 2) === '0x') {
     // data is already hex
     return data;
diff --git a/app/scripts/lib/personal-message-manager.js b/app/scripts/lib/personal-message-manager.js
index 907f3ee5a..e1f94a156 100644
--- a/app/scripts/lib/personal-message-manager.js
+++ b/app/scripts/lib/personal-message-manager.js
@@ -107,6 +107,9 @@ export default class PersonalMessageManager extends EventEmitter {
               ),
             );
             return;
+          case 'errored':
+            reject(new Error(`MetaMask Message Signature: ${data.error}`));
+            return;
           default:
             reject(
               new Error(
@@ -254,6 +257,19 @@ export default class PersonalMessageManager extends EventEmitter {
     this._setMsgStatus(msgId, 'rejected');
   }
 
+  /**
+   * Sets a Message status to 'errored' via a call to this._setMsgStatus.
+   *
+   * @param {number} msgId - The id of the Message to error
+   *
+   */
+  errorMessage(msgId, error) {
+    const msg = this.getMsg(msgId);
+    msg.error = error;
+    this._updateMsg(msg);
+    this._setMsgStatus(msgId, 'errored');
+  }
+
   /**
    * Clears all unapproved messages from memory.
    */
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index e92640540..d1c17c240 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -15,8 +15,10 @@ import log from 'loglevel';
 import TrezorKeyring from 'eth-trezor-keyring';
 import LedgerBridgeKeyring from '@metamask/eth-ledger-bridge-keyring';
 import LatticeKeyring from 'eth-lattice-keyring';
+import { MetaMaskKeyring as QRHardwareKeyring } from '@keystonehq/metamask-airgapped-keyring';
 import EthQuery from 'eth-query';
 import nanoid from 'nanoid';
+import { ethErrors } from 'eth-rpc-errors';
 import { captureException } from '@sentry/browser';
 import {
   AddressBookController,
@@ -29,6 +31,9 @@ import {
   TokenListController,
   TokensController,
   TokenRatesController,
+  CollectiblesController,
+  AssetsContractController,
+  CollectibleDetectionController,
 } from '@metamask/controllers';
 import { TRANSACTION_STATUSES } from '../../shared/constants/transaction';
 import {
@@ -37,7 +42,10 @@ import {
   SWAPS_CLIENT_ID,
 } from '../../shared/constants/swaps';
 import { MAINNET_CHAIN_ID } from '../../shared/constants/network';
-import { KEYRING_TYPES } from '../../shared/constants/hardware-wallets';
+import {
+  DEVICE_NAMES,
+  KEYRING_TYPES,
+} from '../../shared/constants/hardware-wallets';
 import { UI_NOTIFICATIONS } from '../../shared/notifications';
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
 import { MILLISECOND } from '../../shared/constants/time';
@@ -61,7 +69,7 @@ import AlertController from './controllers/alert';
 import OnboardingController from './controllers/onboarding';
 import ThreeBoxController from './controllers/threebox';
 import IncomingTransactionsController from './controllers/incoming-transactions';
-import MessageManager from './lib/message-manager';
+import MessageManager, { normalizeMsgData } from './lib/message-manager';
 import DecryptMessageManager from './lib/decrypt-message-manager';
 import EncryptionPublicKeyManager from './lib/encryption-public-key-manager';
 import PersonalMessageManager from './lib/personal-message-manager';
@@ -175,6 +183,59 @@ export default class MetamaskController extends EventEmitter {
       state: initState.TokensController,
     });
 
+    this.assetsContractController = new AssetsContractController({
+      provider: this.provider,
+    });
+
+    this.collectiblesController = new CollectiblesController({
+      onPreferencesStateChange: this.preferencesController.store.subscribe.bind(
+        this.preferencesController.store,
+      ),
+      onNetworkStateChange: this.networkController.store.subscribe.bind(
+        this.networkController.store,
+      ),
+      getAssetName: this.assetsContractController.getAssetName.bind(
+        this.assetsContractController,
+      ),
+      getAssetSymbol: this.assetsContractController.getAssetSymbol.bind(
+        this.assetsContractController,
+      ),
+      getCollectibleTokenURI: this.assetsContractController.getCollectibleTokenURI.bind(
+        this.assetsContractController,
+      ),
+      getOwnerOf: this.assetsContractController.getOwnerOf.bind(
+        this.assetsContractController,
+      ),
+      balanceOfERC1155Collectible: this.assetsContractController.balanceOfERC1155Collectible.bind(
+        this.assetsContractController,
+      ),
+      uriERC1155Collectible: this.assetsContractController.uriERC1155Collectible.bind(
+        this.assetsContractController,
+      ),
+    });
+
+    process.env.COLLECTIBLES_V1 &&
+      (this.collectibleDetectionController = new CollectibleDetectionController(
+        {
+          onCollectiblesStateChange: (listener) =>
+            this.collectiblesController.subscribe(listener),
+          onPreferencesStateChange: this.preferencesController.store.subscribe.bind(
+            this.preferencesController.store,
+          ),
+          onNetworkStateChange: this.networkController.store.subscribe.bind(
+            this.networkController.store,
+          ),
+          getOpenSeaApiKey: () => this.collectiblesController.openSeaApiKey,
+          getBalancesInSingleCall: this.assetsContractController.getBalancesInSingleCall.bind(
+            this.assetsContractController,
+          ),
+          addCollectible: this.collectiblesController.addCollectible.bind(
+            this.collectiblesController,
+          ),
+          getCollectiblesState: () => this.collectiblesController.state,
+        },
+      ));
+
     this.metaMetricsController = new MetaMetricsController({
       segment,
       preferencesStore: this.preferencesController.store,
@@ -231,6 +292,8 @@ export default class MetamaskController extends EventEmitter {
       },
     });
 
+    this.qrHardwareKeyring = new QRHardwareKeyring();
+
     this.appStateController = new AppStateController({
       addUnlockListener: this.on.bind(this, 'unlock'),
       isUnlocked: this.isUnlocked.bind(this),
@@ -238,6 +301,7 @@ export default class MetamaskController extends EventEmitter {
       onInactiveTimeout: () => this.setLocked(),
       showUnlockRequest: opts.showUserConfirmation,
       preferencesStore: this.preferencesController.store,
+      qrHardwareStore: this.qrHardwareKeyring.getMemStore(),
     });
 
     const currencyRateMessenger = this.controllerMessenger.getRestricted({
@@ -377,6 +441,7 @@ export default class MetamaskController extends EventEmitter {
       TrezorKeyring,
       LedgerBridgeKeyring,
       LatticeKeyring,
+      QRHardwareKeyring,
     ];
     this.keyringController = new KeyringController({
       keyringTypes: additionalKeyrings,
@@ -525,6 +590,7 @@ export default class MetamaskController extends EventEmitter {
         console.error(error);
       }
     });
+
     this.networkController.lookupNetwork();
     this.messageManager = new MessageManager({
       metricsEvent: this.metaMetricsController.trackEvent.bind(
@@ -611,6 +677,7 @@ export default class MetamaskController extends EventEmitter {
       GasFeeController: this.gasFeeController,
       TokenListController: this.tokenListController,
       TokensController: this.tokensController,
+      CollectiblesController: this.collectiblesController,
     });
 
     this.memStore = new ComposableObservableStore({
@@ -645,6 +712,7 @@ export default class MetamaskController extends EventEmitter {
         GasFeeController: this.gasFeeController,
         TokenListController: this.tokenListController,
         TokensController: this.tokensController,
+        CollectiblesController: this.collectiblesController,
       },
       controllerMessenger: this.controllerMessenger,
     });
@@ -826,6 +894,7 @@ export default class MetamaskController extends EventEmitter {
       threeBoxController,
       txController,
       tokensController,
+      collectiblesController,
     } = this;
 
     return {
@@ -843,6 +912,14 @@ export default class MetamaskController extends EventEmitter {
         this.preferencesController.setUseTokenDetection,
         this.preferencesController,
       ),
+      setUseCollectibleDetection: nodeify(
+        this.preferencesController.setUseCollectibleDetection,
+        this.preferencesController,
+      ),
+      setOpenSeaEnabled: nodeify(
+        this.preferencesController.setOpenSeaEnabled,
+        this.preferencesController,
+      ),
       setIpfsGateway: this.setIpfsGateway.bind(this),
       setParticipateInMetaMetrics: this.setParticipateInMetaMetrics.bind(this),
       setCurrentLocale: this.setCurrentLocale.bind(this),
@@ -880,6 +957,28 @@ export default class MetamaskController extends EventEmitter {
         this,
       ),
 
+      // qr hardware devices
+      submitQRHardwareCryptoHDKey: nodeify(
+        this.qrHardwareKeyring.submitCryptoHDKey,
+        this.qrHardwareKeyring,
+      ),
+      submitQRHardwareCryptoAccount: nodeify(
+        this.qrHardwareKeyring.submitCryptoAccount,
+        this.qrHardwareKeyring,
+      ),
+      cancelSyncQRHardware: nodeify(
+        this.qrHardwareKeyring.cancelSync,
+        this.qrHardwareKeyring,
+      ),
+      submitQRHardwareSignature: nodeify(
+        this.qrHardwareKeyring.submitSignature,
+        this.qrHardwareKeyring,
+      ),
+      cancelQRHardwareSignRequest: nodeify(
+        this.qrHardwareKeyring.cancelSignRequest,
+        this.qrHardwareKeyring,
+      ),
+
       // mobile
       fetchInfoToSync: nodeify(this.fetchInfoToSync, this),
 
@@ -948,6 +1047,27 @@ export default class MetamaskController extends EventEmitter {
         preferencesController,
       ),
 
+      // CollectiblesController
+      addCollectible: nodeify(
+        collectiblesController.addCollectible,
+        collectiblesController,
+      ),
+
+      addCollectibleVerifyOwnership: nodeify(
+        collectiblesController.addCollectibleVerifyOwnership,
+        collectiblesController,
+      ),
+
+      removeAndIgnoreCollectible: nodeify(
+        collectiblesController.removeAndIgnoreCollectible,
+        collectiblesController,
+      ),
+
+      removeCollectible: nodeify(
+        collectiblesController.removeCollectible,
+        collectiblesController,
+      ),
+
       // AddressController
       setAddressBook: nodeify(
         this.addressBookController.set,
@@ -1008,9 +1128,7 @@ export default class MetamaskController extends EventEmitter {
       ),
       createCancelTransaction: nodeify(this.createCancelTransaction, this),
       createSpeedUpTransaction: nodeify(this.createSpeedUpTransaction, this),
-      isNonceTaken: nodeify(txController.isNonceTaken, txController),
       estimateGas: nodeify(this.estimateGas, this),
-      getPendingNonce: nodeify(this.getPendingNonce, this),
       getNextNonce: nodeify(this.getNextNonce, this),
       addUnapprovedTransaction: nodeify(
         txController.addUnapprovedTransaction,
@@ -1094,13 +1212,6 @@ export default class MetamaskController extends EventEmitter {
         permissionsController.approvePermissionsRequest,
         permissionsController,
       ),
-      clearPermissions: permissionsController.clearPermissions.bind(
-        permissionsController,
-      ),
-      getApprovedAccounts: nodeify(
-        permissionsController.getAccounts,
-        permissionsController,
-      ),
       rejectPermissionsRequest: nodeify(
         permissionsController.rejectPermissionsRequest,
         permissionsController,
@@ -1255,6 +1366,14 @@ export default class MetamaskController extends EventEmitter {
         this.detectTokensController.detectNewTokens,
         this.detectTokensController,
       ),
+
+      // DetectCollectibleController
+      detectCollectibles: process.env.COLLECTIBLES_V1
+        ? nodeify(
+            this.collectibleDetectionController.detectCollectibles,
+            this.collectibleDetectionController,
+          )
+        : null,
     };
   }
 
@@ -1574,13 +1693,16 @@ export default class MetamaskController extends EventEmitter {
   async getKeyringForDevice(deviceName, hdPath = null) {
     let keyringName = null;
     switch (deviceName) {
-      case 'trezor':
+      case DEVICE_NAMES.TREZOR:
         keyringName = TrezorKeyring.type;
         break;
-      case 'ledger':
+      case DEVICE_NAMES.LEDGER:
         keyringName = LedgerBridgeKeyring.type;
         break;
-      case 'lattice':
+      case DEVICE_NAMES.QR:
+        keyringName = QRHardwareKeyring.type;
+        break;
+      case DEVICE_NAMES.LATTICE:
         keyringName = LatticeKeyring.type;
         break;
       default:
@@ -1597,9 +1719,14 @@ export default class MetamaskController extends EventEmitter {
     if (hdPath && keyring.setHdPath) {
       keyring.setHdPath(hdPath);
     }
-    if (deviceName === 'lattice') {
+    if (deviceName === DEVICE_NAMES.LATTICE) {
       keyring.appName = 'MetaMask';
     }
+    if (deviceName === 'trezor') {
+      const model = keyring.getModel();
+      this.appStateController.setTrezorModel(model);
+    }
+
     keyring.network = this.networkController.getProviderConfig().type;
 
     return keyring;
@@ -1667,6 +1794,18 @@ export default class MetamaskController extends EventEmitter {
     return true;
   }
 
+  /**
+   * get hardware account label
+   *
+   * @return string label
+   * */
+
+  getAccountLabel(name, index, hdPathDescription) {
+    return `${name[0].toUpperCase()}${name.slice(1)} ${
+      parseInt(index, 10) + 1
+    } ${hdPathDescription || ''}`.trim();
+  }
+
   /**
    * Imports an account from a Trezor or Ledger device.
    *
@@ -1687,10 +1826,12 @@ export default class MetamaskController extends EventEmitter {
     this.preferencesController.setAddresses(newAccounts);
     newAccounts.forEach((address) => {
       if (!oldAccounts.includes(address)) {
-        const label = `${deviceName[0].toUpperCase()}${deviceName.slice(1)} ${
-          parseInt(index, 10) + 1
-        } ${hdPathDescription || ''}`.trim();
-        // Set the account label to Trezor 1 /  Ledger 1, etc
+        const label = this.getAccountLabel(
+          deviceName === DEVICE_NAMES.QR ? keyring.getName() : deviceName,
+          index,
+          hdPathDescription,
+        );
+        // Set the account label to Trezor 1 /  Ledger 1 / QR Hardware 1, etc
         this.preferencesController.setAccountLabel(address, label);
         // Select the account
         this.preferencesController.setSelectedAddress(address);
@@ -1852,14 +1993,22 @@ export default class MetamaskController extends EventEmitter {
    * @param {Object} msgParams - The params passed to eth_sign.
    * @param {Function} cb - The callback function called with the signature.
    */
-  newUnsignedMessage(msgParams, req) {
-    const promise = this.messageManager.addUnapprovedMessageAsync(
-      msgParams,
-      req,
-    );
-    this.sendUpdate();
-    this.opts.showUserConfirmation();
-    return promise;
+  async newUnsignedMessage(msgParams, req) {
+    const data = normalizeMsgData(msgParams.data);
+    let promise;
+    // 64 hex + "0x" at the beginning
+    // This is needed because Ethereum's EcSign works only on 32 byte numbers
+    // For 67 length see: https://github.com/MetaMask/metamask-extension/pull/12679/files#r749479607
+    if (data.length === 66 || data.length === 67) {
+      promise = this.messageManager.addUnapprovedMessageAsync(msgParams, req);
+      this.sendUpdate();
+      this.opts.showUserConfirmation();
+    } else {
+      throw ethErrors.rpc.invalidParams(
+        'eth_sign requires 32 byte message hash',
+      );
+    }
+    return await promise;
   }
 
   /**
@@ -1868,24 +2017,23 @@ export default class MetamaskController extends EventEmitter {
    * @param {Object} msgParams - The params passed to eth_call.
    * @returns {Promise<Object>} Full state update.
    */
-  signMessage(msgParams) {
+  async signMessage(msgParams) {
     log.info('MetaMaskController - signMessage');
     const msgId = msgParams.metamaskId;
-
-    // sets the status op the message to 'approved'
-    // and removes the metamaskId for signing
-    return this.messageManager
-      .approveMessage(msgParams)
-      .then((cleanMsgParams) => {
-        // signs the message
-        return this.keyringController.signMessage(cleanMsgParams);
-      })
-      .then((rawSig) => {
-        // tells the listener that the message has been signed
-        // and can be returned to the dapp
-        this.messageManager.setMsgStatusSigned(msgId, rawSig);
-        return this.getState();
-      });
+    try {
+      // sets the status op the message to 'approved'
+      // and removes the metamaskId for signing
+      const cleanMsgParams = await this.messageManager.approveMessage(
+        msgParams,
+      );
+      const rawSig = await this.keyringController.signMessage(cleanMsgParams);
+      this.messageManager.setMsgStatusSigned(msgId, rawSig);
+      return this.getState();
+    } catch (error) {
+      log.info('MetaMaskController - eth_sign failed', error);
+      this.messageManager.errorMessage(msgId, error);
+      throw error;
+    }
   }
 
   /**
@@ -1932,23 +2080,27 @@ export default class MetamaskController extends EventEmitter {
    * @param {Object} msgParams - The params of the message to sign & return to the Dapp.
    * @returns {Promise<Object>} A full state update.
    */
-  signPersonalMessage(msgParams) {
+  async signPersonalMessage(msgParams) {
     log.info('MetaMaskController - signPersonalMessage');
     const msgId = msgParams.metamaskId;
     // sets the status op the message to 'approved'
     // and removes the metamaskId for signing
-    return this.personalMessageManager
-      .approveMessage(msgParams)
-      .then((cleanMsgParams) => {
-        // signs the message
-        return this.keyringController.signPersonalMessage(cleanMsgParams);
-      })
-      .then((rawSig) => {
-        // tells the listener that the message has been signed
-        // and can be returned to the dapp
-        this.personalMessageManager.setMsgStatusSigned(msgId, rawSig);
-        return this.getState();
-      });
+    try {
+      const cleanMsgParams = await this.personalMessageManager.approveMessage(
+        msgParams,
+      );
+      const rawSig = await this.keyringController.signPersonalMessage(
+        cleanMsgParams,
+      );
+      // tells the listener that the message has been signed
+      // and can be returned to the dapp
+      this.personalMessageManager.setMsgStatusSigned(msgId, rawSig);
+      return this.getState();
+    } catch (error) {
+      log.info('MetaMaskController - eth_personalSign failed', error);
+      this.personalMessageManager.errorMessage(msgId, error);
+      throw error;
+    }
   }
 
   /**
@@ -2095,6 +2247,12 @@ export default class MetamaskController extends EventEmitter {
         });
       }
 
+      case KEYRING_TYPES.QR: {
+        return Promise.reject(
+          new Error('QR hardware does not support eth_getEncryptionPublicKey.'),
+        );
+      }
+
       default: {
         const promise = this.encryptionPublicKeyManager.addUnapprovedMessageAsync(
           msgParams,
@@ -2227,17 +2385,10 @@ export default class MetamaskController extends EventEmitter {
   }
 
   /**
-   * Method to return a boolean if the keyring for the currently selected
-   * account is a ledger or trezor keyring.
-   * TODO: remove this method when Ledger and Trezor release their supported
-   * client utilities for EIP-1559
    * @returns {boolean} true if the keyring type supports EIP-1559
    */
-  async getCurrentAccountEIP1559Compatibility(fromAddress) {
-    const address =
-      fromAddress || this.preferencesController.getSelectedAddress();
-    const keyring = await this.keyringController.getKeyringForAccount(address);
-    return keyring.type !== KEYRING_TYPES.TREZOR;
+  async getCurrentAccountEIP1559Compatibility() {
+    return true;
   }
 
   //=============================================================================
@@ -3187,6 +3338,12 @@ export default class MetamaskController extends EventEmitter {
    * Locks MetaMask
    */
   setLocked() {
+    const [trezorKeyring] = this.keyringController.getKeyringsByType(
+      KEYRING_TYPES.TREZOR,
+    );
+    if (trezorKeyring) {
+      trezorKeyring.dispose();
+    }
     return this.keyringController.setLocked();
   }
 }
diff --git a/app/scripts/metamask-controller.test.js b/app/scripts/metamask-controller.test.js
index f91176858..12b91fd8b 100644
--- a/app/scripts/metamask-controller.test.js
+++ b/app/scripts/metamask-controller.test.js
@@ -607,12 +607,12 @@ describe('MetaMaskController', function () {
       sinon.spy(metamaskController.preferencesController, 'setSelectedAddress');
       sinon.spy(metamaskController.preferencesController, 'setAccountLabel');
       await metamaskController
-        .connectHardware('trezor', 0, `m/44/0'/0'`)
+        .connectHardware('trezor', 0, `m/44'/1'/0'/0`)
         .catch(() => null);
       await metamaskController.unlockHardwareWalletAccount(
         accountToUnlock,
         'trezor',
-        `m/44/0'/0'`,
+        `m/44'/1'/0'/0`,
       );
     });
 
@@ -835,7 +835,8 @@ describe('MetaMaskController', function () {
     let msgParams, metamaskMsgs, messages, msgId;
 
     const address = '0xc42edfcc21ed14dda456aa0756c153f7985d8813';
-    const data = '0x43727970746f6b697474696573';
+    const data =
+      '0x0000000000000000000000000000000000000043727970746f6b697474696573';
 
     beforeEach(async function () {
       sandbox.stub(metamaskController, 'getBalance');
@@ -885,6 +886,19 @@ describe('MetaMaskController', function () {
       assert.equal(messages[0].status, TRANSACTION_STATUSES.REJECTED);
     });
 
+    it('checks message length', async function () {
+      msgParams = {
+        from: address,
+        data: '0xDEADBEEF',
+      };
+
+      try {
+        await metamaskController.newUnsignedMessage(msgParams);
+      } catch (error) {
+        assert.equal(error.message, 'eth_sign requires 32 byte message hash');
+      }
+    });
+
     it('errors when signing a message', async function () {
       try {
         await metamaskController.signMessage(messages[0].msgParams);
diff --git a/app/scripts/platforms/extension.js b/app/scripts/platforms/extension.js
index c2f931b49..722d96625 100644
--- a/app/scripts/platforms/extension.js
+++ b/app/scripts/platforms/extension.js
@@ -118,13 +118,14 @@ export default class ExtensionPlatform {
   ) {
     let extensionURL = extension.runtime.getURL('home.html');
 
+    if (route) {
+      extensionURL += `#${route}`;
+    }
+
     if (queryString) {
       extensionURL += `?${queryString}`;
     }
 
-    if (route) {
-      extensionURL += `#${route}`;
-    }
     this.openTab({ url: extensionURL });
     if (
       getEnvironmentType() !== ENVIRONMENT_TYPE_BACKGROUND &&
diff --git a/development/build/transforms/remove-fenced-code.js b/development/build/transforms/remove-fenced-code.js
index 200233fe8..632660ec2 100644
--- a/development/build/transforms/remove-fenced-code.js
+++ b/development/build/transforms/remove-fenced-code.js
@@ -41,11 +41,16 @@ class RemoveFencedCodeTransform extends Transform {
   // stream, immediately before the "end" event is emitted.
   // It applies the transform to the concatenated file contents.
   _flush(end) {
-    const [fileContent, didModify] = removeFencedCode(
-      this.filePath,
-      this.buildType,
-      Buffer.concat(this._fileBuffers).toString('utf8'),
-    );
+    let fileContent, didModify;
+    try {
+      [fileContent, didModify] = removeFencedCode(
+        this.filePath,
+        this.buildType,
+        Buffer.concat(this._fileBuffers).toString('utf8'),
+      );
+    } catch (error) {
+      return end(error);
+    }
 
     const pushAndEnd = () => {
       this.push(fileContent);
@@ -53,12 +58,11 @@ class RemoveFencedCodeTransform extends Transform {
     };
 
     if (this.shouldLintTransformedFiles && didModify) {
-      lintTransformedFile(fileContent, this.filePath)
+      return lintTransformedFile(fileContent, this.filePath)
         .then(pushAndEnd)
         .catch((error) => end(error));
-    } else {
-      pushAndEnd();
     }
+    return pushAndEnd();
   }
 }
 
diff --git a/development/build/transforms/remove-fenced-code.test.js b/development/build/transforms/remove-fenced-code.test.js
index 5eebc1135..4397b4bf6 100644
--- a/development/build/transforms/remove-fenced-code.test.js
+++ b/development/build/transforms/remove-fenced-code.test.js
@@ -161,6 +161,28 @@ describe('build/transforms/remove-fenced-code', () => {
       });
     });
 
+    it('handles error during code fence removal or parsing', async () => {
+      const fileContent = getMinimalFencedCode().concat(
+        '///: END:ONLY_INCLUDE_IN',
+      );
+
+      const stream = createRemoveFencedCodeTransform('main')(mockJsFileName);
+
+      await new Promise((resolve) => {
+        stream.on('error', (error) => {
+          expect(error.message).toStrictEqual(
+            expect.stringContaining(
+              'A valid fence consists of two fence lines, but the file contains an uneven number, "3", of fence lines.',
+            ),
+          );
+          expect(lintTransformedFileMock).toHaveBeenCalledTimes(0);
+          resolve();
+        });
+
+        stream.end(fileContent);
+      });
+    });
+
     it('handles transformed file lint failure', async () => {
       lintTransformedFileMock.mockImplementationOnce(() =>
         Promise.reject(new Error('lint failure')),
diff --git a/development/jest.config.js b/development/jest.config.js
index 4eeaa048c..e4218c21f 100644
--- a/development/jest.config.js
+++ b/development/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   displayName: '/development',
   collectCoverageFrom: ['<rootDir>/**/*.js'],
   coverageDirectory: '../jest-coverage/development/',
-  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  coverageReporters: ['html', 'text-summary'],
   coverageThreshold: {
     './development/build/transforms/**/*.js': {
       branches: 100,
diff --git a/docs/trezor-emulator.md b/docs/trezor-emulator.md
index 8f66ba213..bf232a09c 100644
--- a/docs/trezor-emulator.md
+++ b/docs/trezor-emulator.md
@@ -13,7 +13,7 @@ Follow this instructions: https://github.com/trezor/trezor-core/blob/master/docs
 
 ## 3 - Restart the bridge with emulator support (Mac OSx instructions)
 
-`
+```
     # stop any existing instance of trezord
     killall trezord
 
@@ -22,4 +22,4 @@ Follow this instructions: https://github.com/trezor/trezor-core/blob/master/docs
 
     # launch the emulator
     ~/trezor-core/emu.sh
-`
+````
diff --git a/jest.config.js b/jest.config.js
index 9f87eb4d9..186afbfe9 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -2,7 +2,7 @@ module.exports = {
   collectCoverageFrom: ['<rootDir>/ui/**/*.js', '<rootDir>/shared/**/*.js'],
   coverageDirectory: './jest-coverage/main',
   coveragePathIgnorePatterns: ['.stories.js', '.snap'],
-  coverageReporters: ['json', 'lcov', 'text', 'clover'],
+  coverageReporters: ['html', 'text-summary'],
   coverageThreshold: {
     global: {
       branches: 35,
@@ -23,4 +23,8 @@ module.exports = {
     '<rootDir>/app/scripts/platforms/*.test.js',
   ],
   testTimeout: 2500,
+  transform: {
+    '^.+\\.[tj]sx?$': 'babel-jest',
+    '^.+\\.mdx$': '@storybook/addon-docs/jest-transform-mdx',
+  },
 };
diff --git a/jest.stories.config.js b/jest.stories.config.js
new file mode 100644
index 000000000..fa66332a3
--- /dev/null
+++ b/jest.stories.config.js
@@ -0,0 +1,16 @@
+/* eslint-disable import/unambiguous */
+module.exports = {
+  coverageDirectory: './jest-coverage/storybook',
+  coverageReporters: ['html', 'text-summary'],
+  // TODO: enable resetMocks
+  // resetMocks: true,
+  restoreMocks: true,
+  setupFiles: ['<rootDir>/test/setup.js', '<rootDir>/test/env.js'],
+  setupFilesAfterEnv: ['<rootDir>/test/jest/setup.js'],
+  testMatch: ['<rootDir>/ui/**/*stories.test.js'],
+  testTimeout: 2500,
+  transform: {
+    '^.+\\.[tj]sx?$': 'babel-jest',
+    '^.+\\.mdx$': '@storybook/addon-docs/jest-transform-mdx',
+  },
+};
diff --git a/lavamoat/browserify/beta/policy.json b/lavamoat/browserify/beta/policy.json
index 3cfd712fa..7c0b7ce6d 100644
--- a/lavamoat/browserify/beta/policy.json
+++ b/lavamoat/browserify/beta/policy.json
@@ -412,6 +412,47 @@
         "Intl.getCanonicalLocales": true
       }
     },
+    "@keystonehq/base-eth-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/bc-ur-registry": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "@ngraveio/bc-ur": true,
+        "bs58check": true,
+        "buffer": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth": {
+      "packages": {
+        "@keystonehq/bc-ur-registry": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "buffer": true,
+        "events": true,
+        "rlp": true,
+        "uuid": true
+      }
+    },
     "@material-ui/core": {
       "globals": {
         "Image": true,
@@ -526,6 +567,7 @@
         "ethjs-util": true,
         "events": true,
         "human-standard-collectible-abi": true,
+        "human-standard-multi-collectible-abi": true,
         "human-standard-token-abi": true,
         "immer": true,
         "isomorphic-fetch": true,
@@ -618,6 +660,18 @@
         "events": true
       }
     },
+    "@ngraveio/bc-ur": {
+      "packages": {
+        "@apocentre/alias-sampling": true,
+        "assert": true,
+        "bignumber.js": true,
+        "buffer": true,
+        "cbor-sync": true,
+        "crc": true,
+        "jsbi": true,
+        "sha.js": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -737,6 +791,83 @@
         "util": true
       }
     },
+    "@truffle/abi-utils": {
+      "packages": {
+        "change-case": true,
+        "faker": true,
+        "fast-check": true
+      }
+    },
+    "@truffle/code-utils": {
+      "packages": {
+        "buffer": true,
+        "cbor": true
+      }
+    },
+    "@truffle/codec": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/compile-common": true,
+        "big.js": true,
+        "bn.js": true,
+        "buffer": true,
+        "cbor": true,
+        "debug": true,
+        "lodash.clonedeep": true,
+        "lodash.escaperegexp": true,
+        "lodash.partition": true,
+        "lodash.sum": true,
+        "semver": true,
+        "utf8": true,
+        "util": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/compile-common": {
+      "packages": {
+        "@truffle/error": true,
+        "colors": true,
+        "path-browserify": true
+      }
+    },
+    "@truffle/decoder": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/codec": true,
+        "@truffle/compile-common": true,
+        "@truffle/source-map-utils": true,
+        "bn.js": true,
+        "debug": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/source-map-utils": {
+      "packages": {
+        "@truffle/code-utils": true,
+        "@truffle/codec": true,
+        "debug": true,
+        "json-pointer": true,
+        "node-interval-tree": true,
+        "web3-utils": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "URL.createObjectURL": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
     "@zxing/library": {
       "globals": {
         "TextDecoder": true,
@@ -922,6 +1053,11 @@
         "buffer": true
       }
     },
+    "big.js": {
+      "globals": {
+        "define": true
+      }
+    },
     "bignumber.js": {
       "globals": {
         "crypto": true,
@@ -974,6 +1110,9 @@
       }
     },
     "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
         "browser-resolve": true
       }
@@ -1098,6 +1237,62 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
+    "camel-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
+    "cbor": {
+      "globals": {
+        "TextDecoder": true
+      },
+      "packages": {
+        "bignumber.js": true,
+        "buffer": true,
+        "is-buffer": true,
+        "nofilter": true,
+        "stream-browserify": true,
+        "url": true,
+        "util": true
+      }
+    },
+    "cbor-sync": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "buffer": true
+      }
+    },
+    "change-case": {
+      "packages": {
+        "camel-case": true,
+        "constant-case": true,
+        "dot-case": true,
+        "header-case": true,
+        "is-lower-case": true,
+        "is-upper-case": true,
+        "lower-case": true,
+        "lower-case-first": true,
+        "no-case": true,
+        "param-case": true,
+        "pascal-case": true,
+        "path-case": true,
+        "sentence-case": true,
+        "snake-case": true,
+        "swap-case": true,
+        "title-case": true,
+        "upper-case": true,
+        "upper-case-first": true
+      }
+    },
     "cids": {
       "packages": {
         "buffer": true,
@@ -1152,6 +1347,22 @@
         "color-name": true
       }
     },
+    "colors": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "os-browserify": true,
+        "process": true,
+        "util": true
+      }
+    },
+    "constant-case": {
+      "packages": {
+        "snake-case": true,
+        "upper-case": true
+      }
+    },
     "cookiejar": {
       "globals": {
         "console.warn": true
@@ -1159,7 +1370,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1190,6 +1401,11 @@
         "is-buffer": true
       }
     },
+    "crc": {
+      "packages": {
+        "buffer": true
+      }
+    },
     "crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
@@ -1406,6 +1622,11 @@
         "@babel/runtime": true
       }
     },
+    "dot-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "drbg.js": {
       "packages": {
         "buffer": true,
@@ -1489,12 +1710,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -1662,6 +1877,11 @@
         "trezor-connect": true
       }
     },
+    "ethereum-bloom-filters": {
+      "packages": {
+        "js-sha3": true
+      }
+    },
     "ethereum-cryptography": {
       "packages": {
         "assert": true,
@@ -1886,6 +2106,24 @@
         "chrome": true
       }
     },
+    "faker": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "dbg": "write"
+      }
+    },
+    "fast-check": {
+      "globals": {
+        "clearTimeout": true,
+        "console.log": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "buffer": true,
+        "pure-rand": true
+      }
+    },
     "fast-json-patch": {
       "globals": {
         "addEventListener": true,
@@ -1933,6 +2171,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -1975,6 +2225,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2006,12 +2261,19 @@
     "hdkey": {
       "packages": {
         "assert": true,
+        "bs58check": true,
         "coinstring": true,
         "crypto-browserify": true,
         "safe-buffer": true,
         "secp256k1": true
       }
     },
+    "header-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "heap": {
       "globals": {
         "define": true
@@ -2495,11 +2757,22 @@
         "multihashes": true
       }
     },
+    "is-lower-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
+    "is-upper-case": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "iso-random-stream": {
       "globals": {
         "crypto": true,
@@ -2558,6 +2831,16 @@
         "console.warn": true
       }
     },
+    "jsbi": {
+      "globals": {
+        "define": true
+      }
+    },
+    "json-pointer": {
+      "packages": {
+        "foreach": true
+      }
+    },
     "json-rpc-engine": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -2645,6 +2928,7 @@
       "packages": {
         "buffer": true,
         "inherits": true,
+        "readable-stream": true,
         "safe-buffer": true,
         "stream-browserify": true
       }
@@ -3099,12 +3383,22 @@
         "util": true
       }
     },
+    "lower-case-first": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "lru": {
       "packages": {
         "events": true,
         "inherits": true
       }
     },
+    "lru-cache": {
+      "packages": {
+        "yallist": true
+      }
+    },
     "ltgt": {
       "packages": {
         "is-buffer": true
@@ -3274,6 +3568,11 @@
         "crypto-browserify": true
       }
     },
+    "no-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "node-forge": {
       "globals": {
         "Blob": true,
@@ -3298,6 +3597,11 @@
         "timers-browserify": true
       }
     },
+    "node-interval-tree": {
+      "packages": {
+        "shallowequal": true
+      }
+    },
     "nodeify": {
       "globals": {
         "setTimeout": true
@@ -3309,6 +3613,13 @@
         "timers-browserify": true
       }
     },
+    "nofilter": {
+      "packages": {
+        "buffer": true,
+        "stream-browserify": true,
+        "util": true
+      }
+    },
     "nonce-tracker": {
       "packages": {
         "assert": true,
@@ -3504,6 +3815,11 @@
         "p-map": true
       }
     },
+    "param-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "parse-asn1": {
       "packages": {
         "asn1.js": true,
@@ -3513,11 +3829,22 @@
         "pbkdf2": true
       }
     },
+    "pascal-case": {
+      "packages": {
+        "camel-case": true,
+        "upper-case-first": true
+      }
+    },
     "path-browserify": {
       "packages": {
         "process": true
       }
     },
+    "path-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "path-to-regexp": {
       "packages": {
         "isarray": true
@@ -3768,6 +4095,17 @@
         "define": true
       }
     },
+    "qrcode.react": {
+      "globals": {
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "prop-types": true,
+        "qr.js": true,
+        "react": true
+      }
+    },
     "rabin-wasm": {
       "globals": {
         "Blob": true,
@@ -4074,8 +4412,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "symbol-observable": true
+        "@babel/runtime": true
       }
     },
     "redux-devtools-core": {
@@ -4114,8 +4451,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
-        "es-abstract": true
+        "call-bind": true,
+        "define-properties": true
       }
     },
     "relative-url": {
@@ -4260,9 +4597,16 @@
         "console": true
       },
       "packages": {
+        "lru-cache": true,
         "process": true
       }
     },
+    "sentence-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case-first": true
+      }
+    },
     "set-immediate-shim": {
       "globals": {
         "setTimeout.apply": true
@@ -4307,6 +4651,11 @@
         "readable-stream": true
       }
     },
+    "snake-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "socket.io-client": {
       "globals": {
         "clearTimeout": true,
@@ -4457,6 +4806,12 @@
         "component-emitter": true
       }
     },
+    "swap-case": {
+      "packages": {
+        "lower-case": true,
+        "upper-case": true
+      }
+    },
     "textarea-caret": {
       "globals": {
         "document.body.appendChild": true,
@@ -4503,6 +4858,12 @@
         "console": true
       }
     },
+    "title-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "toggle-selection": {
       "globals": {
         "document.activeElement": true,
@@ -4597,6 +4958,11 @@
         "buffer": true
       }
     },
+    "upper-case-first": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "url": {
       "packages": {
         "punycode": true,
@@ -4711,6 +5077,21 @@
         "uuid": true
       }
     },
+    "web3-utils": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "bn.js": true,
+        "eth-lib": true,
+        "ethereum-bloom-filters": true,
+        "ethjs-unit": true,
+        "is-buffer": true,
+        "number-to-bn": true,
+        "randombytes": true,
+        "utf8": true
+      }
+    },
     "webrtcsupport": {
       "globals": {
         "AudioContext": true,
diff --git a/lavamoat/browserify/flask/policy.json b/lavamoat/browserify/flask/policy.json
index 3cfd712fa..7c0b7ce6d 100644
--- a/lavamoat/browserify/flask/policy.json
+++ b/lavamoat/browserify/flask/policy.json
@@ -412,6 +412,47 @@
         "Intl.getCanonicalLocales": true
       }
     },
+    "@keystonehq/base-eth-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/bc-ur-registry": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "@ngraveio/bc-ur": true,
+        "bs58check": true,
+        "buffer": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth": {
+      "packages": {
+        "@keystonehq/bc-ur-registry": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "buffer": true,
+        "events": true,
+        "rlp": true,
+        "uuid": true
+      }
+    },
     "@material-ui/core": {
       "globals": {
         "Image": true,
@@ -526,6 +567,7 @@
         "ethjs-util": true,
         "events": true,
         "human-standard-collectible-abi": true,
+        "human-standard-multi-collectible-abi": true,
         "human-standard-token-abi": true,
         "immer": true,
         "isomorphic-fetch": true,
@@ -618,6 +660,18 @@
         "events": true
       }
     },
+    "@ngraveio/bc-ur": {
+      "packages": {
+        "@apocentre/alias-sampling": true,
+        "assert": true,
+        "bignumber.js": true,
+        "buffer": true,
+        "cbor-sync": true,
+        "crc": true,
+        "jsbi": true,
+        "sha.js": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -737,6 +791,83 @@
         "util": true
       }
     },
+    "@truffle/abi-utils": {
+      "packages": {
+        "change-case": true,
+        "faker": true,
+        "fast-check": true
+      }
+    },
+    "@truffle/code-utils": {
+      "packages": {
+        "buffer": true,
+        "cbor": true
+      }
+    },
+    "@truffle/codec": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/compile-common": true,
+        "big.js": true,
+        "bn.js": true,
+        "buffer": true,
+        "cbor": true,
+        "debug": true,
+        "lodash.clonedeep": true,
+        "lodash.escaperegexp": true,
+        "lodash.partition": true,
+        "lodash.sum": true,
+        "semver": true,
+        "utf8": true,
+        "util": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/compile-common": {
+      "packages": {
+        "@truffle/error": true,
+        "colors": true,
+        "path-browserify": true
+      }
+    },
+    "@truffle/decoder": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/codec": true,
+        "@truffle/compile-common": true,
+        "@truffle/source-map-utils": true,
+        "bn.js": true,
+        "debug": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/source-map-utils": {
+      "packages": {
+        "@truffle/code-utils": true,
+        "@truffle/codec": true,
+        "debug": true,
+        "json-pointer": true,
+        "node-interval-tree": true,
+        "web3-utils": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "URL.createObjectURL": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
     "@zxing/library": {
       "globals": {
         "TextDecoder": true,
@@ -922,6 +1053,11 @@
         "buffer": true
       }
     },
+    "big.js": {
+      "globals": {
+        "define": true
+      }
+    },
     "bignumber.js": {
       "globals": {
         "crypto": true,
@@ -974,6 +1110,9 @@
       }
     },
     "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
         "browser-resolve": true
       }
@@ -1098,6 +1237,62 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
+    "camel-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
+    "cbor": {
+      "globals": {
+        "TextDecoder": true
+      },
+      "packages": {
+        "bignumber.js": true,
+        "buffer": true,
+        "is-buffer": true,
+        "nofilter": true,
+        "stream-browserify": true,
+        "url": true,
+        "util": true
+      }
+    },
+    "cbor-sync": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "buffer": true
+      }
+    },
+    "change-case": {
+      "packages": {
+        "camel-case": true,
+        "constant-case": true,
+        "dot-case": true,
+        "header-case": true,
+        "is-lower-case": true,
+        "is-upper-case": true,
+        "lower-case": true,
+        "lower-case-first": true,
+        "no-case": true,
+        "param-case": true,
+        "pascal-case": true,
+        "path-case": true,
+        "sentence-case": true,
+        "snake-case": true,
+        "swap-case": true,
+        "title-case": true,
+        "upper-case": true,
+        "upper-case-first": true
+      }
+    },
     "cids": {
       "packages": {
         "buffer": true,
@@ -1152,6 +1347,22 @@
         "color-name": true
       }
     },
+    "colors": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "os-browserify": true,
+        "process": true,
+        "util": true
+      }
+    },
+    "constant-case": {
+      "packages": {
+        "snake-case": true,
+        "upper-case": true
+      }
+    },
     "cookiejar": {
       "globals": {
         "console.warn": true
@@ -1159,7 +1370,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1190,6 +1401,11 @@
         "is-buffer": true
       }
     },
+    "crc": {
+      "packages": {
+        "buffer": true
+      }
+    },
     "crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
@@ -1406,6 +1622,11 @@
         "@babel/runtime": true
       }
     },
+    "dot-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "drbg.js": {
       "packages": {
         "buffer": true,
@@ -1489,12 +1710,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -1662,6 +1877,11 @@
         "trezor-connect": true
       }
     },
+    "ethereum-bloom-filters": {
+      "packages": {
+        "js-sha3": true
+      }
+    },
     "ethereum-cryptography": {
       "packages": {
         "assert": true,
@@ -1886,6 +2106,24 @@
         "chrome": true
       }
     },
+    "faker": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "dbg": "write"
+      }
+    },
+    "fast-check": {
+      "globals": {
+        "clearTimeout": true,
+        "console.log": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "buffer": true,
+        "pure-rand": true
+      }
+    },
     "fast-json-patch": {
       "globals": {
         "addEventListener": true,
@@ -1933,6 +2171,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -1975,6 +2225,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2006,12 +2261,19 @@
     "hdkey": {
       "packages": {
         "assert": true,
+        "bs58check": true,
         "coinstring": true,
         "crypto-browserify": true,
         "safe-buffer": true,
         "secp256k1": true
       }
     },
+    "header-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "heap": {
       "globals": {
         "define": true
@@ -2495,11 +2757,22 @@
         "multihashes": true
       }
     },
+    "is-lower-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
+    "is-upper-case": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "iso-random-stream": {
       "globals": {
         "crypto": true,
@@ -2558,6 +2831,16 @@
         "console.warn": true
       }
     },
+    "jsbi": {
+      "globals": {
+        "define": true
+      }
+    },
+    "json-pointer": {
+      "packages": {
+        "foreach": true
+      }
+    },
     "json-rpc-engine": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -2645,6 +2928,7 @@
       "packages": {
         "buffer": true,
         "inherits": true,
+        "readable-stream": true,
         "safe-buffer": true,
         "stream-browserify": true
       }
@@ -3099,12 +3383,22 @@
         "util": true
       }
     },
+    "lower-case-first": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "lru": {
       "packages": {
         "events": true,
         "inherits": true
       }
     },
+    "lru-cache": {
+      "packages": {
+        "yallist": true
+      }
+    },
     "ltgt": {
       "packages": {
         "is-buffer": true
@@ -3274,6 +3568,11 @@
         "crypto-browserify": true
       }
     },
+    "no-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "node-forge": {
       "globals": {
         "Blob": true,
@@ -3298,6 +3597,11 @@
         "timers-browserify": true
       }
     },
+    "node-interval-tree": {
+      "packages": {
+        "shallowequal": true
+      }
+    },
     "nodeify": {
       "globals": {
         "setTimeout": true
@@ -3309,6 +3613,13 @@
         "timers-browserify": true
       }
     },
+    "nofilter": {
+      "packages": {
+        "buffer": true,
+        "stream-browserify": true,
+        "util": true
+      }
+    },
     "nonce-tracker": {
       "packages": {
         "assert": true,
@@ -3504,6 +3815,11 @@
         "p-map": true
       }
     },
+    "param-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "parse-asn1": {
       "packages": {
         "asn1.js": true,
@@ -3513,11 +3829,22 @@
         "pbkdf2": true
       }
     },
+    "pascal-case": {
+      "packages": {
+        "camel-case": true,
+        "upper-case-first": true
+      }
+    },
     "path-browserify": {
       "packages": {
         "process": true
       }
     },
+    "path-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "path-to-regexp": {
       "packages": {
         "isarray": true
@@ -3768,6 +4095,17 @@
         "define": true
       }
     },
+    "qrcode.react": {
+      "globals": {
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "prop-types": true,
+        "qr.js": true,
+        "react": true
+      }
+    },
     "rabin-wasm": {
       "globals": {
         "Blob": true,
@@ -4074,8 +4412,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "symbol-observable": true
+        "@babel/runtime": true
       }
     },
     "redux-devtools-core": {
@@ -4114,8 +4451,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
-        "es-abstract": true
+        "call-bind": true,
+        "define-properties": true
       }
     },
     "relative-url": {
@@ -4260,9 +4597,16 @@
         "console": true
       },
       "packages": {
+        "lru-cache": true,
         "process": true
       }
     },
+    "sentence-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case-first": true
+      }
+    },
     "set-immediate-shim": {
       "globals": {
         "setTimeout.apply": true
@@ -4307,6 +4651,11 @@
         "readable-stream": true
       }
     },
+    "snake-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "socket.io-client": {
       "globals": {
         "clearTimeout": true,
@@ -4457,6 +4806,12 @@
         "component-emitter": true
       }
     },
+    "swap-case": {
+      "packages": {
+        "lower-case": true,
+        "upper-case": true
+      }
+    },
     "textarea-caret": {
       "globals": {
         "document.body.appendChild": true,
@@ -4503,6 +4858,12 @@
         "console": true
       }
     },
+    "title-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "toggle-selection": {
       "globals": {
         "document.activeElement": true,
@@ -4597,6 +4958,11 @@
         "buffer": true
       }
     },
+    "upper-case-first": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "url": {
       "packages": {
         "punycode": true,
@@ -4711,6 +5077,21 @@
         "uuid": true
       }
     },
+    "web3-utils": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "bn.js": true,
+        "eth-lib": true,
+        "ethereum-bloom-filters": true,
+        "ethjs-unit": true,
+        "is-buffer": true,
+        "number-to-bn": true,
+        "randombytes": true,
+        "utf8": true
+      }
+    },
     "webrtcsupport": {
       "globals": {
         "AudioContext": true,
diff --git a/lavamoat/browserify/main/policy.json b/lavamoat/browserify/main/policy.json
index 3cfd712fa..7c0b7ce6d 100644
--- a/lavamoat/browserify/main/policy.json
+++ b/lavamoat/browserify/main/policy.json
@@ -412,6 +412,47 @@
         "Intl.getCanonicalLocales": true
       }
     },
+    "@keystonehq/base-eth-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/bc-ur-registry": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "@ngraveio/bc-ur": true,
+        "bs58check": true,
+        "buffer": true
+      }
+    },
+    "@keystonehq/bc-ur-registry-eth": {
+      "packages": {
+        "@keystonehq/bc-ur-registry": true,
+        "buffer": true,
+        "ethereumjs-util": true,
+        "hdkey": true,
+        "uuid": true
+      }
+    },
+    "@keystonehq/metamask-airgapped-keyring": {
+      "packages": {
+        "@ethereumjs/tx": true,
+        "@keystonehq/base-eth-keyring": true,
+        "@keystonehq/bc-ur-registry-eth": true,
+        "@metamask/obs-store": true,
+        "buffer": true,
+        "events": true,
+        "rlp": true,
+        "uuid": true
+      }
+    },
     "@material-ui/core": {
       "globals": {
         "Image": true,
@@ -526,6 +567,7 @@
         "ethjs-util": true,
         "events": true,
         "human-standard-collectible-abi": true,
+        "human-standard-multi-collectible-abi": true,
         "human-standard-token-abi": true,
         "immer": true,
         "isomorphic-fetch": true,
@@ -618,6 +660,18 @@
         "events": true
       }
     },
+    "@ngraveio/bc-ur": {
+      "packages": {
+        "@apocentre/alias-sampling": true,
+        "assert": true,
+        "bignumber.js": true,
+        "buffer": true,
+        "cbor-sync": true,
+        "crc": true,
+        "jsbi": true,
+        "sha.js": true
+      }
+    },
     "@popperjs/core": {
       "globals": {
         "Element": true,
@@ -737,6 +791,83 @@
         "util": true
       }
     },
+    "@truffle/abi-utils": {
+      "packages": {
+        "change-case": true,
+        "faker": true,
+        "fast-check": true
+      }
+    },
+    "@truffle/code-utils": {
+      "packages": {
+        "buffer": true,
+        "cbor": true
+      }
+    },
+    "@truffle/codec": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/compile-common": true,
+        "big.js": true,
+        "bn.js": true,
+        "buffer": true,
+        "cbor": true,
+        "debug": true,
+        "lodash.clonedeep": true,
+        "lodash.escaperegexp": true,
+        "lodash.partition": true,
+        "lodash.sum": true,
+        "semver": true,
+        "utf8": true,
+        "util": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/compile-common": {
+      "packages": {
+        "@truffle/error": true,
+        "colors": true,
+        "path-browserify": true
+      }
+    },
+    "@truffle/decoder": {
+      "packages": {
+        "@truffle/abi-utils": true,
+        "@truffle/codec": true,
+        "@truffle/compile-common": true,
+        "@truffle/source-map-utils": true,
+        "bn.js": true,
+        "debug": true,
+        "web3-utils": true
+      }
+    },
+    "@truffle/source-map-utils": {
+      "packages": {
+        "@truffle/code-utils": true,
+        "@truffle/codec": true,
+        "debug": true,
+        "json-pointer": true,
+        "node-interval-tree": true,
+        "web3-utils": true
+      }
+    },
+    "@zxing/browser": {
+      "globals": {
+        "HTMLElement": true,
+        "HTMLImageElement": true,
+        "HTMLVideoElement": true,
+        "URL.createObjectURL": true,
+        "clearTimeout": true,
+        "console.error": true,
+        "console.warn": true,
+        "document": true,
+        "navigator": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "@zxing/library": true
+      }
+    },
     "@zxing/library": {
       "globals": {
         "TextDecoder": true,
@@ -922,6 +1053,11 @@
         "buffer": true
       }
     },
+    "big.js": {
+      "globals": {
+        "define": true
+      }
+    },
     "bignumber.js": {
       "globals": {
         "crypto": true,
@@ -974,6 +1110,9 @@
       }
     },
     "bn.js": {
+      "globals": {
+        "Buffer": true
+      },
       "packages": {
         "browser-resolve": true
       }
@@ -1098,6 +1237,62 @@
         "buffer": true
       }
     },
+    "call-bind": {
+      "packages": {
+        "function-bind": true,
+        "get-intrinsic": true
+      }
+    },
+    "camel-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
+    "cbor": {
+      "globals": {
+        "TextDecoder": true
+      },
+      "packages": {
+        "bignumber.js": true,
+        "buffer": true,
+        "is-buffer": true,
+        "nofilter": true,
+        "stream-browserify": true,
+        "url": true,
+        "util": true
+      }
+    },
+    "cbor-sync": {
+      "globals": {
+        "define": true
+      },
+      "packages": {
+        "buffer": true
+      }
+    },
+    "change-case": {
+      "packages": {
+        "camel-case": true,
+        "constant-case": true,
+        "dot-case": true,
+        "header-case": true,
+        "is-lower-case": true,
+        "is-upper-case": true,
+        "lower-case": true,
+        "lower-case-first": true,
+        "no-case": true,
+        "param-case": true,
+        "pascal-case": true,
+        "path-case": true,
+        "sentence-case": true,
+        "snake-case": true,
+        "swap-case": true,
+        "title-case": true,
+        "upper-case": true,
+        "upper-case-first": true
+      }
+    },
     "cids": {
       "packages": {
         "buffer": true,
@@ -1152,6 +1347,22 @@
         "color-name": true
       }
     },
+    "colors": {
+      "globals": {
+        "console.log": true
+      },
+      "packages": {
+        "os-browserify": true,
+        "process": true,
+        "util": true
+      }
+    },
+    "constant-case": {
+      "packages": {
+        "snake-case": true,
+        "upper-case": true
+      }
+    },
     "cookiejar": {
       "globals": {
         "console.warn": true
@@ -1159,7 +1370,7 @@
     },
     "copy-to-clipboard": {
       "globals": {
-        "clipboardData.setData": true,
+        "clipboardData": true,
         "console.error": true,
         "console.warn": true,
         "document.body.appendChild": true,
@@ -1190,6 +1401,11 @@
         "is-buffer": true
       }
     },
+    "crc": {
+      "packages": {
+        "buffer": true
+      }
+    },
     "crc-32": {
       "globals": {
         "DO_NOT_EXPORT_CRC": true,
@@ -1406,6 +1622,11 @@
         "@babel/runtime": true
       }
     },
+    "dot-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "drbg.js": {
       "packages": {
         "buffer": true,
@@ -1489,12 +1710,6 @@
         "prr": true
       }
     },
-    "es-abstract": {
-      "packages": {
-        "function-bind": true,
-        "has-symbols": true
-      }
-    },
     "eth-block-tracker": {
       "globals": {
         "clearTimeout": true,
@@ -1662,6 +1877,11 @@
         "trezor-connect": true
       }
     },
+    "ethereum-bloom-filters": {
+      "packages": {
+        "js-sha3": true
+      }
+    },
     "ethereum-cryptography": {
       "packages": {
         "assert": true,
@@ -1886,6 +2106,24 @@
         "chrome": true
       }
     },
+    "faker": {
+      "globals": {
+        "console.error": true,
+        "console.log": true,
+        "dbg": "write"
+      }
+    },
+    "fast-check": {
+      "globals": {
+        "clearTimeout": true,
+        "console.log": true,
+        "setTimeout": true
+      },
+      "packages": {
+        "buffer": true,
+        "pure-rand": true
+      }
+    },
     "fast-json-patch": {
       "globals": {
         "addEventListener": true,
@@ -1933,6 +2171,18 @@
         "webkitRTCSessionDescription": true
       }
     },
+    "get-intrinsic": {
+      "globals": {
+        "AggregateError": true,
+        "FinalizationRegistry": true,
+        "WeakRef": true
+      },
+      "packages": {
+        "function-bind": true,
+        "has": true,
+        "has-symbols": true
+      }
+    },
     "get-params": {
       "globals": {
         "GetParams": "write"
@@ -1975,6 +2225,11 @@
         "sparse-array": true
       }
     },
+    "has": {
+      "packages": {
+        "function-bind": true
+      }
+    },
     "has-binary2": {
       "globals": {
         "Blob": true,
@@ -2006,12 +2261,19 @@
     "hdkey": {
       "packages": {
         "assert": true,
+        "bs58check": true,
         "coinstring": true,
         "crypto-browserify": true,
         "safe-buffer": true,
         "secp256k1": true
       }
     },
+    "header-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "heap": {
       "globals": {
         "define": true
@@ -2495,11 +2757,22 @@
         "multihashes": true
       }
     },
+    "is-lower-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "is-regex": {
       "packages": {
+        "call-bind": true,
         "has-symbols": true
       }
     },
+    "is-upper-case": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "iso-random-stream": {
       "globals": {
         "crypto": true,
@@ -2558,6 +2831,16 @@
         "console.warn": true
       }
     },
+    "jsbi": {
+      "globals": {
+        "define": true
+      }
+    },
+    "json-pointer": {
+      "packages": {
+        "foreach": true
+      }
+    },
     "json-rpc-engine": {
       "packages": {
         "@metamask/safe-event-emitter": true,
@@ -2645,6 +2928,7 @@
       "packages": {
         "buffer": true,
         "inherits": true,
+        "readable-stream": true,
         "safe-buffer": true,
         "stream-browserify": true
       }
@@ -3099,12 +3383,22 @@
         "util": true
       }
     },
+    "lower-case-first": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "lru": {
       "packages": {
         "events": true,
         "inherits": true
       }
     },
+    "lru-cache": {
+      "packages": {
+        "yallist": true
+      }
+    },
     "ltgt": {
       "packages": {
         "is-buffer": true
@@ -3274,6 +3568,11 @@
         "crypto-browserify": true
       }
     },
+    "no-case": {
+      "packages": {
+        "lower-case": true
+      }
+    },
     "node-forge": {
       "globals": {
         "Blob": true,
@@ -3298,6 +3597,11 @@
         "timers-browserify": true
       }
     },
+    "node-interval-tree": {
+      "packages": {
+        "shallowequal": true
+      }
+    },
     "nodeify": {
       "globals": {
         "setTimeout": true
@@ -3309,6 +3613,13 @@
         "timers-browserify": true
       }
     },
+    "nofilter": {
+      "packages": {
+        "buffer": true,
+        "stream-browserify": true,
+        "util": true
+      }
+    },
     "nonce-tracker": {
       "packages": {
         "assert": true,
@@ -3504,6 +3815,11 @@
         "p-map": true
       }
     },
+    "param-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "parse-asn1": {
       "packages": {
         "asn1.js": true,
@@ -3513,11 +3829,22 @@
         "pbkdf2": true
       }
     },
+    "pascal-case": {
+      "packages": {
+        "camel-case": true,
+        "upper-case-first": true
+      }
+    },
     "path-browserify": {
       "packages": {
         "process": true
       }
     },
+    "path-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "path-to-regexp": {
       "packages": {
         "isarray": true
@@ -3768,6 +4095,17 @@
         "define": true
       }
     },
+    "qrcode.react": {
+      "globals": {
+        "Path2D": true,
+        "devicePixelRatio": true
+      },
+      "packages": {
+        "prop-types": true,
+        "qr.js": true,
+        "react": true
+      }
+    },
     "rabin-wasm": {
       "globals": {
         "Blob": true,
@@ -4074,8 +4412,7 @@
         "console": true
       },
       "packages": {
-        "@babel/runtime": true,
-        "symbol-observable": true
+        "@babel/runtime": true
       }
     },
     "redux-devtools-core": {
@@ -4114,8 +4451,8 @@
     },
     "regexp.prototype.flags": {
       "packages": {
-        "define-properties": true,
-        "es-abstract": true
+        "call-bind": true,
+        "define-properties": true
       }
     },
     "relative-url": {
@@ -4260,9 +4597,16 @@
         "console": true
       },
       "packages": {
+        "lru-cache": true,
         "process": true
       }
     },
+    "sentence-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case-first": true
+      }
+    },
     "set-immediate-shim": {
       "globals": {
         "setTimeout.apply": true
@@ -4307,6 +4651,11 @@
         "readable-stream": true
       }
     },
+    "snake-case": {
+      "packages": {
+        "no-case": true
+      }
+    },
     "socket.io-client": {
       "globals": {
         "clearTimeout": true,
@@ -4457,6 +4806,12 @@
         "component-emitter": true
       }
     },
+    "swap-case": {
+      "packages": {
+        "lower-case": true,
+        "upper-case": true
+      }
+    },
     "textarea-caret": {
       "globals": {
         "document.body.appendChild": true,
@@ -4503,6 +4858,12 @@
         "console": true
       }
     },
+    "title-case": {
+      "packages": {
+        "no-case": true,
+        "upper-case": true
+      }
+    },
     "toggle-selection": {
       "globals": {
         "document.activeElement": true,
@@ -4597,6 +4958,11 @@
         "buffer": true
       }
     },
+    "upper-case-first": {
+      "packages": {
+        "upper-case": true
+      }
+    },
     "url": {
       "packages": {
         "punycode": true,
@@ -4711,6 +5077,21 @@
         "uuid": true
       }
     },
+    "web3-utils": {
+      "globals": {
+        "setTimeout": true
+      },
+      "packages": {
+        "bn.js": true,
+        "eth-lib": true,
+        "ethereum-bloom-filters": true,
+        "ethjs-unit": true,
+        "is-buffer": true,
+        "number-to-bn": true,
+        "randombytes": true,
+        "utf8": true
+      }
+    },
     "webrtcsupport": {
       "globals": {
         "AudioContext": true,
diff --git a/lavamoat/build-system/policy-override.json b/lavamoat/build-system/policy-override.json
index eaa6b9b26..6e23d3347 100644
--- a/lavamoat/build-system/policy-override.json
+++ b/lavamoat/build-system/policy-override.json
@@ -29,7 +29,8 @@
     },
     "eslint-module-utils": {
       "packages": {
-        "eslint-import-resolver-node": true
+        "eslint-import-resolver-node": true,
+        "@babel/eslint-parser": true
       }
     },
     "node-sass": {
diff --git a/lavamoat/build-system/policy.json b/lavamoat/build-system/policy.json
index a9073f4cd..e7cf27f5e 100644
--- a/lavamoat/build-system/policy.json
+++ b/lavamoat/build-system/policy.json
@@ -12,19 +12,23 @@
     "@babel/core": {
       "builtin": {
         "fs": true,
+        "module": true,
         "path": true,
-        "url": true
+        "url": true,
+        "v8": true
       },
       "globals": {
         "console.log": true,
         "process.cwd": true,
         "process.env.BABEL_ENV": true,
         "process.env.BABEL_SHOW_CONFIG_FOR": true,
-        "process.env.NODE_ENV": true
+        "process.env.NODE_ENV": true,
+        "process.versions.node": true
       },
       "packages": {
         "@babel/code-frame": true,
         "@babel/generator": true,
+        "@babel/helper-compilation-targets": true,
         "@babel/helper-module-transforms": true,
         "@babel/helpers": true,
         "@babel/parser": true,
@@ -35,8 +39,6 @@
         "debug": true,
         "gensync": true,
         "json5": true,
-        "lodash": true,
-        "resolve": true,
         "semver": true,
         "source-map": true
       }
@@ -76,22 +78,9 @@
         "@babel/types": true
       }
     },
-    "@babel/helper-builder-react-jsx": {
-      "packages": {
-        "@babel/helper-annotate-as-pure": true,
-        "@babel/types": true
-      }
-    },
-    "@babel/helper-builder-react-jsx-experimental": {
-      "packages": {
-        "@babel/helper-annotate-as-pure": true,
-        "@babel/helper-module-imports": true,
-        "@babel/types": true
-      }
-    },
     "@babel/helper-compilation-targets": {
       "globals": {
-        "console.log": true,
+        "console.warn": true,
         "process.versions.node": true
       },
       "packages": {
@@ -107,6 +96,7 @@
       },
       "packages": {
         "@babel/core": true,
+        "@babel/helper-annotate-as-pure": true,
         "@babel/helper-function-name": true,
         "@babel/helper-member-expression-to-functions": true,
         "@babel/helper-optimise-call-expression": true,
@@ -121,11 +111,22 @@
         "regexpu-core": true
       }
     },
-    "@babel/helper-define-map": {
+    "@babel/helper-define-polyfill-provider": {
+      "builtin": {
+        "path": true
+      },
+      "globals": {
+        "console.log": true,
+        "console.warn": true,
+        "process.exitCode": "write",
+        "process.versions.node": true
+      },
       "packages": {
-        "@babel/helper-function-name": true,
-        "@babel/types": true,
-        "lodash": true
+        "@babel/core": true,
+        "@babel/helper-compilation-targets": true,
+        "@babel/helper-plugin-utils": true,
+        "lodash.debounce": true,
+        "resolve": true
       }
     },
     "@babel/helper-explode-assignable-expression": {
@@ -177,8 +178,7 @@
         "@babel/helper-validator-identifier": true,
         "@babel/template": true,
         "@babel/traverse": true,
-        "@babel/types": true,
-        "lodash": true
+        "@babel/types": true
       }
     },
     "@babel/helper-optimise-call-expression": {
@@ -237,6 +237,14 @@
         "js-tokens": true
       }
     },
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/helper-skip-transparent-expression-wrappers": true,
+        "@babel/plugin-proposal-optional-chaining": true
+      }
+    },
     "@babel/plugin-proposal-async-generator-functions": {
       "packages": {
         "@babel/core": true,
@@ -251,6 +259,13 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-proposal-class-static-block": {
+      "packages": {
+        "@babel/helper-create-class-features-plugin": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/plugin-syntax-class-static-block": true
+      }
+    },
     "@babel/plugin-proposal-dynamic-import": {
       "packages": {
         "@babel/helper-plugin-utils": true,
@@ -292,7 +307,9 @@
     },
     "@babel/plugin-proposal-object-rest-spread": {
       "packages": {
+        "@babel/compat-data": true,
         "@babel/core": true,
+        "@babel/helper-compilation-targets": true,
         "@babel/helper-plugin-utils": true,
         "@babel/plugin-syntax-object-rest-spread": true,
         "@babel/plugin-transform-parameters": true
@@ -318,6 +335,14 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-proposal-private-property-in-object": {
+      "packages": {
+        "@babel/helper-annotate-as-pure": true,
+        "@babel/helper-create-class-features-plugin": true,
+        "@babel/helper-plugin-utils": true,
+        "@babel/plugin-syntax-private-property-in-object": true
+      }
+    },
     "@babel/plugin-proposal-unicode-property-regex": {
       "packages": {
         "@babel/helper-create-regexp-features-plugin": true,
@@ -334,6 +359,11 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-syntax-class-static-block": {
+      "packages": {
+        "@babel/helper-plugin-utils": true
+      }
+    },
     "@babel/plugin-syntax-dynamic-import": {
       "packages": {
         "@babel/helper-plugin-utils": true
@@ -384,6 +414,11 @@
         "@babel/helper-plugin-utils": true
       }
     },
+    "@babel/plugin-syntax-private-property-in-object": {
+      "packages": {
+        "@babel/helper-plugin-utils": true
+      }
+    },
     "@babel/plugin-syntax-top-level-await": {
       "packages": {
         "@babel/helper-plugin-utils": true
@@ -418,7 +453,6 @@
       "packages": {
         "@babel/core": true,
         "@babel/helper-annotate-as-pure": true,
-        "@babel/helper-define-map": true,
         "@babel/helper-function-name": true,
         "@babel/helper-optimise-call-expression": true,
         "@babel/helper-plugin-utils": true,
@@ -554,7 +588,9 @@
     },
     "@babel/plugin-transform-react-display-name": {
       "builtin": {
-        "path": true
+        "path.basename": true,
+        "path.dirname": true,
+        "path.extname": true
       },
       "packages": {
         "@babel/core": true,
@@ -564,30 +600,15 @@
     "@babel/plugin-transform-react-jsx": {
       "packages": {
         "@babel/core": true,
-        "@babel/helper-builder-react-jsx": true,
-        "@babel/helper-builder-react-jsx-experimental": true,
+        "@babel/helper-annotate-as-pure": true,
+        "@babel/helper-module-imports": true,
         "@babel/helper-plugin-utils": true,
         "@babel/plugin-syntax-jsx": true
       }
     },
     "@babel/plugin-transform-react-jsx-development": {
       "packages": {
-        "@babel/core": true,
-        "@babel/helper-builder-react-jsx-experimental": true,
-        "@babel/helper-plugin-utils": true,
-        "@babel/plugin-syntax-jsx": true
-      }
-    },
-    "@babel/plugin-transform-react-jsx-self": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/helper-plugin-utils": true
-      }
-    },
-    "@babel/plugin-transform-react-jsx-source": {
-      "packages": {
-        "@babel/core": true,
-        "@babel/helper-plugin-utils": true
+        "@babel/plugin-transform-react-jsx": true
       }
     },
     "@babel/plugin-transform-react-pure-annotations": {
@@ -673,11 +694,12 @@
       "packages": {
         "@babel/compat-data": true,
         "@babel/helper-compilation-targets": true,
-        "@babel/helper-module-imports": true,
         "@babel/helper-plugin-utils": true,
         "@babel/helper-validator-option": true,
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": true,
         "@babel/plugin-proposal-async-generator-functions": true,
         "@babel/plugin-proposal-class-properties": true,
+        "@babel/plugin-proposal-class-static-block": true,
         "@babel/plugin-proposal-dynamic-import": true,
         "@babel/plugin-proposal-export-namespace-from": true,
         "@babel/plugin-proposal-json-strings": true,
@@ -688,9 +710,11 @@
         "@babel/plugin-proposal-optional-catch-binding": true,
         "@babel/plugin-proposal-optional-chaining": true,
         "@babel/plugin-proposal-private-methods": true,
+        "@babel/plugin-proposal-private-property-in-object": true,
         "@babel/plugin-proposal-unicode-property-regex": true,
         "@babel/plugin-syntax-async-generators": true,
         "@babel/plugin-syntax-class-properties": true,
+        "@babel/plugin-syntax-class-static-block": true,
         "@babel/plugin-syntax-dynamic-import": true,
         "@babel/plugin-syntax-export-namespace-from": true,
         "@babel/plugin-syntax-json-strings": true,
@@ -700,6 +724,7 @@
         "@babel/plugin-syntax-object-rest-spread": true,
         "@babel/plugin-syntax-optional-catch-binding": true,
         "@babel/plugin-syntax-optional-chaining": true,
+        "@babel/plugin-syntax-private-property-in-object": true,
         "@babel/plugin-syntax-top-level-await": true,
         "@babel/plugin-transform-arrow-functions": true,
         "@babel/plugin-transform-async-to-generator": true,
@@ -735,6 +760,9 @@
         "@babel/plugin-transform-unicode-regex": true,
         "@babel/preset-modules": true,
         "@babel/types": true,
+        "babel-plugin-polyfill-corejs2": true,
+        "babel-plugin-polyfill-corejs3": true,
+        "babel-plugin-polyfill-regenerator": true,
         "core-js-compat": true,
         "semver": true
       }
@@ -742,11 +770,10 @@
     "@babel/preset-react": {
       "packages": {
         "@babel/helper-plugin-utils": true,
+        "@babel/helper-validator-option": true,
         "@babel/plugin-transform-react-display-name": true,
         "@babel/plugin-transform-react-jsx": true,
         "@babel/plugin-transform-react-jsx-development": true,
-        "@babel/plugin-transform-react-jsx-self": true,
-        "@babel/plugin-transform-react-jsx-source": true,
         "@babel/plugin-transform-react-pure-annotations": true
       }
     },
@@ -760,13 +787,13 @@
     "@babel/traverse": {
       "globals": {
         "console.log": true,
-        "console.trace": true,
-        "process.env.NODE_ENV": true
+        "console.trace": true
       },
       "packages": {
         "@babel/code-frame": true,
         "@babel/generator": true,
         "@babel/helper-function-name": true,
+        "@babel/helper-hoist-variables": true,
         "@babel/helper-split-export-declaration": true,
         "@babel/parser": true,
         "@babel/types": true,
@@ -781,7 +808,6 @@
       },
       "packages": {
         "@babel/helper-validator-identifier": true,
-        "lodash": true,
         "to-fast-properties": true
       }
     },
@@ -945,11 +971,6 @@
         "define": true
       }
     },
-    "acorn-dynamic-import": {
-      "packages": {
-        "acorn": true
-      }
-    },
     "acorn-jsx": {
       "packages": {
         "acorn": true
@@ -958,7 +979,6 @@
     "acorn-node": {
       "packages": {
         "acorn": true,
-        "acorn-dynamic-import": true,
         "acorn-walk": true,
         "xtend": true
       }
@@ -1117,13 +1137,33 @@
       "packages": {
         "browserslist": true,
         "caniuse-lite": true,
-        "colorette": true,
         "normalize-range": true,
         "num2fraction": true,
+        "picocolors": true,
         "postcss": true,
         "postcss-value-parser": true
       }
     },
+    "babel-plugin-polyfill-corejs2": {
+      "packages": {
+        "@babel/compat-data": true,
+        "@babel/core": true,
+        "@babel/helper-define-polyfill-provider": true,
+        "semver": true
+      }
+    },
+    "babel-plugin-polyfill-corejs3": {
+      "packages": {
+        "@babel/core": true,
+        "@babel/helper-define-polyfill-provider": true,
+        "core-js-compat": true
+      }
+    },
+    "babel-plugin-polyfill-regenerator": {
+      "packages": {
+        "@babel/helper-define-polyfill-provider": true
+      }
+    },
     "babelify": {
       "builtin": {
         "path.extname": true,
@@ -1675,7 +1715,7 @@
     },
     "deps-sort": {
       "packages": {
-        "shasum": true,
+        "shasum-object": true,
         "through2": true
       }
     },
@@ -1773,15 +1813,9 @@
       }
     },
     "es-abstract": {
-      "globals": {
-        "AggregateError": true,
-        "FinalizationRegistry": true,
-        "WeakRef": true
-      },
       "packages": {
         "call-bind": true,
         "es-to-primitive": true,
-        "function-bind": true,
         "get-intrinsic": true,
         "has": true,
         "has-symbols": true,
@@ -3069,7 +3103,6 @@
     "labeled-stream-splicer": {
       "packages": {
         "inherits": true,
-        "isarray": true,
         "stream-splicer": true
       }
     },
@@ -3196,6 +3229,12 @@
         "define": true
       }
     },
+    "lodash.debounce": {
+      "globals": {
+        "clearTimeout": true,
+        "setTimeout": true
+      }
+    },
     "log-symbols": {
       "globals": {
         "process.env.CI": true,
@@ -3489,7 +3528,6 @@
       "packages": {
         "call-bind": true,
         "define-properties": true,
-        "es-abstract": true,
         "has-symbols": true,
         "object-keys": true
       }
@@ -3534,14 +3572,6 @@
         "make-iterator": true
       }
     },
-    "object.values": {
-      "packages": {
-        "call-bind": true,
-        "define-properties": true,
-        "es-abstract": true,
-        "has": true
-      }
-    },
     "once": {
       "packages": {
         "wrappy": true
@@ -3670,6 +3700,16 @@
         "through": true
       }
     },
+    "picocolors": {
+      "builtin": {
+        "tty.isatty": true
+      },
+      "globals": {
+        "process.argv.includes": true,
+        "process.env": true,
+        "process.platform": true
+      }
+    },
     "picomatch": {
       "builtin": {
         "path.basename": true,
@@ -3727,6 +3767,7 @@
       },
       "packages": {
         "chalk": true,
+        "picocolors": true,
         "source-map": true,
         "supports-color": true
       }
@@ -3767,13 +3808,9 @@
       }
     },
     "postcss-selector-parser": {
-      "builtin": {
-        "util.deprecate": true
-      },
       "packages": {
         "cssesc": true,
-        "indexes-of": true,
-        "uniq": true
+        "util-deprecate": true
       }
     },
     "postcss-syntax": {
@@ -3861,6 +3898,11 @@
         "pump": true
       }
     },
+    "qs": {
+      "packages": {
+        "side-channel": true
+      }
+    },
     "quote-stream": {
       "globals": {
         "Buffer": true
@@ -4272,6 +4314,17 @@
         "json-stable-stringify": true
       }
     },
+    "shasum-object": {
+      "builtin": {
+        "crypto.createHash": true
+      },
+      "globals": {
+        "Buffer.isBuffer": true
+      },
+      "packages": {
+        "fast-safe-stringify": true
+      }
+    },
     "shebang-command": {
       "packages": {
         "shebang-regex": true
@@ -5200,8 +5253,8 @@
     "yaml": {
       "globals": {
         "Buffer": true,
-        "_YAML_SILENCE_DEPRECATION_WARNINGS": true,
-        "_YAML_SILENCE_WARNINGS": true,
+        "YAML_SILENCE_DEPRECATION_WARNINGS": true,
+        "YAML_SILENCE_WARNINGS": true,
         "atob": true,
         "btoa": true,
         "console.warn": true,
diff --git a/package.json b/package.json
index 04de91a1f..cccdd9768 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metamask-crx",
-  "version": "10.7.1",
+  "version": "10.8.0",
   "private": true,
   "repository": {
     "type": "git",
@@ -60,6 +60,7 @@
     "start:dev": "concurrently -k -n build,react,redux yarn:start yarn:devtools:react yarn:devtools:redux",
     "announce": "node development/announcer.js",
     "storybook": "start-storybook -p 6006 -c .storybook -s ./app,./.storybook/images",
+    "storybook:test": "jest --config=./jest.stories.config.js",
     "storybook:build": "build-storybook -c .storybook -o storybook-build -s ./app,./.storybook/images",
     "storybook:deploy": "storybook-to-ghpages --existing-output-dir storybook-build --remote storybook --branch master",
     "update-changelog": "auto-changelog update",
@@ -106,9 +107,11 @@
     "@ethereumjs/tx": "^3.2.1",
     "@formatjs/intl-relativetimeformat": "^5.2.6",
     "@fortawesome/fontawesome-free": "^5.13.0",
+    "@keystonehq/bc-ur-registry-eth": "^0.6.8",
+    "@keystonehq/metamask-airgapped-keyring": "0.2.1",
     "@material-ui/core": "^4.11.0",
     "@metamask/contract-metadata": "^1.28.0",
-    "@metamask/controllers": "^17.0.0",
+    "@metamask/controllers": "^20.1.0",
     "@metamask/eth-ledger-bridge-keyring": "^0.10.0",
     "@metamask/eth-token-tracker": "^3.0.1",
     "@metamask/etherscan-link": "^2.1.0",
@@ -117,11 +120,15 @@
     "@metamask/obs-store": "^5.0.0",
     "@metamask/post-message-stream": "^4.0.0",
     "@metamask/providers": "^8.1.1",
+    "@ngraveio/bc-ur": "^1.1.6",
     "@popperjs/core": "^2.4.0",
     "@reduxjs/toolkit": "^1.6.2",
     "@sentry/browser": "^6.0.0",
     "@sentry/integrations": "^6.0.0",
-    "@zxing/library": "^0.8.0",
+    "@truffle/codec": "^0.11.18",
+    "@truffle/decoder": "^5.1.0",
+    "@zxing/browser": "^0.0.10",
+    "@zxing/library": "0.8.0",
     "analytics-node": "^3.4.0-beta.3",
     "await-semaphore": "^0.1.1",
     "base32-encode": "^1.2.0",
@@ -145,7 +152,7 @@
     "eth-query": "^2.1.2",
     "eth-rpc-errors": "^4.0.2",
     "eth-sig-util": "^3.0.0",
-    "eth-trezor-keyring": "^0.7.0",
+    "eth-trezor-keyring": "^0.9.1",
     "ethereum-ens-network-map": "^1.0.2",
     "ethereumjs-abi": "^0.6.4",
     "ethereumjs-util": "^7.0.10",
@@ -181,6 +188,7 @@
     "pump": "^3.0.0",
     "punycode": "^2.1.1",
     "qrcode-generator": "1.4.1",
+    "qrcode.react": "^1.0.1",
     "react": "^16.12.0",
     "react-dnd": "^3.0.2",
     "react-dnd-html5-backend": "^7.4.4",
@@ -206,6 +214,7 @@
     "swappable-obj-proxy": "^1.1.0",
     "textarea-caret": "^3.0.1",
     "unicode-confusables": "^0.1.1",
+    "uuid": "^8.3.2",
     "valid-url": "^1.0.9",
     "web3": "^0.20.7",
     "web3-stream-provider": "^4.0.0"
@@ -253,9 +262,10 @@
     "babelify": "^10.0.0",
     "bify-module-groups": "^1.0.0",
     "brfs": "^2.0.2",
+    "browser-util-inspect": "^0.2.0",
     "browserify": "^16.5.1",
     "chalk": "^3.0.0",
-    "chromedriver": "^95.0.0",
+    "chromedriver": "^96.0.0",
     "concurrently": "^5.2.0",
     "copy-webpack-plugin": "^6.0.3",
     "cross-spawn": "^7.0.3",
@@ -299,7 +309,7 @@
     "jest": "^26.6.3",
     "jsdom": "^11.2.0",
     "koa": "^2.7.0",
-    "lavamoat": "^5.3.4",
+    "lavamoat": "^5.3.5",
     "lavamoat-browserify": "^14.0.3",
     "lavamoat-viz": "^6.0.9",
     "lockfile-lint": "^4.0.0",
@@ -373,7 +383,9 @@
       "@lavamoat/preinstall-always-fail": false,
       "fsevents": false,
       "node-hid": false,
-      "usb": false
+      "usb": false,
+      "blake-hash": false,
+      "protobufjs": false
     }
   }
 }
diff --git a/patches/@babel+runtime+7.15.4.patch b/patches/@babel+runtime+7.15.4.patch
new file mode 100644
index 000000000..2213f4cb0
--- /dev/null
+++ b/patches/@babel+runtime+7.15.4.patch
@@ -0,0 +1,62 @@
+diff --git a/node_modules/@babel/runtime/helpers/extends.js b/node_modules/@babel/runtime/helpers/extends.js
+index eaf9547..d0474f5 100644
+--- a/node_modules/@babel/runtime/helpers/extends.js
++++ b/node_modules/@babel/runtime/helpers/extends.js
+@@ -1,20 +1,5 @@
+ function _extends() {
+-  module.exports = _extends = Object.assign || function (target) {
+-    for (var i = 1; i < arguments.length; i++) {
+-      var source = arguments[i];
+-
+-      for (var key in source) {
+-        if (Object.prototype.hasOwnProperty.call(source, key)) {
+-          target[key] = source[key];
+-        }
+-      }
+-    }
+-
+-    return target;
+-  };
+-
+-  module.exports["default"] = module.exports, module.exports.__esModule = true;
+-  return _extends.apply(this, arguments);
++  return Object.assign(...arguments)
+ }
+ 
+ module.exports = _extends;
+diff --git a/node_modules/@babel/runtime/helpers/getPrototypeOf.js b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
+index a6916eb..e01b2d6 100644
+--- a/node_modules/@babel/runtime/helpers/getPrototypeOf.js
++++ b/node_modules/@babel/runtime/helpers/getPrototypeOf.js
+@@ -1,9 +1,5 @@
+ function _getPrototypeOf(o) {
+-  module.exports = _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) {
+-    return o.__proto__ || Object.getPrototypeOf(o);
+-  };
+-  module.exports["default"] = module.exports, module.exports.__esModule = true;
+-  return _getPrototypeOf(o);
++  return Object.getPrototypeOf(o);
+ }
+ 
+ module.exports = _getPrototypeOf;
+diff --git a/node_modules/@babel/runtime/helpers/setPrototypeOf.js b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
+index 415797b..63312f2 100644
+--- a/node_modules/@babel/runtime/helpers/setPrototypeOf.js
++++ b/node_modules/@babel/runtime/helpers/setPrototypeOf.js
+@@ -1,12 +1,7 @@
+ function _setPrototypeOf(o, p) {
+-  module.exports = _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+-    o.__proto__ = p;
+-    return o;
+-  };
+-
+-  module.exports["default"] = module.exports, module.exports.__esModule = true;
+-  return _setPrototypeOf(o, p);
+-}
++  o.__proto__ = p;
++  return o;
++};
+ 
+ module.exports = _setPrototypeOf;
+ module.exports["default"] = module.exports, module.exports.__esModule = true;
+\ No newline at end of file
diff --git a/patches/acorn+7.4.1.patch b/patches/acorn+7.4.1.patch
new file mode 100644
index 000000000..061aa1281
--- /dev/null
+++ b/patches/acorn+7.4.1.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/acorn/dist/acorn.js b/node_modules/acorn/dist/acorn.js
+index 0523f0e..9d3d5c2 100644
+--- a/node_modules/acorn/dist/acorn.js
++++ b/node_modules/acorn/dist/acorn.js
+@@ -1835,7 +1835,7 @@
+       if (checkClashes) {
+         if (has(checkClashes, expr.name))
+           { this.raiseRecoverable(expr.start, "Argument name clash"); }
+-        checkClashes[expr.name] = true;
++        Object.defineProperty(checkClashes, expr.name, { value: true, writable: true, enumerable: true, configurable: true })
+       }
+       if (bindingType !== BIND_NONE && bindingType !== BIND_OUTSIDE) { this.declareName(expr.name, bindingType, expr.start); }
+       break
diff --git a/patches/colors+1.4.0.patch b/patches/colors+1.4.0.patch
new file mode 100644
index 000000000..9ea49d833
--- /dev/null
+++ b/patches/colors+1.4.0.patch
@@ -0,0 +1,14 @@
+diff --git a/node_modules/colors/lib/extendStringPrototype.js b/node_modules/colors/lib/extendStringPrototype.js
+index 46fd386..c7d0fc5 100644
+--- a/node_modules/colors/lib/extendStringPrototype.js
++++ b/node_modules/colors/lib/extendStringPrototype.js
+@@ -5,7 +5,8 @@ module['exports'] = function() {
+   // Extends prototype of native string object to allow for "foo".red syntax
+   //
+   var addProperty = function(color, func) {
+-    String.prototype.__defineGetter__(color, func);
++    // remove prototype mutation so this plays well with LavaMoat
++    // String.prototype.__defineGetter__(color, func);
+   };
+ 
+   addProperty('strip', function() {
diff --git a/patches/object.values+1.1.1.patch b/patches/object.values+1.1.3.patch
similarity index 79%
rename from patches/object.values+1.1.1.patch
rename to patches/object.values+1.1.3.patch
index f0323c184..2664d97c6 100644
--- a/patches/object.values+1.1.1.patch
+++ b/patches/object.values+1.1.3.patch
@@ -1,17 +1,18 @@
 diff --git a/node_modules/object.values/index.js b/node_modules/object.values/index.js
-index b8ba091..2dc8083 100644
+index abf0449..2dc8083 100644
 --- a/node_modules/object.values/index.js
 +++ b/node_modules/object.values/index.js
-@@ -1,17 +1,3 @@
+@@ -1,18 +1,3 @@
  'use strict';
  
 -var define = require('define-properties');
+-var callBind = require('call-bind');
 -
 -var implementation = require('./implementation');
 -var getPolyfill = require('./polyfill');
 -var shim = require('./shim');
 -
--var polyfill = getPolyfill();
+-var polyfill = callBind(getPolyfill(), Object);
 -
 -define(polyfill, {
 -	getPolyfill: getPolyfill,
diff --git a/patches/sass+1.32.4.patch b/patches/sass+1.35.2.patch
similarity index 57%
rename from patches/sass+1.32.4.patch
rename to patches/sass+1.35.2.patch
index 6939fd235..b4cc16cc1 100644
--- a/patches/sass+1.32.4.patch
+++ b/patches/sass+1.35.2.patch
@@ -1,25 +1,29 @@
 diff --git a/node_modules/sass/sass.dart.js b/node_modules/sass/sass.dart.js
-index fedd867..fef6a8f 100644
+index 512d612..1374f5e 100644
 --- a/node_modules/sass/sass.dart.js
 +++ b/node_modules/sass/sass.dart.js
-@@ -16,6 +16,9 @@ self.scheduleImmediate = self.setImmediate
+@@ -16,6 +16,10 @@ self.scheduleImmediate = typeof setImmediate !== "undefined"
  // CommonJS globals.
  self.exports = exports;
  
++// realm bridge utility functions
 +exports.bridgeJson = (target) => JSON.parse(JSON.stringify(target))
 +exports.bridgeFn = (target) => ((...args) => target(...args))
 +
  // Node.js specific exports, check to see if they exist & or polyfilled
  
  if (typeof process !== "undefined") {
-@@ -3616,10 +3619,6 @@ self.fs = require("fs");
+@@ -3700,13 +3704,6 @@ self.fs = require("fs");
          return C.PlainJavaScriptObject_methods;
        if (proto === Object.prototype)
          return C.PlainJavaScriptObject_methods;
 -      if (typeof $constructor == "function") {
--        Object.defineProperty($constructor, J.JS_INTEROP_INTERCEPTOR_TAG(), {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
+-        t1 = $._JS_INTEROP_INTERCEPTOR_TAG;
+-        if (t1 == null)
+-          t1 = $._JS_INTEROP_INTERCEPTOR_TAG = init.getIsolateTag("_$dart_js");
+-        Object.defineProperty($constructor, t1, {value: C.UnknownJavaScriptObject_methods, enumerable: false, writable: true, configurable: true});
 -        return C.UnknownJavaScriptObject_methods;
 -      }
        return C.UnknownJavaScriptObject_methods;
      },
-     JS_INTEROP_INTERCEPTOR_TAG: function() {
+     JSArray_JSArray$fixed: function($length, $E) {
diff --git a/shared/constants/gas.js b/shared/constants/gas.js
index 1c0bc8ae7..01d490960 100644
--- a/shared/constants/gas.js
+++ b/shared/constants/gas.js
@@ -30,6 +30,17 @@ export const GAS_RECOMMENDATIONS = {
   HIGH: 'high',
 };
 
+/**
+ * These represent types of gas estimation
+ */
+export const PRIORITY_LEVELS = {
+  LOW: 'low',
+  MEDIUM: 'medium',
+  HIGH: 'high',
+  CUSTOM: 'custom',
+  DAPP_SUGGESTED: 'dappSuggested',
+};
+
 /**
  * Represents the user customizing their gas preference
  */
diff --git a/shared/constants/hardware-wallets.js b/shared/constants/hardware-wallets.js
index f32306472..105287800 100644
--- a/shared/constants/hardware-wallets.js
+++ b/shared/constants/hardware-wallets.js
@@ -1,5 +1,5 @@
 /**
- * Accounts can be instantiated from simple, HD or the two hardware wallet
+ * Accounts can be instantiated from simple, HD or the multiple hardware wallet
  * keyring types. Both simple and HD are treated as default but we do special
  * case accounts managed by a hardware wallet.
  */
@@ -7,6 +7,14 @@ export const KEYRING_TYPES = {
   LEDGER: 'Ledger Hardware',
   TREZOR: 'Trezor Hardware',
   LATTICE: 'Lattice Hardware',
+  QR: 'QR Hardware Wallet Device',
+};
+
+export const DEVICE_NAMES = {
+  LEDGER: 'ledger',
+  TREZOR: 'trezor',
+  QR: 'QR Hardware',
+  LATTICE: 'lattice',
 };
 
 /**
diff --git a/shared/constants/swaps.js b/shared/constants/swaps.js
index 2b1c9cbbf..2518a7079 100644
--- a/shared/constants/swaps.js
+++ b/shared/constants/swaps.js
@@ -84,12 +84,7 @@ export const WBNB_CONTRACT_ADDRESS =
 export const WMATIC_CONTRACT_ADDRESS =
   '0x0d500b1d8e8ef31e21c99d1db9a6444d3adf1270';
 
-const METASWAP_ETH_API_HOST = 'https://api.metaswap.codefi.network';
-
-const METASWAP_BSC_API_HOST = 'https://bsc-api.metaswap.codefi.network';
-
 const SWAPS_TESTNET_CHAIN_ID = '0x539';
-const SWAPS_TESTNET_HOST = 'https://metaswap-api.airswap-dev.codefi.network';
 
 export const SWAPS_API_V2_BASE_URL = 'https://api2.metaswap.codefi.network';
 export const SWAPS_DEV_API_V2_BASE_URL =
@@ -111,14 +106,6 @@ export const ALLOWED_SWAPS_CHAIN_IDS = {
   [RINKEBY_CHAIN_ID]: true,
 };
 
-// This is mapping for v1 URLs and will be removed once we migrate to v2.
-export const METASWAP_CHAINID_API_HOST_MAP = {
-  [MAINNET_CHAIN_ID]: METASWAP_ETH_API_HOST,
-  [SWAPS_TESTNET_CHAIN_ID]: `${SWAPS_API_V2_BASE_URL}/networks/1`,
-  [BSC_CHAIN_ID]: METASWAP_BSC_API_HOST,
-  [RINKEBY_CHAIN_ID]: SWAPS_TESTNET_HOST,
-};
-
 export const SWAPS_CHAINID_CONTRACT_ADDRESS_MAP = {
   [MAINNET_CHAIN_ID]: MAINNET_CONTRACT_ADDRESS,
   [SWAPS_TESTNET_CHAIN_ID]: TESTNET_CONTRACT_ADDRESS,
diff --git a/shared/modules/conversion.utils.js b/shared/modules/conversion.utils.js
index 5c139bbbc..eba33fc8e 100644
--- a/shared/modules/conversion.utils.js
+++ b/shared/modules/conversion.utils.js
@@ -229,6 +229,21 @@ const multiplyCurrencies = (a, b, options = {}) => {
   });
 };
 
+const divideCurrencies = (a, b, options = {}) => {
+  const { dividendBase, divisorBase, ...conversionOptions } = options;
+
+  if (!isValidBase(dividendBase) || !isValidBase(divisorBase)) {
+    throw new Error('Must specify valid dividendBase and divisorBase');
+  }
+
+  const value = getBigNumber(a, dividendBase).div(getBigNumber(b, divisorBase));
+
+  return converter({
+    value,
+    ...conversionOptions,
+  });
+};
+
 const conversionGreaterThan = ({ ...firstProps }, { ...secondProps }) => {
   const firstValue = converter({ ...firstProps });
   const secondValue = converter({ ...secondProps });
@@ -291,4 +306,5 @@ export {
   decGWEIToHexWEI,
   toBigNumber,
   toNormalizedDenomination,
+  divideCurrencies,
 };
diff --git a/shared/modules/conversion.utils.test.js b/shared/modules/conversion.utils.test.js
index d483a9a78..735d0edf2 100644
--- a/shared/modules/conversion.utils.test.js
+++ b/shared/modules/conversion.utils.test.js
@@ -1,5 +1,9 @@
 import BigNumber from 'bignumber.js';
-import { addCurrencies, conversionUtil } from './conversion.utils';
+import {
+  addCurrencies,
+  conversionUtil,
+  divideCurrencies,
+} from './conversion.utils';
 
 describe('conversion utils', () => {
   describe('addCurrencies()', () => {
@@ -163,4 +167,39 @@ describe('conversion utils', () => {
       ).toStrictEqual('1.5');
     });
   });
+
+  describe('divideCurrencies()', () => {
+    it('should correctly divide decimal values', () => {
+      const result = divideCurrencies(9, 3, {
+        dividendBase: 10,
+        divisorBase: 10,
+      });
+      expect(result.toNumber()).toStrictEqual(3);
+    });
+
+    it('should correctly divide hexadecimal values', () => {
+      const result = divideCurrencies(1000, 0xa, {
+        dividendBase: 16,
+        divisorBase: 16,
+      });
+      expect(result.toNumber()).toStrictEqual(0x100);
+    });
+
+    it('should correctly divide hexadecimal value from decimal value', () => {
+      const result = divideCurrencies(0x3e8, 0xa, {
+        dividendBase: 16,
+        divisorBase: 16,
+      });
+      expect(result.toNumber()).toStrictEqual(0x100);
+    });
+
+    it('should throw error for wrong base value', () => {
+      expect(() => {
+        divideCurrencies(0x3e8, 0xa, {
+          dividendBase: 10.5,
+          divisorBase: 7,
+        });
+      }).toThrow('Must specify valid dividendBase and divisorBase');
+    });
+  });
 });
diff --git a/shared/modules/fetch-with-timeout.test.js b/shared/modules/fetch-with-timeout.test.js
index d7b1f2624..8d7ae5785 100644
--- a/shared/modules/fetch-with-timeout.test.js
+++ b/shared/modules/fetch-with-timeout.test.js
@@ -2,8 +2,8 @@ import nock from 'nock';
 import { MILLISECOND, SECOND } from '../constants/time';
 import getFetchWithTimeout from './fetch-with-timeout';
 
-describe('getFetchWithTimeout', function () {
-  it('fetches a url', async function () {
+describe('getFetchWithTimeout', () => {
+  it('fetches a url', async () => {
     nock('https://api.infura.io').get('/money').reply(200, '{"hodl": false}');
 
     const fetchWithTimeout = getFetchWithTimeout(SECOND * 30);
@@ -15,7 +15,7 @@ describe('getFetchWithTimeout', function () {
     });
   });
 
-  it('throws when the request hits a custom timeout', async function () {
+  it('throws when the request hits a custom timeout', async () => {
     nock('https://api.infura.io')
       .get('/moon')
       .delay(SECOND * 2)
@@ -23,19 +23,14 @@ describe('getFetchWithTimeout', function () {
 
     const fetchWithTimeout = getFetchWithTimeout(MILLISECOND * 123);
 
-    const fetchWithTimeoutThrowsError = async () => {
+    await expect(async () => {
       await fetchWithTimeout('https://api.infura.io/moon').then((r) =>
         r.json(),
       );
-      throw new Error('Request should throw');
-    };
-
-    await expect(fetchWithTimeoutThrowsError()).rejects.toThrow(
-      'The user aborted a request.',
-    );
+    }).rejects.toThrow('The user aborted a request.');
   });
 
-  it('should abort the request when the custom timeout is hit', async function () {
+  it('should abort the request when the custom timeout is hit', async () => {
     nock('https://api.infura.io')
       .get('/moon')
       .delay(SECOND * 2)
@@ -43,29 +38,24 @@ describe('getFetchWithTimeout', function () {
 
     const fetchWithTimeout = getFetchWithTimeout(MILLISECOND * 123);
 
-    const fetchWithTimeoutThrowsError = async () => {
+    await expect(async () => {
       await fetchWithTimeout('https://api.infura.io/moon').then((r) =>
         r.json(),
       );
-      throw new Error('Request should be aborted');
-    };
-
-    await expect(fetchWithTimeoutThrowsError()).rejects.toThrow(
-      'The user aborted a request.',
-    );
+    }).rejects.toThrow('The user aborted a request.');
   });
 
-  it('throws on invalid timeout', async function () {
-    expect(() => getFetchWithTimeout()).toThrow(
+  it('throws on invalid timeout', async () => {
+    await expect(() => getFetchWithTimeout()).toThrow(
       'Must specify positive integer timeout.',
     );
-    expect(() => getFetchWithTimeout(-1)).toThrow(
+    await expect(() => getFetchWithTimeout(-1)).toThrow(
       'Must specify positive integer timeout.',
     );
-    expect(() => getFetchWithTimeout({})).toThrow(
+    await expect(() => getFetchWithTimeout({})).toThrow(
       'Must specify positive integer timeout.',
     );
-    expect(() => getFetchWithTimeout(true)).toThrow(
+    await expect(() => getFetchWithTimeout(true)).toThrow(
       'Must specify positive integer timeout.',
     );
   });
diff --git a/shared/modules/hexstring-utils.test.js b/shared/modules/hexstring-utils.test.js
index bf2d80116..74e444437 100644
--- a/shared/modules/hexstring-utils.test.js
+++ b/shared/modules/hexstring-utils.test.js
@@ -6,51 +6,51 @@ describe('hexstring utils', function () {
     it('should allow 40-char non-prefixed hex', function () {
       const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b825';
       const result = isValidHexAddress(address);
-      expect(result).toBe(true);
+      expect(result).toStrictEqual(true);
     });
 
     it('should allow 42-char prefixed hex', function () {
       const address = '0xfdea65c8e26263f6d9a1b5de9555d2931a33b825';
       const result = isValidHexAddress(address);
-      expect(result).toBe(true);
+      expect(result).toStrictEqual(true);
     });
 
     it('should NOT allow 40-char non-prefixed hex when allowNonPrefixed is false', function () {
       const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b825';
       const result = isValidHexAddress(address, { allowNonPrefixed: false });
-      expect(result).toBe(false);
+      expect(result).toStrictEqual(false);
     });
 
     it('should NOT allow any length of non hex-prefixed string', function () {
       const address = 'fdea65c8e26263f6d9a1b5de9555d2931a33b85';
       const result = isValidHexAddress(address);
-      expect(result).toBe(false);
+      expect(result).toStrictEqual(false);
     });
 
     it('should NOT allow less than 42 character hex-prefixed string', function () {
       const address = '0xfdea65ce26263f6d9a1b5de9555d2931a33b85';
       const result = isValidHexAddress(address);
-      expect(result).toBe(false);
+      expect(result).toStrictEqual(false);
     });
 
     it('should recognize correct capitalized checksum', function () {
       const address = '0xFDEa65C8e26263F6d9A1B5de9555D2931A33b825';
       const result = isValidHexAddress(address, { mixedCaseUseChecksum: true });
-      expect(result).toBe(true);
+      expect(result).toStrictEqual(true);
     });
 
     it('should recognize incorrect capitalized checksum', function () {
       const address = '0xFDea65C8e26263F6d9A1B5de9555D2931A33b825';
       const result = isValidHexAddress(address, { mixedCaseUseChecksum: true });
-      expect(result).toBe(false);
+      expect(result).toStrictEqual(false);
     });
 
     it('should recognize this sample hashed address', function () {
       const address = '0x5Fda30Bb72B8Dfe20e48A00dFc108d0915BE9Bb0';
       const result = isValidHexAddress(address, { mixedCaseUseChecksum: true });
       const hashed = toChecksumAddress(address.toLowerCase());
-      expect(hashed).toBe(address);
-      expect(result).toBe(true);
+      expect(hashed).toStrictEqual(address);
+      expect(result).toStrictEqual(true);
     });
   });
 });
diff --git a/shared/notifications/index.js b/shared/notifications/index.js
index bad25a791..38ae68c0a 100644
--- a/shared/notifications/index.js
+++ b/shared/notifications/index.js
@@ -38,6 +38,14 @@ export const UI_NOTIFICATIONS = {
     id: 8,
     date: '2021-11-01',
   },
+  9: {
+    id: 9,
+    date: '2021-12-07',
+    image: {
+      src: 'images/txinsights.png',
+      width: '80%',
+    },
+  },
 };
 
 export const getTranslatedUINoficiations = (t, locale) => {
@@ -113,5 +121,16 @@ export const getTranslatedUINoficiations = (t, locale) => {
       ),
       actionText: t('notifications8ActionText'),
     },
+    9: {
+      ...UI_NOTIFICATIONS[9],
+      title: t('notifications9Title'),
+      description: [
+        t('notifications9DescriptionOne'),
+        t('notifications9DescriptionTwo'),
+      ],
+      date: new Intl.DateTimeFormat(formattedLocale).format(
+        new Date(UI_NOTIFICATIONS[9].date),
+      ),
+    },
   };
 };
diff --git a/test/data/mock-estimates.json b/test/data/mock-estimates.json
new file mode 100644
index 000000000..8f7587f92
--- /dev/null
+++ b/test/data/mock-estimates.json
@@ -0,0 +1,27 @@
+{
+  "fee-market": {
+    "gasEstimateType": "fee-market",
+    "gasFeeEstimates": {
+      "low": {
+        "minWaitTimeEstimate": 180000,
+        "maxWaitTimeEstimate": 300000,
+        "suggestedMaxPriorityFeePerGas": "3",
+        "suggestedMaxFeePerGas": "53"
+      },
+      "medium": {
+        "minWaitTimeEstimate": 15000,
+        "maxWaitTimeEstimate": 60000,
+        "suggestedMaxPriorityFeePerGas": "7",
+        "suggestedMaxFeePerGas": "70"
+      },
+      "high": {
+        "minWaitTimeEstimate": 0,
+        "maxWaitTimeEstimate": 15000,
+        "suggestedMaxPriorityFeePerGas": "10",
+        "suggestedMaxFeePerGas": "100"
+      },
+      "estimatedBaseFee": "50"
+    },
+    "estimatedGasFeeTimeBounds": {}
+  }
+}
diff --git a/test/e2e/metamask-ui.spec.js b/test/e2e/metamask-ui.spec.js
index f12b8a090..e6ec801d5 100644
--- a/test/e2e/metamask-ui.spec.js
+++ b/test/e2e/metamask-ui.spec.js
@@ -349,14 +349,14 @@ describe('MetaMask', function () {
     });
 
     it('displays the token transfer data', async function () {
-      await driver.clickElement({ text: 'Data', tag: 'button' });
+      await driver.clickElement({ text: 'Hex', tag: 'button' });
       await driver.delay(regularDelayMs);
 
       const functionType = await driver.findElement(
         '.confirm-page-container-content__function-type',
       );
       const functionTypeText = await functionType.getText();
-      assert.equal(functionTypeText, 'Transfer');
+      assert(functionTypeText.match('Transfer'));
 
       const tokenAmount = await driver.findElement(
         '.confirm-page-container-summary__title-text',
diff --git a/test/e2e/tests/address-book.spec.js b/test/e2e/tests/address-book.spec.js
index 4f047fe1b..1468c5734 100644
--- a/test/e2e/tests/address-book.spec.js
+++ b/test/e2e/tests/address-book.spec.js
@@ -34,13 +34,16 @@ describe('Address Book', function () {
         await driver.clickElement('.dialog.send__dialog.dialog--message');
 
         // wait for address book modal to be visible
-        const addressModal = await driver.findElement('span .modal');
+        const addressModal = await driver.findElement('.nickname-popover');
 
-        await driver.findElement('.add-to-address-book-modal');
-        await driver.fill('.add-to-address-book-modal__input', 'Test Name 1');
-        await driver.clickElement(
-          '.add-to-address-book-modal__footer .btn-primary',
+        await driver.clickElement('.nickname-popover__footer-button');
+        await driver.findElement('.update-nickname__wrapper');
+
+        await driver.fill(
+          '.update-nickname__content__text-field input',
+          'Test Name 1',
         );
+        await driver.clickElement('.update-nickname__save');
         // wait for address book modal to be removed from DOM
         await addressModal.waitForElementState('hidden');
 
diff --git a/test/e2e/tests/from-import-ui.spec.js b/test/e2e/tests/from-import-ui.spec.js
index a83a9bbbb..cf3becf05 100644
--- a/test/e2e/tests/from-import-ui.spec.js
+++ b/test/e2e/tests/from-import-ui.spec.js
@@ -1,5 +1,5 @@
 const { strict: assert } = require('assert');
-const { withFixtures, regularDelayMs } = require('../helpers');
+const { withFixtures, regularDelayMs, largeDelayMs } = require('../helpers');
 const enLocaleMessages = require('../../../app/_locales/en/messages.json');
 
 describe('Metamask Import UI', function () {
@@ -318,6 +318,7 @@ describe('Metamask Import UI', function () {
 
         // should open the TREZOR Connect popup
         await driver.clickElement('.hw-connect__btn:nth-of-type(2)');
+        await driver.delay(largeDelayMs * 2);
         await driver.clickElement({ text: 'Continue', tag: 'button' });
         await driver.waitUntilXWindowHandles(2);
         const allWindows = await driver.getAllWindowHandles();
diff --git a/test/e2e/tests/send-edit.spec.js b/test/e2e/tests/send-edit.spec.js
index 81772df7b..94000b4a8 100644
--- a/test/e2e/tests/send-edit.spec.js
+++ b/test/e2e/tests/send-edit.spec.js
@@ -62,7 +62,7 @@ describe('Editing Confirm Transaction', function () {
 
         // has correct updated value on the confirm screen the transaction
         const editedTransactionAmounts = await driver.findElements(
-          '.transaction-detail-item__row .transaction-detail-item__detail-text .currency-display-component__text',
+          '.transaction-detail-item__row .transaction-detail-item__detail-values .currency-display-component__text:last-of-type',
         );
         const editedTransactionAmount = editedTransactionAmounts[0];
         assert.equal(await editedTransactionAmount.getText(), '0.0008');
diff --git a/test/jest/constants.js b/test/jest/constants.js
index da5c54bdf..8015a8a65 100644
--- a/test/jest/constants.js
+++ b/test/jest/constants.js
@@ -1,2 +1,2 @@
-export const METASWAP_BASE_URL = 'https://api.metaswap.codefi.network';
-export const METASWAP_API_V2_BASE_URL = 'https://api2.metaswap.codefi.network';
+export const METASWAP_BASE_URL = 'https://api2.metaswap.codefi.network';
+export const GAS_API_URL = 'https://gas-api.metaswap.codefi.network';
diff --git a/test/jest/mock-store.js b/test/jest/mock-store.js
index 3d397a52c..3039cc1a4 100644
--- a/test/jest/mock-store.js
+++ b/test/jest/mock-store.js
@@ -221,7 +221,6 @@ export const createSwapsMockStore = () => {
         topAggId: 'TEST_AGG_BEST',
         routeState: '',
         swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
       },
       useTokenDetection: true,
       tokenList: {
diff --git a/ui/components/app/account-menu/account-menu.component.js b/ui/components/app/account-menu/account-menu.component.js
index f72077777..131d63336 100644
--- a/ui/components/app/account-menu/account-menu.component.js
+++ b/ui/components/app/account-menu/account-menu.component.js
@@ -239,6 +239,7 @@ export default class AccountMenu extends Component {
       case KEYRING_TYPES.TREZOR:
       case KEYRING_TYPES.LEDGER:
       case KEYRING_TYPES.LATTICE:
+      case KEYRING_TYPES.QR:
         label = t('hardware');
         break;
       case 'Simple Key Pair':
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
new file mode 100644
index 000000000..40c003237
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.js
@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+import Box from '../../../ui/box';
+import I18nValue from '../../../ui/i18n-value';
+
+const AdvancedGasFeeInputSubtext = ({ latest, historical }) => {
+  return (
+    <Box className="advanced-gas-fee-input-subtext">
+      <Box display="flex" alignItems="center">
+        <span className="advanced-gas-fee-input-subtext__label">
+          <I18nValue messageKey="currentTitle" />
+        </span>
+        <span>{latest}</span>
+        <img src="./images/high-arrow.svg" alt="" />
+      </Box>
+      <Box>
+        <span className="advanced-gas-fee-input-subtext__label">
+          <I18nValue messageKey="twelveHrTitle" />
+        </span>
+        <span>{historical}</span>
+      </Box>
+    </Box>
+  );
+};
+
+AdvancedGasFeeInputSubtext.propTypes = {
+  latest: PropTypes.string,
+  historical: PropTypes.string,
+};
+
+export default AdvancedGasFeeInputSubtext;
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js
new file mode 100644
index 000000000..f466a08f0
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/advanced-gas-fee-input-subtext.test.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+
+import AdvancedGasFeeInputSubtext from './advanced-gas-fee-input-subtext';
+
+describe('AdvancedGasFeeInputSubtext', () => {
+  it('should renders latest and historical values passed', () => {
+    render(
+      <AdvancedGasFeeInputSubtext
+        latest="Latest Value"
+        historical="Historical value"
+      />,
+    );
+
+    expect(screen.queryByText('Latest Value')).toBeInTheDocument();
+    expect(screen.queryByText('Historical value')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js
new file mode 100644
index 000000000..13e6bb844
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.js
@@ -0,0 +1 @@
+export { default } from './advanced-gas-fee-input-subtext';
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
new file mode 100644
index 000000000..45763668c
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index.scss
@@ -0,0 +1,17 @@
+.advanced-gas-fee-input-subtext {
+  display: flex;
+  align-items: center;
+  margin-top: 2px;
+  color: $ui-4;
+  font-size: $font-size-h8;
+
+  &__label {
+    font-weight: bold;
+    margin-right: 4px;
+  }
+
+  img {
+    height: 16px;
+    margin-right: 8px;
+  }
+}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js
new file mode 100644
index 000000000..c191d36f6
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/advanced-gas-fee-inputs.js
@@ -0,0 +1,17 @@
+import React from 'react';
+
+import Box from '../../../ui/box';
+import BaseFeeInput from './base-fee-input';
+import PriorityFeeInput from './priority-fee-input';
+
+const AdvancedGasFeeInputs = () => {
+  return (
+    <Box className="advanced-gas-fee-inputs" margin={4}>
+      <BaseFeeInput />
+      <div className="advanced-gas-fee-inputs__separator" />
+      <PriorityFeeInput />
+    </Box>
+  );
+};
+
+export default AdvancedGasFeeInputs;
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
new file mode 100644
index 000000000..1e7739bf3
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/base-fee-input.js
@@ -0,0 +1,155 @@
+import React, { useCallback, useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { PRIORITY_LEVELS } from '../../../../../../shared/constants/gas';
+import {
+  divideCurrencies,
+  multiplyCurrencies,
+} from '../../../../../../shared/modules/conversion.utils';
+import { PRIMARY, SECONDARY } from '../../../../../helpers/constants/common';
+import { decGWEIToHexWEI } from '../../../../../helpers/utils/conversions.util';
+import { getAdvancedGasFeeValues } from '../../../../../selectors';
+import { useGasFeeContext } from '../../../../../contexts/gasFee';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { useUserPreferencedCurrency } from '../../../../../hooks/useUserPreferencedCurrency';
+import { useCurrencyDisplay } from '../../../../../hooks/useCurrencyDisplay';
+import Button from '../../../../ui/button';
+import Box from '../../../../ui/box';
+import FormField from '../../../../ui/form-field';
+import I18nValue from '../../../../ui/i18n-value';
+
+import { useAdvanceGasFeePopoverContext } from '../../context';
+import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
+
+const divideCurrencyValues = (value, baseFee) => {
+  if (baseFee === 0) {
+    return 0;
+  }
+  return divideCurrencies(value, baseFee, {
+    numberOfDecimals: 2,
+    dividendBase: 10,
+    divisorBase: 10,
+  }).toNumber();
+};
+
+const multiplyCurrencyValues = (baseFee, value, numberOfDecimals) =>
+  multiplyCurrencies(baseFee, value, {
+    numberOfDecimals,
+    multiplicandBase: 10,
+    multiplierBase: 10,
+  }).toNumber();
+
+const BaseFeeInput = () => {
+  const t = useI18nContext();
+  const { gasFeeEstimates, estimateUsed, maxFeePerGas } = useGasFeeContext();
+  const { setDirty, setMaxFeePerGas } = useAdvanceGasFeePopoverContext();
+  const { estimatedBaseFee } = gasFeeEstimates;
+  const {
+    numberOfDecimals: numberOfDecimalsPrimary,
+  } = useUserPreferencedCurrency(PRIMARY);
+  const {
+    currency,
+    numberOfDecimals: numberOfDecimalsFiat,
+  } = useUserPreferencedCurrency(SECONDARY);
+
+  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
+
+  const [editingInGwei, setEditingInGwei] = useState(false);
+
+  const [maxBaseFeeGWEI, setMaxBaseFeeGWEI] = useState(() => {
+    if (
+      estimateUsed !== PRIORITY_LEVELS.CUSTOM &&
+      advancedGasFeeValues?.maxBaseFee
+    ) {
+      return multiplyCurrencyValues(
+        estimatedBaseFee,
+        advancedGasFeeValues.maxBaseFee,
+        numberOfDecimalsPrimary,
+      );
+    }
+    return maxFeePerGas;
+  });
+
+  const [maxBaseFeeMultiplier, setMaxBaseFeeMultiplier] = useState(() => {
+    if (
+      estimateUsed !== PRIORITY_LEVELS.CUSTOM &&
+      advancedGasFeeValues?.maxBaseFee
+    ) {
+      return advancedGasFeeValues.maxBaseFee;
+    }
+    return divideCurrencyValues(maxFeePerGas, estimatedBaseFee);
+  });
+
+  const [, { value: baseFeeInFiat }] = useCurrencyDisplay(
+    decGWEIToHexWEI(maxBaseFeeGWEI),
+    { currency, numberOfDecimalsFiat },
+  );
+
+  const updateBaseFee = useCallback(
+    (value) => {
+      let baseFeeInGWEI;
+      let baseFeeMultiplierValue;
+      if (editingInGwei) {
+        baseFeeInGWEI = value;
+        baseFeeMultiplierValue = divideCurrencyValues(value, estimatedBaseFee);
+      } else {
+        baseFeeInGWEI = multiplyCurrencyValues(
+          estimatedBaseFee,
+          value,
+          numberOfDecimalsPrimary,
+        );
+        baseFeeMultiplierValue = value;
+      }
+      setMaxBaseFeeGWEI(baseFeeInGWEI);
+      setMaxBaseFeeMultiplier(baseFeeMultiplierValue);
+      setDirty(true);
+    },
+    [
+      editingInGwei,
+      estimatedBaseFee,
+      numberOfDecimalsPrimary,
+      setMaxBaseFeeGWEI,
+      setMaxBaseFeeMultiplier,
+      setDirty,
+    ],
+  );
+
+  useEffect(() => {
+    setMaxFeePerGas(maxBaseFeeGWEI);
+  }, [maxBaseFeeGWEI, setMaxFeePerGas]);
+
+  return (
+    <Box className="base-fee-input">
+      <FormField
+        onChange={updateBaseFee}
+        titleText={t('maxBaseFee')}
+        titleUnit={editingInGwei ? 'GWEI' : `(${t('multiplier')})`}
+        tooltipText={t('advancedBaseGasFeeToolTip')}
+        titleDetail={
+          <Button
+            className="base-fee-input__edit-link"
+            type="link"
+            onClick={() => setEditingInGwei(!editingInGwei)}
+          >
+            <I18nValue
+              messageKey={editingInGwei ? 'editInMultiplier' : 'editInGwei'}
+            />
+          </Button>
+        }
+        value={editingInGwei ? maxBaseFeeGWEI : maxBaseFeeMultiplier}
+        detailText={
+          editingInGwei
+            ? `${maxBaseFeeMultiplier}x ${`≈ ${baseFeeInFiat}`}`
+            : `${maxBaseFeeGWEI} GWEI ${`≈ ${baseFeeInFiat}`}`
+        }
+        numeric
+      />
+      <AdvancedGasFeeInputSubtext
+        latest={estimatedBaseFee}
+        historical="23-359 GWEI"
+      />
+    </Box>
+  );
+};
+
+export default BaseFeeInput;
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/basefee-input.test.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/basefee-input.test.js
new file mode 100644
index 000000000..7cef8ac15
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/basefee-input.test.js
@@ -0,0 +1,118 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+
+import { GAS_ESTIMATE_TYPES } from '../../../../../../shared/constants/gas';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import mockEstimates from '../../../../../../test/data/mock-estimates.json';
+import mockState from '../../../../../../test/data/mock-state.json';
+import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
+import configureStore from '../../../../../store/store';
+
+import { AdvanceGasFeePopoverContextProvider } from '../../context';
+import BaseFeeInput from './base-fee-input';
+
+jest.mock('../../../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  removePollingTokenFromAppState: jest.fn(),
+}));
+
+const render = (txProps) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      accounts: {
+        [mockState.metamask.selectedAddress]: {
+          address: mockState.metamask.selectedAddress,
+          balance: '0x1F4',
+        },
+      },
+      advancedGasFee: { maxBaseFee: 2 },
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates:
+        mockEstimates[GAS_ESTIMATE_TYPES.FEE_MARKET].gasFeeEstimates,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{
+        userFeeLevel: 'custom',
+        ...txProps,
+      }}
+    >
+      <AdvanceGasFeePopoverContextProvider>
+        <BaseFeeInput />
+      </AdvanceGasFeePopoverContextProvider>
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('BaseFeeInput', () => {
+  it('should renders advancedGasFee.baseFee value if current estimate used is not custom', () => {
+    render({
+      userFeeLevel: 'high',
+    });
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(2);
+  });
+
+  it('should renders baseFee values from transaction if current estimate used is custom', () => {
+    render({
+      txParams: {
+        maxFeePerGas: '0x174876E800',
+      },
+    });
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(2);
+  });
+
+  it('should show GWEI value in input when Edit in GWEI link is clicked', () => {
+    render({
+      txParams: {
+        maxFeePerGas: '0x174876E800',
+      },
+    });
+    fireEvent.click(screen.queryByText('Edit in GWEI'));
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(100);
+  });
+
+  it('should correctly update GWEI value if multiplier is changed', () => {
+    render({
+      txParams: {
+        maxFeePerGas: '0x174876E800',
+      },
+    });
+    fireEvent.change(document.getElementsByTagName('input')[0], {
+      target: { value: 4 },
+    });
+    fireEvent.click(screen.queryByText('Edit in GWEI'));
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(200);
+  });
+
+  it('should correctly update multiplier value if GWEI is changed', () => {
+    render({
+      txParams: {
+        maxFeePerGas: '0x174876E800',
+      },
+    });
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(2);
+    fireEvent.click(screen.queryByText('Edit in GWEI'));
+    fireEvent.change(document.getElementsByTagName('input')[0], {
+      target: { value: 200 },
+    });
+    fireEvent.click(screen.queryByText('Edit in multiplier'));
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(4);
+  });
+
+  it('should show current value of estimatedBaseFee in subtext', () => {
+    render({
+      txParams: {
+        maxFeePerGas: '0x174876E800',
+      },
+    });
+    expect(screen.queryByText('50')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js
new file mode 100644
index 000000000..61d1de89b
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.js
@@ -0,0 +1 @@
+export { default } from './base-fee-input';
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss
new file mode 100644
index 000000000..871c43df9
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index.scss
@@ -0,0 +1,8 @@
+.base-fee-input {
+  a.base-fee-input__edit-link {
+    display: inline;
+    font-size: $font-size-h7;
+    padding: 0;
+    white-space: nowrap;
+  }
+}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js
new file mode 100644
index 000000000..787f2a6d8
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.js
@@ -0,0 +1 @@
+export { default } from './advanced-gas-fee-inputs';
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss
new file mode 100644
index 000000000..55a27eafb
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/index.scss
@@ -0,0 +1,14 @@
+.advanced-gas-fee-inputs {
+  .form-field {
+    margin-bottom: 4px;
+  }
+
+  .form-field__heading-title > h6 {
+    font-size: $font-size-h7;
+  }
+
+  &__separator {
+    border-top: 1px solid $ui-grey;
+    margin: 24px 0 16px 0;
+  }
+}
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js
new file mode 100644
index 000000000..0fddc8c30
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/index.js
@@ -0,0 +1 @@
+export { default } from './priority-fee-input';
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
new file mode 100644
index 000000000..e1d717fd8
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.js
@@ -0,0 +1,67 @@
+import React, { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+
+import { PRIORITY_LEVELS } from '../../../../../../shared/constants/gas';
+import { SECONDARY } from '../../../../../helpers/constants/common';
+import { decGWEIToHexWEI } from '../../../../../helpers/utils/conversions.util';
+import { getAdvancedGasFeeValues } from '../../../../../selectors';
+import { useCurrencyDisplay } from '../../../../../hooks/useCurrencyDisplay';
+import { useGasFeeContext } from '../../../../../contexts/gasFee';
+import { useI18nContext } from '../../../../../hooks/useI18nContext';
+import { useUserPreferencedCurrency } from '../../../../../hooks/useUserPreferencedCurrency';
+import FormField from '../../../../ui/form-field';
+
+import { useAdvanceGasFeePopoverContext } from '../../context';
+import AdvancedGasFeeInputSubtext from '../../advanced-gas-fee-input-subtext';
+
+const PriorityFeeInput = () => {
+  const t = useI18nContext();
+  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
+  const {
+    setDirty,
+    setMaxPriorityFeePerGas,
+  } = useAdvanceGasFeePopoverContext();
+  const { estimateUsed, maxPriorityFeePerGas } = useGasFeeContext();
+
+  const [priorityFee, setPriorityFee] = useState(() => {
+    if (
+      estimateUsed !== PRIORITY_LEVELS.CUSTOM &&
+      advancedGasFeeValues?.priorityFee
+    )
+      return advancedGasFeeValues.priorityFee;
+    return maxPriorityFeePerGas;
+  });
+
+  const { currency, numberOfDecimals } = useUserPreferencedCurrency(SECONDARY);
+
+  const [, { value: priorityFeeInFiat }] = useCurrencyDisplay(
+    decGWEIToHexWEI(priorityFee),
+    { currency, numberOfDecimals },
+  );
+
+  const updatePriorityFee = (value) => {
+    setPriorityFee(value);
+    setDirty(true);
+  };
+
+  useEffect(() => {
+    setMaxPriorityFeePerGas(priorityFee);
+  }, [priorityFee, setMaxPriorityFeePerGas]);
+
+  return (
+    <>
+      <FormField
+        onChange={updatePriorityFee}
+        titleText={t('priorityFee')}
+        titleUnit="(GWEI)"
+        tooltipText={t('advancedPriorityFeeToolTip')}
+        value={priorityFee}
+        detailText={`≈ ${priorityFeeInFiat}`}
+        numeric
+      />
+      <AdvancedGasFeeInputSubtext latest="1-18 GWEI" historical="23-359 GWEI" />
+    </>
+  );
+};
+
+export default PriorityFeeInput;
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
new file mode 100644
index 000000000..1a8733ba5
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-inputs/priority-fee-input/priority-fee-input.test.js
@@ -0,0 +1,70 @@
+import React from 'react';
+
+import { GAS_ESTIMATE_TYPES } from '../../../../../../shared/constants/gas';
+import { renderWithProvider } from '../../../../../../test/lib/render-helpers';
+import mockEstimates from '../../../../../../test/data/mock-estimates.json';
+import mockState from '../../../../../../test/data/mock-state.json';
+import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
+import configureStore from '../../../../../store/store';
+
+import { AdvanceGasFeePopoverContextProvider } from '../../context';
+import PriorityfeeInput from './priority-fee-input';
+
+jest.mock('../../../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  removePollingTokenFromAppState: jest.fn(),
+}));
+
+const render = (txProps) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      accounts: {
+        [mockState.metamask.selectedAddress]: {
+          address: mockState.metamask.selectedAddress,
+          balance: '0x1F4',
+        },
+      },
+      advancedGasFee: { priorityFee: 100 },
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates:
+        mockEstimates[GAS_ESTIMATE_TYPES.FEE_MARKET].gasFeeEstimates,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{
+        userFeeLevel: 'custom',
+        ...txProps,
+      }}
+    >
+      <AdvanceGasFeePopoverContextProvider>
+        <PriorityfeeInput />
+      </AdvanceGasFeePopoverContextProvider>
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('PriorityfeeInput', () => {
+  it('should renders advancedGasFee.priorityfee value if current estimate used is not custom', () => {
+    render({
+      userFeeLevel: 'high',
+    });
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(100);
+  });
+
+  it('should renders priorityfee value from transaction if current estimate used is custom', () => {
+    render({
+      txParams: {
+        maxPriorityFeePerGas: '0x77359400',
+      },
+    });
+    expect(document.getElementsByTagName('input')[0]).toHaveValue(2);
+  });
+});
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.js
new file mode 100644
index 000000000..cda544c81
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.js
@@ -0,0 +1,39 @@
+import React from 'react';
+
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { useTransactionModalContext } from '../../../contexts/transaction-modal';
+import Box from '../../ui/box';
+import Popover from '../../ui/popover';
+
+import { AdvanceGasFeePopoverContextProvider } from './context';
+import AdvancedGasFeeInputs from './advanced-gas-fee-inputs';
+import AdvancedGasFeeSaveButton from './advanced-gas-fee-save';
+
+const AdvancedGasFeePopover = () => {
+  const t = useI18nContext();
+  const {
+    closeModal,
+    closeAllModals,
+    currentModal,
+  } = useTransactionModalContext();
+
+  if (currentModal !== 'advancedGasFee') return null;
+
+  return (
+    <AdvanceGasFeePopoverContextProvider>
+      <Popover
+        className="advanced-gas-fee-popover"
+        title={t('advancedGasFeeModalTitle')}
+        onBack={() => closeModal('advancedGasFee')}
+        onClose={closeAllModals}
+        footer={<AdvancedGasFeeSaveButton />}
+      >
+        <Box className="advanced-gas-fee-popover__wrapper">
+          <AdvancedGasFeeInputs />
+        </Box>
+      </Popover>
+    </AdvanceGasFeePopoverContextProvider>
+  );
+};
+
+export default AdvancedGasFeePopover;
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js
new file mode 100644
index 000000000..dd7f0f7a7
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-popover.test.js
@@ -0,0 +1,71 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+
+import { GAS_ESTIMATE_TYPES } from '../../../../shared/constants/gas';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import mockEstimates from '../../../../test/data/mock-estimates.json';
+import mockState from '../../../../test/data/mock-state.json';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import configureStore from '../../../store/store';
+
+import AdvancedGasFeePopover from './advanced-gas-fee-popover';
+
+jest.mock('../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  removePollingTokenFromAppState: jest.fn(),
+}));
+
+jest.mock('../../../contexts/transaction-modal', () => ({
+  useTransactionModalContext: () => ({
+    closeModal: () => undefined,
+    currentModal: 'advancedGasFee',
+  }),
+}));
+
+const render = () => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      accounts: {
+        [mockState.metamask.selectedAddress]: {
+          address: mockState.metamask.selectedAddress,
+          balance: '0x1F4',
+        },
+      },
+      advancedGasFee: { priorityFee: 100 },
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates:
+        mockEstimates[GAS_ESTIMATE_TYPES.FEE_MARKET].gasFeeEstimates,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{
+        userFeeLevel: 'custom',
+      }}
+    >
+      <AdvancedGasFeePopover />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('AdvancedGasFeePopover', () => {
+  it('should renders save button disabled by default', () => {
+    render();
+    expect(screen.queryByRole('button', { name: 'Save' })).toBeDisabled();
+  });
+
+  it('should enable save button as input value is changed', () => {
+    render();
+    fireEvent.change(document.getElementsByTagName('input')[0], {
+      target: { value: 4 },
+    });
+    expect(screen.queryByRole('button', { name: 'Save' })).not.toBeDisabled();
+  });
+});
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
new file mode 100644
index 000000000..d8efd7c7c
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/advanced-gas-fee-save.js
@@ -0,0 +1,37 @@
+import React from 'react';
+
+import { PRIORITY_LEVELS } from '../../../../../shared/constants/gas';
+import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
+import { useGasFeeContext } from '../../../../contexts/gasFee';
+import Button from '../../../ui/button';
+import I18nValue from '../../../ui/i18n-value';
+
+import { useAdvanceGasFeePopoverContext } from '../context';
+import { decGWEIToHexWEI } from '../../../../../shared/modules/conversion.utils';
+
+const AdvancedGasFeeSaveButton = () => {
+  const { closeModal } = useTransactionModalContext();
+  const { updateTransaction } = useGasFeeContext();
+  const {
+    isDirty,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+  } = useAdvanceGasFeePopoverContext();
+
+  const onSave = () => {
+    updateTransaction(
+      PRIORITY_LEVELS.CUSTOM,
+      decGWEIToHexWEI(maxFeePerGas),
+      decGWEIToHexWEI(maxPriorityFeePerGas),
+    );
+    closeModal('advancedGasFee');
+  };
+
+  return (
+    <Button type="primary" disabled={!isDirty} onClick={onSave}>
+      <I18nValue messageKey="save" />
+    </Button>
+  );
+};
+
+export default AdvancedGasFeeSaveButton;
diff --git a/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/index.js b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/index.js
new file mode 100644
index 000000000..082c24190
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/advanced-gas-fee-save/index.js
@@ -0,0 +1 @@
+export { default } from './advanced-gas-fee-save';
diff --git a/ui/components/app/advanced-gas-fee-popover/context/advanceGasFeePopover.js b/ui/components/app/advanced-gas-fee-popover/context/advanceGasFeePopover.js
new file mode 100644
index 000000000..a6bca0a33
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/context/advanceGasFeePopover.js
@@ -0,0 +1,33 @@
+import React, { createContext, useContext, useState } from 'react';
+import PropTypes from 'prop-types';
+
+export const AdvanceGasFeePopoverContext = createContext({});
+
+export const AdvanceGasFeePopoverContextProvider = ({ children }) => {
+  const [maxFeePerGas, setMaxFeePerGas] = useState();
+  const [maxPriorityFeePerGas, setMaxPriorityFeePerGas] = useState();
+  const [isDirty, setDirty] = useState();
+
+  return (
+    <AdvanceGasFeePopoverContext.Provider
+      value={{
+        isDirty,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        setDirty,
+        setMaxPriorityFeePerGas,
+        setMaxFeePerGas,
+      }}
+    >
+      {children}
+    </AdvanceGasFeePopoverContext.Provider>
+  );
+};
+
+export function useAdvanceGasFeePopoverContext() {
+  return useContext(AdvanceGasFeePopoverContext);
+}
+
+AdvanceGasFeePopoverContextProvider.propTypes = {
+  children: PropTypes.node.isRequired,
+};
diff --git a/ui/components/app/advanced-gas-fee-popover/context/index.js b/ui/components/app/advanced-gas-fee-popover/context/index.js
new file mode 100644
index 000000000..f9181147b
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/context/index.js
@@ -0,0 +1 @@
+export * from './advanceGasFeePopover';
diff --git a/ui/components/app/advanced-gas-fee-popover/index.js b/ui/components/app/advanced-gas-fee-popover/index.js
new file mode 100644
index 000000000..224b2237e
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/index.js
@@ -0,0 +1 @@
+export { default } from './advanced-gas-fee-popover';
diff --git a/ui/components/app/advanced-gas-fee-popover/index.scss b/ui/components/app/advanced-gas-fee-popover/index.scss
new file mode 100644
index 000000000..604a983e5
--- /dev/null
+++ b/ui/components/app/advanced-gas-fee-popover/index.scss
@@ -0,0 +1,10 @@
+.advanced-gas-fee-popover {
+  &__wrapper {
+    border-top: 1px solid $ui-grey;
+  }
+
+  &__separator {
+    border-top: 1px solid $ui-grey;
+    margin: 24px 0 16px 0;
+  }
+}
diff --git a/ui/components/app/app-components.scss b/ui/components/app/app-components.scss
index d76c2998f..26d0d4fa1 100644
--- a/ui/components/app/app-components.scss
+++ b/ui/components/app/app-components.scss
@@ -13,6 +13,10 @@
 @import 'connected-status-indicator/index';
 @import 'edit-gas-display/index';
 @import 'edit-gas-display-education/index';
+@import 'edit-gas-fee-popover/index';
+@import 'edit-gas-fee-popover/edit-gas-item/index';
+@import 'edit-gas-fee-popover/network-status/index';
+@import 'edit-gas-fee-popover/network-status/status-slider/index';
 @import 'gas-customization/gas-modal-page-container/index';
 @import 'gas-customization/gas-price-button-group/index';
 @import 'gas-customization/index';
@@ -46,4 +50,10 @@
 @import 'transaction-total-banner/index';
 @import 'wallet-overview/index';
 @import 'whats-new-popup/index';
-@import 'loading-network-screen/index'
+@import 'loading-network-screen/index';
+@import 'flask/experimental-area/index';
+@import 'advanced-gas-fee-popover/index';
+@import 'advanced-gas-fee-popover/advanced-gas-fee-inputs/index';
+@import 'advanced-gas-fee-popover/advanced-gas-fee-inputs/base-fee-input/index';
+@import 'advanced-gas-fee-popover/advanced-gas-fee-input-subtext/index';
+@import 'transaction-decoding/index';
diff --git a/ui/components/app/collectibles-items/collectibles-items.component.js b/ui/components/app/collectibles-items/collectibles-items.component.js
new file mode 100644
index 000000000..887653658
--- /dev/null
+++ b/ui/components/app/collectibles-items/collectibles-items.component.js
@@ -0,0 +1,148 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import Box from '../../ui/box';
+import Button from '../../ui/button';
+import Typography from '../../ui/typography/typography';
+import {
+  COLORS,
+  TYPOGRAPHY,
+  TEXT_ALIGN,
+  JUSTIFY_CONTENT,
+  FLEX_DIRECTION,
+  ALIGN_ITEMS,
+  DISPLAY,
+  BLOCK_SIZES,
+  SIZES,
+  FLEX_WRAP,
+} from '../../../helpers/constants/design-system';
+import { ENVIRONMENT_TYPE_POPUP } from '../../../../shared/constants/app';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+
+export default function CollectiblesItems({ onAddNFT, onRefreshList }) {
+  const t = useI18nContext();
+  const collections = {};
+  const defaultDropdownState = {};
+
+  Object.keys(collections).forEach((key) => {
+    defaultDropdownState[key] = true;
+  });
+
+  const [dropdownState, setDropdownState] = useState(defaultDropdownState);
+  const width =
+    getEnvironmentType() === ENVIRONMENT_TYPE_POPUP
+      ? BLOCK_SIZES.ONE_THIRD
+      : BLOCK_SIZES.ONE_SIXTH;
+  return (
+    <div className="collectibles-items">
+      <Box padding={[4, 6, 4, 6]} flexDirection={FLEX_DIRECTION.COLUMN}>
+        <>
+          {Object.keys(collections).map((key, index) => {
+            const { icon, collectibles } = collections[key];
+            const isExpanded = dropdownState[key];
+
+            return (
+              <div key={`collection-${index}`}>
+                <Box
+                  marginTop={4}
+                  marginBottom={4}
+                  display={DISPLAY.FLEX}
+                  alignItems={ALIGN_ITEMS.CENTER}
+                  justifyContent={JUSTIFY_CONTENT.SPACE_BETWEEN}
+                >
+                  <Box alignItems={ALIGN_ITEMS.CENTER}>
+                    <img width="28" src={icon} />
+                    <Typography
+                      color={COLORS.BLACK}
+                      variant={TYPOGRAPHY.H4}
+                      margin={[0, 0, 0, 2]}
+                    >
+                      {`${key} (${collectibles.length})`}
+                    </Typography>
+                  </Box>
+                  <Box alignItems={ALIGN_ITEMS.FLEX_END}>
+                    <i
+                      className={`fa fa-lg fa-chevron-${
+                        isExpanded ? 'down' : 'right'
+                      }`}
+                      onClick={() => {
+                        setDropdownState((_dropdownState) => ({
+                          ..._dropdownState,
+                          [key]: !isExpanded,
+                        }));
+                      }}
+                    />
+                  </Box>
+                </Box>
+                {isExpanded ? (
+                  <Box display={DISPLAY.FLEX} flexWrap={FLEX_WRAP.WRAP}>
+                    {collectibles.map((collectible, i) => {
+                      return (
+                        <Box width={width} padding={2} key={`collectible-${i}`}>
+                          <Box
+                            borderRadius={SIZES.MD}
+                            backgroundColor={collectible.backgroundColor}
+                          >
+                            <img src={collectible.icon} />
+                          </Box>
+                        </Box>
+                      );
+                    })}
+                  </Box>
+                ) : null}
+              </div>
+            );
+          })}
+          <Box
+            marginTop={6}
+            flexDirection={FLEX_DIRECTION.COLUMN}
+            justifyContent={JUSTIFY_CONTENT.CENTER}
+          >
+            <Typography
+              color={COLORS.UI3}
+              variant={TYPOGRAPHY.H5}
+              align={TEXT_ALIGN.CENTER}
+            >
+              {t('missingNFT')}
+            </Typography>
+            <Box
+              alignItems={ALIGN_ITEMS.CENTER}
+              justifyContent={JUSTIFY_CONTENT.CENTER}
+            >
+              <Box justifyContent={JUSTIFY_CONTENT.FLEX_END}>
+                <Button
+                  type="link"
+                  onClick={onRefreshList}
+                  style={{ padding: '4px' }}
+                >
+                  {t('refreshList')}
+                </Button>
+              </Box>
+              <Typography
+                color={COLORS.UI3}
+                variant={TYPOGRAPHY.H4}
+                align={TEXT_ALIGN.CENTER}
+              >
+                {t('or')}
+              </Typography>
+              <Box justifyContent={JUSTIFY_CONTENT.FLEX_START}>
+                <Button
+                  type="link"
+                  onClick={onAddNFT}
+                  style={{ padding: '4px' }}
+                >
+                  {t('addNFTLowerCase')}
+                </Button>
+              </Box>
+            </Box>
+          </Box>
+        </>
+      </Box>
+    </div>
+  );
+}
+
+CollectiblesItems.propTypes = {
+  onAddNFT: PropTypes.func.isRequired,
+  onRefreshList: PropTypes.func.isRequired,
+};
diff --git a/ui/components/app/collectibles-items/index.js b/ui/components/app/collectibles-items/index.js
new file mode 100644
index 000000000..b8b286c20
--- /dev/null
+++ b/ui/components/app/collectibles-items/index.js
@@ -0,0 +1 @@
+export { default } from './collectibles-items.component';
diff --git a/ui/components/app/collectibles-list/index.js b/ui/components/app/collectibles-list/index.js
deleted file mode 100644
index ab3fb9b56..000000000
--- a/ui/components/app/collectibles-list/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './collectibles-list.component';
diff --git a/ui/components/app/collectibles-list/collectibles-list.component.js b/ui/components/app/collectibles-tab/collectibles-tab.component.js
similarity index 79%
rename from ui/components/app/collectibles-list/collectibles-list.component.js
rename to ui/components/app/collectibles-tab/collectibles-tab.component.js
index 4fde98023..42c85d17a 100644
--- a/ui/components/app/collectibles-list/collectibles-list.component.js
+++ b/ui/components/app/collectibles-tab/collectibles-tab.component.js
@@ -3,6 +3,8 @@ import PropTypes from 'prop-types';
 import Box from '../../ui/box';
 import Button from '../../ui/button';
 import Typography from '../../ui/typography/typography';
+import NewCollectiblesNotice from '../new-collectibles-notice';
+import CollectiblesItems from '../collectibles-items';
 import {
   COLORS,
   TYPOGRAPHY,
@@ -13,16 +15,23 @@ import {
 } from '../../../helpers/constants/design-system';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
-export default function CollectiblesList({ onAddNFT }) {
+export default function CollectiblesTab({ onAddNFT }) {
   const collectibles = [];
+  const newNFTsDetected = false;
   const t = useI18nContext();
 
   return (
-    <div className="collectibles-list">
+    <div className="collectibles-tab">
       {collectibles.length > 0 ? (
-        <span>{JSON.stringify(collectibles)}</span>
+        <CollectiblesItems
+          onAddNFT={onAddNFT}
+          onRefreshList={() => {
+            console.log('refreshing collectibles');
+          }}
+        />
       ) : (
-        <Box padding={[4, 0, 4, 0]}>
+        <Box padding={[6, 12, 6, 12]}>
+          {newNFTsDetected ? <NewCollectiblesNotice /> : null}
           <Box justifyContent={JUSTIFY_CONTENT.CENTER}>
             <img src="./images/no-nfts.svg" />
           </Box>
@@ -76,6 +85,6 @@ export default function CollectiblesList({ onAddNFT }) {
   );
 }
 
-CollectiblesList.propTypes = {
+CollectiblesTab.propTypes = {
   onAddNFT: PropTypes.func.isRequired,
 };
diff --git a/ui/components/app/collectibles-tab/index.js b/ui/components/app/collectibles-tab/index.js
new file mode 100644
index 000000000..a69b09579
--- /dev/null
+++ b/ui/components/app/collectibles-tab/index.js
@@ -0,0 +1 @@
+export { default } from './collectibles-tab.component';
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js
index fc0a5f669..757e86670 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-container.test.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-container.test.js
@@ -58,7 +58,6 @@ describe('Confirm Page Container Container Test', () => {
     handleCloseEditGas: sinon.spy(),
     // Gas Popover
     currentTransaction: {},
-    showAddToAddressBookModal: sinon.spy(),
     contact: undefined,
     isOwnedAccount: false,
   };
@@ -118,12 +117,6 @@ describe('Confirm Page Container Container Test', () => {
     );
   });
 
-  it('should simulate click on Dialog', () => {
-    const DialogWrapper = wrapper.find(Dialog);
-    DialogWrapper.first().simulate('click');
-    expect(props.showAddToAddressBookModal.calledOnce).toStrictEqual(true);
-  });
-
   it('should not show add to address dialog if contact is not undefined', () => {
     props.contact = {
       address: '0x7a1A4Ad9cc746a70ee58568466f7996dD0aCE4E8',
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
index 574967420..45a9a6daf 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import { Tabs, Tab } from '../../../ui/tabs';
 import ErrorMessage from '../../../ui/error-message';
+import ActionableMessage from '../../../ui/actionable-message/actionable-message';
 import { PageContainerFooter } from '../../../ui/page-container';
 import { ConfirmPageContainerSummary, ConfirmPageContainerWarning } from '.';
 
@@ -14,9 +15,11 @@ export default class ConfirmPageContainerContent extends Component {
   static propTypes = {
     action: PropTypes.string,
     dataComponent: PropTypes.node,
+    dataHexComponent: PropTypes.node,
     detailsComponent: PropTypes.node,
     errorKey: PropTypes.string,
     errorMessage: PropTypes.string,
+    hasSimulationError: PropTypes.bool,
     hideSubtitle: PropTypes.bool,
     identiconAddress: PropTypes.string,
     nonce: PropTypes.string,
@@ -31,11 +34,14 @@ export default class ConfirmPageContainerContent extends Component {
     onCancel: PropTypes.func,
     cancelText: PropTypes.string,
     onSubmit: PropTypes.func,
+    setUserAcknowledgedGasMissing: PropTypes.func,
     submitText: PropTypes.string,
     disabled: PropTypes.bool,
+    hideUserAcknowledgedGasMissing: PropTypes.bool,
     unapprovedTxCount: PropTypes.number,
     rejectNText: PropTypes.string,
-    hideTitle: PropTypes.boolean,
+    hideTitle: PropTypes.bool,
+    supportsEIP1559V2: PropTypes.bool,
   };
 
   renderContent() {
@@ -49,7 +55,7 @@ export default class ConfirmPageContainerContent extends Component {
 
   renderTabs() {
     const { t } = this.context;
-    const { detailsComponent, dataComponent } = this.props;
+    const { detailsComponent, dataComponent, dataHexComponent } = this.props;
 
     return (
       <Tabs>
@@ -62,6 +68,14 @@ export default class ConfirmPageContainerContent extends Component {
         <Tab className="confirm-page-container-content__tab" name={t('data')}>
           {dataComponent}
         </Tab>
+        {dataHexComponent && (
+          <Tab
+            className="confirm-page-container-content__tab"
+            name={t('dataHex')}
+          >
+            {dataHexComponent}
+          </Tab>
+        )}
       </Tabs>
     );
   }
@@ -71,6 +85,7 @@ export default class ConfirmPageContainerContent extends Component {
       action,
       errorKey,
       errorMessage,
+      hasSimulationError,
       title,
       titleComponent,
       subtitleComponent,
@@ -91,14 +106,33 @@ export default class ConfirmPageContainerContent extends Component {
       origin,
       ethGasPriceWarning,
       hideTitle,
+      setUserAcknowledgedGasMissing,
+      hideUserAcknowledgedGasMissing,
+      supportsEIP1559V2,
     } = this.props;
 
+    const primaryAction = hideUserAcknowledgedGasMissing
+      ? null
+      : {
+          label: this.context.t('tryAnywayOption'),
+          onClick: setUserAcknowledgedGasMissing,
+        };
+
     return (
       <div className="confirm-page-container-content">
         {warning ? <ConfirmPageContainerWarning warning={warning} /> : null}
         {ethGasPriceWarning && (
           <ConfirmPageContainerWarning warning={ethGasPriceWarning} />
         )}
+        {hasSimulationError && (
+          <div className="confirm-page-container-content__error-container">
+            <ActionableMessage
+              type="danger"
+              primaryAction={primaryAction}
+              message={this.context.t('simulationErrorMessage')}
+            />
+          </div>
+        )}
         <ConfirmPageContainerSummary
           className={classnames({
             'confirm-page-container-summary--border':
@@ -115,11 +149,13 @@ export default class ConfirmPageContainerContent extends Component {
           hideTitle={hideTitle}
         />
         {this.renderContent()}
-        {(errorKey || errorMessage) && (
-          <div className="confirm-page-container-content__error-container">
-            <ErrorMessage errorMessage={errorMessage} errorKey={errorKey} />
-          </div>
-        )}
+        {!supportsEIP1559V2 &&
+          !hasSimulationError &&
+          (errorKey || errorMessage) && (
+            <div className="confirm-page-container-content__error-container">
+              <ErrorMessage errorMessage={errorMessage} errorKey={errorKey} />
+            </div>
+          )}
         <PageContainerFooter
           onCancel={onCancel}
           cancelText={cancelText}
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
new file mode 100644
index 000000000..3ccdb21e9
--- /dev/null
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/confirm-page-container-content.component.test.js
@@ -0,0 +1,126 @@
+import { fireEvent } from '@testing-library/react';
+import React from 'react';
+import configureMockStore from 'redux-mock-store';
+import { renderWithProvider } from '../../../../../test/lib/render-helpers';
+import { TRANSACTION_ERROR_KEY } from '../../../../helpers/constants/error-keys';
+import ConfirmPageContainerContent from './confirm-page-container-content.component';
+
+describe('Confirm Page Container Content', () => {
+  const mockStore = {
+    metamask: {
+      provider: {
+        type: 'test',
+      },
+    },
+  };
+
+  const store = configureMockStore()(mockStore);
+
+  let props = {};
+
+  beforeEach(() => {
+    const mockOnCancel = jest.fn();
+    const mockOnCancelAll = jest.fn();
+    const mockOnSubmit = jest.fn();
+    const mockSetUserAcknowledgedGasMissing = jest.fn();
+    props = {
+      action: ' Withdraw Stake',
+      errorMessage: null,
+      errorKey: null,
+      hasSimulationError: true,
+      onCancelAll: mockOnCancelAll,
+      onCancel: mockOnCancel,
+      cancelText: 'Reject',
+      onSubmit: mockOnSubmit,
+      setUserAcknowledgedGasMissing: mockSetUserAcknowledgedGasMissing,
+      submitText: 'Confirm',
+      disabled: true,
+      origin: 'http://localhost:4200',
+      hideTitle: false,
+    };
+  });
+
+  it('render ConfirmPageContainer component with simulation error', async () => {
+    process.env.EIP_1559_V2 = false;
+
+    const { queryByText, getByText } = renderWithProvider(
+      <ConfirmPageContainerContent {...props} />,
+      store,
+    );
+
+    expect(
+      queryByText('Transaction Error. Exception thrown in contract code.'),
+    ).not.toBeInTheDocument();
+    expect(
+      queryByText(
+        'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
+      ),
+    ).toBeInTheDocument();
+    expect(queryByText('I will try anyway')).toBeInTheDocument();
+
+    const confirmButton = getByText('Confirm');
+    expect(getByText('Confirm').closest('button')).toBeDisabled();
+    fireEvent.click(confirmButton);
+    expect(props.onSubmit).toHaveBeenCalledTimes(0);
+
+    const iWillTryButton = getByText('I will try anyway');
+    fireEvent.click(iWillTryButton);
+    expect(props.setUserAcknowledgedGasMissing).toHaveBeenCalledTimes(1);
+
+    const cancelButton = getByText('Reject');
+    fireEvent.click(cancelButton);
+    expect(props.onCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it('render ConfirmPageContainer component with another error', async () => {
+    props.hasSimulationError = false;
+    props.disabled = true;
+    props.errorKey = TRANSACTION_ERROR_KEY;
+    const { queryByText, getByText } = renderWithProvider(
+      <ConfirmPageContainerContent {...props} />,
+      store,
+    );
+
+    expect(
+      queryByText(
+        'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
+      ),
+    ).not.toBeInTheDocument();
+    expect(queryByText('I will try anyway')).not.toBeInTheDocument();
+    expect(getByText('Confirm').closest('button')).toBeDisabled();
+    expect(
+      getByText('Transaction Error. Exception thrown in contract code.'),
+    ).toBeInTheDocument();
+
+    const cancelButton = getByText('Reject');
+    fireEvent.click(cancelButton);
+    expect(props.onCancel).toHaveBeenCalledTimes(1);
+  });
+
+  it('render ConfirmPageContainer component with no errors', async () => {
+    props.hasSimulationError = false;
+    props.disabled = false;
+    const { queryByText, getByText } = renderWithProvider(
+      <ConfirmPageContainerContent {...props} />,
+      store,
+    );
+
+    expect(
+      queryByText(
+        'This transaction is expected to fail. Trying to execute it is expected to be expensive but fail, and is not recommended.',
+      ),
+    ).not.toBeInTheDocument();
+    expect(
+      queryByText('Transaction Error. Exception thrown in contract code.'),
+    ).not.toBeInTheDocument();
+    expect(queryByText('I will try anyway')).not.toBeInTheDocument();
+
+    const confirmButton = getByText('Confirm');
+    fireEvent.click(confirmButton);
+    expect(props.onSubmit).toHaveBeenCalledTimes(1);
+
+    const cancelButton = getByText('Reject');
+    fireEvent.click(cancelButton);
+    expect(props.onCancel).toHaveBeenCalledTimes(1);
+  });
+});
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 1ae028115..05a5964fd 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
@@ -3,6 +3,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import Identicon from '../../../../ui/identicon';
+import { useGasFeeContext } from '../../../../../contexts/gasFee';
 
 const ConfirmPageContainerSummary = (props) => {
   const {
@@ -18,6 +19,8 @@ const ConfirmPageContainerSummary = (props) => {
     hideTitle,
   } = props;
 
+  const { supportsEIP1559V2 } = useGasFeeContext();
+
   return (
     <div className={classnames('confirm-page-container-summary', className)}>
       {origin === 'metamask' ? null : (
@@ -45,7 +48,7 @@ const ConfirmPageContainerSummary = (props) => {
           </div>
         ) : null}
       </div>
-      {hideSubtitle || (
+      {!hideSubtitle && !supportsEIP1559V2 && (
         <div className="confirm-page-container-summary__subtitle">
           {subtitleComponent}
         </div>
diff --git a/ui/components/app/confirm-page-container/confirm-page-container-content/index.scss b/ui/components/app/confirm-page-container/confirm-page-container-content/index.scss
index c7655165b..2783e08d4 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container-content/index.scss
+++ b/ui/components/app/confirm-page-container/confirm-page-container-content/index.scss
@@ -20,6 +20,10 @@
   &__data {
     padding: 16px;
     color: $oslo-gray;
+
+    & > .disclosure {
+      margin-top: 0;
+    }
   }
 
   &__data-box {
@@ -27,9 +31,7 @@
 
     background-color: #f9fafa;
     padding: 12px;
-    margin-bottom: 16px;
     word-wrap: break-word;
-    max-height: 200px;
     overflow-y: auto;
 
     &-label {
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.component.js b/ui/components/app/confirm-page-container/confirm-page-container.component.js
index 117318e3d..351a6e37d 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.component.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.component.js
@@ -1,13 +1,21 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import SenderToRecipient from '../../ui/sender-to-recipient';
-import { PageContainerFooter } from '../../ui/page-container';
-import EditGasPopover from '../edit-gas-popover';
+
 import { EDIT_GAS_MODES } from '../../../../shared/constants/gas';
 import { GasFeeContextProvider } from '../../../contexts/gasFee';
-import ErrorMessage from '../../ui/error-message';
 import { TRANSACTION_TYPES } from '../../../../shared/constants/transaction';
+
+import { PageContainerFooter } from '../../ui/page-container';
 import Dialog from '../../ui/dialog';
+import ErrorMessage from '../../ui/error-message';
+import SenderToRecipient from '../../ui/sender-to-recipient';
+
+import NicknamePopovers from '../modals/nickname-popovers';
+
+import AdvancedGasFeePopover from '../advanced-gas-fee-popover';
+import EditGasFeePopover from '../edit-gas-fee-popover/edit-gas-fee-popover';
+import EditGasPopover from '../edit-gas-popover';
+
 import {
   ConfirmPageContainerHeader,
   ConfirmPageContainerContent,
@@ -15,6 +23,10 @@ import {
 } from '.';
 
 export default class ConfirmPageContainer extends Component {
+  state = {
+    showNicknamePopovers: false,
+  };
+
   static contextTypes = {
     t: PropTypes.func,
   };
@@ -42,6 +54,7 @@ export default class ConfirmPageContainer extends Component {
     errorKey: PropTypes.string,
     errorMessage: PropTypes.string,
     dataComponent: PropTypes.node,
+    dataHexComponent: PropTypes.node,
     detailsComponent: PropTypes.node,
     identiconAddress: PropTypes.string,
     nonce: PropTypes.string,
@@ -69,9 +82,9 @@ export default class ConfirmPageContainer extends Component {
     handleCloseEditGas: PropTypes.func,
     // Gas Popover
     currentTransaction: PropTypes.object.isRequired,
-    showAddToAddressBookModal: PropTypes.func,
     contact: PropTypes.object,
     isOwnedAccount: PropTypes.bool,
+    supportsEIP1559V2: PropTypes.bool,
   };
 
   render() {
@@ -95,6 +108,7 @@ export default class ConfirmPageContainer extends Component {
       hideSubtitle,
       detailsComponent,
       dataComponent,
+      dataHexComponent,
       onCancelAll,
       onCancel,
       onSubmit,
@@ -119,9 +133,9 @@ export default class ConfirmPageContainer extends Component {
       editingGas,
       handleCloseEditGas,
       currentTransaction,
-      showAddToAddressBookModal,
       contact = {},
       isOwnedAccount,
+      supportsEIP1559V2,
     } = this.props;
 
     const showAddToAddressDialog =
@@ -169,13 +183,23 @@ export default class ConfirmPageContainer extends Component {
           </ConfirmPageContainerHeader>
           <div>
             {showAddToAddressDialog && (
-              <Dialog
-                type="message"
-                className="send__dialog"
-                onClick={() => showAddToAddressBookModal()}
-              >
-                {this.context.t('newAccountDetectedDialogMessage')}
-              </Dialog>
+              <>
+                <Dialog
+                  type="message"
+                  className="send__dialog"
+                  onClick={() => this.setState({ showNicknamePopovers: true })}
+                >
+                  {this.context.t('newAccountDetectedDialogMessage')}
+                </Dialog>
+                {this.state.showNicknamePopovers ? (
+                  <NicknamePopovers
+                    onClose={() =>
+                      this.setState({ showNicknamePopovers: false })
+                    }
+                    address={toAddress}
+                  />
+                ) : null}
+              </>
             )}
           </div>
           {contentComponent || (
@@ -187,6 +211,7 @@ export default class ConfirmPageContainer extends Component {
               hideSubtitle={hideSubtitle}
               detailsComponent={detailsComponent}
               dataComponent={dataComponent}
+              dataHexComponent={dataHexComponent}
               errorMessage={errorMessage}
               errorKey={errorKey}
               identiconAddress={identiconAddress}
@@ -203,6 +228,7 @@ export default class ConfirmPageContainer extends Component {
               origin={origin}
               ethGasPriceWarning={ethGasPriceWarning}
               hideTitle={hideTitle}
+              supportsEIP1559V2={supportsEIP1559V2}
             />
           )}
           {shouldDisplayWarning && (
@@ -225,13 +251,15 @@ export default class ConfirmPageContainer extends Component {
               )}
             </PageContainerFooter>
           )}
-          {editingGas && (
+          {editingGas && !supportsEIP1559V2 && (
             <EditGasPopover
               mode={EDIT_GAS_MODES.MODIFY_IN_PLACE}
               onClose={handleCloseEditGas}
               transaction={currentTransaction}
             />
           )}
+          <EditGasFeePopover />
+          <AdvancedGasFeePopover />
         </div>
       </GasFeeContextProvider>
     );
diff --git a/ui/components/app/confirm-page-container/confirm-page-container.container.js b/ui/components/app/confirm-page-container/confirm-page-container.container.js
index c5bc0396c..ec5ba84c0 100644
--- a/ui/components/app/confirm-page-container/confirm-page-container.container.js
+++ b/ui/components/app/confirm-page-container/confirm-page-container.container.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
 import { getAccountsWithLabels, getAddressBookEntry } from '../../../selectors';
-import * as actions from '../../../store/actions';
 import ConfirmPageContainer from './confirm-page-container.component';
 
 function mapStateToProps(state, ownProps) {
@@ -17,30 +16,4 @@ function mapStateToProps(state, ownProps) {
   };
 }
 
-function mapDispatchToProps(dispatch) {
-  return {
-    showAddToAddressBookModal: (recipient) =>
-      dispatch(
-        actions.showModal({
-          name: 'ADD_TO_ADDRESSBOOK',
-          recipient,
-        }),
-      ),
-  };
-}
-
-function mergeProps(stateProps, dispatchProps, ownProps) {
-  const { to, ...restStateProps } = stateProps;
-  return {
-    ...ownProps,
-    ...restStateProps,
-    showAddToAddressBookModal: () =>
-      dispatchProps.showAddToAddressBookModal(to),
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-)(ConfirmPageContainer);
+export default connect(mapStateToProps)(ConfirmPageContainer);
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
new file mode 100644
index 000000000..1f6037c26
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.js
@@ -0,0 +1,83 @@
+import React from 'react';
+
+import { PRIORITY_LEVELS } from '../../../../shared/constants/gas';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { useTransactionModalContext } from '../../../contexts/transaction-modal';
+import ErrorMessage from '../../ui/error-message';
+import I18nValue from '../../ui/i18n-value';
+import LoadingHeartBeat from '../../ui/loading-heartbeat';
+import Popover from '../../ui/popover';
+import Typography from '../../ui/typography/typography';
+
+import { COLORS } from '../../../helpers/constants/design-system';
+import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-keys';
+import { useGasFeeContext } from '../../../contexts/gasFee';
+import EditGasItem from './edit-gas-item';
+import NetworkStatus from './network-status';
+
+const EditGasFeePopover = () => {
+  const { balanceError } = useGasFeeContext();
+  const t = useI18nContext();
+  const { closeModal, currentModal } = useTransactionModalContext();
+
+  if (currentModal !== 'editGasFee') return null;
+
+  return (
+    <Popover
+      title={t('editGasFeeModalTitle')}
+      onClose={() => closeModal('editGasFee')}
+      className="edit-gas-fee-popover"
+    >
+      <>
+        {process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />}
+        <div className="edit-gas-fee-popover__wrapper">
+          <div className="edit-gas-fee-popover__content">
+            {balanceError && (
+              <ErrorMessage errorKey={INSUFFICIENT_FUNDS_ERROR_KEY} />
+            )}
+            <div className="edit-gas-fee-popover__content__header">
+              <span className="edit-gas-fee-popover__content__header-option">
+                <I18nValue messageKey="gasOption" />
+              </span>
+              <span className="edit-gas-fee-popover__content__header-time">
+                <I18nValue messageKey="time" />
+              </span>
+              <span className="edit-gas-fee-popover__content__header-max-fee">
+                <I18nValue messageKey="maxFee" />
+              </span>
+            </div>
+            <EditGasItem priorityLevel={PRIORITY_LEVELS.LOW} />
+            <EditGasItem priorityLevel={PRIORITY_LEVELS.MEDIUM} />
+            <EditGasItem priorityLevel={PRIORITY_LEVELS.HIGH} />
+            <div className="edit-gas-fee-popover__content__separator" />
+            <EditGasItem priorityLevel={PRIORITY_LEVELS.DAPP_SUGGESTED} />
+            <EditGasItem priorityLevel={PRIORITY_LEVELS.CUSTOM} />
+            <NetworkStatus />
+            <Typography
+              className="edit-gas-fee-popover__know-more"
+              align="center"
+              color={COLORS.UI4}
+              fontSize="12px"
+            >
+              <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>
+          </div>
+        </div>
+      </>
+    </Popover>
+  );
+};
+
+export default EditGasFeePopover;
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js
new file mode 100644
index 000000000..df06ae62c
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-fee-popover.test.js
@@ -0,0 +1,114 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import { ETH } from '../../../helpers/constants/common';
+import configureStore from '../../../store/store';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+
+import EditGasFeePopover from './edit-gas-fee-popover';
+
+jest.mock('../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+}));
+
+jest.mock('../../../contexts/transaction-modal', () => ({
+  useTransactionModalContext: () => ({
+    closeModal: () => undefined,
+    currentModal: 'editGasFee',
+  }),
+}));
+
+const MOCK_FEE_ESTIMATE = {
+  low: {
+    minWaitTimeEstimate: 360000,
+    maxWaitTimeEstimate: 300000,
+    suggestedMaxPriorityFeePerGas: '3',
+    suggestedMaxFeePerGas: '53',
+  },
+  medium: {
+    minWaitTimeEstimate: 30000,
+    maxWaitTimeEstimate: 60000,
+    suggestedMaxPriorityFeePerGas: '7',
+    suggestedMaxFeePerGas: '70',
+  },
+  high: {
+    minWaitTimeEstimate: 15000,
+    maxWaitTimeEstimate: 15000,
+    suggestedMaxPriorityFeePerGas: '10',
+    suggestedMaxFeePerGas: '100',
+  },
+  estimatedBaseFee: '50',
+};
+
+const render = (txProps) => {
+  const store = configureStore({
+    metamask: {
+      nativeCurrency: ETH,
+      provider: {},
+      cachedBalances: {},
+      accounts: {
+        '0xAddress': {
+          address: '0xAddress',
+          balance: '0x1F4',
+        },
+      },
+      selectedAddress: '0xAddress',
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates: MOCK_FEE_ESTIMATE,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{ txParams: { gas: '0x5208' }, ...txProps }}
+    >
+      <EditGasFeePopover />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('EditGasFeePopover', () => {
+  it('should renders low / medium / high options', () => {
+    render();
+
+    expect(screen.queryByText('🐢')).toBeInTheDocument();
+    expect(screen.queryByText('🦊')).toBeInTheDocument();
+    expect(screen.queryByText('🦍')).toBeInTheDocument();
+    expect(screen.queryByText('🌐')).toBeInTheDocument();
+    expect(screen.queryByText('⚙')).toBeInTheDocument();
+    expect(screen.queryByText('Low')).toBeInTheDocument();
+    expect(screen.queryByText('Market')).toBeInTheDocument();
+    expect(screen.queryByText('Aggressive')).toBeInTheDocument();
+    expect(screen.queryByText('Site')).toBeInTheDocument();
+    expect(screen.queryByText('Advanced')).toBeInTheDocument();
+  });
+
+  it('should show time estimates', () => {
+    render();
+    expect(screen.queryAllByText('5 min')).toHaveLength(2);
+    expect(screen.queryByText('15 sec')).toBeInTheDocument();
+  });
+
+  it('should show gas fee estimates', () => {
+    render();
+    expect(screen.queryByTitle('0.001113 ETH')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.00147 ETH')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.0021 ETH')).toBeInTheDocument();
+  });
+
+  it('should not show insufficient balance message if transaction value is less than balance', () => {
+    render({ userFeeLevel: 'high', txParams: { value: '0x64' } });
+    expect(screen.queryByText('Insufficient funds.')).not.toBeInTheDocument();
+  });
+
+  it('should show insufficient balance message if transaction value is more than balance', () => {
+    render({ userFeeLevel: 'high', txParams: { value: '0x5208' } });
+    expect(screen.queryByText('Insufficient funds.')).toBeInTheDocument();
+  });
+});
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
new file mode 100644
index 000000000..7cd7aa281
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.js
@@ -0,0 +1,158 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import classNames from 'classnames';
+import { useSelector } from 'react-redux';
+
+import { getMaximumGasTotalInHexWei } from '../../../../../shared/modules/gas.utils';
+import { PRIORITY_LEVELS } from '../../../../../shared/constants/gas';
+import { PRIORITY_LEVEL_ICON_MAP } from '../../../../helpers/constants/gas';
+import { PRIMARY } from '../../../../helpers/constants/common';
+import {
+  decGWEIToHexWEI,
+  decimalToHex,
+  hexWEIToDecGWEI,
+} from '../../../../helpers/utils/conversions.util';
+import { getAdvancedGasFeeValues } from '../../../../selectors';
+import { toHumanReadableTime } from '../../../../helpers/utils/util';
+import { useGasFeeContext } from '../../../../contexts/gasFee';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import { useTransactionModalContext } from '../../../../contexts/transaction-modal';
+import I18nValue from '../../../ui/i18n-value';
+import InfoTooltip from '../../../ui/info-tooltip';
+import UserPreferencedCurrencyDisplay from '../../user-preferenced-currency-display';
+
+import { useCustomTimeEstimate } from './useCustomTimeEstimate';
+
+const EditGasItem = ({ priorityLevel }) => {
+  const {
+    estimateUsed,
+    gasFeeEstimates,
+    gasLimit,
+    maxFeePerGas: maxFeePerGasValue,
+    maxPriorityFeePerGas: maxPriorityFeePerGasValue,
+    updateTransactionUsingGasFeeEstimates,
+    transaction: { dappSuggestedGasFees },
+  } = useGasFeeContext();
+  const t = useI18nContext();
+  const advancedGasFeeValues = useSelector(getAdvancedGasFeeValues);
+  const { closeModal, openModal } = useTransactionModalContext();
+
+  let maxFeePerGas;
+  let maxPriorityFeePerGas;
+  let minWaitTime;
+
+  if (gasFeeEstimates?.[priorityLevel]) {
+    maxFeePerGas = gasFeeEstimates[priorityLevel].suggestedMaxFeePerGas;
+  } else if (
+    priorityLevel === PRIORITY_LEVELS.DAPP_SUGGESTED &&
+    dappSuggestedGasFees
+  ) {
+    maxFeePerGas = hexWEIToDecGWEI(dappSuggestedGasFees.maxFeePerGas);
+    maxPriorityFeePerGas = hexWEIToDecGWEI(
+      dappSuggestedGasFees.maxPriorityFeePerGas,
+    );
+  } else if (priorityLevel === PRIORITY_LEVELS.CUSTOM) {
+    if (estimateUsed === PRIORITY_LEVELS.CUSTOM) {
+      maxFeePerGas = maxFeePerGasValue;
+      maxPriorityFeePerGas = maxPriorityFeePerGasValue;
+    } else if (advancedGasFeeValues) {
+      maxFeePerGas =
+        gasFeeEstimates.estimatedBaseFee *
+        parseFloat(advancedGasFeeValues.maxBaseFee);
+      maxPriorityFeePerGas = advancedGasFeeValues.priorityFee;
+    }
+  }
+
+  const { waitTimeEstimate } = useCustomTimeEstimate({
+    gasFeeEstimates,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+  });
+
+  if (gasFeeEstimates[priorityLevel]) {
+    minWaitTime =
+      priorityLevel === PRIORITY_LEVELS.HIGH
+        ? gasFeeEstimates?.high.minWaitTimeEstimate
+        : gasFeeEstimates?.low.maxWaitTimeEstimate;
+  } else {
+    minWaitTime = waitTimeEstimate;
+  }
+
+  const hexMaximumTransactionFee = maxFeePerGas
+    ? getMaximumGasTotalInHexWei({
+        gasLimit: decimalToHex(gasLimit),
+        maxFeePerGas: decGWEIToHexWEI(maxFeePerGas),
+      })
+    : null;
+
+  const onOptionSelect = () => {
+    if (priorityLevel === PRIORITY_LEVELS.CUSTOM) {
+      openModal('advancedGasFee');
+    } else {
+      updateTransactionUsingGasFeeEstimates(priorityLevel);
+      closeModal('editGasFee');
+    }
+  };
+
+  return (
+    <button
+      className={classNames('edit-gas-item', {
+        'edit-gas-item-selected': priorityLevel === estimateUsed,
+        'edit-gas-item-disabled':
+          priorityLevel === PRIORITY_LEVELS.DAPP_SUGGESTED &&
+          !dappSuggestedGasFees,
+      })}
+      disabled={
+        priorityLevel === PRIORITY_LEVELS.DAPP_SUGGESTED &&
+        !dappSuggestedGasFees
+      }
+      onClick={onOptionSelect}
+      aria-label={priorityLevel}
+      autoFocus={priorityLevel === estimateUsed}
+    >
+      <span className="edit-gas-item__name">
+        <span
+          className={`edit-gas-item__icon edit-gas-item__icon-${priorityLevel}`}
+        >
+          {PRIORITY_LEVEL_ICON_MAP[priorityLevel]}
+        </span>
+        <I18nValue
+          messageKey={
+            priorityLevel === PRIORITY_LEVELS.DAPP_SUGGESTED
+              ? 'dappSuggestedShortLabel'
+              : priorityLevel
+          }
+        />
+      </span>
+      <span
+        className={`edit-gas-item__time-estimate edit-gas-item__time-estimate-${priorityLevel}`}
+      >
+        {minWaitTime
+          ? minWaitTime && toHumanReadableTime(t, minWaitTime)
+          : '--'}
+      </span>
+      <span
+        className={`edit-gas-item__fee-estimate edit-gas-item__fee-estimate-${priorityLevel}`}
+      >
+        {hexMaximumTransactionFee ? (
+          <UserPreferencedCurrencyDisplay
+            key="editGasSubTextFeeAmount"
+            type={PRIMARY}
+            value={hexMaximumTransactionFee}
+          />
+        ) : (
+          '--'
+        )}
+      </span>
+      <span className="edit-gas-item__tooltip">
+        <InfoTooltip position="top" />
+      </span>
+    </button>
+  );
+};
+
+EditGasItem.propTypes = {
+  priorityLevel: PropTypes.string,
+};
+
+export default EditGasItem;
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
new file mode 100644
index 000000000..cd95b654f
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/edit-gas-item.test.js
@@ -0,0 +1,148 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { renderWithProvider } from '../../../../../test/lib/render-helpers';
+import { ETH } from '../../../../helpers/constants/common';
+import configureStore from '../../../../store/store';
+import { GasFeeContextProvider } from '../../../../contexts/gasFee';
+
+import EditGasItem from './edit-gas-item';
+
+jest.mock('../../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  getGasFeeTimeEstimate: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve('unknown')),
+}));
+
+const MOCK_FEE_ESTIMATE = {
+  low: {
+    minWaitTimeEstimate: 360000,
+    maxWaitTimeEstimate: 300000,
+    suggestedMaxPriorityFeePerGas: '3',
+    suggestedMaxFeePerGas: '53',
+  },
+  medium: {
+    minWaitTimeEstimate: 30000,
+    maxWaitTimeEstimate: 60000,
+    suggestedMaxPriorityFeePerGas: '7',
+    suggestedMaxFeePerGas: '70',
+  },
+  high: {
+    minWaitTimeEstimate: 15000,
+    maxWaitTimeEstimate: 15000,
+    suggestedMaxPriorityFeePerGas: '10',
+    suggestedMaxFeePerGas: '100',
+  },
+  estimatedBaseFee: '50',
+};
+
+const DAPP_SUGGESTED_ESTIMATE = {
+  maxFeePerGas: '0x59682f10',
+  maxPriorityFeePerGas: '0x59682f00',
+};
+
+const renderComponent = (componentProps, transactionProps) => {
+  const store = configureStore({
+    metamask: {
+      nativeCurrency: ETH,
+      provider: {},
+      cachedBalances: {},
+      accounts: {
+        '0xAddress': {
+          address: '0xAddress',
+          balance: '0x176e5b6f173ebe66',
+        },
+      },
+      selectedAddress: '0xAddress',
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates: MOCK_FEE_ESTIMATE,
+      advancedGasFee: {
+        maxBaseFee: '1.5',
+        priorityFee: '2',
+      },
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{ txParams: { gas: '0x5208' }, ...transactionProps }}
+    >
+      <EditGasItem priorityLevel="low" {...componentProps} />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('EditGasItem', () => {
+  it('should renders low gas estimate option for priorityLevel low', () => {
+    renderComponent({ priorityLevel: 'low' });
+    expect(screen.queryByRole('button', { name: 'low' })).toBeInTheDocument();
+    expect(screen.queryByText('🐢')).toBeInTheDocument();
+    expect(screen.queryByText('Low')).toBeInTheDocument();
+    expect(screen.queryByText('5 min')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.001113 ETH')).toBeInTheDocument();
+  });
+
+  it('should renders market gas estimate option for priorityLevel medium', () => {
+    renderComponent({ priorityLevel: 'medium' });
+    expect(
+      screen.queryByRole('button', { name: 'medium' }),
+    ).toBeInTheDocument();
+    expect(screen.queryByText('🦊')).toBeInTheDocument();
+    expect(screen.queryByText('Market')).toBeInTheDocument();
+    expect(screen.queryByText('5 min')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.00147 ETH')).toBeInTheDocument();
+  });
+
+  it('should renders aggressive gas estimate option for priorityLevel high', () => {
+    renderComponent({ priorityLevel: 'high' });
+    expect(screen.queryByRole('button', { name: 'high' })).toBeInTheDocument();
+    expect(screen.queryByText('🦍')).toBeInTheDocument();
+    expect(screen.queryByText('Aggressive')).toBeInTheDocument();
+    expect(screen.queryByText('15 sec')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.0021 ETH')).toBeInTheDocument();
+  });
+
+  it('should highlight option is priorityLevel is currently selected', () => {
+    renderComponent({ priorityLevel: 'high' }, { userFeeLevel: 'high' });
+    expect(
+      document.getElementsByClassName('edit-gas-item-selected'),
+    ).toHaveLength(1);
+  });
+
+  it('should renders site gas estimate option for priorityLevel dappSuggested', () => {
+    renderComponent(
+      { priorityLevel: 'dappSuggested' },
+      { dappSuggestedGasFees: DAPP_SUGGESTED_ESTIMATE },
+    );
+    expect(
+      screen.queryByRole('button', { name: 'dappSuggested' }),
+    ).toBeInTheDocument();
+    expect(screen.queryByText('🌐')).toBeInTheDocument();
+    expect(screen.queryByText('Site')).toBeInTheDocument();
+    expect(screen.queryByTitle('0.0000315 ETH')).toBeInTheDocument();
+  });
+
+  it('should disable site gas estimate option for is transaction does not have dappSuggestedGasFees', async () => {
+    renderComponent({ priorityLevel: 'dappSuggested' });
+    expect(
+      document.getElementsByClassName('edit-gas-item-disabled'),
+    ).toHaveLength(1);
+  });
+
+  it('should renders advance gas estimate option for priorityLevel custom', () => {
+    renderComponent({ priorityLevel: 'custom' }, { userFeeLevel: 'high' });
+    expect(
+      screen.queryByRole('button', { name: 'custom' }),
+    ).toBeInTheDocument();
+    expect(screen.queryByText('⚙')).toBeInTheDocument();
+    expect(screen.queryByText('Advanced')).toBeInTheDocument();
+    // below value of custom gas fee estimate is default obtained from state.metamask.advancedGasFee
+    expect(screen.queryByTitle('0.001575 ETH')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.js
new file mode 100644
index 000000000..3ba916857
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.js
@@ -0,0 +1 @@
+export { default } from './edit-gas-item';
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
new file mode 100644
index 000000000..f29b80fce
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/index.scss
@@ -0,0 +1,70 @@
+.edit-gas-item {
+  border-radius: 24px;
+  background: white;
+  color: $ui-4;
+  cursor: pointer;
+  font-size: 12px;
+  display: flex;
+  align-items: center;
+  margin: 12px 0;
+  padding: 4px 12px;
+  height: 32px;
+  width: 100%;
+
+  &-selected {
+    background-color: $ui-1;
+  }
+
+  &-disabled {
+    cursor: default;
+  }
+
+  &__name {
+    display: inline-flex;
+    align-items: center;
+    color: $ui-black;
+    font-size: 12px;
+    font-weight: bold;
+    width: 40%;
+  }
+
+  &__icon {
+    margin-right: 4px;
+
+    &-custom {
+      font-size: 20px;
+      line-height: 0;
+    }
+  }
+
+  &__time-estimate {
+    display: inline-block;
+    width: 20%;
+  }
+
+  &__fee-estimate {
+    display: inline-block;
+    width: 30%;
+    white-space: nowrap;
+  }
+
+  &__tooltip {
+    display: inline-block;
+    text-align: right;
+    width: 10%;
+
+    .info-tooltip {
+      display: inline-block;
+    }
+  }
+
+  &__time-estimate-low,
+  &__fee-estimate-high {
+    color: $secondary-1;
+  }
+
+  &__time-estimate-medium,
+  &__time-estimate-high {
+    color: $success-3;
+  }
+}
diff --git a/ui/components/app/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js b/ui/components/app/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js
new file mode 100644
index 000000000..41d6c59ed
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/edit-gas-item/useCustomTimeEstimate.js
@@ -0,0 +1,83 @@
+import { useEffect, useState } from 'react';
+import { useSelector } from 'react-redux';
+import BigNumber from 'bignumber.js';
+
+import { GAS_ESTIMATE_TYPES } from '../../../../../shared/constants/gas';
+import {
+  getGasEstimateType,
+  getIsGasEstimatesLoading,
+} from '../../../../ducks/metamask/metamask';
+import { getGasFeeTimeEstimate } from '../../../../store/actions';
+
+export const useCustomTimeEstimate = ({
+  gasFeeEstimates,
+  maxFeePerGas,
+  maxPriorityFeePerGas,
+}) => {
+  const gasEstimateType = useSelector(getGasEstimateType);
+  const isGasEstimatesLoading = useSelector(getIsGasEstimatesLoading);
+
+  const [customEstimatedTime, setCustomEstimatedTime] = useState(null);
+
+  const returnNoEstimates =
+    isGasEstimatesLoading ||
+    gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET ||
+    !maxPriorityFeePerGas;
+
+  // If the user has chosen a value lower than the low gas fee estimate,
+  // We'll need to use the useEffect hook below to make a call to calculate
+  // the time to show
+  const isUnknownLow =
+    gasFeeEstimates?.low &&
+    Number(maxPriorityFeePerGas) <
+      Number(gasFeeEstimates.low.suggestedMaxPriorityFeePerGas);
+
+  useEffect(() => {
+    if (
+      isGasEstimatesLoading ||
+      gasEstimateType !== GAS_ESTIMATE_TYPES.FEE_MARKET ||
+      !maxPriorityFeePerGas
+    )
+      return;
+    if (isUnknownLow) {
+      // getGasFeeTimeEstimate requires parameters in string format
+      getGasFeeTimeEstimate(
+        new BigNumber(maxPriorityFeePerGas, 10).toString(10),
+        new BigNumber(maxFeePerGas, 10).toString(10),
+      ).then((result) => {
+        setCustomEstimatedTime(result);
+      });
+    }
+  }, [
+    gasEstimateType,
+    isUnknownLow,
+    isGasEstimatesLoading,
+    maxFeePerGas,
+    maxPriorityFeePerGas,
+    returnNoEstimates,
+  ]);
+
+  if (returnNoEstimates) {
+    return {};
+  }
+
+  const { low = {}, medium = {}, high = {} } = gasFeeEstimates;
+  let waitTimeEstimate = '';
+
+  if (
+    isUnknownLow &&
+    customEstimatedTime &&
+    customEstimatedTime !== 'unknown' &&
+    customEstimatedTime?.upperTimeBound !== 'unknown'
+  ) {
+    waitTimeEstimate = Number(customEstimatedTime?.upperTimeBound);
+  } else if (
+    Number(maxPriorityFeePerGas) >= Number(medium.suggestedMaxPriorityFeePerGas)
+  ) {
+    waitTimeEstimate = high.minWaitTimeEstimate;
+  } else {
+    waitTimeEstimate = low.maxWaitTimeEstimate;
+  }
+
+  return { waitTimeEstimate };
+};
diff --git a/ui/components/app/edit-gas-fee-popover/index.js b/ui/components/app/edit-gas-fee-popover/index.js
new file mode 100644
index 000000000..d2e6862b9
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/index.js
@@ -0,0 +1 @@
+export { default } from './edit-gas-fee-popover';
diff --git a/ui/components/app/edit-gas-fee-popover/index.scss b/ui/components/app/edit-gas-fee-popover/index.scss
new file mode 100644
index 000000000..581cb5f6b
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/index.scss
@@ -0,0 +1,51 @@
+.edit-gas-fee-popover {
+  height: 500px;
+
+  &__wrapper {
+    border-top: 1px solid $ui-grey;
+  }
+
+  &__content {
+    padding: 16px 12px;
+
+    & .error-message {
+      margin-top: 0;
+      margin-bottom: 12px;
+    }
+
+    &__header {
+      color: $ui-4;
+      font-size: 10px;
+      font-weight: 700;
+      margin: 0 12px;
+
+      &-option {
+        display: inline-block;
+        width: 40%;
+      }
+
+      &-time {
+        display: inline-block;
+        width: 20%;
+      }
+
+      &-max-fee {
+        display: inline-block;
+        width: 30%;
+      }
+    }
+
+    &__separator {
+      border-top: 1px solid $ui-grey;
+      margin: 8px 12px;
+    }
+  }
+
+  &__network-status {
+    margin-top: 36px;
+  }
+
+  &__know-more a {
+    color: $primary-1;
+  }
+}
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/index.js b/ui/components/app/edit-gas-fee-popover/network-status/index.js
new file mode 100644
index 000000000..0ba1f18f3
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/index.js
@@ -0,0 +1 @@
+export { default } from './network-status';
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/index.scss b/ui/components/app/edit-gas-fee-popover/network-status/index.scss
new file mode 100644
index 000000000..db6d37299
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/index.scss
@@ -0,0 +1,41 @@
+.network-status {
+  margin: 24px 0 12px;
+
+  &__info {
+    border-top: 1px solid $ui-2;
+    border-bottom: 1px solid $ui-2;
+    height: 56px;
+    display: flex;
+    align-items: center;
+
+    &__separator {
+      border-left: 1px solid $ui-2;
+      height: 65%;
+    }
+
+    &__field {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      width: 30%;
+
+      &--priority-fee {
+        width: 40%;
+      }
+
+      &-data {
+        color: $ui-4;
+        font-size: 12px;
+        text-align: center;
+      }
+
+      &-label {
+        color: $Black-100;
+        font-size: 10px;
+        font-weight: bold;
+        margin-top: 4px;
+      }
+    }
+  }
+}
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/network-status.js b/ui/components/app/edit-gas-fee-popover/network-status/network-status.js
new file mode 100644
index 000000000..bd102f81e
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/network-status.js
@@ -0,0 +1,52 @@
+import React from 'react';
+
+import { COLORS } from '../../../../helpers/constants/design-system';
+import { useGasFeeContext } from '../../../../contexts/gasFee';
+import I18nValue from '../../../ui/i18n-value';
+import Typography from '../../../ui/typography/typography';
+
+import StatusSlider from './status-slider';
+
+const NetworkStatus = () => {
+  const { gasFeeEstimates } = useGasFeeContext();
+
+  return (
+    <div className="network-status">
+      <Typography
+        color={COLORS.UI4}
+        fontSize="10px"
+        fontWeight="bold"
+        margin={[3, 0]}
+        variant="h6"
+      >
+        <I18nValue messageKey="networkStatus" />
+      </Typography>
+      <div className="network-status__info">
+        <div className="network-status__info__field">
+          <span className="network-status__info__field-data">
+            {gasFeeEstimates?.estimatedBaseFee &&
+              `${gasFeeEstimates?.estimatedBaseFee} GWEI`}
+          </span>
+          <span className="network-status__info__field-label">Base fee</span>
+        </div>
+        <div className="network-status__info__separator" />
+        <div className="network-status__info__field network-status__info__field--priority-fee">
+          <span className="network-status__info__field-data">
+            0.5 - 22 GWEI
+          </span>
+          <span className="network-status__info__field-label">
+            Priority fee
+          </span>
+        </div>
+        <div className="network-status__info__separator" />
+        <div className="network-status__info__field">
+          <StatusSlider />
+        </div>
+      </div>
+    </div>
+  );
+};
+
+NetworkStatus.propTypes = {};
+
+export default NetworkStatus;
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/network-status.test.js b/ui/components/app/edit-gas-fee-popover/network-status/network-status.test.js
new file mode 100644
index 000000000..7981b5a72
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/network-status.test.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { renderWithProvider } from '../../../../../test/jest';
+import { ETH } from '../../../../helpers/constants/common';
+import { GasFeeContextProvider } from '../../../../contexts/gasFee';
+import configureStore from '../../../../store/store';
+
+import NetworkStatus from './network-status';
+
+jest.mock('../../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  getGasFeeTimeEstimate: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve('unknown')),
+}));
+
+const MOCK_FEE_ESTIMATE = {
+  estimatedBaseFee: '50.0112',
+};
+
+const renderComponent = (props) => {
+  const store = configureStore({
+    metamask: {
+      nativeCurrency: ETH,
+      provider: {},
+      cachedBalances: {},
+      accounts: {
+        '0xAddress': {
+          address: '0xAddress',
+          balance: '0x176e5b6f173ebe66',
+        },
+      },
+      selectedAddress: '0xAddress',
+      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates: MOCK_FEE_ESTIMATE,
+      ...props,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider>
+      <NetworkStatus />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('NetworkStatus', () => {
+  it('should renders labels', () => {
+    renderComponent();
+    expect(screen.queryByText('Base fee')).toBeInTheDocument();
+    expect(screen.queryByText('Priority fee')).toBeInTheDocument();
+  });
+
+  it('should renders current base fee value', () => {
+    renderComponent();
+    expect(
+      screen.queryByText(`${MOCK_FEE_ESTIMATE.estimatedBaseFee} GWEI`),
+    ).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.js b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.js
new file mode 100644
index 000000000..a9105f5f7
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.js
@@ -0,0 +1 @@
+export { default } from './status-slider';
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.scss b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.scss
new file mode 100644
index 000000000..2ae4daf0c
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/index.scss
@@ -0,0 +1,42 @@
+.status-slider {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 55%;
+
+  &__line {
+    background-image: linear-gradient(to right, #037dd6, #d73a49);
+    height: 4px;
+    width: 100%;
+    border-radius: 100px;
+    display: block;
+  }
+
+  &__label {
+    font-size: 10px;
+    font-weight: bold;
+    margin-top: 4px;
+  }
+
+  &__arrow-border {
+    width: 0;
+    height: 0;
+    border-left: 10px solid transparent;
+    border-right: 10px solid transparent;
+    border-top: 10px solid white;
+    position: relative;
+    margin-bottom: -2px;
+  }
+
+  &__arrow {
+    width: 0;
+    height: 0;
+    border-left: 5px solid transparent;
+    border-right: 5px solid transparent;
+    border-top: 5px solid black;
+    position: absolute;
+    bottom: 3px;
+    left: -5px;
+  }
+}
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.js b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.js
new file mode 100644
index 000000000..8271cac6a
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.js
@@ -0,0 +1,53 @@
+import React from 'react';
+
+import I18nValue from '../../../../ui/i18n-value';
+
+const GRADIENT_COLORS = [
+  '#037DD6',
+  '#1876C8',
+  '#2D70BA',
+  '#4369AB',
+  '#57629E',
+  '#6A5D92',
+  '#805683',
+  '#9A4D71',
+  '#B44561',
+  '#C54055',
+];
+
+const StatusSlider = () => {
+  // todo: value below to be replaced with dynamic values from api once it is available
+  // corresponding test cases also to be added
+  const statusValue = 0.5;
+  const sliderValueNumeric = Math.round(statusValue * 10);
+
+  let statusLabel = 'stable';
+  if (statusValue <= 0.33) {
+    statusLabel = 'notBusy';
+  } else if (statusValue > 0.66) {
+    statusLabel = 'busy';
+  }
+
+  return (
+    <div className="status-slider">
+      <div className="status-slider__arrow-border">
+        <div
+          className="status-slider__arrow"
+          style={{
+            borderTopColor: GRADIENT_COLORS[sliderValueNumeric],
+            marginLeft: `${sliderValueNumeric * 10}%`,
+          }}
+        />
+      </div>
+      <div className="status-slider__line" />
+      <div
+        className="status-slider__label"
+        style={{ color: GRADIENT_COLORS[sliderValueNumeric] }}
+      >
+        <I18nValue messageKey={statusLabel} />
+      </div>
+    </div>
+  );
+};
+
+export default StatusSlider;
diff --git a/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.test.js b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.test.js
new file mode 100644
index 000000000..a10ed82bb
--- /dev/null
+++ b/ui/components/app/edit-gas-fee-popover/network-status/status-slider/status-slider.test.js
@@ -0,0 +1,51 @@
+import React from 'react';
+import { screen } from '@testing-library/react';
+
+import { renderWithProvider } from '../../../../../../test/jest';
+import { ETH } from '../../../../../helpers/constants/common';
+import { GasFeeContextProvider } from '../../../../../contexts/gasFee';
+import configureStore from '../../../../../store/store';
+
+import StatusSlider from './status-slider';
+
+jest.mock('../../../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+  getGasFeeTimeEstimate: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve('unknown')),
+}));
+
+const renderComponent = () => {
+  const store = configureStore({
+    metamask: {
+      nativeCurrency: ETH,
+      provider: {},
+      cachedBalances: {},
+      accounts: {
+        '0xAddress': {
+          address: '0xAddress',
+          balance: '0x176e5b6f173ebe66',
+        },
+      },
+      selectedAddress: '0xAddress',
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider>
+      <StatusSlider />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('NetworkStatus', () => {
+  it('should renders stable for statusValue > 0.33 and <= 0.66', () => {
+    renderComponent();
+    expect(screen.queryByText('Stable')).toBeInTheDocument();
+  });
+});
diff --git a/ui/components/app/flask/experimental-area/experimental-area.js b/ui/components/app/flask/experimental-area/experimental-area.js
new file mode 100644
index 000000000..49fa52ca8
--- /dev/null
+++ b/ui/components/app/flask/experimental-area/experimental-area.js
@@ -0,0 +1,97 @@
+import React, { useContext } from 'react';
+import { useHistory } from 'react-router-dom';
+import PropTypes from 'prop-types';
+import { I18nContext } from '../../../../contexts/i18n';
+import Button from '../../../ui/button';
+
+function lineBreaksToBr(source) {
+  return source.split('\n').map((value) => {
+    return (
+      <>
+        {value}
+        <br />
+      </>
+    );
+  });
+}
+
+const METAMASK_LOGO = lineBreaksToBr(`MMm*mmMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMmm*mMM
+MM*./***mMMMMMMMMMMMMMMMMMMMMMMMMMMm***/.*MM
+MM/...///*mMMMMMMMMMMMMMMMMMMMMMMm*///.../MM
+Mm.....//../*mMMMMMMMMMMMMMMMMm*/..//.....mM
+M*....../*....*mMMMMMMMMMMMMm*....*/......*M
+M/........*.....*//////////*...../......../M
+m..........*/...//........//.../*..........m
+M/..........//.../......../...//........../M
+M/.........../*/./.......//./*/.........../M
+M*.............////......////.............*M
+Mm...............**......**...............mM
+Mm/...............*/..../*.............../mM
+MM/............../*/..../*/............../MM
+Mm..............//./...././/..............mM
+MM*............*/../..../../*............*MM
+MM/........../*..../..../....*/........../MM
+MMm.........//...../..../.....//.........mMM
+MMm......//**....../..../......**//......mMM
+MMM/..////.*......./..../......././///../MMM
+MMMm*//..../......./..../......./....//*mMMM
+MMMm......*////////*....*////////*......mMMM
+MMM*......*////////*....*////////*......*MMM
+MMM/....../*......./..../.......*/....../MMM
+MMm........**/./m*./..../.**/..**........mMM
+MM*........//*mMMM///..///mMMm*//........*MM
+MM/........././*mM*//..//*Mm*/./........./MM
+Mm..........//.../**/../**/...//..........mM
+M*...........*..../*/../*/..../...........*M
+M*///////////*/.../m/../m/.../*///////////*M
+M*.........../*/...m/../m.../*/...........*M
+Mm.........../..//.*....*./*../...........mM
+MM/........../...//******//.../........../MM
+MM*........../....*MMMMMM*..../..........*MM
+MMm........../....*MMMMMM*..../..........mMM
+MMm/........//....*MMMMMM*....//......../mMM
+MMM/....../*mm*...*mmmmmm*...*mm*/....../MMM
+MMM*../*mmMMMMMm///......//*mMMMMMmm*/..*MMM
+MMMm*mMMMMMMMMMMm**......**mMMMMMMMMMMm*mMMM
+MMMMMMMMMMMMMMMMMm/....../mMMMMMMMMMMMMMMMMM
+MMMMMMMMMMMMMMMMMMmmmmmmmmMMMMMMMMMMMMMMMMMM`);
+
+/* eslint-disable no-irregular-whitespace */
+const EXPERIMENTAL_AREA = lineBreaksToBr(`█▄█ █▀█ █░█ ▀ █▀█ █▀▀   █▀▀ █▄░█ ▀█▀ █▀▀ █▀█ █ █▄░█ █▀▀   ▄▀█ █▄░█
+░█░ █▄█ █▄█ ░ █▀▄ ██▄   ██▄ █░▀█ ░█░ ██▄ █▀▄ █ █░▀█ █▄█   █▀█ █░▀█
+
+█▀▀ ▀▄▀ █▀█ █▀▀ █▀█ █ █▀▄▀█ █▀▀ █▄░█ ▀█▀ ▄▀█ █░░   ▄▀█ █▀█ █▀▀ ▄▀█
+██▄ █░█ █▀▀ ██▄ █▀▄ █ █░▀░█ ██▄ █░▀█ ░█░ █▀█ █▄▄   █▀█ █▀▄ ██▄ █▀█`);
+/* eslint-enable no-irregular-whitespace */
+
+export default function ExperimentalArea({ redirectTo }) {
+  const t = useContext(I18nContext);
+  const history = useHistory();
+
+  const onClick = () => {
+    history.push(redirectTo);
+  };
+
+  return (
+    <div className="experimental-area">
+      <div className="logo">{METAMASK_LOGO}</div>
+      <div className="experimental-text">{EXPERIMENTAL_AREA}</div>
+      <div className="text">
+        {t('flaskExperimentalText1')}
+        <ul>
+          <li>{t('flaskExperimentalText2')}</li>
+          <li>{t('flaskExperimentalText3')}</li>
+          <li>{t('flaskExperimentalText4')}</li>
+        </ul>
+        {t('flaskExperimentalText5')}
+      </div>
+      <Button type="primary" onClick={onClick}>
+        {t('userAccepts')}
+      </Button>
+    </div>
+  );
+}
+
+ExperimentalArea.propTypes = {
+  redirectTo: PropTypes.string,
+};
diff --git a/ui/components/app/flask/experimental-area/experimental-area.stories.js b/ui/components/app/flask/experimental-area/experimental-area.stories.js
new file mode 100644
index 000000000..55e993049
--- /dev/null
+++ b/ui/components/app/flask/experimental-area/experimental-area.stories.js
@@ -0,0 +1,13 @@
+import React from 'react';
+
+import ExperimentalArea from '.';
+
+export default {
+  title: 'Components/App/Flask/ExperimentalArea',
+  id: __filename,
+  component: ExperimentalArea,
+};
+
+export const DefaultStory = () => <ExperimentalArea />;
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/flask/experimental-area/index.js b/ui/components/app/flask/experimental-area/index.js
new file mode 100644
index 000000000..716ab972d
--- /dev/null
+++ b/ui/components/app/flask/experimental-area/index.js
@@ -0,0 +1 @@
+export { default } from './experimental-area';
diff --git a/ui/components/app/flask/experimental-area/index.scss b/ui/components/app/flask/experimental-area/index.scss
new file mode 100644
index 000000000..c743033da
--- /dev/null
+++ b/ui/components/app/flask/experimental-area/index.scss
@@ -0,0 +1,54 @@
+.experimental-area {
+  color: $flask-purple;
+  margin: auto;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+
+  .logo {
+    padding: 16px 8px 0;
+    line-height: 0.625em;
+    font-family: monospace;
+    font-size: $font-size-h8;
+    margin-bottom: 32px;
+  }
+
+  .experimental-text {
+    padding: 16px 8px 0;
+    font-family: monospace;
+    font-size: $font-size-h5;
+    margin: auto;
+    line-height: 0.875em;
+    margin-bottom: 32px;
+  }
+
+  .text {
+    @include H5;
+
+    padding: 16px;
+    max-width: 670px;
+  }
+
+  ul {
+    padding: 16px 0;
+  }
+
+  li {
+    list-style-type: disc;
+    padding-left: 8px;
+    list-style-position: inside;
+    margin-bottom: 8px;
+
+    &:nth-last-child(1) {
+      margin-bottom: 0;
+    }
+  }
+
+  button {
+    background-color: $flask-purple !important;
+    border: 0 !important;
+    color: $ui-1;
+    width: 200px;
+  }
+}
diff --git a/ui/components/app/gas-timing/gas-timing.component.js b/ui/components/app/gas-timing/gas-timing.component.js
index 41fc6bed5..49ba84075 100644
--- a/ui/components/app/gas-timing/gas-timing.component.js
+++ b/ui/components/app/gas-timing/gas-timing.component.js
@@ -28,8 +28,6 @@ import { useGasFeeContext } from '../../../contexts/gasFee';
 
 // Once we reach this second threshold, we switch to minutes as a unit
 const SECOND_CUTOFF = 90;
-// eslint-disable-next-line prefer-destructuring
-const EIP_1559_V2 = process.env.EIP_1559_V2;
 
 // Shows "seconds" as unit of time if under SECOND_CUTOFF, otherwise "minutes"
 const toHumanReadableTime = (milliseconds = 1, t) => {
@@ -50,7 +48,7 @@ export default function GasTiming({
 
   const [customEstimatedTime, setCustomEstimatedTime] = useState(null);
   const t = useContext(I18nContext);
-  const { estimateToUse } = useGasFeeContext();
+  const { estimateUsed, supportsEIP1559V2 } = useGasFeeContext();
 
   // If the user has chosen a value lower than the low gas fee estimate,
   // We'll need to use the useEffect hook below to make a call to calculate
@@ -97,7 +95,7 @@ export default function GasTiming({
   ]);
 
   let unknownProcessingTimeText;
-  if (EIP_1559_V2) {
+  if (supportsEIP1559V2) {
     unknownProcessingTimeText = t('editGasTooLow');
   } else {
     unknownProcessingTimeText = (
@@ -155,7 +153,7 @@ export default function GasTiming({
       ]);
     }
   } else {
-    if (!EIP_1559_V2 || estimateToUse === 'low') {
+    if (!supportsEIP1559V2 || estimateUsed === 'low') {
       attitude = 'negative';
     }
     // If the user has chosen a value less than our low estimate,
@@ -176,7 +174,7 @@ export default function GasTiming({
       }
     }
     // code below needs to cleaned-up once EIP_1559_V2 flag is removed
-    else if (EIP_1559_V2) {
+    else if (supportsEIP1559V2) {
       text = t('gasTimingNegative', [
         toHumanReadableTime(low.maxWaitTimeEstimate, t),
       ]);
@@ -199,8 +197,8 @@ export default function GasTiming({
     <Typography
       variant={TYPOGRAPHY.H7}
       className={classNames('gas-timing', {
-        [`gas-timing--${attitude}`]: attitude && !EIP_1559_V2,
-        [`gas-timing--${attitude}-V2`]: attitude && EIP_1559_V2,
+        [`gas-timing--${attitude}`]: attitude && !supportsEIP1559V2,
+        [`gas-timing--${attitude}-V2`]: attitude && supportsEIP1559V2,
       })}
     >
       {text}
diff --git a/ui/components/app/modals/nickname-popovers/index.js b/ui/components/app/modals/nickname-popovers/index.js
new file mode 100644
index 000000000..b18a3fcb7
--- /dev/null
+++ b/ui/components/app/modals/nickname-popovers/index.js
@@ -0,0 +1 @@
+export { default } from './nickname-popovers.component';
diff --git a/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
new file mode 100644
index 000000000..664358a66
--- /dev/null
+++ b/ui/components/app/modals/nickname-popovers/nickname-popovers.component.js
@@ -0,0 +1,72 @@
+import React, { useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import { getAccountLink } from '@metamask/etherscan-link';
+import { addToAddressBook } from '../../../../store/actions';
+import {
+  getRpcPrefsForCurrentProvider,
+  getCurrentChainId,
+  getAddressBook,
+} from '../../../../selectors';
+import NicknamePopover from '../../../ui/nickname-popover';
+import UpdateNicknamePopover from '../../../ui/update-nickname-popover/update-nickname-popover';
+
+const SHOW_NICKNAME_POPOVER = 'SHOW_NICKNAME_POPOVER';
+const ADD_NICKNAME_POPOVER = 'ADD_NICKNAME_POPOVER';
+
+const NicknamePopovers = ({ address, onClose }) => {
+  const dispatch = useDispatch();
+
+  const [popoverToDisplay, setPopoverToDisplay] = useState(
+    SHOW_NICKNAME_POPOVER,
+  );
+
+  const addressBook = useSelector(getAddressBook);
+  const chainId = useSelector(getCurrentChainId);
+
+  const addressBookEntryObject = addressBook.find(
+    (entry) => entry.address === address,
+  );
+
+  const recipientNickname = addressBookEntryObject?.name;
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+
+  const explorerLink = getAccountLink(
+    address,
+    chainId,
+    { blockExplorerUrl: rpcPrefs?.blockExplorerUrl ?? null },
+    null,
+  );
+
+  if (popoverToDisplay === ADD_NICKNAME_POPOVER) {
+    return (
+      <UpdateNicknamePopover
+        address={address}
+        nickname={recipientNickname || null}
+        memo={addressBookEntryObject?.memo}
+        onClose={() => setPopoverToDisplay(SHOW_NICKNAME_POPOVER)}
+        onAdd={(recipient, nickname, memo) =>
+          dispatch(addToAddressBook(recipient, nickname, memo))
+        }
+      />
+    );
+  }
+
+  // SHOW_NICKNAME_POPOVER case
+  return (
+    <NicknamePopover
+      address={address}
+      nickname={recipientNickname || null}
+      onClose={onClose}
+      onAdd={() => setPopoverToDisplay(ADD_NICKNAME_POPOVER)}
+      explorerLink={explorerLink}
+    />
+  );
+};
+
+NicknamePopovers.propTypes = {
+  address: PropTypes.string,
+  onClose: PropTypes.func,
+};
+
+export default NicknamePopovers;
diff --git a/ui/components/app/new-collectibles-notice/index.js b/ui/components/app/new-collectibles-notice/index.js
new file mode 100644
index 000000000..2f54229ac
--- /dev/null
+++ b/ui/components/app/new-collectibles-notice/index.js
@@ -0,0 +1 @@
+export { default } from './new-collectibles-notice.component';
diff --git a/ui/components/app/new-collectibles-notice/new-collectibles-notice.component.js b/ui/components/app/new-collectibles-notice/new-collectibles-notice.component.js
new file mode 100644
index 000000000..0d77128ca
--- /dev/null
+++ b/ui/components/app/new-collectibles-notice/new-collectibles-notice.component.js
@@ -0,0 +1,56 @@
+import React from 'react';
+import Box from '../../ui/box';
+import Dialog from '../../ui/dialog';
+import Typography from '../../ui/typography/typography';
+import {
+  COLORS,
+  TYPOGRAPHY,
+  TEXT_ALIGN,
+  FONT_WEIGHT,
+  DISPLAY,
+} from '../../../helpers/constants/design-system';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+
+export default function NewCollectiblesNotice() {
+  const t = useI18nContext();
+
+  return (
+    <Box marginBottom={8}>
+      <Dialog type="message">
+        <Box display={DISPLAY.FLEX}>
+          <Box paddingTop={2}>
+            <i style={{ fontSize: '1rem' }} className="fa fa-info-circle" />
+          </Box>
+          <Box paddingLeft={4}>
+            <Typography
+              color={COLORS.BLACK}
+              align={TEXT_ALIGN.LEFT}
+              variant={TYPOGRAPHY.Paragraph}
+              fontWeight={FONT_WEIGHT.BOLD}
+            >
+              {t('newNFTsDetected')}
+            </Typography>
+            <Typography
+              color={COLORS.BLACK}
+              align={TEXT_ALIGN.LEFT}
+              variant={TYPOGRAPHY.Paragraph}
+              boxProps={{ marginBottom: 4 }}
+            >
+              {t('newNFTsDetectedInfo')}
+            </Typography>
+            <a
+              href="#"
+              onClick={(e) => {
+                e.preventDefault();
+                console.log('show preference popover');
+              }}
+              style={{ fontSize: '.9rem' }}
+            >
+              {t('selectNFTPrivacyPreference')}
+            </a>
+          </Box>
+        </Box>
+      </Dialog>
+    </Box>
+  );
+}
diff --git a/ui/components/app/qr-hardware-popover/base-reader.js b/ui/components/app/qr-hardware-popover/base-reader.js
new file mode 100644
index 000000000..5743dc3c4
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/base-reader.js
@@ -0,0 +1,217 @@
+import React, { useEffect, useRef, useState } from 'react';
+import log from 'loglevel';
+import { URDecoder } from '@ngraveio/bc-ur';
+import PropTypes from 'prop-types';
+import { getEnvironmentType } from '../../../../app/scripts/lib/util';
+import { ENVIRONMENT_TYPE_FULLSCREEN } from '../../../../shared/constants/app';
+import WebcamUtils from '../../../helpers/utils/webcam-utils';
+import PageContainerFooter from '../../ui/page-container/page-container-footer/page-container-footer.component';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import { SECOND } from '../../../../shared/constants/time';
+import EnhancedReader from './enhanced-reader';
+
+const READY_STATE = {
+  ACCESSING_CAMERA: 'ACCESSING_CAMERA',
+  NEED_TO_ALLOW_ACCESS: 'NEED_TO_ALLOW_ACCESS',
+  READY: 'READY',
+};
+
+const BaseReader = ({
+  isReadingWallet,
+  handleCancel,
+  handleSuccess,
+  setErrorTitle,
+}) => {
+  const t = useI18nContext();
+  const [ready, setReady] = useState(READY_STATE.ACCESSING_CAMERA);
+  const [error, setError] = useState(null);
+  const [urDecoder, setURDecoder] = useState(new URDecoder());
+
+  let permissionChecker = null;
+  const mounted = useRef(false);
+
+  const reset = () => {
+    setReady(READY_STATE.ACCESSING_CAMERA);
+    setError(null);
+    setURDecoder(new URDecoder());
+  };
+
+  const checkEnvironment = async () => {
+    try {
+      const { environmentReady } = await WebcamUtils.checkStatus();
+      if (
+        !environmentReady &&
+        getEnvironmentType() !== ENVIRONMENT_TYPE_FULLSCREEN
+      ) {
+        const currentUrl = new URL(window.location.href);
+        const currentHash = currentUrl.hash;
+        const currentRoute = currentHash ? currentHash.substring(1) : null;
+        global.platform.openExtensionInBrowser(currentRoute);
+      }
+    } catch (e) {
+      if (mounted.current) {
+        setError(e);
+      }
+    }
+    // initial attempt is required to trigger permission prompt
+    // eslint-disable-next-line no-use-before-define
+    return initCamera();
+  };
+
+  const checkPermissions = async () => {
+    try {
+      const { permissions } = await WebcamUtils.checkStatus();
+      if (permissions) {
+        // Let the video stream load first...
+        await new Promise((resolve) => setTimeout(resolve, SECOND * 2));
+        if (!mounted.current) {
+          return;
+        }
+        setReady(READY_STATE.READY);
+      } else if (mounted.current) {
+        // Keep checking for permissions
+        permissionChecker = setTimeout(checkPermissions, SECOND);
+        setReady(READY_STATE.NEED_TO_ALLOW_ACCESS);
+      }
+    } catch (e) {
+      if (mounted.current) {
+        setError(e);
+      }
+    }
+  };
+
+  const handleScan = (data) => {
+    try {
+      if (!data) {
+        return;
+      }
+      urDecoder.receivePart(data);
+      if (urDecoder.isComplete()) {
+        const result = urDecoder.resultUR();
+        handleSuccess(result).catch(setError);
+      }
+    } catch (e) {
+      if (isReadingWallet) {
+        setErrorTitle(t('QRHardwareUnknownQRCodeTitle'));
+      } else {
+        setErrorTitle(t('QRHardwareInvalidTransactionTitle'));
+      }
+      setError(new Error(t('unknownQrCode')));
+    }
+  };
+
+  const initCamera = () => {
+    try {
+      checkPermissions();
+    } catch (e) {
+      if (!mounted.current) {
+        return;
+      }
+      if (e.name === 'NotAllowedError') {
+        log.info(`Permission denied: '${e}'`);
+        setReady(READY_STATE.NEED_TO_ALLOW_ACCESS);
+      } else {
+        setError(e);
+      }
+    }
+  };
+
+  useEffect(() => {
+    mounted.current = true;
+    checkEnvironment();
+    return () => {
+      mounted.current = false;
+      clearTimeout(permissionChecker);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  useEffect(() => {
+    if (ready === READY_STATE.READY) {
+      initCamera();
+    } else if (ready === READY_STATE.NEED_TO_ALLOW_ACCESS) {
+      checkPermissions();
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [ready]);
+
+  const tryAgain = () => {
+    clearTimeout(permissionChecker);
+    reset();
+    checkEnvironment();
+  };
+
+  const renderError = () => {
+    let title, msg;
+    if (error.type === 'NO_WEBCAM_FOUND') {
+      title = t('noWebcamFoundTitle');
+      msg = t('noWebcamFound');
+    } else if (error.message === t('unknownQrCode')) {
+      if (isReadingWallet) {
+        msg = t('QRHardwareUnknownWalletQRCode');
+      } else {
+        msg = t('unknownQrCode');
+      }
+    } else if (error.message === t('QRHardwareMismatchedSignId')) {
+      msg = t('QRHardwareMismatchedSignId');
+    } else {
+      title = t('unknownCameraErrorTitle');
+      msg = t('unknownCameraError');
+    }
+
+    return (
+      <>
+        <div className="qr-scanner__image">
+          <img src="images/webcam.svg" width="70" height="70" alt="" />
+        </div>
+        {title ? <div className="qr-scanner__title">{title}</div> : null}
+        <div className="qr-scanner__error">{msg}</div>
+        <PageContainerFooter
+          onCancel={() => {
+            setErrorTitle('');
+            handleCancel();
+          }}
+          onSubmit={() => {
+            setErrorTitle('');
+            tryAgain();
+          }}
+          cancelText={t('cancel')}
+          submitText={t('tryAgain')}
+          submitButtonType="confirm"
+        />
+      </>
+    );
+  };
+
+  const renderVideo = () => {
+    let message;
+    if (ready === READY_STATE.ACCESSING_CAMERA) {
+      message = t('accessingYourCamera');
+    } else if (ready === READY_STATE.READY) {
+      message = t('QRHardwareScanInstructions');
+    } else if (ready === READY_STATE.NEED_TO_ALLOW_ACCESS) {
+      message = t('youNeedToAllowCameraAccess');
+    }
+    return (
+      <>
+        <div className="qr-scanner__content">
+          <EnhancedReader handleScan={handleScan} />
+        </div>
+        {message && <div className="qr-scanner__status">{message}</div>}
+      </>
+    );
+  };
+
+  return (
+    <div className="qr-scanner">{error ? renderError() : renderVideo()}</div>
+  );
+};
+
+BaseReader.propTypes = {
+  isReadingWallet: PropTypes.bool.isRequired,
+  handleCancel: PropTypes.func.isRequired,
+  handleSuccess: PropTypes.func.isRequired,
+  setErrorTitle: PropTypes.func.isRequired,
+};
+
+export default BaseReader;
diff --git a/ui/components/app/qr-hardware-popover/enhanced-reader.js b/ui/components/app/qr-hardware-popover/enhanced-reader.js
new file mode 100644
index 000000000..d1d696717
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/enhanced-reader.js
@@ -0,0 +1,67 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { BarcodeFormat, DecodeHintType } from '@zxing/library';
+import { BrowserQRCodeReader } from '@zxing/browser';
+import log from 'loglevel';
+import PropTypes from 'prop-types';
+import { MILLISECOND } from '../../../../shared/constants/time';
+import Spinner from '../../ui/spinner';
+
+const EnhancedReader = ({ handleScan }) => {
+  const [canplay, setCanplay] = useState(false);
+  const codeReader = useMemo(() => {
+    const hint = new Map();
+    hint.set(DecodeHintType.POSSIBLE_FORMATS, [BarcodeFormat.QR_CODE]);
+    return new BrowserQRCodeReader(hint, {
+      delayBetweenScanAttempts: MILLISECOND * 100,
+      delayBetweenScanSuccess: MILLISECOND * 100,
+    });
+  }, []);
+
+  useEffect(() => {
+    const videoElem = document.getElementById('video');
+    const canplayListener = () => {
+      setCanplay(true);
+    };
+    videoElem.addEventListener('canplay', canplayListener);
+    const promise = codeReader.decodeFromVideoDevice(
+      undefined,
+      'video',
+      (result) => {
+        if (result) {
+          handleScan(result.getText());
+        }
+      },
+    );
+    return () => {
+      videoElem.removeEventListener('canplay', canplayListener);
+      promise
+        .then((controls) => {
+          if (controls) {
+            controls.stop();
+          }
+        })
+        .catch(log.info);
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <div className="qr-scanner__content__video-wrapper">
+      <video
+        id="video"
+        style={{
+          display: canplay ? 'block' : 'none',
+          width: '100%',
+          filter: 'blur(4px)',
+        }}
+      />
+      {canplay ? null : <Spinner color="#F7C06C" />}
+    </div>
+  );
+};
+
+EnhancedReader.propTypes = {
+  handleScan: PropTypes.func.isRequired,
+};
+
+export default EnhancedReader;
diff --git a/ui/components/app/qr-hardware-popover/index.js b/ui/components/app/qr-hardware-popover/index.js
new file mode 100644
index 000000000..2ccbb2100
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/index.js
@@ -0,0 +1,3 @@
+import QRHardwarePopover from './qr-hardware-popover';
+
+export default QRHardwarePopover;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-popover.js b/ui/components/app/qr-hardware-popover/qr-hardware-popover.js
new file mode 100644
index 000000000..c3875c4e8
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-popover.js
@@ -0,0 +1,102 @@
+import React, { useCallback, useMemo, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { getCurrentQRHardwareState } from '../../../selectors';
+import Popover from '../../ui/popover';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import {
+  cancelSyncQRHardware as cancelSyncQRHardwareAction,
+  cancelQRHardwareSignRequest as cancelQRHardwareSignRequestAction,
+  cancelTx,
+  cancelPersonalMsg,
+  cancelMsg,
+  cancelTypedMsg,
+} from '../../../store/actions';
+import { MESSAGE_TYPE } from '../../../../shared/constants/app';
+import QRHardwareWalletImporter from './qr-hardware-wallet-importer';
+import QRHardwareSignRequest from './qr-hardware-sign-request';
+
+const QRHardwarePopover = () => {
+  const t = useI18nContext();
+
+  const qrHardware = useSelector(getCurrentQRHardwareState);
+  const { sync, sign } = qrHardware;
+  const showWalletImporter = sync?.reading;
+  const showSignRequest = sign?.request;
+  const showPopover = showWalletImporter || showSignRequest;
+  const [errorTitle, setErrorTitle] = useState('');
+
+  const { txData } = useSelector((state) => {
+    return state.confirmTransaction;
+  });
+  // the confirmTransaction's life cycle is not consistent with QR hardware wallet;
+  // the confirmTransaction will change after the previous tx is confirmed or cancel,
+  // we want to block the changing by sign request id;
+  const _txData = useMemo(() => {
+    return txData;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [sign?.request?.requestId]);
+
+  const dispatch = useDispatch();
+  const walletImporterCancel = useCallback(
+    () => dispatch(cancelSyncQRHardwareAction()),
+    [dispatch],
+  );
+
+  const signRequestCancel = useCallback(() => {
+    let action = cancelTx;
+    switch (_txData.type) {
+      case MESSAGE_TYPE.PERSONAL_SIGN: {
+        action = cancelPersonalMsg;
+        break;
+      }
+      case MESSAGE_TYPE.ETH_SIGN: {
+        action = cancelMsg;
+        break;
+      }
+      case MESSAGE_TYPE.ETH_SIGN_TYPED_DATA: {
+        action = cancelTypedMsg;
+        break;
+      }
+      default: {
+        action = cancelTx;
+      }
+    }
+    dispatch(action(_txData));
+    dispatch(cancelQRHardwareSignRequestAction());
+  }, [dispatch, _txData]);
+
+  const title = useMemo(() => {
+    let _title = '';
+    if (showSignRequest) {
+      _title = t('QRHardwareSignRequestTitle');
+    } else if (showWalletImporter) {
+      _title = t('QRHardwareWalletImporterTitle');
+    }
+    if (errorTitle !== '') {
+      _title = errorTitle;
+    }
+    return _title;
+  }, [showSignRequest, showWalletImporter, t, errorTitle]);
+  return showPopover ? (
+    <Popover
+      title={title}
+      onClose={showWalletImporter ? walletImporterCancel : signRequestCancel}
+    >
+      {showWalletImporter && (
+        <QRHardwareWalletImporter
+          handleCancel={walletImporterCancel}
+          setErrorTitle={setErrorTitle}
+        />
+      )}
+      {showSignRequest && (
+        <QRHardwareSignRequest
+          setErrorTitle={setErrorTitle}
+          handleCancel={signRequestCancel}
+          request={sign.request}
+        />
+      )}
+    </Popover>
+  ) : null;
+};
+
+export default QRHardwarePopover;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/index.js b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/index.js
new file mode 100644
index 000000000..9a59357a1
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/index.js
@@ -0,0 +1,3 @@
+import QRHardwareSignRequest from './qr-hardware-sign-request.component';
+
+export default QRHardwareSignRequest;
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
new file mode 100644
index 000000000..c79dec547
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/player.js
@@ -0,0 +1,71 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import QRCode from 'qrcode.react';
+import { UR, UREncoder } from '@ngraveio/bc-ur';
+import PropTypes from 'prop-types';
+import Typography from '../../../ui/typography';
+import Box from '../../../ui/box';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+import {
+  ALIGN_ITEMS,
+  DISPLAY,
+  FLEX_DIRECTION,
+  TEXT_ALIGN,
+} from '../../../../helpers/constants/design-system';
+import { PageContainerFooter } from '../../../ui/page-container';
+
+const Player = ({ type, cbor, cancelQRHardwareSignRequest, toRead }) => {
+  const t = useI18nContext();
+  const urEncoder = useMemo(
+    () => new UREncoder(new UR(Buffer.from(cbor, 'hex'), type), 400),
+    [cbor, type],
+  );
+  const [currentQRCode, setCurrentQRCode] = useState(urEncoder.nextPart());
+  useEffect(() => {
+    const id = setInterval(() => {
+      setCurrentQRCode(urEncoder.nextPart());
+    }, 100);
+    return () => {
+      clearInterval(id);
+    };
+  }, [urEncoder]);
+
+  return (
+    <>
+      <Box>
+        <Typography align={TEXT_ALIGN.CENTER}>
+          {t('QRHardwareSignRequestSubtitle')}
+        </Typography>
+      </Box>
+      <Box
+        paddingTop={4}
+        paddingBottom={4}
+        display={DISPLAY.FLEX}
+        alignItems={ALIGN_ITEMS.CENTER}
+        flexDirection={FLEX_DIRECTION.COLUMN}
+      >
+        <QRCode value={currentQRCode.toUpperCase()} size={250} />
+      </Box>
+      <Box paddingBottom={4} paddingLeft={4} paddingRight={4}>
+        <Typography align={TEXT_ALIGN.CENTER}>
+          {t('QRHardwareSignRequestDescription')}
+        </Typography>
+      </Box>
+      <PageContainerFooter
+        onCancel={cancelQRHardwareSignRequest}
+        onSubmit={toRead}
+        cancelText={t('QRHardwareSignRequestCancel')}
+        submitText={t('QRHardwareSignRequestGetSignature')}
+        submitButtonType="confirm"
+      />
+    </>
+  );
+};
+
+Player.propTypes = {
+  type: PropTypes.string.isRequired,
+  cbor: PropTypes.string.isRequired,
+  cancelQRHardwareSignRequest: PropTypes.func.isRequired,
+  toRead: PropTypes.func.isRequired,
+};
+
+export default Player;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/qr-hardware-sign-request.component.js b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/qr-hardware-sign-request.component.js
new file mode 100644
index 000000000..efbc40729
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/qr-hardware-sign-request.component.js
@@ -0,0 +1,45 @@
+import React, { useCallback, useState } from 'react';
+import PropTypes from 'prop-types';
+import { submitQRHardwareSignature } from '../../../../store/actions';
+import Player from './player';
+import Reader from './reader';
+
+const QRHardwareSignRequest = ({ request, handleCancel, setErrorTitle }) => {
+  const [status, setStatus] = useState('play');
+
+  const toRead = useCallback(() => setStatus('read'), []);
+
+  const renderPlayer = () => {
+    const { payload } = request;
+    return (
+      <Player
+        type={payload.type}
+        cbor={payload.cbor}
+        cancelQRHardwareSignRequest={handleCancel}
+        toRead={toRead}
+      />
+    );
+  };
+
+  const renderReader = () => {
+    return (
+      <Reader
+        cancelQRHardwareSignRequest={handleCancel}
+        submitQRHardwareSignature={submitQRHardwareSignature}
+        requestId={request.requestId}
+        setErrorTitle={setErrorTitle}
+      />
+    );
+  };
+
+  if (status === 'play') return renderPlayer();
+  return renderReader();
+};
+
+QRHardwareSignRequest.propTypes = {
+  request: PropTypes.object.isRequired,
+  handleCancel: PropTypes.func.isRequired,
+  setErrorTitle: PropTypes.func.isRequired,
+};
+
+export default QRHardwareSignRequest;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/reader.js b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/reader.js
new file mode 100644
index 000000000..2a5804a71
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-sign-request/reader.js
@@ -0,0 +1,52 @@
+import React from 'react';
+import { ETHSignature } from '@keystonehq/bc-ur-registry-eth';
+import * as uuid from 'uuid';
+import PropTypes from 'prop-types';
+import BaseReader from '../base-reader';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+
+const Reader = ({
+  submitQRHardwareSignature,
+  cancelQRHardwareSignRequest,
+  requestId,
+  setErrorTitle,
+}) => {
+  const t = useI18nContext();
+  const cancel = () => {
+    cancelQRHardwareSignRequest();
+  };
+
+  const handleSuccess = async (ur) => {
+    if (ur.type === 'eth-signature') {
+      const ethSignature = ETHSignature.fromCBOR(ur.cbor);
+      const buffer = ethSignature.getRequestId();
+      const signId = uuid.stringify(buffer);
+      if (signId === requestId) {
+        return await submitQRHardwareSignature(signId, ur.cbor.toString('hex'));
+      }
+      setErrorTitle(t('QRHardwareInvalidTransactionTitle'));
+      throw new Error(t('QRHardwareMismatchedSignId'));
+    } else {
+      setErrorTitle(t('QRHardwareInvalidTransactionTitle'));
+      throw new Error(t('unknownQrCode'));
+    }
+  };
+
+  return (
+    <BaseReader
+      isReadingWallet={false}
+      handleCancel={cancel}
+      handleSuccess={handleSuccess}
+      setErrorTitle={setErrorTitle}
+    />
+  );
+};
+
+Reader.propTypes = {
+  submitQRHardwareSignature: PropTypes.func.isRequired,
+  cancelQRHardwareSignRequest: PropTypes.func.isRequired,
+  requestId: PropTypes.string.isRequired,
+  setErrorTitle: PropTypes.func.isRequired,
+};
+
+export default Reader;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/index.js b/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/index.js
new file mode 100644
index 000000000..55c7b34e2
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/index.js
@@ -0,0 +1,3 @@
+import QRHardwareWalletImporter from './qr-hardware-wallet-importer.component';
+
+export default QRHardwareWalletImporter;
diff --git a/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/qr-hardware-wallet-importer.component.js b/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/qr-hardware-wallet-importer.component.js
new file mode 100644
index 000000000..0c5a6355b
--- /dev/null
+++ b/ui/components/app/qr-hardware-popover/qr-hardware-wallet-importer/qr-hardware-wallet-importer.component.js
@@ -0,0 +1,37 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import {
+  submitQRHardwareCryptoAccount,
+  submitQRHardwareCryptoHDKey,
+} from '../../../../store/actions';
+import BaseReader from '../base-reader';
+import { useI18nContext } from '../../../../hooks/useI18nContext';
+
+const QRHardwareWalletImporter = ({ handleCancel, setErrorTitle }) => {
+  const t = useI18nContext();
+  const handleSuccess = async (ur) => {
+    if (ur.type === 'crypto-hdkey') {
+      return await submitQRHardwareCryptoHDKey(ur.cbor.toString('hex'));
+    } else if (ur.type === 'crypto-account') {
+      return await submitQRHardwareCryptoAccount(ur.cbor.toString('hex'));
+    }
+    setErrorTitle(t('QRHardwareUnknownQRCodeTitle'));
+    throw new Error(t('unknownQrCode'));
+  };
+
+  return (
+    <BaseReader
+      isReadingWallet
+      handleCancel={handleCancel}
+      handleSuccess={handleSuccess}
+      setErrorTitle={setErrorTitle}
+    />
+  );
+};
+
+QRHardwareWalletImporter.propTypes = {
+  handleCancel: PropTypes.func.isRequired,
+  setErrorTitle: PropTypes.func.isRequired,
+};
+
+export default QRHardwareWalletImporter;
diff --git a/ui/components/app/transaction-breakdown/index.scss b/ui/components/app/transaction-breakdown/index.scss
index 7df517d1b..87aa3c72e 100644
--- a/ui/components/app/transaction-breakdown/index.scss
+++ b/ui/components/app/transaction-breakdown/index.scss
@@ -2,8 +2,11 @@
 
 .transaction-breakdown {
   &__title {
-    border-bottom: 1px solid #d8d8d8;
     padding-bottom: 4px;
+    padding-top: 8px;
+    font-size: 14px;
+    color: $Black-100;
+    font-weight: bold;
     text-transform: capitalize;
   }
 
@@ -15,12 +18,17 @@
     display: flex;
     justify-content: flex-end;
     text-align: end;
-    white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
 
     &--eth-total {
-      font-weight: 500;
+      font-weight: bold;
+      color: $Black-100;
+    }
+
+    &--amount {
+      font-weight: bold;
+      color: $Black-100;
     }
   }
 }
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown-row/index.scss b/ui/components/app/transaction-breakdown/transaction-breakdown-row/index.scss
index 372a40e4b..ac6111af2 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown-row/index.scss
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown-row/index.scss
@@ -1,20 +1,22 @@
 .transaction-breakdown-row {
   @include H7;
 
-  color: $scorpion;
+  color: $Grey-500;
   display: flex;
   justify-content: space-between;
   padding: 8px 0;
 
-  &:not(:last-child) {
+  &--with-bottom-border {
     border-bottom: 1px solid #d8d8d8;
   }
 
   &__title {
     padding-right: 8px;
+    min-width: 40%;
   }
 
   &__value {
     min-width: 0;
+    word-break: break-word;
   }
 }
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js b/ui/components/app/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js
index 99c2b1e30..e4c7c56bc 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown-row/transaction-breakdown-row.component.js
@@ -7,14 +7,19 @@ export default class TransactionBreakdownRow extends PureComponent {
     title: PropTypes.string,
     children: PropTypes.node,
     className: PropTypes.string,
+    divider: PropTypes.bool,
   };
 
   render() {
-    const { title, children, className } = this.props;
+    const { title, children, className, divider = false } = this.props;
 
     return (
       <div
-        className={classnames('transaction-breakdown-row', className)}
+        className={classnames(
+          'transaction-breakdown-row',
+          divider ? 'transaction-breakdown-row--with-bottom-border' : '',
+          className,
+        )}
         data-testid="transaction-breakdown-row"
       >
         <div
diff --git a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
index d046d09e0..ce179036c 100644
--- a/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
+++ b/ui/components/app/transaction-breakdown/transaction-breakdown.component.js
@@ -65,7 +65,7 @@ export default class TransactionBreakdown extends PureComponent {
     return (
       <div className={classnames('transaction-breakdown', className)}>
         <div className="transaction-breakdown__title">{t('transaction')}</div>
-        <TransactionBreakdownRow title={t('nonce')}>
+        <TransactionBreakdownRow divider title={t('nonce')}>
           {typeof nonce === 'undefined' ? null : (
             <HexToDecimal
               className="transaction-breakdown__value"
@@ -76,7 +76,7 @@ export default class TransactionBreakdown extends PureComponent {
         <TransactionBreakdownRow
           title={isTokenApprove ? t('spendLimitAmount') : t('amount')}
         >
-          <span className="transaction-breakdown__value">
+          <span className="transaction-breakdown__value transaction-breakdown__value--amount">
             {primaryCurrency}
           </span>
         </TransactionBreakdownRow>
@@ -178,7 +178,10 @@ export default class TransactionBreakdown extends PureComponent {
           </TransactionBreakdownRow>
         )}
         {isEIP1559Transaction && (
-          <TransactionBreakdownRow title={t('transactionHistoryMaxFeePerGas')}>
+          <TransactionBreakdownRow
+            divider
+            title={t('transactionHistoryMaxFeePerGas')}
+          >
             <UserPreferencedCurrencyDisplay
               className="transaction-breakdown__value"
               currency={nativeCurrency}
diff --git a/ui/components/app/transaction-decoding/components/decoding/address/address.component.js b/ui/components/app/transaction-decoding/components/decoding/address/address.component.js
new file mode 100644
index 000000000..7e6358634
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/decoding/address/address.component.js
@@ -0,0 +1,71 @@
+import React, { useState } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import copyToClipboard from 'copy-to-clipboard';
+import { shortenAddress } from '../../../../../../helpers/utils/util';
+import Identicon from '../../../../../ui/identicon';
+import { useI18nContext } from '../../../../../../hooks/useI18nContext';
+import { getAddressBook } from '../../../../../../selectors';
+import NicknamePopovers from '../../../../modals/nickname-popovers';
+
+const Address = ({
+  checksummedRecipientAddress,
+  onRecipientClick,
+  addressOnly,
+  recipientEns,
+  recipientName,
+}) => {
+  const t = useI18nContext();
+  const [showNicknamePopovers, setShowNicknamePopovers] = useState(false);
+
+  const addressBook = useSelector(getAddressBook);
+  const addressBookEntryObject = addressBook.find(
+    (entry) => entry.address === checksummedRecipientAddress,
+  );
+  const recipientNickname = addressBookEntryObject?.name;
+
+  const recipientToRender = addressOnly
+    ? recipientNickname ||
+      recipientEns ||
+      shortenAddress(checksummedRecipientAddress)
+    : recipientNickname || recipientEns || recipientName || t('newContract');
+
+  return (
+    <div
+      className="tx-insight tx-insight-component tx-insight-component-address"
+      onClick={() => {
+        copyToClipboard(checksummedRecipientAddress);
+        if (onRecipientClick) {
+          onRecipientClick();
+        }
+      }}
+    >
+      <div className="tx-insight-component-address__sender-icon">
+        <Identicon address={checksummedRecipientAddress} diameter={18} />
+      </div>
+
+      <div
+        className="address__name"
+        onClick={() => setShowNicknamePopovers(true)}
+      >
+        {recipientToRender}
+      </div>
+      {showNicknamePopovers ? (
+        <NicknamePopovers
+          onClose={() => setShowNicknamePopovers(false)}
+          address={checksummedRecipientAddress}
+        />
+      ) : null}
+    </div>
+  );
+};
+
+Address.propTypes = {
+  checksummedRecipientAddress: PropTypes.string,
+  recipientName: PropTypes.string,
+  recipientEns: PropTypes.string,
+  addressOnly: PropTypes.bool,
+  onRecipientClick: PropTypes.func,
+};
+
+export default Address;
diff --git a/ui/components/app/transaction-decoding/components/decoding/address/index.js b/ui/components/app/transaction-decoding/components/decoding/address/index.js
new file mode 100644
index 000000000..6909aec4e
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/decoding/address/index.js
@@ -0,0 +1 @@
+export { default } from './address.component';
diff --git a/ui/components/app/transaction-decoding/components/decoding/address/index.scss b/ui/components/app/transaction-decoding/components/decoding/address/index.scss
new file mode 100644
index 000000000..ca821dae8
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/decoding/address/index.scss
@@ -0,0 +1,12 @@
+.tx-insight-content {
+  .tx-insight-component-address {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    overflow: visible;
+
+    &__sender-icon {
+      padding-right: 5px;
+    }
+  }
+}
diff --git a/ui/components/app/transaction-decoding/components/ui/accreditation/accreditation.component.js b/ui/components/app/transaction-decoding/components/ui/accreditation/accreditation.component.js
new file mode 100644
index 000000000..fd1d75cd8
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/accreditation/accreditation.component.js
@@ -0,0 +1,72 @@
+import React, { useContext } from 'react';
+import { useSelector } from 'react-redux';
+import PropTypes from 'prop-types';
+import { getAccountLink } from '@metamask/etherscan-link';
+import {
+  getCurrentChainId,
+  getRpcPrefsForCurrentProvider,
+} from '../../../../../../selectors';
+import { I18nContext } from '../../../../../../contexts/i18n';
+
+import { TYPOGRAPHY } from '../../../../../../helpers/constants/design-system';
+
+import Button from '../../../../../ui/button';
+import Typography from '../../../../../ui/typography';
+
+const Accreditation = ({ fetchVia, address }) => {
+  const t = useContext(I18nContext);
+  const chainId = useSelector(getCurrentChainId);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
+  const addressLink = getAccountLink(address, chainId, rpcPrefs);
+
+  const AccreditationLink = () => {
+    return (
+      <>
+        <Typography
+          variant={TYPOGRAPHY.H7}
+          className="accreditation__prefix"
+          boxProps={{ margin: 0 }}
+        >
+          {t('transactionDecodingAccreditationVerified', [
+            <Button
+              type="link"
+              className="accreditation__link"
+              onClick={() => {
+                global.platform.openTab({
+                  url: addressLink,
+                });
+              }}
+              target="_blank"
+              rel="noopener noreferrer"
+              title={t('etherscanView')}
+              key="accreditation-link-button"
+            >
+              {fetchVia}
+            </Button>,
+          ])}
+        </Typography>
+        <Typography variant={TYPOGRAPHY.H7} boxProps={{ margin: 0 }}>
+          {t('transactionDecodingAccreditationDecoded')}
+        </Typography>
+      </>
+    );
+  };
+
+  return (
+    <div className="accreditation">
+      <div className="accreditation__icon">
+        <i className="fa fa-info-circle" />
+      </div>
+      <div className="accreditation__info">
+        <AccreditationLink />
+      </div>
+    </div>
+  );
+};
+
+Accreditation.propTypes = {
+  fetchVia: PropTypes.string.isRequired,
+  address: PropTypes.string.isRequired,
+};
+
+export default Accreditation;
diff --git a/ui/components/app/transaction-decoding/components/ui/accreditation/index.js b/ui/components/app/transaction-decoding/components/ui/accreditation/index.js
new file mode 100644
index 000000000..138aad790
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/accreditation/index.js
@@ -0,0 +1 @@
+export { default } from './accreditation.component';
diff --git a/ui/components/app/transaction-decoding/components/ui/accreditation/index.scss b/ui/components/app/transaction-decoding/components/ui/accreditation/index.scss
new file mode 100644
index 000000000..efc4af751
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/accreditation/index.scss
@@ -0,0 +1,24 @@
+.accreditation {
+  display: flex;
+  align-items: center;
+  margin-top: 8px;
+
+  &__icon {
+    margin-right: 8px;
+  }
+
+  &__info {
+    color: $ui-black;
+    display: flex;
+    flex-flow: column;
+    flex-wrap: wrap;
+  }
+
+  &__link.btn-link {
+    @include H7;
+
+    display: inherit;
+    padding: 0 4px;
+  }
+}
+
diff --git a/ui/components/app/transaction-decoding/components/ui/copy-raw-data/copy-raw-data.component.js b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/copy-raw-data.component.js
new file mode 100644
index 000000000..8e9361e70
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/copy-raw-data.component.js
@@ -0,0 +1,38 @@
+import React, { useContext } from 'react';
+import PropTypes from 'prop-types';
+import Tooltip from '../../../../../ui/tooltip/tooltip';
+import CopyIcon from '../../../../../ui/icon/copy-icon.component';
+import { I18nContext } from '../../../../../../contexts/i18n';
+
+import { useCopyToClipboard } from '../../../../../../hooks/useCopyToClipboard';
+
+const CopyRawData = ({ data }) => {
+  const t = useContext(I18nContext);
+  const [copied, handleCopy] = useCopyToClipboard();
+
+  return (
+    <div className="copy-raw-data">
+      <Tooltip position="right" title={copied ? t('copiedExclamation') : ''}>
+        <button
+          onClick={() => {
+            handleCopy(data);
+          }}
+          className="copy-raw-data__button"
+        >
+          <div className="copy-raw-data__icon">
+            <CopyIcon size={12} color="#BBC0C5" />
+          </div>
+          <div className="copy-raw-data__label">
+            {t('copyRawTransactionData')}
+          </div>
+        </button>
+      </Tooltip>
+    </div>
+  );
+};
+
+CopyRawData.propTypes = {
+  data: PropTypes.string.isRequired,
+};
+
+export default CopyRawData;
diff --git a/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.js b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.js
new file mode 100644
index 000000000..c586d6272
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.js
@@ -0,0 +1 @@
+export { default } from './copy-raw-data.component';
diff --git a/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.scss b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.scss
new file mode 100644
index 000000000..4deb4c525
--- /dev/null
+++ b/ui/components/app/transaction-decoding/components/ui/copy-raw-data/index.scss
@@ -0,0 +1,30 @@
+.copy-raw-data {
+  display: flex;
+  align-items: center;
+
+  &__button {
+    border-radius: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 8px;
+    margin-top: 5px;
+    background-color: transparent;
+
+    &:hover {
+      background-color: $Grey-000;
+    }
+
+    &:active {
+      background-color: #ededed;
+    }
+  }
+
+  &__icon {
+    padding-inline-end: 6px;
+  }
+
+  &__label {
+    color: #6a737d;
+  }
+}
diff --git a/ui/components/app/transaction-decoding/constants.js b/ui/components/app/transaction-decoding/constants.js
new file mode 100644
index 000000000..06840193f
--- /dev/null
+++ b/ui/components/app/transaction-decoding/constants.js
@@ -0,0 +1,4 @@
+const TX_INSIGHTS_BASE_URI = 'https://tx-insights.metaswap.codefi.network';
+
+export const FETCH_PROJECT_INFO_URI = `${TX_INSIGHTS_BASE_URI}/fetch-project`;
+export const FETCH_SUPPORTED_NETWORKS_URI = `${TX_INSIGHTS_BASE_URI}/networks`;
diff --git a/ui/components/app/transaction-decoding/index.js b/ui/components/app/transaction-decoding/index.js
new file mode 100644
index 000000000..005447c73
--- /dev/null
+++ b/ui/components/app/transaction-decoding/index.js
@@ -0,0 +1 @@
+export { default } from './transaction-decoding.component';
diff --git a/ui/components/app/transaction-decoding/index.scss b/ui/components/app/transaction-decoding/index.scss
new file mode 100644
index 000000000..98992c7aa
--- /dev/null
+++ b/ui/components/app/transaction-decoding/index.scss
@@ -0,0 +1,172 @@
+//styling for ui components
+@import './components/ui/copy-raw-data/index';
+@import './components/ui/accreditation/index';
+
+//styling for decoding components
+@import './components/decoding/address/index';
+
+.tx-insight {
+  overflow-x: hidden;
+
+  &-loading {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    min-height: 100px;
+
+    .spinner {
+      width: 30px;
+    }
+  }
+
+  & > details {
+    margin: 20px 0;
+  }
+
+  & > details > summary {
+    &.tx-insight-title {
+      font-size: 14px;
+      position: relative;
+      margin: 12px 0 4px;
+      padding-inline-start: 22px;
+      cursor: pointer;
+
+      & + .tx-insight-content {
+        padding-inline-start: 14px;
+        padding-top: 5px;
+      }
+    }
+  }
+
+  &-error {
+    cursor: auto;
+  }
+
+  .tx-insight-content {
+    &__tree-component {
+      line-height: 175%;
+
+      & > ol {
+        padding-left: 0;
+      }
+
+      .eth-tx-params {
+        padding: 8px;
+        width: 343px;
+        background: white;
+        text-align: left;
+        display: flex;
+        flex-direction: column;
+        align-items: left;
+        font-family: Euclid Circular B, sans-serif;
+        font-style: normal;
+        font-weight: normal;
+        font-size: 14px;
+        line-height: 172%;
+      }
+
+      ol ol {
+        padding-left: 22px;
+        margin-left: 4px;
+      }
+
+      details > summary {
+        position: relative;
+        cursor: pointer;
+        padding-bottom: 5px;
+      }
+
+      .eth-tx-params .solidity-func-name {
+        width: fit-content;
+        padding: 4px;
+        text-transform: uppercase;
+        border: 1px solid rgb(149, 149, 149);
+        color: rgb(149, 149, 149);
+        border-radius: 4px;
+      }
+
+      .eth-tx-params .sol-value {
+        display: flex;
+        flex-flow: row wrap;
+      }
+
+      .eth-tx-params .sol-value > {
+        overflow: ellipses;
+      }
+
+      .eth-tx-params ol {
+        list-style: none;
+        padding: 0;
+        max-width: inherit;
+      }
+
+      .eth-tx-params > ol {
+        margin-left: 16px;
+      }
+
+      /*
+      Use this parameter to change the indentation!! */
+      .eth-tx-params ol ol:not(:first-child) {
+        padding-left: 8px;
+      }
+
+      pre.solidity-raw {
+        text-align: left;
+      }
+
+      .solidity-address {
+        display: flex;
+        flex-direction: row;
+      }
+
+      .solidity-address :first-child {
+        width: 16px;
+        height: 16px;
+        margin: 0 8px;
+      }
+
+      .solidity-item .param-name {
+        padding-right: 4px;
+      }
+
+      .solidity-value {
+        color: #6a737d;
+        overflow-x: hidden;
+        padding-bottom: 5px;
+
+        & > div {
+          display: flex;
+          flex-wrap: wrap;
+          word-break: break-all;
+        }
+      }
+
+      .solidity-error {
+        display: flex;
+        align-items: center;
+
+        & > .error-message__icon {
+          width: 14px;
+          margin-right: 5px;
+        }
+      }
+
+      .eth-tx-params details > summary {
+        color: black;
+        font-family: sans-serif;
+      }
+
+      .eth-tx-params footer {
+        text-align: center;
+        color: #8d959e;
+      }
+
+      .eth-tx-params footer a {
+        text-align: center;
+        color: #8d959e;
+      }
+    }
+  }
+}
+
+
diff --git a/ui/components/app/transaction-decoding/transaction-decoding.component.js b/ui/components/app/transaction-decoding/transaction-decoding.component.js
new file mode 100644
index 000000000..75ed7af4f
--- /dev/null
+++ b/ui/components/app/transaction-decoding/transaction-decoding.component.js
@@ -0,0 +1,244 @@
+import React, { useContext, useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import inspect from 'browser-util-inspect';
+import { forAddress } from '@truffle/decoder';
+import { useSelector } from 'react-redux';
+import * as Codec from '@truffle/codec';
+import Spinner from '../../ui/spinner';
+import ErrorMessage from '../../ui/error-message';
+import fetchWithCache from '../../../helpers/utils/fetch-with-cache';
+import { getSelectedAccount, getCurrentChainId } from '../../../selectors';
+import { hexToDecimal } from '../../../helpers/utils/conversions.util';
+import { I18nContext } from '../../../contexts/i18n';
+import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
+import { transformTxDecoding } from './transaction-decoding.util';
+import {
+  FETCH_PROJECT_INFO_URI,
+  FETCH_SUPPORTED_NETWORKS_URI,
+} from './constants';
+
+import Address from './components/decoding/address';
+import CopyRawData from './components/ui/copy-raw-data';
+import Accreditation from './components/ui/accreditation';
+
+export default function TransactionDecoding({ to = '', inputData: data = '' }) {
+  const t = useContext(I18nContext);
+  const [tx, setTx] = useState([]);
+  const [sourceAddress, setSourceAddress] = useState('');
+  const [sourceFetchedVia, setSourceFetchedVia] = useState('');
+
+  const { address: from } = useSelector(getSelectedAccount);
+  const network = hexToDecimal(useSelector(getCurrentChainId));
+
+  const [loading, setLoading] = useState(false);
+  const [hasError, setError] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+
+  useEffect(() => {
+    (async () => {
+      setLoading(true);
+      try {
+        const networks = await fetchWithCache(FETCH_SUPPORTED_NETWORKS_URI, {
+          method: 'GET',
+        });
+
+        if (
+          !networks.some(
+            (n) => n.active && Number(n.chainId) === Number(network),
+          )
+        ) {
+          throw new Error(
+            t('transactionDecodingUnsupportedNetworkError', [network]),
+          );
+        }
+
+        const requestUrl = `${FETCH_PROJECT_INFO_URI}?${new URLSearchParams({
+          to,
+          'network-id': network,
+        })}`;
+
+        const response = await fetchWithCache(requestUrl, { method: 'GET' });
+
+        const { info: projectInfo, fetchedVia, address } = response;
+
+        // update source information
+        if (address) {
+          setSourceAddress(address);
+        }
+
+        if (fetchedVia) {
+          setSourceFetchedVia(fetchedVia);
+        }
+
+        // creating instance of the truffle decoder
+        const decoder = await forAddress(to, {
+          provider: global.ethereumProvider,
+          projectInfo,
+        });
+
+        // decode tx input data
+        const decoding = await decoder.decodeTransaction({
+          from,
+          to,
+          input: data,
+          blockNumber: null,
+        });
+
+        // transform tx decoding arguments into tree data
+        const params = transformTxDecoding(decoding?.arguments);
+        setTx(params);
+
+        setLoading(false);
+      } catch (error) {
+        setLoading(false);
+        setError(true);
+        if (error?.message.match('400')) {
+          setErrorMessage(t('txInsightsNotSupported'));
+        } else {
+          setErrorMessage(error?.message);
+        }
+      }
+    })();
+  }, [t, from, to, network, data]);
+
+  // ***********************************************************
+  // component rendering methods
+  // ***********************************************************
+  const renderLeaf = ({ name, kind, typeClass, value }) => {
+    switch (kind) {
+      case 'error':
+        return (
+          <span className="sol-item solidity-error">
+            <span>Malformed data</span>
+          </span>
+        );
+
+      default:
+        switch (typeClass) {
+          case 'int':
+            return (
+              <span className="sol-item solidity-int">
+                {[value.asBN || value.asString].toString()}
+              </span>
+            );
+
+          case 'uint':
+            return (
+              <span className="sol-item solidity-uint">
+                {[value.asBN || value.asString].toString()}
+              </span>
+            );
+
+          case 'bytes':
+            return (
+              <span className="sol-item solidity-bytes">{value.asHex}</span>
+            );
+
+          case 'array':
+            return (
+              <details>
+                <summary className="typography--color-black">{name}: </summary>
+                <ol>
+                  {value.map((itemValue, index) => {
+                    return (
+                      <li key={`${itemValue.type?.typeClass}-${index}`}>
+                        {renderLeaf({
+                          typeClass: itemValue.type?.typeClass,
+                          value: itemValue.value,
+                          kind: itemValue.kind,
+                        })}
+                      </li>
+                    );
+                  })}
+                </ol>
+              </details>
+            );
+
+          case 'address': {
+            const address = value?.asAddress;
+            return (
+              <Address
+                addressOnly
+                checksummedRecipientAddress={toChecksumHexAddress(address)}
+              />
+            );
+          }
+          default:
+            return (
+              <pre className="sol-item solidity-raw">
+                {inspect(new Codec.Format.Utils.Inspect.ResultInspector(value))}
+              </pre>
+            );
+        }
+    }
+  };
+
+  const renderTree = (
+    { name, kind, typeClass, type, value, children },
+    index,
+  ) => {
+    return children ? (
+      <li key={`${typeClass}-${index}`}>
+        <details open={index === 0 ? 'open' : ''}>
+          <summary>{name}: </summary>
+          <ol>{children.map(renderTree)}</ol>
+        </details>
+      </li>
+    ) : (
+      <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>
+          ) : null}
+          <span className="sol-item solidity-uint">
+            {renderLeaf({ name, typeClass, type, value, kind })}
+          </span>
+        </div>
+      </li>
+    );
+  };
+
+  const renderTransactionDecoding = () => {
+    if (loading) {
+      return (
+        <div className="tx-insight-loading">
+          <Spinner color="#F7C06C" />
+        </div>
+      );
+    }
+
+    if (hasError) {
+      return (
+        <div className="tx-insight-error">
+          <ErrorMessage errorMessage={errorMessage} />
+        </div>
+      );
+    }
+
+    return (
+      <div className="tx-insight-content">
+        <div className="tx-insight-content__tree-component">
+          <ol>{tx.map(renderTree)}</ol>
+        </div>
+        <div className="tx-insight-content__copy-raw-tx">
+          <CopyRawData data={data} />
+        </div>
+        {sourceFetchedVia && sourceAddress ? (
+          <div className="tx-insight-content__accreditation">
+            <Accreditation
+              address={sourceAddress}
+              fetchVia={sourceFetchedVia}
+            />
+          </div>
+        ) : null}
+      </div>
+    );
+  };
+
+  return <div className="tx-insight">{renderTransactionDecoding()}</div>;
+}
+
+TransactionDecoding.propTypes = {
+  to: PropTypes.string.isRequired,
+  inputData: PropTypes.string.isRequired,
+};
diff --git a/ui/components/app/transaction-decoding/transaction-decoding.util.js b/ui/components/app/transaction-decoding/transaction-decoding.util.js
new file mode 100644
index 000000000..fa351a565
--- /dev/null
+++ b/ui/components/app/transaction-decoding/transaction-decoding.util.js
@@ -0,0 +1,30 @@
+// *********************************************
+// data transformation utils
+// *********************************************
+export const transformTxDecoding = (params) => {
+  return params.map((node) => {
+    const nodeName = node.name;
+    const nodeValue = node.value;
+    const nodeKind = nodeValue.kind;
+    const nodeTypeClass = nodeValue.type.typeClass;
+
+    const treeItem = {
+      name: nodeName,
+      kind: nodeKind,
+      typeClass: nodeTypeClass,
+      type: nodeValue.type,
+    };
+
+    if (nodeTypeClass === 'struct') {
+      return {
+        ...treeItem,
+        children: transformTxDecoding(nodeValue.value),
+      };
+    }
+
+    return {
+      ...treeItem,
+      value: nodeValue.value ? nodeValue.value : nodeValue,
+    };
+  });
+};
diff --git a/ui/components/app/transaction-detail-item/index.scss b/ui/components/app/transaction-detail-item/index.scss
index 5fecb94e0..a19f4316e 100644
--- a/ui/components/app/transaction-detail-item/index.scss
+++ b/ui/components/app/transaction-detail-item/index.scss
@@ -5,19 +5,24 @@
 
   &__row {
     display: flex;
+    justify-content: space-between;
     grid-gap: 5px;
-  }
 
-  &__title {
-    flex-grow: 1;
-    word-break: break-word;
+    &-subText {
+      display: flex;
+      align-items: center;
+
+      .currency-display-component {
+        margin-left: 4px;
+      }
+    }
   }
 
   &__detail-values {
     display: flex;
     flex-wrap: wrap;
     justify-content: end;
-    width: 55%;
+    width: 52%;
 
     &--flex-width {
       width: auto;
@@ -33,19 +38,6 @@
     }
   }
 
-  &__total {
-    font-weight: bold;
-    color: $ui-black;
-  }
-
-  &__subtitle {
-    flex-grow: 1;
-  }
-
-  &__subtext {
-    text-align: end;
-  }
-
   .currency-display-component {
     display: inline;
   }
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 84689bc95..cbd01182c 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
@@ -7,6 +7,9 @@ import {
   COLORS,
   FONT_WEIGHT,
   TYPOGRAPHY,
+  DISPLAY,
+  FLEX_WRAP,
+  ALIGN_ITEMS,
 } from '../../../helpers/constants/design-system';
 
 export default function TransactionDetailItem({
@@ -26,44 +29,39 @@ export default function TransactionDetailItem({
           color={detailTitleColor}
           fontWeight={boldHeadings ? FONT_WEIGHT.BOLD : FONT_WEIGHT.NORMAL}
           variant={TYPOGRAPHY.H6}
-          className="transaction-detail-item__title"
+          boxProps={{
+            display: DISPLAY.FLEX,
+            flexWrap: FLEX_WRAP.NO_WRAP,
+            alignItems: ALIGN_ITEMS.CENTER,
+          }}
         >
           {detailTitle}
         </Typography>
-        {detailText && (
-          <div
-            className={classnames('transaction-detail-item__detail-values', {
-              'transaction-detail-item__detail-values--flex-width': flexWidthValues,
-            })}
-          >
-            <Typography
-              fontWeight={boldHeadings ? FONT_WEIGHT.BOLD : FONT_WEIGHT.NORMAL}
-              variant={TYPOGRAPHY.H6}
-              className="transaction-detail-item__detail-text"
-              color={COLORS.UI4}
-            >
+        <div
+          className={classnames('transaction-detail-item__detail-values', {
+            'transaction-detail-item__detail-values--flex-width': flexWidthValues,
+          })}
+        >
+          {detailText && (
+            <Typography variant={TYPOGRAPHY.H6} color={COLORS.UI4}>
               {detailText}
             </Typography>
-          </div>
-        )}
-        <Typography
-          color={COLORS.BLACK}
-          fontWeight={FONT_WEIGHT.BOLD}
-          variant={TYPOGRAPHY.H6}
-          className="transaction-detail-item__total"
-        >
-          {detailTotal}
-        </Typography>
+          )}
+          <Typography
+            color={COLORS.BLACK}
+            fontWeight={boldHeadings ? FONT_WEIGHT.BOLD : FONT_WEIGHT.NORMAL}
+            variant={TYPOGRAPHY.H6}
+            margin={[1, 0, 1, 1]}
+          >
+            {detailTotal}
+          </Typography>
+        </div>
       </div>
       <div className="transaction-detail-item__row">
         {React.isValidElement(subTitle) ? (
-          <div className="transaction-detail-item__subtitle">{subTitle}</div>
+          <div>{subTitle}</div>
         ) : (
-          <Typography
-            variant={TYPOGRAPHY.H7}
-            className="transaction-detail-item__subtitle"
-            color={COLORS.UI4}
-          >
+          <Typography variant={TYPOGRAPHY.H7} color={COLORS.UI4}>
             {subTitle}
           </Typography>
         )}
@@ -71,7 +69,8 @@ export default function TransactionDetailItem({
         <Typography
           variant={TYPOGRAPHY.H7}
           color={COLORS.UI4}
-          className="transaction-detail-item__subtext"
+          align="end"
+          className="transaction-detail-item__row-subText"
         >
           {subText}
         </Typography>
diff --git a/ui/components/app/transaction-detail/index.scss b/ui/components/app/transaction-detail/index.scss
index 35bcf27c9..a24bd4ede 100644
--- a/ui/components/app/transaction-detail/index.scss
+++ b/ui/components/app/transaction-detail/index.scss
@@ -17,7 +17,6 @@
   }
 
   &-edit-V2 {
-    margin-bottom: 10px;
     display: flex;
     align-items: baseline;
     justify-content: flex-end;
@@ -66,4 +65,8 @@
       }
     }
   }
+
+  &-rows {
+    margin-top: 10px;
+  }
 }
diff --git a/ui/components/app/transaction-detail/transaction-detail.component.js b/ui/components/app/transaction-detail/transaction-detail.component.js
index b06d43af8..919d76dac 100644
--- a/ui/components/app/transaction-detail/transaction-detail.component.js
+++ b/ui/components/app/transaction-detail/transaction-detail.component.js
@@ -1,48 +1,43 @@
-import React, { useContext } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
 
-import { I18nContext } from '../../../contexts/i18n';
 import { useGasFeeContext } from '../../../contexts/gasFee';
+import { useTransactionModalContext } from '../../../contexts/transaction-modal';
 import InfoTooltip from '../../ui/info-tooltip/info-tooltip';
 import Typography from '../../ui/typography/typography';
 
 import TransactionDetailItem from '../transaction-detail-item/transaction-detail-item.component';
 import { COLORS } from '../../../helpers/constants/design-system';
+import { PRIORITY_LEVEL_ICON_MAP } from '../../../helpers/constants/gas';
+import { useI18nContext } from '../../../hooks/useI18nContext';
 
-const GasLevelIconMap = {
-  low: '🐢',
-  medium: '🦊',
-  high: '🦍',
-  dappSuggested: '🌐',
-  custom: '⚙',
-};
-
-export default function TransactionDetail({ rows = [], onEdit }) {
-  // eslint-disable-next-line prefer-destructuring
-  const EIP_1559_V2 = process.env.EIP_1559_V2;
-
-  const t = useContext(I18nContext);
+export default function TransactionDetail({
+  rows = [],
+  onEdit,
+  userAcknowledgedGasMissing,
+}) {
+  const t = useI18nContext();
   const {
-    estimateToUse,
     gasLimit,
-    gasPrice,
-    isUsingDappSuggestedGasFees,
+    hasSimulationError,
+    estimateUsed,
     maxFeePerGas,
     maxPriorityFeePerGas,
+    supportsEIP1559V2,
     transaction,
-    supportsEIP1559,
   } = useGasFeeContext();
-  const estimateUsed = isUsingDappSuggestedGasFees
-    ? 'dappSuggested'
-    : estimateToUse;
+  const { openModal } = useTransactionModalContext();
+
+  if (supportsEIP1559V2 && estimateUsed) {
+    const editEnabled = !hasSimulationError || userAcknowledgedGasMissing;
+    if (!editEnabled) return null;
 
-  if (EIP_1559_V2 && estimateUsed) {
     return (
       <div className="transaction-detail">
         <div className="transaction-detail-edit-V2">
-          <button onClick={onEdit}>
+          <button onClick={() => openModal('editGasFee')}>
             <span className="transaction-detail-edit-V2__icon">
-              {`${GasLevelIconMap[estimateUsed]} `}
+              {`${PRIORITY_LEVEL_ICON_MAP[estimateUsed]} `}
             </span>
             <span className="transaction-detail-edit-V2__label">
               {t(estimateUsed)}
@@ -50,7 +45,9 @@ export default function TransactionDetail({ rows = [], onEdit }) {
             <i className="fas fa-chevron-right asset-list-item__chevron-right" />
           </button>
           {estimateUsed === 'custom' && onEdit && (
-            <button onClick={onEdit}>{t('edit')}</button>
+            <button onClick={() => openModal('advancedGasFee')}>
+              {t('edit')}
+            </button>
           )}
           {estimateUsed === 'dappSuggested' && (
             <InfoTooltip
@@ -59,23 +56,14 @@ export default function TransactionDetail({ rows = [], onEdit }) {
                   <Typography fontSize="12px" color={COLORS.GREY}>
                     {t('dappSuggestedTooltip', [transaction.origin])}
                   </Typography>
-                  {supportsEIP1559 ? (
-                    <>
-                      <Typography fontSize="12px">
-                        <b>{t('maxBaseFee')}</b>
-                        {maxFeePerGas}
-                      </Typography>
-                      <Typography fontSize="12px">
-                        <b>{t('maxPriorityFee')}</b>
-                        {maxPriorityFeePerGas}
-                      </Typography>
-                    </>
-                  ) : (
-                    <Typography fontSize="12px">
-                      <b>{t('gasPriceLabel')}</b>
-                      {gasPrice}
-                    </Typography>
-                  )}
+                  <Typography fontSize="12px">
+                    <b>{t('maxBaseFee')}</b>
+                    {maxFeePerGas}
+                  </Typography>
+                  <Typography fontSize="12px">
+                    <b>{t('maxPriorityFee')}</b>
+                    {maxPriorityFeePerGas}
+                  </Typography>
                   <Typography fontSize="12px">
                     <b>{t('gasLimit')}</b>
                     {gasLimit}
@@ -106,4 +94,5 @@ export default function TransactionDetail({ rows = [], onEdit }) {
 TransactionDetail.propTypes = {
   rows: PropTypes.arrayOf(TransactionDetailItem).isRequired,
   onEdit: PropTypes.func,
+  userAcknowledgedGasMissing: PropTypes.bool.isRequired,
 };
diff --git a/ui/components/app/transaction-detail/transaction-detail.component.test.js b/ui/components/app/transaction-detail/transaction-detail.component.test.js
index a95cf1565..7209c872e 100644
--- a/ui/components/app/transaction-detail/transaction-detail.component.test.js
+++ b/ui/components/app/transaction-detail/transaction-detail.component.test.js
@@ -1,9 +1,16 @@
 import React from 'react';
 import { screen } from '@testing-library/react';
 
-import { ETH } from '../../../helpers/constants/common';
+import {
+  GAS_ESTIMATE_TYPES,
+  PRIORITY_LEVELS,
+} from '../../../../shared/constants/gas';
+import { TRANSACTION_ENVELOPE_TYPES } from '../../../../shared/constants/transaction';
+
 import { GasFeeContextProvider } from '../../../contexts/gasFee';
 import { renderWithProvider } from '../../../../test/jest';
+import mockEstimates from '../../../../test/data/mock-estimates.json';
+import mockState from '../../../../test/data/mock-state.json';
 import configureStore from '../../../store/store';
 
 import TransactionDetail from './transaction-detail.component';
@@ -16,34 +23,29 @@ jest.mock('../../../store/actions', () => ({
   addPollingTokenToAppState: jest.fn(),
 }));
 
-const render = (props) => {
+const render = ({ componentProps, contextProps } = {}) => {
   const store = configureStore({
     metamask: {
-      nativeCurrency: ETH,
-      preferences: {
-        useNativeCurrencyAsPrimaryCurrency: true,
-      },
-      provider: {},
-      cachedBalances: {},
+      ...mockState.metamask,
       accounts: {
-        '0xAddress': {
-          address: '0xAddress',
-          balance: '0x176e5b6f173ebe66',
+        [mockState.metamask.selectedAddress]: {
+          address: mockState.metamask.selectedAddress,
+          balance: '0x1F4',
         },
       },
-      selectedAddress: '0xAddress',
-      featureFlags: { advancedInlineGas: true },
+      gasFeeEstimates: mockEstimates[GAS_ESTIMATE_TYPES.FEE_MARKET],
     },
   });
 
   return renderWithProvider(
-    <GasFeeContextProvider {...props}>
+    <GasFeeContextProvider {...contextProps}>
       <TransactionDetail
         onEdit={() => {
           console.log('on edit');
         }}
         rows={[]}
-        {...props}
+        userAcknowledgedGasMissing
+        {...componentProps}
       />
     </GasFeeContextProvider>,
     store,
@@ -54,41 +56,93 @@ describe('TransactionDetail', () => {
   beforeEach(() => {
     process.env.EIP_1559_V2 = true;
   });
+
   afterEach(() => {
     process.env.EIP_1559_V2 = false;
   });
+
   it('should render edit link with text low if low gas estimates are selected', () => {
-    render({ transaction: { userFeeLevel: 'low' } });
+    render({ contextProps: { transaction: { userFeeLevel: 'low' } } });
     expect(screen.queryByText('🐢')).toBeInTheDocument();
     expect(screen.queryByText('Low')).toBeInTheDocument();
   });
+
   it('should render edit link with text markey if medium gas estimates are selected', () => {
-    render({ transaction: { userFeeLevel: 'medium' } });
+    render({ contextProps: { transaction: { userFeeLevel: 'medium' } } });
     expect(screen.queryByText('🦊')).toBeInTheDocument();
     expect(screen.queryByText('Market')).toBeInTheDocument();
   });
+
   it('should render edit link with text agressive if high gas estimates are selected', () => {
-    render({ transaction: { userFeeLevel: 'high' } });
+    render({ contextProps: { transaction: { userFeeLevel: 'high' } } });
     expect(screen.queryByText('🦍')).toBeInTheDocument();
     expect(screen.queryByText('Aggressive')).toBeInTheDocument();
   });
+
   it('should render edit link with text Site suggested if site suggested estimated are used', () => {
     render({
-      transaction: {
-        dappSuggestedGasFees: { maxFeePerGas: 1, maxPriorityFeePerGas: 1 },
-        txParams: { maxFeePerGas: 1, maxPriorityFeePerGas: 1 },
+      contextProps: {
+        transaction: {
+          userFeeLevel: PRIORITY_LEVELS.DAPP_SUGGESTED,
+          dappSuggestedGasFees: { maxFeePerGas: 1, maxPriorityFeePerGas: 1 },
+          txParams: { maxFeePerGas: 1, maxPriorityFeePerGas: 1 },
+        },
       },
     });
     expect(screen.queryByText('🌐')).toBeInTheDocument();
     expect(screen.queryByText('Site suggested')).toBeInTheDocument();
     expect(document.getElementsByClassName('info-tooltip')).toHaveLength(1);
   });
+
   it('should render edit link with text advance if custom gas estimates are used', () => {
     render({
-      defaultEstimateToUse: 'custom',
+      contextProps: {
+        defaultEstimateToUse: 'custom',
+      },
     });
     expect(screen.queryByText('⚙')).toBeInTheDocument();
     expect(screen.queryByText('Advanced')).toBeInTheDocument();
     expect(screen.queryByText('Edit')).toBeInTheDocument();
   });
+
+  it('should not render edit link if transaction has simulation error and prop userAcknowledgedGasMissing is false', () => {
+    render({
+      contextProps: {
+        transaction: {
+          simulationFails: true,
+          userFeeLevel: 'low',
+        },
+      },
+      componentProps: { userAcknowledgedGasMissing: false },
+    });
+    expect(screen.queryByRole('button')).not.toBeInTheDocument();
+    expect(screen.queryByText('Low')).not.toBeInTheDocument();
+  });
+
+  it('should render edit link if userAcknowledgedGasMissing is true even if transaction has simulation error', () => {
+    render({
+      contextProps: {
+        transaction: {
+          simulationFails: true,
+          userFeeLevel: 'low',
+        },
+      },
+      componentProps: { userAcknowledgedGasMissing: true },
+    });
+    expect(screen.queryByRole('button')).toBeInTheDocument();
+    expect(screen.queryByText('Low')).toBeInTheDocument();
+  });
+
+  it('should render edit link with text edit for legacy transactions', () => {
+    render({
+      contextProps: {
+        transaction: {
+          userFeeLevel: 'low',
+          txParams: { type: TRANSACTION_ENVELOPE_TYPES.LEGACY },
+        },
+      },
+    });
+    expect(screen.queryByText('🐢')).not.toBeInTheDocument();
+    expect(screen.queryByText('Edit')).toBeInTheDocument();
+  });
 });
diff --git a/ui/components/app/transaction-list-item-details/index.scss b/ui/components/app/transaction-list-item-details/index.scss
index a0f95f470..2df231e14 100644
--- a/ui/components/app/transaction-list-item-details/index.scss
+++ b/ui/components/app/transaction-list-item-details/index.scss
@@ -1,11 +1,82 @@
 .transaction-list-item-details {
+  div.disclosure + div.disclosure {
+    margin-top: 0;
+  }
+
+  .sender-to-recipient--flat .sender-to-recipient__party.sender-to-recipient__party--sender {
+    padding: 0;
+    justify-content: flex-start;
+  }
+
+  .sender-to-recipient--flat .sender-to-recipient__party.sender-to-recipient__party--recipient {
+    padding: 0;
+    justify-content: flex-end;
+  }
+
+  &__sender-to-recipient-header {
+    display: flex;
+    font-size: 14px;
+    color: $Black-100;
+    font-weight: bold;
+    padding-bottom: 7px;
+
+    & > div:first-child {
+      flex: 1;
+    }
+  }
+
+  &__tx-status {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-start;
+    height: 44px;
+    justify-content: space-between;
+
+    & > div:first-child {
+      font-size: 14px;
+      color: $Black-100;
+      font-weight: bold;
+    }
+
+    & > div:last-child {
+      font-weight: bold;
+    }
+  }
+
+  &__tx-hash {
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+
+    .btn-link {
+      font-size: 12px;
+      line-height: 100%;
+      padding: 0;
+    }
+
+    & > div:first-child {
+      padding-bottom: 16px;
+    }
+  }
+
+  &__operations {
+    margin: 0 0 16px 16px;
+    display: flex;
+    justify-content: end;
+  }
+
   &__header {
+    font-size: 12px;
     margin: 8px 16px;
     display: flex;
     justify-content: space-between;
     align-items: center;
   }
 
+  &__body {
+    padding: 8px 16px;
+  }
+
   &__header-buttons {
     display: flex;
     flex-direction: row;
@@ -31,12 +102,25 @@
 
   &__sender-to-recipient-container {
     margin-bottom: 8px;
+
+    .sender-to-recipient {
+      .sender-to-recipient__party {
+        border: none;
+
+        &--sender {
+          padding-left: 0;
+        }
+
+        &--recipient {
+          padding-right: 0;
+        }
+      }
+    }
   }
 
   &__cards-container {
     display: flex;
     flex-direction: column;
-    padding: 8px 16px;
   }
 
   &__transaction-breakdown {
@@ -49,5 +133,13 @@
   &__transaction-activity-log {
     flex: 2;
     min-width: 0;
+
+    .transaction-activity-log__activities-container {
+      padding-top: 0;
+    }
+
+    .transaction-activity-log__title {
+      display: none;
+    }
   }
 }
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 335859aa3..6fe04de97 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
@@ -4,16 +4,17 @@ import copyToClipboard from 'copy-to-clipboard';
 import { getBlockExplorerLink } from '@metamask/etherscan-link';
 import SenderToRecipient from '../../ui/sender-to-recipient';
 import { DEFAULT_VARIANT } from '../../ui/sender-to-recipient/sender-to-recipient.constants';
+import Disclosure from '../../ui/disclosure';
 import TransactionActivityLog from '../transaction-activity-log';
 import TransactionBreakdown from '../transaction-breakdown';
 import Button from '../../ui/button';
 import Tooltip from '../../ui/tooltip';
-import Copy from '../../ui/icon/copy-icon.component';
 import CancelButton from '../cancel-button';
 import Popover from '../../ui/popover';
 import { SECOND } from '../../../../shared/constants/time';
 import { TRANSACTION_TYPES } from '../../../../shared/constants/transaction';
 import { getURLHostName } from '../../../helpers/utils/util';
+import TransactionDecoding from '../transaction-decoding';
 
 export default class TransactionListItemDetails extends PureComponent {
   static contextTypes = {
@@ -44,6 +45,7 @@ export default class TransactionListItemDetails extends PureComponent {
     tryReverseResolveAddress: PropTypes.func.isRequired,
     senderNickname: PropTypes.string.isRequired,
     recipientNickname: PropTypes.string,
+    transactionStatus: PropTypes.func,
   };
 
   state = {
@@ -124,7 +126,6 @@ export default class TransactionListItemDetails extends PureComponent {
       showRetry,
       recipientEns,
       recipientAddress,
-      rpcPrefs: { blockExplorerUrl } = {},
       senderAddress,
       isEarliestNonce,
       senderNickname,
@@ -132,6 +133,7 @@ export default class TransactionListItemDetails extends PureComponent {
       onClose,
       recipientNickname,
       showCancel,
+      transactionStatus: TransactionStatus,
     } = this.props;
     const {
       primaryTransaction: transaction,
@@ -142,8 +144,7 @@ export default class TransactionListItemDetails extends PureComponent {
     return (
       <Popover title={title} onClose={onClose}>
         <div className="transaction-list-item-details">
-          <div className="transaction-list-item-details__header">
-            <div>{t('details')}</div>
+          <div className="transaction-list-item-details__operations">
             <div className="transaction-list-item-details__header-buttons">
               {showSpeedUp && (
                 <Button
@@ -161,43 +162,6 @@ export default class TransactionListItemDetails extends PureComponent {
                   detailsModal
                 />
               )}
-              <Tooltip
-                wrapperClassName="transaction-list-item-details__header-button"
-                containerClassName="transaction-list-item-details__header-button-tooltip-container"
-                title={
-                  justCopied ? t('copiedTransactionId') : t('copyTransactionId')
-                }
-              >
-                <Button
-                  type="raised"
-                  onClick={this.handleCopyTxId}
-                  disabled={!hash}
-                >
-                  <Copy size={10} color="#3098DC" />
-                </Button>
-              </Tooltip>
-              <Tooltip
-                wrapperClassName="transaction-list-item-details__header-button"
-                containerClassName="transaction-list-item-details__header-button-tooltip-container"
-                title={
-                  blockExplorerUrl
-                    ? t('viewOnCustomBlockExplorer', [
-                        t('blockExplorerTransactionAction'),
-                        blockExplorerUrl,
-                      ])
-                    : t('viewOnEtherscan', [
-                        t('blockExplorerTransactionAction'),
-                      ])
-                }
-              >
-                <Button
-                  type="raised"
-                  onClick={this.handleBlockExplorerClick}
-                  disabled={!hash}
-                >
-                  <img src="./images/arrow-popout.svg" alt="" />
-                </Button>
-              </Tooltip>
               {showRetry && (
                 <Tooltip title={t('retryTransaction')}>
                   <Button
@@ -211,7 +175,45 @@ export default class TransactionListItemDetails extends PureComponent {
               )}
             </div>
           </div>
+          <div className="transaction-list-item-details__header">
+            <div className="transaction-list-item-details__tx-status">
+              <div>Status</div>
+              <div>
+                <TransactionStatus />
+              </div>
+            </div>
+            <div className="transaction-list-item-details__tx-hash">
+              <div>
+                <Button
+                  type="link"
+                  onClick={this.handleBlockExplorerClick}
+                  disabled={!hash}
+                >
+                  {t('viewOnBlockExplorer')}
+                </Button>
+              </div>
+              <div>
+                <Tooltip
+                  wrapperClassName="transaction-list-item-details__header-button"
+                  containerClassName="transaction-list-item-details__header-button-tooltip-container"
+                  title={justCopied ? t('copiedExclamation') : null}
+                >
+                  <Button
+                    type="link"
+                    onClick={this.handleCopyTxId}
+                    disabled={!hash}
+                  >
+                    {t('copyTransactionId')}
+                  </Button>
+                </Tooltip>
+              </div>
+            </div>
+          </div>
           <div className="transaction-list-item-details__body">
+            <div className="transaction-list-item-details__sender-to-recipient-header">
+              <div>{t('from')}</div>
+              <div>{t('to')}</div>
+            </div>
             <div className="transaction-list-item-details__sender-to-recipient-container">
               <SenderToRecipient
                 warnUserOnAccountMismatch={false}
@@ -250,13 +252,29 @@ export default class TransactionListItemDetails extends PureComponent {
                 primaryCurrency={primaryCurrency}
                 className="transaction-list-item-details__transaction-breakdown"
               />
-              <TransactionActivityLog
-                transactionGroup={transactionGroup}
-                className="transaction-list-item-details__transaction-activity-log"
-                onCancel={this.handleCancel}
-                onRetry={this.handleRetry}
-                isEarliestNonce={isEarliestNonce}
-              />
+              {transactionGroup.initialTransaction.type !==
+                TRANSACTION_TYPES.INCOMING && (
+                <Disclosure title={t('activityLog')} size="small">
+                  <TransactionActivityLog
+                    transactionGroup={transactionGroup}
+                    className="transaction-list-item-details__transaction-activity-log"
+                    onCancel={this.handleCancel}
+                    onRetry={this.handleRetry}
+                    isEarliestNonce={isEarliestNonce}
+                  />
+                </Disclosure>
+              )}
+              {transactionGroup.initialTransaction?.txParams?.data ? (
+                <Disclosure title="Transaction data" size="small">
+                  <TransactionDecoding
+                    title={t('transactionData')}
+                    to={transactionGroup.initialTransaction.txParams?.to}
+                    inputData={
+                      transactionGroup.initialTransaction.txParams?.data
+                    }
+                  />
+                </Disclosure>
+              ) : null}
             </div>
           </div>
         </div>
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 88227e7d0..b5f215c15 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
@@ -212,6 +212,16 @@ export default function TransactionListItem({
           isEarliestNonce={isEarliestNonce}
           onCancel={cancelTransaction}
           showCancel={isPending && !hasCancelled}
+          transactionStatus={() => (
+            <TransactionStatus
+              isPending={isPending}
+              isEarliestNonce={isEarliestNonce}
+              error={err}
+              date={date}
+              status={displayedStatusKey}
+              statusOnly
+            />
+          )}
         />
       )}
       {showRetryEditGasPopover && (
diff --git a/ui/components/app/transaction-status/index.scss b/ui/components/app/transaction-status/index.scss
index 0896aa7f8..18af1f0df 100644
--- a/ui/components/app/transaction-status/index.scss
+++ b/ui/components/app/transaction-status/index.scss
@@ -1,6 +1,10 @@
 .transaction-status {
   display: inline;
 
+  &--confirmed {
+    color: $success-3;
+  }
+
   &--unapproved {
     color: $Orange-500;
   }
diff --git a/ui/components/app/transaction-status/transaction-status.component.js b/ui/components/app/transaction-status/transaction-status.component.js
index f8f5f8018..584989adb 100644
--- a/ui/components/app/transaction-status/transaction-status.component.js
+++ b/ui/components/app/transaction-status/transaction-status.component.js
@@ -43,6 +43,7 @@ export default function TransactionStatus({
   error,
   isEarliestNonce,
   className,
+  statusOnly,
 }) {
   const t = useI18nContext();
   const tooltipText = error?.rpc?.message || error?.message;
@@ -54,7 +55,9 @@ export default function TransactionStatus({
   }
 
   const statusText =
-    statusKey === TRANSACTION_STATUSES.CONFIRMED ? date : t(statusKey);
+    statusKey === TRANSACTION_STATUSES.CONFIRMED && !statusOnly
+      ? date
+      : t(statusKey);
 
   return (
     <Tooltip
@@ -62,6 +65,7 @@ export default function TransactionStatus({
       title={tooltipText}
       wrapperClassName={classnames(
         'transaction-status',
+        `transaction-status--${statusKey}`,
         className,
         statusToClassNameHash[statusKey],
       )}
@@ -77,4 +81,5 @@ TransactionStatus.propTypes = {
   date: PropTypes.string,
   error: PropTypes.object,
   isEarliestNonce: PropTypes.bool,
+  statusOnly: PropTypes.bool,
 };
diff --git a/ui/components/app/transaction-total-banner/transaction-total-banner.stories.js b/ui/components/app/transaction-total-banner/transaction-total-banner.stories.js
index c8849c8cf..576a6a742 100644
--- a/ui/components/app/transaction-total-banner/transaction-total-banner.stories.js
+++ b/ui/components/app/transaction-total-banner/transaction-total-banner.stories.js
@@ -6,7 +6,7 @@ export default {
   id: __filename,
 };
 
-export const basic = () => {
+export const DefaultStory = () => {
   return (
     <TransactionTotalBanner
       total="~18.73"
@@ -19,3 +19,5 @@ export const basic = () => {
     />
   );
 };
+
+DefaultStory.storyName = 'Default';
diff --git a/ui/components/app/transaction-total-banner/transaction-total-banner.stories.test.js b/ui/components/app/transaction-total-banner/transaction-total-banner.stories.test.js
new file mode 100644
index 000000000..dbf59496a
--- /dev/null
+++ b/ui/components/app/transaction-total-banner/transaction-total-banner.stories.test.js
@@ -0,0 +1,11 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+
+import '@testing-library/jest-dom/extend-expect';
+import { DefaultStory } from './transaction-total-banner.stories';
+
+it('renders transaction total banner stories with Base state', () => {
+  render(<DefaultStory {...DefaultStory.args} />);
+  expect(screen.findByTestId('#popover-content')).toBeDefined();
+});
diff --git a/ui/components/ui/actionable-message/actionable-message.js b/ui/components/ui/actionable-message/actionable-message.js
index 8af6646c7..ccae2b676 100644
--- a/ui/components/ui/actionable-message/actionable-message.js
+++ b/ui/components/ui/actionable-message/actionable-message.js
@@ -19,6 +19,7 @@ const typeHash = {
 export default function ActionableMessage({
   message = '',
   primaryAction = null,
+  primaryActionV2 = null,
   secondaryAction = null,
   className = '',
   infoTooltipText = '',
@@ -26,6 +27,7 @@ export default function ActionableMessage({
   type = 'default',
   useIcon = false,
   iconFillColor = '',
+  roundedButtons,
 }) {
   const actionableMessageClassName = classnames(
     'actionable-message',
@@ -35,6 +37,9 @@ export default function ActionableMessage({
     { 'actionable-message--with-icon': useIcon },
   );
 
+  const onlyOneAction =
+    (primaryAction && !secondaryAction) || (secondaryAction && !primaryAction);
+
   return (
     <div className={actionableMessageClassName}>
       {useIcon ? <InfoTooltipIcon fillColor={iconFillColor} /> : null}
@@ -46,13 +51,29 @@ export default function ActionableMessage({
         />
       )}
       <div className="actionable-message__message">{message}</div>
+      {primaryActionV2 && (
+        <button
+          className="actionable-message__action-v2"
+          onClick={primaryActionV2.onClick}
+        >
+          {primaryActionV2.label}
+        </button>
+      )}
       {(primaryAction || secondaryAction) && (
-        <div className="actionable-message__actions">
+        <div
+          className={classnames('actionable-message__actions', {
+            'actionable-message__actions--single': onlyOneAction,
+          })}
+        >
           {primaryAction && (
             <button
               className={classnames(
                 'actionable-message__action',
                 'actionable-message__action--primary',
+                `actionable-message__action-${type}`,
+                {
+                  'actionable-message__action--rounded': roundedButtons,
+                },
               )}
               onClick={primaryAction.onClick}
             >
@@ -64,6 +85,10 @@ export default function ActionableMessage({
               className={classnames(
                 'actionable-message__action',
                 'actionable-message__action--secondary',
+                `actionable-message__action-${type}`,
+                {
+                  'actionable-message__action--rounded': roundedButtons,
+                },
               )}
               onClick={secondaryAction.onClick}
             >
@@ -82,6 +107,10 @@ ActionableMessage.propTypes = {
     label: PropTypes.string,
     onClick: PropTypes.func,
   }),
+  primaryActionV2: PropTypes.shape({
+    label: PropTypes.string,
+    onClick: PropTypes.func,
+  }),
   secondaryAction: PropTypes.shape({
     label: PropTypes.string,
     onClick: PropTypes.func,
@@ -92,4 +121,5 @@ ActionableMessage.propTypes = {
   infoTooltipText: PropTypes.string,
   useIcon: PropTypes.bool,
   iconFillColor: PropTypes.string,
+  roundedButtons: PropTypes.bool,
 };
diff --git a/ui/components/ui/actionable-message/actionable-message.test.js b/ui/components/ui/actionable-message/actionable-message.test.js
index aeae55104..9c86be37b 100644
--- a/ui/components/ui/actionable-message/actionable-message.test.js
+++ b/ui/components/ui/actionable-message/actionable-message.test.js
@@ -1,4 +1,5 @@
 import React from 'react';
+import { fireEvent } from '@testing-library/react';
 
 import { renderWithProvider } from '../../../../test/jest';
 import ActionableMessage from '.';
@@ -19,4 +20,28 @@ describe('ActionableMessage', () => {
     expect(getByText(props.message)).toBeInTheDocument();
     expect(container).toMatchSnapshot();
   });
+
+  it('renders button for primaryActionV2 prop', () => {
+    const props = createProps();
+    const { getByRole } = renderWithProvider(
+      <ActionableMessage
+        {...props}
+        primaryActionV2={{ label: 'primary-action-v2' }}
+      />,
+    );
+    expect(getByRole('button')).toBeInTheDocument();
+  });
+
+  it('renders primaryActionV2.onClick is callen when primaryActionV2 button is clicked', () => {
+    const props = createProps();
+    const onClick = jest.fn();
+    const { getByRole } = renderWithProvider(
+      <ActionableMessage
+        {...props}
+        primaryActionV2={{ label: 'primary-action-v2', onClick }}
+      />,
+    );
+    fireEvent.click(getByRole('button'));
+    expect(onClick).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/ui/components/ui/actionable-message/index.scss b/ui/components/ui/actionable-message/index.scss
index 942123b4e..217a8be90 100644
--- a/ui/components/ui/actionable-message/index.scss
+++ b/ui/components/ui/actionable-message/index.scss
@@ -38,14 +38,37 @@
   &__actions {
     display: flex;
     width: 80%;
-    justify-content: space-evenly;
+    justify-content: flex-end;
     align-items: center;
     margin-top: 10px;
     color: $Blue-600;
+
+    &--single {
+      width: 100%;
+    }
   }
 
   &__action {
     font-weight: bold;
+
+    &--rounded {
+      border-radius: 8px;
+    }
+
+    &-danger {
+      background: $Red-500;
+      color: #fff;
+    }
+  }
+
+  &__action-v2 {
+    color: $primary-1;
+    background: none;
+    border: none;
+    font-size: 12px;
+    align-self: baseline;
+    padding: 0;
+    margin-top: 12px;
   }
 
   &__info-tooltip-wrapper {
@@ -78,11 +101,6 @@
       color: $Black-100;
       text-align: left;
     }
-
-    button {
-      background: $Red-500;
-      color: #fff;
-    }
   }
 
   &--info {
diff --git a/ui/components/ui/alert-circle-icon/README.mdx b/ui/components/ui/alert-circle-icon/README.mdx
new file mode 100644
index 000000000..c7d05782f
--- /dev/null
+++ b/ui/components/ui/alert-circle-icon/README.mdx
@@ -0,0 +1,25 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import AlertCircleIcon from '.';
+
+# Alert Circle Icon
+
+<Canvas>
+  <Story id="ui-components-ui-alert-circle-icon-alert-circle-icon-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={AlertCircleIcon} />
+
+## Usage
+
+The following describes the props and example usage for this component.
+
+### Warning
+
+Render warning alert icon
+
+<Canvas>
+  <Story id="ui-components-ui-alert-circle-icon-alert-circle-icon-stories-js--warning" />
+</Canvas>
diff --git a/ui/components/ui/alert-circle-icon/alert-circle-icon.component.js b/ui/components/ui/alert-circle-icon/alert-circle-icon.component.js
index 71eca7783..689447810 100644
--- a/ui/components/ui/alert-circle-icon/alert-circle-icon.component.js
+++ b/ui/components/ui/alert-circle-icon/alert-circle-icon.component.js
@@ -15,6 +15,9 @@ const typeConfig = {
 
 export default class AlertCircleIcon extends Component {
   static propTypes = {
+    /**
+     * giving different alert icon for the component
+     */
     type: PropTypes.oneOf(Object.keys(typeConfig)).isRequired,
   };
 
diff --git a/ui/components/ui/alert-circle-icon/alert-circle-icon.stories.js b/ui/components/ui/alert-circle-icon/alert-circle-icon.stories.js
index 4053d9661..fe34a15a8 100644
--- a/ui/components/ui/alert-circle-icon/alert-circle-icon.stories.js
+++ b/ui/components/ui/alert-circle-icon/alert-circle-icon.stories.js
@@ -1,11 +1,29 @@
 import React from 'react';
+import README from './README.mdx';
 import AlertCircleIcon from './alert-circle-icon.component';
 
 export default {
-  title: 'AlertCircleIcon',
+  title: 'Components/UI/Alert Circle Icon',
   id: __filename,
+  component: AlertCircleIcon,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    type: { options: ['warning', 'danger'], control: { type: 'select' } },
+  },
 };
 
-export const dangerCircleIcon = () => <AlertCircleIcon type="danger" />;
+export const DefaultStory = (args) => <AlertCircleIcon type={args.type} />;
+DefaultStory.storyName = 'Default';
 
-export const warningCircleIcon = () => <AlertCircleIcon type="warning" />;
+DefaultStory.args = {
+  type: 'danger',
+};
+
+export const Warning = (args) => <AlertCircleIcon type={args.type} />;
+Warning.args = {
+  type: 'warning',
+};
diff --git a/ui/components/ui/button-group/README.mdx b/ui/components/ui/button-group/README.mdx
new file mode 100644
index 000000000..c075f5607
--- /dev/null
+++ b/ui/components/ui/button-group/README.mdx
@@ -0,0 +1,63 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import ButtonGroup from '.';
+
+# Button Group
+
+Button Group is a wrapper for buttons to align them horizontally
+
+<Canvas>
+  <Story id="ui-components-ui-button-group-button-group-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={ButtonGroup} />
+
+### With Disabled Button
+
+By changing the `disabled` value to true, the buttons inside the button group component will be disabled
+
+```jsx
+<ButtonGroup disabled>
+  <button>cheap</button>
+  <button>average</button>
+  <button>fast</button>
+</ButtonGroup>
+```
+
+<Canvas>
+  <Story id="ui-components-ui-button-group-button-group-stories-js--with-disabled-button" />
+</Canvas>
+
+### With Radio Button
+
+Rendering radio type button instead
+
+```jsx
+<ButtonGroup variant="radiogroup">
+  <button>cheap</button>
+  <button>average</button>
+  <button>fast</button>
+</ButtonGroup>
+```
+
+<Canvas>
+  <Story id="ui-components-ui-button-group-button-group-stories-js--with-radio-button" />
+</Canvas>
+
+### No Active Button
+
+Rendering button group without active button
+
+```jsx
+<ButtonGroup noButtonActiveByDefault>
+  <button>cheap</button>
+  <button>average</button>
+  <button>fast</button>
+</ButtonGroup>
+```
+
+<Canvas>
+  <Story id="ui-components-ui-button-group-button-group-stories-js--no-active-button" />
+</Canvas>
diff --git a/ui/components/ui/button-group/button-group.component.js b/ui/components/ui/button-group/button-group.component.js
index 9cd5d9896..65f005ac2 100644
--- a/ui/components/ui/button-group/button-group.component.js
+++ b/ui/components/ui/button-group/button-group.component.js
@@ -4,13 +4,37 @@ import classnames from 'classnames';
 
 export default class ButtonGroup extends PureComponent {
   static propTypes = {
+    /**
+     * change button active order
+     */
     defaultActiveButtonIndex: PropTypes.number,
+    /**
+     * no button are active before clicked by the user
+     */
     noButtonActiveByDefault: PropTypes.bool,
+    /**
+     * disabling every button inside button group
+     */
     disabled: PropTypes.bool,
+    /**
+     * Children must be an array of button components
+     */
     children: PropTypes.array,
+    /**
+     * Adds a className to the root div of the of the ButtonGroup component
+     */
     className: PropTypes.string,
+    /**
+     * adding style for button group component
+     */
     style: PropTypes.object,
+    /**
+     * updating value of active button in button group component
+     */
     newActiveButtonIndex: PropTypes.number,
+    /**
+     * options for rendering type of button, consist of 'default' and 'radiogroup'
+     */
     variant: PropTypes.oneOf(['radiogroup', 'default']),
   };
 
diff --git a/ui/components/ui/button-group/button-group.stories.js b/ui/components/ui/button-group/button-group.stories.js
index d71172bd0..46c4b2781 100644
--- a/ui/components/ui/button-group/button-group.stories.js
+++ b/ui/components/ui/button-group/button-group.stories.js
@@ -1,51 +1,94 @@
 import React from 'react';
-import { action } from '@storybook/addon-actions';
-import classnames from 'classnames';
-import { text, boolean } from '@storybook/addon-knobs';
+
 import Button from '../button';
+import README from './README.mdx';
 import ButtonGroup from '.';
 
 export default {
-  title: 'ButtonGroup',
+  title: 'Components/UI/ButtonGroup',
   id: __filename,
+  component: ButtonGroup,
+  parameters: { docs: { page: README } },
+  argTypes: {
+    defaultActiveButtonIndex: { control: 'number' },
+    noButtonActiveByDefault: { control: 'boolean' },
+    disabled: { control: 'boolean' },
+    children: { control: 'array' },
+    className: { control: 'text' },
+    style: { control: 'object' },
+    newActiveButtonIndex: { control: 'number' },
+    variant: {
+      options: ['radiogroup', 'default'],
+      control: { type: 'select' },
+    },
+  },
 };
 
-export const withButtons = () => (
-  <ButtonGroup
-    style={{ width: '300px' }}
-    disabled={boolean('Disabled', false)}
-    defaultActiveButtonIndex={1}
-  >
-    <Button onClick={action('cheap')}>{text('Button1', 'Cheap')}</Button>
-    <Button onClick={action('average')}>{text('Button2', 'Average')}</Button>
-    <Button onClick={action('fast')}>{text('Button3', 'Fast')}</Button>
-  </ButtonGroup>
+export const DefaultStory = (args) => (
+  <ButtonGroup {...args}>{args.children}</ButtonGroup>
 );
 
-export const withDisabledButton = () => (
-  <ButtonGroup style={{ width: '300px' }} disabled={boolean('Disabled', false)}>
-    <Button onClick={action('enabled')}>{text('Button1', 'Enabled')}</Button>
-    <Button onClick={action('disabled')} disabled>
-      {text('Button2', 'Disabled')}
-    </Button>
-  </ButtonGroup>
+DefaultStory.storyName = 'Default';
+DefaultStory.args = {
+  defaultActiveButtonIndex: 1,
+  noButtonActiveByDefault: false,
+  disabled: false,
+  children: ['cheap', 'average', 'fast'].map((label, index) => (
+    <Button key={index}>{label}</Button>
+  )),
+  className: '',
+  style: { width: '300px' },
+  newActiveButtonIndex: 0,
+  variant: 'default',
+};
+
+export const WithDisabledButton = (args) => (
+  <ButtonGroup {...args}>{args.children}</ButtonGroup>
 );
 
-export const radioButtons = () => (
-  <ButtonGroup
-    style={{ width: '300px' }}
-    defaultActiveButtonIndex={1}
-    variant="radiogroup"
-  >
-    <Button onClick={action('radio 1')}>{text('Button1', '1%')}</Button>
-    <Button onClick={action('radio 2')}>{text('Button2', '2%')}</Button>
-    <Button
-      onClick={action('radio 3')}
-      className={classnames({
-        'radio-button--danger': boolean('Button3 warning', false),
-      })}
-    >
-      {text('Button3', '5%')}
-    </Button>
-  </ButtonGroup>
+WithDisabledButton.args = {
+  defaultActiveButtonIndex: 1,
+  noButtonActiveByDefault: false,
+  disabled: true,
+  children: ['cheap', 'average', 'fast'].map((label, index) => (
+    <Button key={index}>{label}</Button>
+  )),
+  className: '',
+  style: { width: '300px' },
+  newActiveButtonIndex: 0,
+  variant: 'default',
+};
+
+export const WithRadioButton = (args) => (
+  <ButtonGroup {...args}>{args.children}</ButtonGroup>
 );
+
+WithRadioButton.args = {
+  defaultActiveButtonIndex: 1,
+  noButtonActiveByDefault: false,
+  disabled: false,
+  children: ['cheap', 'average', 'fast'].map((label, index) => (
+    <Button key={index}>{label}</Button>
+  )),
+  className: '',
+  style: { width: '300px' },
+  newActiveButtonIndex: 0,
+  variant: 'radiogroup',
+};
+
+export const NoActiveButton = (args) => (
+  <ButtonGroup {...args}>{args.children}</ButtonGroup>
+);
+
+NoActiveButton.args = {
+  defaultActiveButtonIndex: 1,
+  noButtonActiveByDefault: true,
+  disabled: false,
+  children: ['cheap', 'average', 'fast'].map((label, index) => (
+    <Button key={index}>{label}</Button>
+  )),
+  className: '',
+  style: { width: '300px' },
+  newActiveButtonIndex: 0,
+  variant: 'default',
+};
diff --git a/ui/components/ui/button/button.stories.test.js b/ui/components/ui/button/button.stories.test.js
new file mode 100644
index 000000000..391285270
--- /dev/null
+++ b/ui/components/ui/button/button.stories.test.js
@@ -0,0 +1,12 @@
+/* eslint-disable jest/require-top-level-describe */
+import React from 'react';
+
+import { render, screen } from '@testing-library/react';
+
+import '@testing-library/jest-dom/extend-expect';
+import { DefaultStory } from './button.stories';
+
+it('renders the button in the primary state', () => {
+  render(<DefaultStory {...DefaultStory.args} />);
+  expect(screen.getByRole('button')).toHaveTextContent('Default');
+});
diff --git a/ui/components/ui/check-box/README.mdx b/ui/components/ui/check-box/README.mdx
new file mode 100644
index 000000000..b667c2f11
--- /dev/null
+++ b/ui/components/ui/check-box/README.mdx
@@ -0,0 +1,15 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import CheckBox from '.';
+
+# Checkbox
+
+A small interactive box that can be toggled by the user to indicate an affirmative or negative choice.
+
+<Canvas>
+  <Story id="ui-components-ui-check-box-check-box-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={CheckBox} />
diff --git a/ui/components/ui/check-box/check-box.component.js b/ui/components/ui/check-box/check-box.component.js
index 8d8d4a617..734c60238 100644
--- a/ui/components/ui/check-box/check-box.component.js
+++ b/ui/components/ui/check-box/check-box.component.js
@@ -58,13 +58,34 @@ const CheckBox = ({
 };
 
 CheckBox.propTypes = {
+  /**
+   * Add custom classname css
+   */
   className: PropTypes.string,
+  /**
+   * Check if checkbox disabled or not
+   */
   disabled: PropTypes.bool,
+  /**
+   * Checkbox ID
+   */
   id: PropTypes.string,
+  /**
+   * Click handler
+   */
   onClick: PropTypes.func,
+  /**
+   * Check if the checkbox are checked or not
+   */
   checked: PropTypes.oneOf([...Object.keys(CHECKBOX_STATE), true, false])
     .isRequired,
+  /**
+   * Show title
+   */
   title: PropTypes.string,
+  /**
+   * Data test ID for checkbox Component
+   */
   dataTestId: PropTypes.string,
 };
 
diff --git a/ui/components/ui/check-box/check-box.stories.js b/ui/components/ui/check-box/check-box.stories.js
index 6894e46d1..5e3dcb5a1 100644
--- a/ui/components/ui/check-box/check-box.stories.js
+++ b/ui/components/ui/check-box/check-box.stories.js
@@ -1,17 +1,11 @@
 import React from 'react';
-import { action } from '@storybook/addon-actions';
-import { boolean, select, text } from '@storybook/addon-knobs';
+import README from './README.mdx';
 import CheckBox, {
   CHECKED,
   INDETERMINATE,
   UNCHECKED,
 } from './check-box.component';
 
-export default {
-  title: 'Check Box',
-  id: __filename,
-};
-
 const checkboxOptions = {
   [CHECKED]: CHECKED,
   [INDETERMINATE]: INDETERMINATE,
@@ -20,11 +14,36 @@ const checkboxOptions = {
   False: false,
 };
 
-export const primaryType = () => (
-  <CheckBox
-    checked={select('checked state', checkboxOptions, UNCHECKED)}
-    disabled={boolean('Disabled', false)}
-    id={text('ID', 'checkboxId')}
-    onClick={action('checkbox clicked')}
-  />
+export default {
+  title: 'Components/UI/Check Box',
+  id: __filename,
+  component: CheckBox,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    className: { control: 'text' },
+    disabled: { control: 'boolean' },
+    id: { control: 'text' },
+    onClick: { action: 'clicked' },
+    checked: {
+      options: ['CHECKED', 'INDETERMINATE', 'UNCHECKED', 'True', 'False'],
+      control: 'select',
+    },
+    title: { control: 'text' },
+    dataTestId: { control: 'text' },
+  },
+};
+
+export const DefaultStory = (args) => (
+  <CheckBox {...args} checked={checkboxOptions[args.checked]} />
 );
+
+DefaultStory.storyName = 'Default';
+DefaultStory.args = {
+  checked: UNCHECKED,
+  disabled: false,
+  id: 'checkboxID',
+};
diff --git a/ui/components/ui/circle-icon/README.mdx b/ui/components/ui/circle-icon/README.mdx
new file mode 100644
index 000000000..ee4a95b7d
--- /dev/null
+++ b/ui/components/ui/circle-icon/README.mdx
@@ -0,0 +1,16 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import CircleIcon from '.';
+
+# Circle Icon
+
+Add circle border to the image component
+
+<Canvas>
+  <Story id="ui-components-ui-circle-icon-circle-icon-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={CircleIcon} />
+
diff --git a/ui/components/ui/circle-icon/circle-icon.component.js b/ui/components/ui/circle-icon/circle-icon.component.js
index 522953286..c772941c4 100644
--- a/ui/components/ui/circle-icon/circle-icon.component.js
+++ b/ui/components/ui/circle-icon/circle-icon.component.js
@@ -3,9 +3,21 @@ import PropTypes from 'prop-types';
 
 export default class CircleIcon extends PureComponent {
   static propTypes = {
+    /**
+     * add size (px) for the image container
+     */
     size: PropTypes.string,
+    /**
+     * add css classname for the component based on the parent css
+     */
     circleClass: PropTypes.string,
+    /**
+     * image source path
+     */
     iconSource: PropTypes.string.isRequired,
+    /**
+     * add size (px) for the image
+     */
     iconSize: PropTypes.string,
   };
 
diff --git a/ui/components/ui/circle-icon/circle-icon.stories.js b/ui/components/ui/circle-icon/circle-icon.stories.js
index 786efaa1a..5fb969737 100644
--- a/ui/components/ui/circle-icon/circle-icon.stories.js
+++ b/ui/components/ui/circle-icon/circle-icon.stories.js
@@ -1,17 +1,37 @@
 import React from 'react';
+import README from './README.mdx';
 import CircleIcon from './circle-icon.component';
 
 export default {
-  title: 'CircleIcon',
+  title: 'Components/UI/Circle Icon',
   id: __filename,
+  component: CircleIcon,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    size: { control: 'text' },
+    circleClass: { control: 'text' },
+    iconSource: { control: 'text' },
+    iconSize: { control: 'text' },
+  },
 };
 
-export const basicCircleIcon = () => (
+export const DefaultStory = (args) => (
   <CircleIcon
     border="1px solid"
     borderColor="black"
     background="white"
-    iconSize="42px"
-    iconSource="images/eth_logo.svg"
+    iconSize={args.iconSize}
+    iconSource={args.iconSource}
   />
 );
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  iconSize: '42px',
+  iconSource: 'images/eth_logo.svg',
+};
diff --git a/ui/components/ui/disclosure/disclosure.js b/ui/components/ui/disclosure/disclosure.js
new file mode 100644
index 000000000..9e3d56ebc
--- /dev/null
+++ b/ui/components/ui/disclosure/disclosure.js
@@ -0,0 +1,51 @@
+import React, { useState, useRef, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import classnames from 'classnames';
+
+const Disclosure = ({ children, title, size }) => {
+  const disclosureFooterEl = useRef(null);
+  const [open, setOpen] = useState(false);
+
+  const scrollToBottom = () => {
+    disclosureFooterEl &&
+      disclosureFooterEl.current &&
+      disclosureFooterEl.current.scrollIntoView({ behavior: 'smooth' });
+  };
+
+  useEffect(() => {
+    if (open) {
+      scrollToBottom();
+    }
+  }, [open]);
+
+  return (
+    <div className="disclosure" onClick={() => setOpen((state) => !state)}>
+      {title ? (
+        <details>
+          <summary className="disclosure__title disclosure__summary typography--weight-bold typography--color-black">
+            {title}:{' '}
+          </summary>
+          <div className={classnames('disclosure__content', size)}>
+            {children}
+          </div>
+          <div ref={disclosureFooterEl} className="disclosure__footer"></div>
+        </details>
+      ) : (
+        children
+      )}
+    </div>
+  );
+};
+
+Disclosure.propTypes = {
+  children: PropTypes.node.isRequired,
+  title: PropTypes.string,
+  size: PropTypes.string,
+};
+
+Disclosure.defaultProps = {
+  size: 'normal',
+  title: null,
+};
+
+export default Disclosure;
diff --git a/ui/components/ui/disclosure/disclosure.scss b/ui/components/ui/disclosure/disclosure.scss
new file mode 100644
index 000000000..8a0fe8b4b
--- /dev/null
+++ b/ui/components/ui/disclosure/disclosure.scss
@@ -0,0 +1,46 @@
+.disclosure {
+  margin: 12px 0;
+  cursor: pointer;
+  font-size: 14px;
+
+  & > details[open] > summary {
+    &::before {
+      background-image: url("images/icons/collapse.svg");
+    }
+  }
+
+  &__summary {
+    position: relative;
+    padding-left: 24px;
+    padding-bottom: 10px;
+
+    &::-webkit-details-marker,
+    &::marker {
+      display: none;
+      content: "";
+    }
+
+    &::before {
+      position: absolute;
+      content: " ";
+      flex: 0 0 auto;
+      height: 16px;
+      width: 16px;
+      background-image: url("images/icons/expand.svg");
+      background-size: contain;
+      background-repeat: no-repeat;
+      cursor: pointer;
+      left: 0;
+      top: 2px;
+    }
+  }
+
+  &__content {
+    margin-left: 12px;
+    font-size: 14px;
+
+    &.small {
+      font-size: 12px;
+    }
+  }
+}
diff --git a/ui/components/ui/disclosure/index.js b/ui/components/ui/disclosure/index.js
new file mode 100644
index 000000000..cd9bc820d
--- /dev/null
+++ b/ui/components/ui/disclosure/index.js
@@ -0,0 +1 @@
+export { default } from './disclosure';
diff --git a/ui/components/ui/form-field/index.scss b/ui/components/ui/form-field/index.scss
index d7d4cb0b7..ed8859141 100644
--- a/ui/components/ui/form-field/index.scss
+++ b/ui/components/ui/form-field/index.scss
@@ -3,6 +3,7 @@
 
   &__heading {
     display: flex;
+    align-items: center;
     margin-top: 4px;
   }
 
diff --git a/ui/components/ui/icon-border/icon-border.scss b/ui/components/ui/icon-border/icon-border.scss
index 5028617e6..1ac7e3a4b 100644
--- a/ui/components/ui/icon-border/icon-border.scss
+++ b/ui/components/ui/icon-border/icon-border.scss
@@ -1,8 +1,9 @@
 .icon-border {
   border-radius: 50%;
-  border: 1px solid #f2f3f4;
-  background: #ececf0;
+  border: 1px solid $ui-1;
+  background: $ui-1;
   display: flex;
   justify-content: center;
   align-items: center;
+  overflow: hidden;
 }
diff --git a/ui/components/ui/icon-with-fallback/README.mdx b/ui/components/ui/icon-with-fallback/README.mdx
new file mode 100644
index 000000000..10ce346a1
--- /dev/null
+++ b/ui/components/ui/icon-with-fallback/README.mdx
@@ -0,0 +1,27 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import IconWithFallback from '.';
+
+# IconWithFallback
+
+Icon component that takes an image src and uses `onError` to fallback to the first letter of the icon `name`
+
+<Canvas>
+  <Story id="ui-components-ui-icon-with-fallback-icon-with-fallback-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={IconWithFallback} />
+
+## Usage
+
+The following describes the props and example usage for this component.
+
+### Fallback
+
+If the image src errors `onError` the image tag will be replace with a span and the first letter of the `name` prop
+
+<Canvas>
+  <Story id="ui-components-ui-icon-with-fallback-icon-with-fallback-stories-js--fallback" />
+</Canvas>
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js b/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
index fec573cd0..62c1ba69f 100644
--- a/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.component.js
@@ -1,46 +1,61 @@
-import React, { PureComponent } from 'react';
+import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
 
-export default class IconWithFallback extends PureComponent {
-  static propTypes = {
-    icon: PropTypes.string,
-    name: PropTypes.string,
-    size: PropTypes.number,
-    className: PropTypes.string,
-    fallbackClassName: PropTypes.string,
-  };
+const IconWithFallback = ({
+  name = '',
+  icon = null,
+  size,
+  className,
+  fallbackClassName,
+  ...props
+}) => {
+  const [iconError, setIconError] = useState(false);
+  const style = size ? { height: `${size}px`, width: `${size}px` } : {};
 
-  static defaultProps = {
-    name: '',
-    icon: null,
+  const handleOnError = () => {
+    setIconError(true);
   };
 
-  state = {
-    iconError: false,
-  };
+  return !iconError && icon ? (
+    <img
+      onError={handleOnError}
+      src={icon}
+      style={style}
+      className={className}
+      alt={name.length ? name : 'icon'}
+      {...props}
+    />
+  ) : (
+    <span
+      className={classnames('icon-with-fallback__fallback', fallbackClassName)}
+    >
+      {name.length ? name.charAt(0).toUpperCase() : ''}
+    </span>
+  );
+};
 
-  render() {
-    const { icon, name, size, className, fallbackClassName } = this.props;
-    const style = size ? { height: `${size}px`, width: `${size}px` } : {};
+IconWithFallback.propTypes = {
+  /**
+   * The img src of the icon
+   */
+  icon: PropTypes.string,
+  /**
+   * The name of the icon also used for the alt attribute of the image
+   */
+  name: PropTypes.string,
+  /**
+   * The size of the icon. Recommended sizes adhere to 8px grid: 16, 24, 32, 40
+   */
+  size: PropTypes.number,
+  /**
+   * className to apply to the image tag
+   */
+  className: PropTypes.string,
+  /**
+   * Additional className to apply to the fallback span tag
+   */
+  fallbackClassName: PropTypes.string,
+};
 
-    return !this.state.iconError && icon ? (
-      <img
-        onError={() => this.setState({ iconError: true })}
-        src={icon}
-        style={style}
-        className={className}
-        alt=""
-      />
-    ) : (
-      <i
-        className={classnames(
-          'icon-with-fallback__fallback',
-          fallbackClassName,
-        )}
-      >
-        {name.length ? name.charAt(0).toUpperCase() : ''}
-      </i>
-    );
-  }
-}
+export default IconWithFallback;
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 a0cb7cd42..c31671677 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: black;
+    color: $ui-black;
   }
 }
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.stories.js b/ui/components/ui/icon-with-fallback/icon-with-fallback.stories.js
new file mode 100644
index 000000000..aa6087ec0
--- /dev/null
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.stories.js
@@ -0,0 +1,49 @@
+import React from 'react';
+
+import README from './README.mdx';
+import IconWithFallback from '.';
+
+export default {
+  title: 'Components/UI/IconWithFallback',
+  id: __filename,
+  component: IconWithFallback,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    icon: {
+      control: 'text',
+    },
+    name: {
+      control: 'text',
+    },
+    size: {
+      control: 'number',
+    },
+    className: {
+      control: 'text',
+    },
+    fallbackClassName: {
+      control: 'text',
+    },
+  },
+};
+
+export const DefaultStory = (args) => <IconWithFallback {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  name: 'ast',
+  icon: './AST.png',
+  size: 24,
+};
+
+export const Fallback = (args) => <IconWithFallback {...args} />;
+
+Fallback.args = {
+  name: 'ast',
+  size: 24,
+};
diff --git a/ui/components/ui/icon-with-fallback/icon-with-fallback.test.js b/ui/components/ui/icon-with-fallback/icon-with-fallback.test.js
new file mode 100644
index 000000000..5cff033cb
--- /dev/null
+++ b/ui/components/ui/icon-with-fallback/icon-with-fallback.test.js
@@ -0,0 +1,39 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import IconWithFallback from '.';
+
+describe('IconWithFallback', () => {
+  const args = {
+    name: 'Snap name',
+    icon: './AST.png',
+    className: 'classname-test',
+    fallbackClassName: 'fallback-classname-test',
+  };
+
+  it('should render without crashing', () => {
+    const { container } = render(<IconWithFallback />);
+    expect(container.querySelector('span')).toBeDefined();
+  });
+
+  it('should render an icon image', () => {
+    const { getByAltText } = render(<IconWithFallback {...args} />);
+    const image = getByAltText(args.name);
+    expect(image).toBeDefined();
+    expect(image).toHaveAttribute('src', args.icon);
+  });
+
+  it('should render with a fallback letter from the name prop', () => {
+    const { getByText } = render(<IconWithFallback {...args} icon="" />);
+    expect(getByText('S')).toBeDefined();
+  });
+
+  it('should render with a classname', () => {
+    const { getByAltText } = render(<IconWithFallback {...args} />);
+    expect(getByAltText(args.name)).toHaveClass(args.className);
+  });
+
+  it('should render with a fallback classname', () => {
+    const { getByText } = render(<IconWithFallback {...args} icon="" />);
+    expect(getByText('S')).toHaveClass(args.fallbackClassName);
+  });
+});
diff --git a/ui/components/ui/nickname-popover/index.js b/ui/components/ui/nickname-popover/index.js
new file mode 100644
index 000000000..f5303aa1e
--- /dev/null
+++ b/ui/components/ui/nickname-popover/index.js
@@ -0,0 +1 @@
+export { default } from './nickname-popover.component';
diff --git a/ui/components/ui/nickname-popover/index.scss b/ui/components/ui/nickname-popover/index.scss
new file mode 100644
index 000000000..c7b91d246
--- /dev/null
+++ b/ui/components/ui/nickname-popover/index.scss
@@ -0,0 +1,74 @@
+.nickname-popover {
+  &__popover-wrap {
+    height: 232px;
+    border-radius: 4px;
+    background: $ui-white;
+    display: flex;
+    justify-content: center;
+    width: auto;
+
+    .popover-header {
+      padding: 16px 16px 0 0;
+    }
+
+    .popover-content {
+      margin-top: -15px;
+      align-items: center;
+    }
+  }
+
+  &__address {
+    @include H4;
+
+    font-weight: bold;
+    display: flex;
+    align-items: center;
+    color: $Black-100;
+    padding-top: 8px;
+  }
+
+  &__public-address {
+    @include H7;
+
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    min-height: 25px;
+    background: $Grey-000;
+    border-radius: 40px;
+    padding-left: 8px;
+    padding-right: 2px;
+    margin-top: 8px;
+
+    button {
+      background: none;
+    }
+
+    &__constant {
+      @include H8;
+
+      color: $Grey-500;
+    }
+  }
+
+  &__view-on-block-explorer {
+    @include H7;
+
+    color: $primary-1;
+    margin-top: 12px;
+  }
+
+  &__etherscan-link {
+    @include H7;
+
+    padding: 0;
+  }
+
+  &__footer-button {
+    margin-top: 16px;
+    width: 152px;
+    height: 40px;
+    border-radius: 100px;
+    background: $primary-1;
+  }
+}
diff --git a/ui/components/ui/nickname-popover/nickname-popover.component.js b/ui/components/ui/nickname-popover/nickname-popover.component.js
new file mode 100644
index 000000000..0ffea24e4
--- /dev/null
+++ b/ui/components/ui/nickname-popover/nickname-popover.component.js
@@ -0,0 +1,95 @@
+import React, { useCallback, useContext } from 'react';
+import PropTypes from 'prop-types';
+import { I18nContext } from '../../../contexts/i18n';
+import Tooltip from '../tooltip';
+import Popover from '../popover';
+import Button from '../button';
+import Identicon from '../identicon/identicon.component';
+import { shortenAddress } from '../../../helpers/utils/util';
+import CopyIcon from '../icon/copy-icon.component';
+import { useCopyToClipboard } from '../../../hooks/useCopyToClipboard';
+
+const NicknamePopover = ({
+  address,
+  nickname,
+  onClose = null,
+  onAdd = null,
+  explorerLink,
+}) => {
+  const t = useContext(I18nContext);
+
+  const onAddClick = useCallback(() => {
+    onAdd();
+  }, [onAdd]);
+
+  const [copied, handleCopy] = useCopyToClipboard();
+
+  return (
+    <div className="nickname-popover">
+      <Popover onClose={onClose} className="nickname-popover__popover-wrap">
+        <Identicon
+          address={address}
+          diameter={36}
+          className="nickname-popover__identicon"
+        />
+        <div className="nickname-popover__address">
+          {nickname || shortenAddress(address)}
+        </div>
+        <div className="nickname-popover__public-address">
+          <div className="nickname-popover__public-address__constant">
+            {address}
+          </div>
+
+          <Tooltip
+            position="bottom"
+            title={copied ? t('copiedExclamation') : t('copyToClipboard')}
+          >
+            <button
+              type="link"
+              onClick={() => {
+                handleCopy(address);
+              }}
+              title=""
+            >
+              <CopyIcon size={11} color="#989a9b" />
+            </button>
+          </Tooltip>
+        </div>
+
+        <div className="nickname-popover__view-on-block-explorer">
+          <Button
+            type="link"
+            className="nickname-popover__etherscan-link"
+            onClick={() => {
+              global.platform.openTab({
+                url: explorerLink,
+              });
+            }}
+            target="_blank"
+            rel="noopener noreferrer"
+            title={t('etherscanView')}
+          >
+            {t('viewOnBlockExplorer')}
+          </Button>
+        </div>
+        <Button
+          type="primary"
+          className="nickname-popover__footer-button"
+          onClick={onAddClick}
+        >
+          {nickname ? t('editANickname') : t('addANickname')}
+        </Button>
+      </Popover>
+    </div>
+  );
+};
+
+NicknamePopover.propTypes = {
+  address: PropTypes.string,
+  nickname: PropTypes.string,
+  onClose: PropTypes.func,
+  onAdd: PropTypes.func,
+  explorerLink: PropTypes.string,
+};
+
+export default NicknamePopover;
diff --git a/ui/components/ui/nickname-popover/nickname-popover.stories.js b/ui/components/ui/nickname-popover/nickname-popover.stories.js
new file mode 100644
index 000000000..a1097e32c
--- /dev/null
+++ b/ui/components/ui/nickname-popover/nickname-popover.stories.js
@@ -0,0 +1,32 @@
+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: 'NicknamePopover',
+  id: __filename,
+};
+
+export const Default = () => {
+  const [showNicknamePopover, setShowNicknamePopover] = useState(false);
+
+  return (
+    <div>
+      <Button onClick={() => setShowNicknamePopover(true)}>
+        Open Nickname Popover
+      </Button>
+      {showNicknamePopover && (
+        <NicknamePopover
+          address={text(
+            'Address',
+            '0x5e6DaAD1BE117e26590F9eEcD509336ABFBe5966',
+          )}
+          onClose={() => setShowNicknamePopover(false)}
+          onAdd={action('add NicknamePopover')}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js b/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
index 4f92a3016..ef229d84c 100644
--- a/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
+++ b/ui/components/ui/sender-to-recipient/sender-to-recipient.component.js
@@ -8,6 +8,7 @@ import { shortenAddress } from '../../../helpers/utils/util';
 import AccountMismatchWarning from '../account-mismatch-warning/account-mismatch-warning.component';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 import { toChecksumHexAddress } from '../../../../shared/modules/hexstring-utils';
+import NicknamePopovers from '../../app/modals/nickname-popovers';
 import {
   DEFAULT_VARIANT,
   CARDS_VARIANT,
@@ -94,7 +95,7 @@ SenderAddress.propTypes = {
   warnUserOnAccountMismatch: PropTypes.bool,
 };
 
-function RecipientWithAddress({
+export function RecipientWithAddress({
   checksummedRecipientAddress,
   onRecipientClick,
   addressOnly,
@@ -103,44 +104,22 @@ function RecipientWithAddress({
   recipientName,
 }) {
   const t = useI18nContext();
-  const [addressCopied, setAddressCopied] = useState(false);
+  const [showNicknamePopovers, setShowNicknamePopovers] = useState(false);
 
-  let tooltipHtml = <p>{t('copiedExclamation')}</p>;
-  if (!addressCopied) {
-    if (addressOnly && !recipientNickname && !recipientEns) {
-      tooltipHtml = <p>{t('copyAddress')}</p>;
-    } else {
-      tooltipHtml = (
-        <p>
-          {shortenAddress(checksummedRecipientAddress)}
-          <br />
-          {t('copyAddress')}
-        </p>
-      );
-    }
-  }
   return (
-    <div
-      className="sender-to-recipient__party sender-to-recipient__party--recipient sender-to-recipient__party--recipient-with-address"
-      onClick={() => {
-        setAddressCopied(true);
-        copyToClipboard(checksummedRecipientAddress);
-        if (onRecipientClick) {
-          onRecipientClick();
-        }
-      }}
-    >
-      <div className="sender-to-recipient__sender-icon">
-        <Identicon address={checksummedRecipientAddress} diameter={24} />
-      </div>
-      <Tooltip
-        position="bottom"
-        html={tooltipHtml}
-        offset={-10}
-        wrapperClassName="sender-to-recipient__tooltip-wrapper"
-        containerClassName="sender-to-recipient__tooltip-container"
-        onHidden={() => setAddressCopied(false)}
+    <>
+      <div
+        className="sender-to-recipient__party sender-to-recipient__party--recipient sender-to-recipient__party--recipient-with-address"
+        onClick={() => {
+          setShowNicknamePopovers(true);
+          if (onRecipientClick) {
+            onRecipientClick();
+          }
+        }}
       >
+        <div className="sender-to-recipient__sender-icon">
+          <Identicon address={checksummedRecipientAddress} diameter={24} />
+        </div>
         <div className="sender-to-recipient__name">
           {addressOnly
             ? recipientNickname ||
@@ -151,8 +130,14 @@ function RecipientWithAddress({
               recipientName ||
               t('newContract')}
         </div>
-      </Tooltip>
-    </div>
+      </div>
+      {showNicknamePopovers ? (
+        <NicknamePopovers
+          onClose={() => setShowNicknamePopovers(false)}
+          address={checksummedRecipientAddress}
+        />
+      ) : null}
+    </>
   );
 }
 
diff --git a/ui/components/ui/site-icon/README.mdx b/ui/components/ui/site-icon/README.mdx
new file mode 100644
index 000000000..6ef847958
--- /dev/null
+++ b/ui/components/ui/site-icon/README.mdx
@@ -0,0 +1,27 @@
+import { Story, Canvas, ArgsTable } from '@storybook/addon-docs';
+
+import SiteIcon from '.';
+
+# SiteIcon
+
+SiteIcon uses the `IconBorder` and `IconWithFallback` components to create an icon within a gray ellipse
+
+<Canvas>
+  <Story id="ui-components-ui-site-icon-site-icon-stories-js--default-story" />
+</Canvas>
+
+## Component API
+
+<ArgsTable of={SiteIcon} />
+
+## Usage
+
+The following describes the props and example usage for this component.
+
+### Fallback
+
+`SiteIcon` wraps the `IconWithFallback` component which has a fallback `onError` and will display the first letter of the `name` prop
+
+<Canvas>
+  <Story id="ui-components-ui-site-icon-site-icon-stories-js--fallback" />
+</Canvas>
diff --git a/ui/components/ui/site-icon/site-icon.js b/ui/components/ui/site-icon/site-icon.js
index 4101b7b30..f165ff311 100644
--- a/ui/components/ui/site-icon/site-icon.js
+++ b/ui/components/ui/site-icon/site-icon.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import IconBorder from '../icon-border';
 import IconWithFallback from '../icon-with-fallback';
 
-export default function SiteIcon({ icon, name, size }) {
+export default function SiteIcon({ icon = null, name = '', size }) {
   const iconSize = Math.floor(size * 0.75);
   return (
     <IconBorder size={size}>
@@ -13,12 +13,19 @@ export default function SiteIcon({ icon, name, size }) {
 }
 
 SiteIcon.propTypes = {
+  /**
+   * The img src of the icon.
+   * Used in IconWithFallback
+   */
   icon: PropTypes.string,
+  /**
+   * The name of the icon also used for the alt tag of the image and fallback letter.
+   * Used in IconWithFallback
+   */
   name: PropTypes.string,
+  /**
+   * The size of the icon.
+   * Used in IconWithFallback
+   */
   size: PropTypes.number.isRequired,
 };
-
-SiteIcon.defaultProps = {
-  icon: undefined,
-  name: undefined,
-};
diff --git a/ui/components/ui/site-icon/site-icon.stories.js b/ui/components/ui/site-icon/site-icon.stories.js
new file mode 100644
index 000000000..8d0bdba71
--- /dev/null
+++ b/ui/components/ui/site-icon/site-icon.stories.js
@@ -0,0 +1,43 @@
+import React from 'react';
+
+import README from './README.mdx';
+import SiteIcon from '.';
+
+export default {
+  title: 'Components/UI/SiteIcon',
+  id: __filename,
+  component: SiteIcon,
+  parameters: {
+    docs: {
+      page: README,
+    },
+  },
+  argTypes: {
+    icon: {
+      control: 'text',
+    },
+    name: {
+      control: 'text',
+    },
+    size: {
+      control: 'number',
+    },
+  },
+};
+
+export const DefaultStory = (args) => <SiteIcon {...args} />;
+
+DefaultStory.storyName = 'Default';
+
+DefaultStory.args = {
+  name: 'eth',
+  icon: './images/eth_logo.svg',
+  size: 24,
+};
+
+export const Fallback = (args) => <SiteIcon {...args} />;
+
+Fallback.args = {
+  name: 'eth',
+  size: 24,
+};
diff --git a/ui/components/ui/site-icon/site-icon.test.js b/ui/components/ui/site-icon/site-icon.test.js
new file mode 100644
index 000000000..5c4efa156
--- /dev/null
+++ b/ui/components/ui/site-icon/site-icon.test.js
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import SiteIcon from '.';
+
+describe('SiteIcon', () => {
+  const args = {
+    name: 'Snap name',
+    icon: './images/eth_logo.svg',
+    className: 'classname-test',
+    fallbackClassName: 'fallback-classname-test',
+  };
+
+  it('should render without crashing', () => {
+    const { getByText } = render(<SiteIcon name={args.name} />);
+    expect(getByText('S')).toBeDefined();
+  });
+
+  it('should render an icon image', () => {
+    const { getByAltText } = render(<SiteIcon {...args} />);
+    const image = getByAltText(args.name);
+    expect(image).toBeDefined();
+    expect(image).toHaveAttribute('src', args.icon);
+  });
+});
diff --git a/ui/components/ui/text-field/text-field.component.js b/ui/components/ui/text-field/text-field.component.js
index a9a212d16..ba9fa28b0 100644
--- a/ui/components/ui/text-field/text-field.component.js
+++ b/ui/components/ui/text-field/text-field.component.js
@@ -203,6 +203,7 @@ const TextField = ({
   min,
   max,
   autoComplete,
+  onPaste,
   ...textFieldProps
 }) => {
   const inputProps = themeToInputProps[theme]({
@@ -215,6 +216,16 @@ const TextField = ({
     autoComplete,
   });
 
+  if (onPaste) {
+    if (!inputProps.InputProps) {
+      inputProps.InputProps = {};
+    }
+    if (!inputProps.InputProps.inputProps) {
+      inputProps.InputProps.inputProps = {};
+    }
+    inputProps.InputProps.inputProps.onPaste = onPaste;
+  }
+
   return (
     <MaterialTextField
       error={Boolean(error)}
@@ -241,6 +252,7 @@ TextField.propTypes = {
   min: PropTypes.number,
   max: PropTypes.number,
   autoComplete: PropTypes.string,
+  onPaste: PropTypes.func,
 };
 
 export default withStyles(styles)(TextField);
diff --git a/ui/components/ui/toggle-button/toggle-button.component.js b/ui/components/ui/toggle-button/toggle-button.component.js
index c54f0bbd8..ef28fec8a 100644
--- a/ui/components/ui/toggle-button/toggle-button.component.js
+++ b/ui/components/ui/toggle-button/toggle-button.component.js
@@ -47,7 +47,7 @@ const colors = {
 };
 
 const ToggleButton = (props) => {
-  const { value, onToggle, offLabel, onLabel, disabled } = props;
+  const { value, onToggle, offLabel, onLabel, disabled, className } = props;
 
   const modifier = value ? 'on' : 'off';
 
@@ -59,9 +59,14 @@ const ToggleButton = (props) => {
           onToggle(value);
         }
       }}
-      className={classnames('toggle-button', `toggle-button--${modifier}`, {
-        'toggle-button--disabled': disabled,
-      })}
+      className={classnames(
+        'toggle-button',
+        `toggle-button--${modifier}`,
+        {
+          'toggle-button--disabled': disabled,
+        },
+        className,
+      )}
     >
       <ReactToggleButton
         value={value}
@@ -87,6 +92,7 @@ ToggleButton.propTypes = {
   offLabel: PropTypes.string,
   onLabel: PropTypes.string,
   disabled: PropTypes.bool,
+  className: PropTypes.string,
 };
 
 export default ToggleButton;
diff --git a/ui/components/ui/typography/typography.js b/ui/components/ui/typography/typography.js
index 0af48e699..2d11ca3cc 100644
--- a/ui/components/ui/typography/typography.js
+++ b/ui/components/ui/typography/typography.js
@@ -79,9 +79,11 @@ Typography.propTypes = {
     'h5',
     'h6',
     'span',
+    'strong',
+    'em',
+    'li',
     'div',
     'dt',
     'dd',
-    'i',
   ]),
 };
diff --git a/ui/components/ui/typography/typography.scss b/ui/components/ui/typography/typography.scss
index c92fc6eb2..ea1cbaff3 100644
--- a/ui/components/ui/typography/typography.scss
+++ b/ui/components/ui/typography/typography.scss
@@ -4,7 +4,8 @@
 .typography {
   @include design-system.Paragraph;
 
-  & b {
+  & b,
+  & strong {
     font-weight: 700;
   }
 
diff --git a/ui/components/ui/typography/typography.test.js b/ui/components/ui/typography/typography.test.js
new file mode 100644
index 000000000..d8b259b85
--- /dev/null
+++ b/ui/components/ui/typography/typography.test.js
@@ -0,0 +1,58 @@
+import * as React from 'react';
+import { render } from '@testing-library/react';
+import Typography from '.';
+
+describe('Typography', () => {
+  it('should render the Typography without crashing', () => {
+    const { getByText } = render(<Typography>Test type</Typography>);
+    expect(getByText('Test type')).toBeDefined();
+  });
+  it('should render the Typography with correct html tags', () => {
+    const { getByText, container } = render(
+      <>
+        <Typography tag="p">p tag</Typography>
+        <Typography tag="h1">h1 tag</Typography>
+        <Typography tag="h2">h2 tag</Typography>
+        <Typography tag="h3">h3 tag</Typography>
+        <Typography tag="h4">h4 tag</Typography>
+        <Typography tag="h5">h5 tag</Typography>
+        <Typography tag="h6">h6 tag</Typography>
+        <Typography tag="span">span tag</Typography>
+        <Typography tag="strong">strong tag</Typography>
+        <Typography tag="em">em tag</Typography>
+        <Typography tag="li">li tag</Typography>
+        <Typography tag="div">div tag</Typography>
+        <Typography tag="dt">dt tag</Typography>
+        <Typography tag="dd">dd tag</Typography>
+      </>,
+    );
+    expect(container.querySelector('p')).toBeDefined();
+    expect(getByText('p tag')).toBeDefined();
+    expect(container.querySelector('h1')).toBeDefined();
+    expect(getByText('h1 tag')).toBeDefined();
+    expect(container.querySelector('h2')).toBeDefined();
+    expect(getByText('h2 tag')).toBeDefined();
+    expect(container.querySelector('h3')).toBeDefined();
+    expect(getByText('h3 tag')).toBeDefined();
+    expect(container.querySelector('h4')).toBeDefined();
+    expect(getByText('h4 tag')).toBeDefined();
+    expect(container.querySelector('h5')).toBeDefined();
+    expect(getByText('h5 tag')).toBeDefined();
+    expect(container.querySelector('h6')).toBeDefined();
+    expect(getByText('h6 tag')).toBeDefined();
+    expect(container.querySelector('span')).toBeDefined();
+    expect(getByText('span tag')).toBeDefined();
+    expect(container.querySelector('strong')).toBeDefined();
+    expect(getByText('strong tag')).toBeDefined();
+    expect(container.querySelector('em')).toBeDefined();
+    expect(getByText('em tag')).toBeDefined();
+    expect(container.querySelector('li')).toBeDefined();
+    expect(getByText('li tag')).toBeDefined();
+    expect(container.querySelector('div')).toBeDefined();
+    expect(getByText('div tag')).toBeDefined();
+    expect(container.querySelector('dt')).toBeDefined();
+    expect(getByText('dt tag')).toBeDefined();
+    expect(container.querySelector('dd')).toBeDefined();
+    expect(getByText('dd tag')).toBeDefined();
+  });
+});
diff --git a/ui/components/ui/ui-components.scss b/ui/components/ui/ui-components.scss
index 6200bb21f..34c435acd 100644
--- a/ui/components/ui/ui-components.scss
+++ b/ui/components/ui/ui-components.scss
@@ -35,6 +35,7 @@
 @import 'loading-screen/index';
 @import 'menu/menu';
 @import 'numeric-input/numeric-input';
+@import 'nickname-popover/index';
 @import 'form-field/index';
 @import 'page-container/index';
 @import 'popover/index';
@@ -53,3 +54,5 @@
 @import 'typography/typography';
 @import 'unit-input/index';
 @import 'url-icon/index';
+@import 'update-nickname-popover/index';
+@import 'disclosure/disclosure';
diff --git a/ui/components/ui/update-nickname-popover/index.js b/ui/components/ui/update-nickname-popover/index.js
new file mode 100644
index 000000000..010441206
--- /dev/null
+++ b/ui/components/ui/update-nickname-popover/index.js
@@ -0,0 +1 @@
+export { default } from './update-nickname-popover';
diff --git a/ui/components/ui/update-nickname-popover/index.scss b/ui/components/ui/update-nickname-popover/index.scss
new file mode 100644
index 000000000..650edf11d
--- /dev/null
+++ b/ui/components/ui/update-nickname-popover/index.scss
@@ -0,0 +1,64 @@
+
+.update-nickname {
+  &__wrapper {
+    height: 620px;
+    width: 360px;
+    border-radius: 10px;
+    max-height: 100vh;
+    width: auto;
+
+    .popover-header {
+      border-bottom: 1px solid #d2d8dd;
+      margin-bottom: 16px;
+      border-radius: 10px;
+    }
+
+    @media screen and (max-width: $break-small) {
+      width: 96%;
+      height: 96%;
+    }
+  }
+
+  &__cancel {
+    margin-right: 16px;
+  }
+
+  &__content {
+    padding: 0 20px 20px 20px;
+    position: relative;
+
+    &__indenticon {
+      margin-bottom: 16px;
+    }
+
+    &__text-area-wrapper {
+      height: 96px !important;
+    }
+
+    &__text-area {
+      line-height: initial !important;
+    }
+
+    &__address {
+      margin-top: 8px;
+      font-size: 13px;
+      color: #bbc0c5;
+      margin-bottom: 16px;
+      overflow-wrap: break-word;
+    }
+
+    &__label,
+    &__label--capitalized {
+      text-transform: capitalize;
+      margin-top: 16px;
+      color: #24292e;
+      font-size: 14px;
+    }
+
+    &__nickname-label {
+      margin-bottom: 8px;
+      color: #24292e;
+      font-size: 14px;
+    }
+  }
+}
diff --git a/ui/components/ui/update-nickname-popover/update-nickname-popover.js b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
new file mode 100644
index 000000000..2713d7b70
--- /dev/null
+++ b/ui/components/ui/update-nickname-popover/update-nickname-popover.js
@@ -0,0 +1,119 @@
+import React, { useCallback, useContext, useState } from 'react';
+import PropTypes from 'prop-types';
+
+import Popover from '../popover';
+import Button from '../button';
+import TextField from '../text-field';
+
+import { I18nContext } from '../../../contexts/i18n';
+
+import Identicon from '../identicon/identicon.component';
+
+export default function UpdateNicknamePopover({
+  nickname,
+  address,
+  onAdd,
+  memo,
+  onClose,
+}) {
+  const t = useContext(I18nContext);
+
+  const [nicknameInput, setNicknameInput] = useState(nickname);
+  const [memoInput, setMemoInput] = useState(memo);
+
+  const handleNicknameChange = (event) => {
+    setNicknameInput(event.target.value);
+  };
+
+  const handleMemoChange = (event) => {
+    setMemoInput(event.target.value);
+  };
+
+  const closePopover = useCallback(() => {
+    onClose();
+  }, [onClose]);
+
+  const onCancel = () => {
+    onClose();
+  };
+
+  const onSubmit = () => {
+    onAdd(address, nicknameInput, memoInput);
+    onClose();
+  };
+
+  return (
+    <Popover
+      title={nickname ? t('editAddressNickname') : t('addANickname')}
+      onClose={closePopover}
+      className="update-nickname__wrapper"
+      footer={
+        <>
+          <Button
+            className="update-nickname__cancel"
+            type="secondary"
+            onClick={onCancel}
+          >
+            {t('cancel')}
+          </Button>
+          <Button
+            className="update-nickname__save"
+            type="primary"
+            onClick={onSubmit}
+            disabled={!nicknameInput}
+          >
+            {t('save')}
+          </Button>
+        </>
+      }
+    >
+      <div className="update-nickname__content">
+        <Identicon
+          className="update-nickname__content__indenticon"
+          address={address}
+          diameter={36}
+        />
+        <label className="update-nickname__content__label--capitalized">
+          {t('address')}
+        </label>
+        <div className="update-nickname__content__address">{address}</div>
+        <div className="update-nickname__content__nickname-label">
+          {t('nickname')}
+        </div>
+        <TextField
+          className="update-nickname__content__text-field"
+          value={nicknameInput}
+          onChange={handleNicknameChange}
+          placeholder={t('addANickname')}
+          fullWidth
+        />
+        <div className="update-nickname__content__label--capitalized">
+          {t('memo')}
+        </div>
+        <TextField
+          type="text"
+          id="memo"
+          value={memoInput}
+          onChange={handleMemoChange}
+          placeholder={t('addMemo')}
+          fullWidth
+          margin="dense"
+          multiline
+          rows={3}
+          classes={{
+            inputMultiline: 'update-nickname__content__text-area',
+            inputRoot: 'update-nickname__content__text-area-wrapper',
+          }}
+        />
+      </div>
+    </Popover>
+  );
+}
+
+UpdateNicknamePopover.propTypes = {
+  nickname: PropTypes.string,
+  address: PropTypes.string,
+  memo: PropTypes.string,
+  onAdd: PropTypes.func,
+  onClose: PropTypes.func,
+};
diff --git a/ui/components/ui/update-nickname-popover/update-nickname-popover.stories.js b/ui/components/ui/update-nickname-popover/update-nickname-popover.stories.js
new file mode 100644
index 000000000..ce9c34aca
--- /dev/null
+++ b/ui/components/ui/update-nickname-popover/update-nickname-popover.stories.js
@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import { action } from '@storybook/addon-actions';
+import { text } from '@storybook/addon-knobs';
+import Button from '../button';
+import UpdateNicknamePopover from '.';
+
+export default {
+  title: 'UpdateNickname',
+  id: __filename,
+};
+
+export const AddNickname = () => {
+  const [showPopover, setShowPopover] = useState(false);
+  return (
+    <div style={{ width: '600px' }}>
+      <Button onClick={() => setShowPopover(true)}>
+        Open Add Nickname Popover
+      </Button>
+      {showPopover && (
+        <UpdateNicknamePopover
+          address={text('address', '0x0011244f50ff4')}
+          onClose={() => action(`Close Update Nickname Popover`)()}
+        />
+      )}
+    </div>
+  );
+};
+
+export const UpdateNickname = () => {
+  const [showPopover, setShowPopover] = useState(false);
+  return (
+    <div style={{ width: '600px' }}>
+      <Button onClick={() => setShowPopover(true)}>
+        Open Update Nickname Popover
+      </Button>
+      {showPopover && (
+        <UpdateNicknamePopover
+          address={text('address', '0x0011244f50ff4')}
+          nickname={text('nickname', 'user_nickname')}
+          onClose={() => action(`Close Update Nickname Popover`)()}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/ui/contexts/gasFee.js b/ui/contexts/gasFee.js
index c7fe7f092..65242fe94 100644
--- a/ui/contexts/gasFee.js
+++ b/ui/contexts/gasFee.js
@@ -31,7 +31,7 @@ export function useGasFeeContext() {
 GasFeeContextProvider.propTypes = {
   children: PropTypes.node.isRequired,
   defaultEstimateToUse: PropTypes.string,
-  transaction: PropTypes.object.isRequired,
+  transaction: PropTypes.object,
   minimumGasLimit: PropTypes.string,
   editGasMode: PropTypes.string,
 };
diff --git a/ui/contexts/metametrics.js b/ui/contexts/metametrics.js
index bb23afef8..3e2b9786a 100644
--- a/ui/contexts/metametrics.js
+++ b/ui/contexts/metametrics.js
@@ -3,6 +3,7 @@ import React, {
   createContext,
   useEffect,
   useCallback,
+  useContext,
   useState,
 } from 'react';
 import { useSelector } from 'react-redux';
@@ -124,6 +125,10 @@ export function MetaMetricsProvider({ children }) {
 
 MetaMetricsProvider.propTypes = { children: PropTypes.node };
 
+export function useMetaMetricsContext() {
+  return useContext(MetaMetricsContext);
+}
+
 export class LegacyMetaMetricsProvider extends Component {
   static propTypes = {
     children: PropTypes.node,
diff --git a/ui/contexts/transaction-modal.js b/ui/contexts/transaction-modal.js
new file mode 100644
index 000000000..bf16ecf09
--- /dev/null
+++ b/ui/contexts/transaction-modal.js
@@ -0,0 +1,80 @@
+import React, { createContext, useContext, useState } from 'react';
+import PropTypes from 'prop-types';
+
+import { TRANSACTION_TYPES } from '../../shared/constants/transaction';
+import { getMethodName } from '../helpers/utils/metrics';
+import { useGasFeeContext } from './gasFee';
+import { useMetaMetricsContext } from './metametrics';
+
+export const TransactionModalContext = createContext({});
+
+export const TransactionModalContextProvider = ({
+  actionKey,
+  children,
+  methodData,
+}) => {
+  const [openModals, setOpenModals] = useState([]);
+  const metricsEvent = useMetaMetricsContext();
+  const { transaction: { origin } = {} } = useGasFeeContext();
+
+  const captureEvent = () => {
+    metricsEvent({
+      eventOpts: {
+        category: 'Transactions',
+        action: 'Confirm Screen',
+        name: 'User clicks "Edit" on gas',
+      },
+      customVariables: {
+        recipientKnown: null,
+        functionType:
+          actionKey ||
+          getMethodName(methodData.name) ||
+          TRANSACTION_TYPES.CONTRACT_INTERACTION,
+        origin,
+      },
+    });
+  };
+
+  const closeModal = (modalName) => {
+    const index = openModals.indexOf(modalName);
+    if (openModals < 0) return;
+    const modals = [...openModals];
+    modals.splice(index, 1);
+    setOpenModals(modals);
+  };
+
+  const closeAllModals = () => {
+    setOpenModals([]);
+  };
+
+  const openModal = (modalName) => {
+    if (openModals.includes(modalName)) return;
+    captureEvent();
+    const modals = [...openModals];
+    modals.push(modalName);
+    setOpenModals(modals);
+  };
+
+  return (
+    <TransactionModalContext.Provider
+      value={{
+        closeModal,
+        closeAllModals,
+        currentModal: openModals[openModals.length - 1],
+        openModal,
+      }}
+    >
+      {children}
+    </TransactionModalContext.Provider>
+  );
+};
+
+export function useTransactionModalContext() {
+  return useContext(TransactionModalContext);
+}
+
+TransactionModalContextProvider.propTypes = {
+  actionKey: PropTypes.string,
+  children: PropTypes.node.isRequired,
+  methodData: PropTypes.object,
+};
diff --git a/ui/css/design-system/attributes.scss b/ui/css/design-system/attributes.scss
index 8b920b7eb..4a187a949 100644
--- a/ui/css/design-system/attributes.scss
+++ b/ui/css/design-system/attributes.scss
@@ -82,4 +82,4 @@ $display: block, grid, flex, inline-block, inline-grid, inline-flex, list-item;
 $text-align: left, right, center, justify, end;
 $font-weight: bold, normal, 100, 200, 300, 400, 500, 600, 700, 800, 900;
 $font-style: normal, italic, oblique;
-$font-size: 12px;
+$font-size: 10px, 12px;
diff --git a/ui/css/design-system/colors.scss b/ui/css/design-system/colors.scss
index d76de5ef6..b66c07690 100644
--- a/ui/css/design-system/colors.scss
+++ b/ui/css/design-system/colors.scss
@@ -1,6 +1,5 @@
 // These are the colors of the MetaMask design system
 // Only design system colors should be added, no superfluous variables
-// See https://bit.ly/32mnoja (link to figma design system)
 $Blue-000: #eaf6ff;
 $Blue-100: #a7d9fe;
 $Blue-200: #75c4fd;
@@ -112,6 +111,8 @@ $rinkeby: #f6c343;
 $goerli: #3099f2;
 $localhost: #29b6af;
 
+$flask-purple: #8b45b6;
+
 $color-map: (
   'ui-1': $ui-1,
   'ui-2': $ui-2,
@@ -143,4 +144,5 @@ $color-map: (
   'goerli': $goerli,
   'localhost': $localhost,
   'transparent': transparent,
+  'flask-purple': $flask-purple
 );
diff --git a/ui/ducks/app/app.js b/ui/ducks/app/app.js
index 2baa2f53d..47c440e00 100644
--- a/ui/ducks/app/app.js
+++ b/ui/ducks/app/app.js
@@ -55,6 +55,7 @@ export default function reduceApp(state = {}, action) {
     ledgerWebHidConnectedStatus: WEBHID_CONNECTED_STATUSES.UNKNOWN,
     ledgerTransportStatus: TRANSPORT_STATES.NONE,
     newNetworkAdded: '',
+    newCollectibleAddedMessage: '',
     ...state,
   };
 
@@ -290,6 +291,12 @@ export default function reduceApp(state = {}, action) {
         newNetworkAdded: action.value,
       };
 
+    case actionConstants.SET_NEW_COLLECTIBLE_ADDED_MESSAGE:
+      return {
+        ...appState,
+        newCollectibleAddedMessage: action.value,
+      };
+
     case actionConstants.LOADING_METHOD_DATA_STARTED:
       return {
         ...appState,
diff --git a/ui/ducks/swaps/swaps.js b/ui/ducks/swaps/swaps.js
index 4acfcad50..8923574fb 100644
--- a/ui/ducks/swaps/swaps.js
+++ b/ui/ducks/swaps/swaps.js
@@ -85,6 +85,10 @@ const initialState = {
   balanceError: false,
   fetchingQuotes: false,
   fromToken: null,
+  fromTokenInputValue: '',
+  fromTokenError: null,
+  isFeatureFlagLoaded: false,
+  maxSlippage: 3,
   quotesFetchStartTime: null,
   reviewSwapClickedTimestamp: null,
   topAssets: {},
@@ -128,6 +132,18 @@ const slice = createSlice({
     setFromToken: (state, action) => {
       state.fromToken = action.payload;
     },
+    setFromTokenInputValue: (state, action) => {
+      state.fromTokenInputValue = action.payload;
+    },
+    setFromTokenError: (state, action) => {
+      state.fromTokenError = action.payload;
+    },
+    setIsFeatureFlagLoaded: (state, action) => {
+      state.isFeatureFlagLoaded = action.payload;
+    },
+    setMaxSlippage: (state, action) => {
+      state.maxSlippage = action.payload;
+    },
     setQuotesFetchStartTime: (state, action) => {
       state.quotesFetchStartTime = action.payload;
     },
@@ -178,6 +194,16 @@ export const getBalanceError = (state) => state.swaps.balanceError;
 
 export const getFromToken = (state) => state.swaps.fromToken;
 
+export const getFromTokenError = (state) => state.swaps.fromTokenError;
+
+export const getFromTokenInputValue = (state) =>
+  state.swaps.fromTokenInputValue;
+
+export const getIsFeatureFlagLoaded = (state) =>
+  state.swaps.isFeatureFlagLoaded;
+
+export const getMaxSlippage = (state) => state.swaps.maxSlippage;
+
 export const getTopAssets = (state) => state.swaps.topAssets;
 
 export const getToToken = (state) => state.swaps.toToken;
@@ -237,9 +263,6 @@ const getSwapsState = (state) => state.metamask.swapsState;
 export const getSwapsFeatureIsLive = (state) =>
   state.metamask.swapsState.swapsFeatureIsLive;
 
-export const getUseNewSwapsApi = (state) =>
-  state.metamask.swapsState.useNewSwapsApi;
-
 export const getSwapsQuoteRefreshTime = (state) =>
   state.metamask.swapsState.swapsQuoteRefreshTime;
 
@@ -332,6 +355,10 @@ const {
   setBalanceError,
   setFetchingQuotes,
   setFromToken,
+  setFromTokenError,
+  setFromTokenInputValue,
+  setIsFeatureFlagLoaded,
+  setMaxSlippage,
   setQuotesFetchStartTime,
   setReviewSwapClickedTimestamp,
   setTopAssets,
@@ -348,6 +375,10 @@ export {
   setBalanceError,
   setFetchingQuotes,
   setFromToken as setSwapsFromToken,
+  setFromTokenError,
+  setFromTokenInputValue,
+  setIsFeatureFlagLoaded,
+  setMaxSlippage,
   setQuotesFetchStartTime as setSwapQuotesFetchStartTime,
   setReviewSwapClickedTimestamp,
   setTopAssets,
@@ -403,7 +434,6 @@ export const fetchSwapsLiveness = () => {
   return async (dispatch, getState) => {
     let swapsLivenessForNetwork = {
       swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
     };
     try {
       const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@@ -415,6 +445,7 @@ export const fetchSwapsLiveness = () => {
       log.error('Failed to fetch Swaps liveness, defaulting to false.', error);
     }
     await dispatch(setSwapsLiveness(swapsLivenessForNetwork));
+    dispatch(setIsFeatureFlagLoaded(true));
     return swapsLivenessForNetwork;
   };
 };
@@ -431,7 +462,6 @@ export const fetchQuotesAndSetQuoteState = (
     const chainId = getCurrentChainId(state);
     let swapsLivenessForNetwork = {
       swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
     };
     try {
       const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@@ -655,7 +685,6 @@ export const signAndSendTransactions = (history, metaMetricsEvent) => {
     );
     let swapsLivenessForNetwork = {
       swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
     };
     try {
       const swapsFeatureFlags = await fetchSwapsFeatureFlags();
@@ -913,13 +942,12 @@ export function fetchMetaSwapsGasPriceEstimates() {
   return async (dispatch, getState) => {
     const state = getState();
     const chainId = getCurrentChainId(state);
-    const useNewSwapsApi = getUseNewSwapsApi(state);
 
     dispatch(swapGasPriceEstimatesFetchStarted());
 
     let priceEstimates;
     try {
-      priceEstimates = await fetchSwapsGasPrices(chainId, useNewSwapsApi);
+      priceEstimates = await fetchSwapsGasPrices(chainId);
     } catch (e) {
       log.warn('Fetching swaps gas prices failed:', e);
 
diff --git a/ui/ducks/swaps/swaps.test.js b/ui/ducks/swaps/swaps.test.js
index 192e1bb9d..e766e484e 100644
--- a/ui/ducks/swaps/swaps.test.js
+++ b/ui/ducks/swaps/swaps.test.js
@@ -61,7 +61,6 @@ describe('Ducks - Swaps', () => {
       const mockDispatch = jest.fn();
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
       };
       const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
       const featureFlagApiNock = mockFeatureFlagsApiResponse({
@@ -72,7 +71,7 @@ describe('Ducks - Swaps', () => {
         createGetState(),
       );
       expect(featureFlagApiNock.isDone()).toBe(true);
-      expect(mockDispatch).toHaveBeenCalledTimes(1);
+      expect(mockDispatch).toHaveBeenCalledTimes(2);
       expect(setSwapsLiveness).toHaveBeenCalledWith(expectedSwapsLiveness);
       expect(swapsLiveness).toMatchObject(expectedSwapsLiveness);
     });
@@ -81,7 +80,6 @@ describe('Ducks - Swaps', () => {
       const mockDispatch = jest.fn();
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
       };
       const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
       featureFlagsResponse.ethereum.extension_active = false;
@@ -93,7 +91,7 @@ describe('Ducks - Swaps', () => {
         createGetState(),
       );
       expect(featureFlagApiNock.isDone()).toBe(true);
-      expect(mockDispatch).toHaveBeenCalledTimes(1);
+      expect(mockDispatch).toHaveBeenCalledTimes(2);
       expect(setSwapsLiveness).toHaveBeenCalledWith(expectedSwapsLiveness);
       expect(swapsLiveness).toMatchObject(expectedSwapsLiveness);
     });
@@ -102,7 +100,6 @@ describe('Ducks - Swaps', () => {
       const mockDispatch = jest.fn();
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
       };
       const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
       featureFlagsResponse.ethereum.extension_active = false;
@@ -115,7 +112,7 @@ describe('Ducks - Swaps', () => {
         createGetState(),
       );
       expect(featureFlagApiNock.isDone()).toBe(true);
-      expect(mockDispatch).toHaveBeenCalledTimes(1);
+      expect(mockDispatch).toHaveBeenCalledTimes(2);
       expect(setSwapsLiveness).toHaveBeenCalledWith(expectedSwapsLiveness);
       expect(swapsLiveness).toMatchObject(expectedSwapsLiveness);
     });
@@ -124,7 +121,6 @@ describe('Ducks - Swaps', () => {
       const mockDispatch = jest.fn();
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
       };
       const featureFlagApiNock = mockFeatureFlagsApiResponse({
         replyWithError: true,
@@ -134,7 +130,7 @@ describe('Ducks - Swaps', () => {
         createGetState(),
       );
       expect(featureFlagApiNock.isDone()).toBe(true);
-      expect(mockDispatch).toHaveBeenCalledTimes(1);
+      expect(mockDispatch).toHaveBeenCalledTimes(2);
       expect(setSwapsLiveness).toHaveBeenCalledWith(expectedSwapsLiveness);
       expect(swapsLiveness).toMatchObject(expectedSwapsLiveness);
     });
@@ -143,7 +139,6 @@ describe('Ducks - Swaps', () => {
       const mockDispatch = jest.fn();
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
       };
       const featureFlagsResponse = MOCKS.createFeatureFlagsResponse();
       const featureFlagApiNock = mockFeatureFlagsApiResponse({
@@ -159,7 +154,7 @@ describe('Ducks - Swaps', () => {
         createGetState(),
       );
       expect(featureFlagApiNock2.isDone()).toBe(false); // Second API call wasn't made, cache was used instead.
-      expect(mockDispatch).toHaveBeenCalledTimes(2);
+      expect(mockDispatch).toHaveBeenCalledTimes(4);
       expect(setSwapsLiveness).toHaveBeenCalledWith(expectedSwapsLiveness);
       expect(swapsLiveness).toMatchObject(expectedSwapsLiveness);
     });
@@ -210,22 +205,6 @@ describe('Ducks - Swaps', () => {
     });
   });
 
-  describe('getUseNewSwapsApi', () => {
-    it('returns true for "useNewSwapsApi"', () => {
-      const state = createSwapsMockStore();
-      const useNewSwapsApi = true;
-      state.metamask.swapsState.useNewSwapsApi = useNewSwapsApi;
-      expect(swaps.getUseNewSwapsApi(state)).toBe(useNewSwapsApi);
-    });
-
-    it('returns false for "useNewSwapsApi"', () => {
-      const state = createSwapsMockStore();
-      const useNewSwapsApi = false;
-      state.metamask.swapsState.useNewSwapsApi = useNewSwapsApi;
-      expect(swaps.getUseNewSwapsApi(state)).toBe(useNewSwapsApi);
-    });
-  });
-
   describe('getUsedQuote', () => {
     it('returns selected quote', () => {
       const state = createSwapsMockStore();
diff --git a/ui/helpers/constants/gas.js b/ui/helpers/constants/gas.js
index 4f2d8612b..726057342 100644
--- a/ui/helpers/constants/gas.js
+++ b/ui/helpers/constants/gas.js
@@ -31,3 +31,11 @@ export function getGasFormErrorText(type, t, { minimumGasLimit } = {}) {
       return '';
   }
 }
+
+export const PRIORITY_LEVEL_ICON_MAP = {
+  low: '🐢',
+  medium: '🦊',
+  high: '🦍',
+  dappSuggested: '🌐',
+  custom: '⚙',
+};
diff --git a/ui/helpers/constants/routes.js b/ui/helpers/constants/routes.js
index d1f1dcf3d..541dad5c1 100644
--- a/ui/helpers/constants/routes.js
+++ b/ui/helpers/constants/routes.js
@@ -70,6 +70,11 @@ const ONBOARDING_PIN_EXTENSION_ROUTE = '/onboarding/pin-extension';
 const ONBOARDING_WELCOME_ROUTE = '/onboarding/welcome';
 const ONBOARDING_METAMETRICS = '/onboarding/metametrics';
 
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+const INITIALIZE_EXPERIMENTAL_AREA = '/initialize/experimental-area';
+const ONBOARDING_EXPERIMENTAL_AREA = '/onboarding/experimental-area';
+///: END:ONLY_INCLUDE_IN
+
 const CONFIRM_TRANSACTION_ROUTE = '/confirm-transaction';
 const CONFIRM_SEND_ETHER_PATH = '/send-ether';
 const CONFIRM_SEND_TOKEN_PATH = '/send-token';
@@ -234,4 +239,8 @@ export {
   ONBOARDING_PIN_EXTENSION_ROUTE,
   ONBOARDING_WELCOME_ROUTE,
   ONBOARDING_METAMETRICS,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  INITIALIZE_EXPERIMENTAL_AREA,
+  ONBOARDING_EXPERIMENTAL_AREA,
+  ///: END:ONLY_INCLUDE_IN
 };
diff --git a/ui/helpers/utils/metric.test.js b/ui/helpers/utils/metric.test.js
new file mode 100644
index 000000000..b3a4981d5
--- /dev/null
+++ b/ui/helpers/utils/metric.test.js
@@ -0,0 +1,13 @@
+import { getMethodName } from './metrics';
+
+describe('getMethodName', () => {
+  it('should get correct method names', () => {
+    expect(getMethodName(undefined)).toStrictEqual('');
+    expect(getMethodName({})).toStrictEqual('');
+    expect(getMethodName('confirm')).toStrictEqual('confirm');
+    expect(getMethodName('balanceOf')).toStrictEqual('balance Of');
+    expect(getMethodName('ethToTokenSwapInput')).toStrictEqual(
+      'eth To Token Swap Input',
+    );
+  });
+});
diff --git a/ui/helpers/utils/metrics.js b/ui/helpers/utils/metrics.js
new file mode 100644
index 000000000..c085545f2
--- /dev/null
+++ b/ui/helpers/utils/metrics.js
@@ -0,0 +1,10 @@
+export function getMethodName(camelCase) {
+  if (!camelCase || typeof camelCase !== 'string') {
+    return '';
+  }
+
+  return camelCase
+    .replace(/([a-z])([A-Z])/gu, '$1 $2')
+    .replace(/([A-Z])([a-z])/gu, ' $1$2')
+    .replace(/ +/gu, ' ');
+}
diff --git a/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js b/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js
index 1beaac13c..5789e0f17 100644
--- a/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js
+++ b/ui/helpers/utils/optimism/buildUnserializedTransaction.test.js
@@ -1,5 +1,4 @@
 import { BN } from 'ethereumjs-util';
-import { times } from 'lodash';
 import buildUnserializedTransaction from './buildUnserializedTransaction';
 
 describe('buildUnserializedTransaction', () => {
@@ -14,15 +13,13 @@ describe('buildUnserializedTransaction', () => {
         data: '0x0',
       },
     });
-    expect(unserializedTransaction).toMatchObject({
-      nonce: new BN('00', 16),
-      gasPrice: new BN('64', 16),
-      gasLimit: new BN('5208', 16),
-      to: expect.objectContaining({
-        buf: Buffer.from(times(20, 0)),
-      }),
-      value: new BN('09184e72a000', 16),
-      data: Buffer.from([0]),
+    expect(unserializedTransaction.toJSON()).toMatchObject({
+      nonce: '0x0',
+      gasPrice: '0x64',
+      gasLimit: '0x5208',
+      to: '0x0000000000000000000000000000000000000000',
+      value: '0x9184e72a000',
+      data: '0x00',
     });
   });
 });
diff --git a/ui/helpers/utils/util.js b/ui/helpers/utils/util.js
index b20e69559..f7d839d08 100644
--- a/ui/helpers/utils/util.js
+++ b/ui/helpers/utils/util.js
@@ -408,3 +408,23 @@ export function getURLHost(url) {
 export function getURLHostName(url) {
   return getURL(url)?.hostname || '';
 }
+
+// Once we reach this threshold, we switch to higher unit
+const MINUTE_CUTOFF = 90 * 60;
+const SECOND_CUTOFF = 90;
+
+export const toHumanReadableTime = (t, milliseconds) => {
+  if (milliseconds === undefined || milliseconds === null) return '';
+  const seconds = Math.ceil(milliseconds / 1000);
+  if (seconds <= SECOND_CUTOFF) {
+    return t('gasTimingSecondsShort', [seconds]);
+  }
+  if (seconds <= MINUTE_CUTOFF) {
+    return t('gasTimingMinutesShort', [Math.ceil(seconds / 60)]);
+  }
+  return t('gasTimingHoursShort', [Math.ceil(seconds / 3600)]);
+};
+
+export function clearClipboard() {
+  window.navigator.clipboard.writeText('');
+}
diff --git a/ui/helpers/utils/util.test.js b/ui/helpers/utils/util.test.js
index 7038dd79e..1f9084865 100644
--- a/ui/helpers/utils/util.test.js
+++ b/ui/helpers/utils/util.test.js
@@ -301,4 +301,43 @@ describe('util', () => {
       });
     });
   });
+
+  describe('toHumanReadableTime()', () => {
+    const t = (key, number) => {
+      switch (key) {
+        case 'gasTimingSecondsShort':
+          return `${number} sec`;
+        case 'gasTimingMinutesShort':
+          return `${number} min`;
+        case 'gasTimingHoursShort':
+          return `${number} hrs`;
+        default:
+          return '';
+      }
+    };
+    it('should return empty string if milliseconds passed is undefined', () => {
+      expect(util.toHumanReadableTime(t)).toStrictEqual('');
+    });
+    it('should return rounded value for time', () => {
+      expect(util.toHumanReadableTime(t, 6300)).toStrictEqual('7 sec');
+    });
+    it('should return value in seconds for milliseconds passed is < 9000', () => {
+      expect(util.toHumanReadableTime(t, 6000)).toStrictEqual('6 sec');
+    });
+    it('should return value in seconds for milliseconds passed is > 6000 and <= 9000', () => {
+      expect(util.toHumanReadableTime(t, 9000)).toStrictEqual('9 sec');
+    });
+    it('should return value in minutes for milliseconds passed is > 90000', () => {
+      expect(util.toHumanReadableTime(t, 90001)).toStrictEqual('2 min');
+    });
+    it('should return value in minutes for milliseconds passed is > 90000 and <= 5400000', () => {
+      expect(util.toHumanReadableTime(t, 5400000)).toStrictEqual('90 min');
+    });
+    it('should return value in hours for milliseconds passed is > 5400000', () => {
+      expect(util.toHumanReadableTime(t, 5400001)).toStrictEqual('2 hrs');
+    });
+    it('should return value in hours for milliseconds passed very high above 5400000', () => {
+      expect(util.toHumanReadableTime(t, 7200000)).toStrictEqual('2 hrs');
+    });
+  });
 });
diff --git a/ui/hooks/gasFeeInput/useGasFeeErrors.js b/ui/hooks/gasFeeInput/useGasFeeErrors.js
index 0300feec0..213b66b2d 100644
--- a/ui/hooks/gasFeeInput/useGasFeeErrors.js
+++ b/ui/hooks/gasFeeInput/useGasFeeErrors.js
@@ -262,5 +262,6 @@ export function useGasFeeErrors({
     gasWarnings,
     balanceError,
     estimatesUnavailableWarning,
+    hasSimulationError: Boolean(transaction?.simulationFails),
   };
 }
diff --git a/ui/hooks/gasFeeInput/useGasFeeErrors.test.js b/ui/hooks/gasFeeInput/useGasFeeErrors.test.js
index 44573dd9f..b40ebc918 100644
--- a/ui/hooks/gasFeeInput/useGasFeeErrors.test.js
+++ b/ui/hooks/gasFeeInput/useGasFeeErrors.test.js
@@ -280,6 +280,21 @@ describe('useGasFeeErrors', () => {
     });
   });
 
+  describe('Simulation Error', () => {
+    it('is false if transaction has falsy values for simulationFails', () => {
+      configureEIP1559();
+      const { result } = renderUseGasFeeErrorsHook();
+      expect(result.current.hasSimulationError).toBe(false);
+    });
+    it('is true if transaction.simulationFails is true', () => {
+      configureEIP1559();
+      const { result } = renderUseGasFeeErrorsHook({
+        transaction: { simulationFails: true },
+      });
+      expect(result.current.hasSimulationError).toBe(true);
+    });
+  });
+
   describe('estimatesUnavailableWarning', () => {
     it('is false if supportsEIP1559 and gasEstimateType is fee-market', () => {
       configureEIP1559();
diff --git a/ui/hooks/gasFeeInput/useGasFeeInputs.js b/ui/hooks/gasFeeInput/useGasFeeInputs.js
index 51021cc42..49864193b 100644
--- a/ui/hooks/gasFeeInput/useGasFeeInputs.js
+++ b/ui/hooks/gasFeeInput/useGasFeeInputs.js
@@ -1,13 +1,13 @@
-import { useCallback, useState } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import {
   CUSTOM_GAS_ESTIMATE,
   GAS_RECOMMENDATIONS,
   EDIT_GAS_MODES,
+  PRIORITY_LEVELS,
 } from '../../../shared/constants/gas';
 import { GAS_FORM_ERRORS } from '../../helpers/constants/gas';
-import { areDappSuggestedAndTxParamGasFeesTheSame } from '../../helpers/utils/confirm-tx.util';
 import {
   checkNetworkAndAccountSupports1559,
   getAdvancedInlineGasShown,
@@ -21,6 +21,10 @@ import { useGasPriceInput } from './useGasPriceInput';
 import { useMaxFeePerGasInput } from './useMaxFeePerGasInput';
 import { useMaxPriorityFeePerGasInput } from './useMaxPriorityFeePerGasInput';
 import { useGasEstimates } from './useGasEstimates';
+import { useTransactionFunctions } from './useTransactionFunctions';
+
+// eslint-disable-next-line prefer-destructuring
+const EIP_1559_V2 = process.env.EIP_1559_V2;
 
 /**
  * @typedef {Object} GasFeeInputReturnType
@@ -73,6 +77,10 @@ export function useGasFeeInputs(
   minimumGasLimit = '0x5208',
   editGasMode = EDIT_GAS_MODES.MODIFY_IN_PLACE,
 ) {
+  // eslint-disable-next-line prefer-destructuring
+  const EIP_1559_V2_ENABLED =
+    process.env.EIP_1559_V2 === true || process.env.EIP_1559_V2 === 'true';
+
   const supportsEIP1559 =
     useSelector(checkNetworkAndAccountSupports1559) &&
     !isLegacyTransaction(transaction?.txParams);
@@ -100,14 +108,31 @@ export function useGasFeeInputs(
     return defaultEstimateToUse;
   });
 
-  const [
-    isUsingDappSuggestedGasFees,
-    setIsUsingDappSuggestedGasFees,
-  ] = useState(() =>
-    Boolean(areDappSuggestedAndTxParamGasFeesTheSame(transaction)),
-  );
+  const [estimateUsed, setEstimateUsed] = useState(() => {
+    if (estimateToUse) {
+      return estimateToUse;
+    }
+    return PRIORITY_LEVELS.CUSTOM;
+  });
+
+  /**
+   * In EIP-1559 V2 designs change to gas estimate is always updated to transaction
+   * Thus callback setEstimateToUse can be deprecate in favour of this useEffect
+   * so that transaction is source of truth whenever possible.
+   */
+  useEffect(() => {
+    if (EIP_1559_V2 && transaction?.userFeeLevel) {
+      setEstimateUsed(transaction?.userFeeLevel);
+      setInternalEstimateToUse(transaction?.userFeeLevel);
+    }
+  }, [
+    setEstimateUsed,
+    setInternalEstimateToUse,
+    transaction,
+    userPrefersAdvancedGas,
+  ]);
 
-  const [gasLimit, setGasLimit] = useState(
+  const [gasLimit, setGasLimit] = useState(() =>
     Number(hexToDecimal(transaction?.txParams?.gas ?? '0x0')),
   );
 
@@ -127,6 +152,7 @@ export function useGasFeeInputs(
     maxFeePerGasFiat,
     setMaxFeePerGas,
   } = useMaxFeePerGasInput({
+    EIP_1559_V2,
     estimateToUse,
     gasEstimateType,
     gasFeeEstimates,
@@ -140,6 +166,7 @@ export function useGasFeeInputs(
     maxPriorityFeePerGasFiat,
     setMaxPriorityFeePerGas,
   } = useMaxPriorityFeePerGasInput({
+    EIP_1559_V2,
     estimateToUse,
     gasEstimateType,
     gasFeeEstimates,
@@ -172,6 +199,7 @@ export function useGasFeeInputs(
     gasErrors,
     gasWarnings,
     hasGasErrors,
+    hasSimulationError,
   } = useGasFeeErrors({
     gasEstimateType,
     gasFeeEstimates,
@@ -197,6 +225,16 @@ export function useGasFeeInputs(
     }
   }, [minimumGasLimit, gasErrors.gasLimit, transaction]);
 
+  const {
+    updateTransaction,
+    updateTransactionUsingGasFeeEstimates,
+  } = useTransactionFunctions({
+    defaultEstimateToUse,
+    gasFeeEstimates,
+    gasLimit,
+    transaction,
+  });
+
   // When a user selects an estimate level, it will wipe out what they have
   // previously put in the inputs. This returns the inputs to the estimated
   // values at the level specified.
@@ -208,7 +246,7 @@ export function useGasFeeInputs(
       setMaxPriorityFeePerGas(null);
       setGasPrice(null);
       setGasPriceHasBeenManuallySet(false);
-      setIsUsingDappSuggestedGasFees(false);
+      setEstimateUsed(estimateLevel);
     },
     [
       setInternalEstimateToUse,
@@ -217,7 +255,7 @@ export function useGasFeeInputs(
       setMaxPriorityFeePerGas,
       setGasPrice,
       setGasPriceHasBeenManuallySet,
-      setIsUsingDappSuggestedGasFees,
+      setEstimateUsed,
     ],
   );
 
@@ -230,6 +268,7 @@ export function useGasFeeInputs(
     setMaxFeePerGas(maxFeePerGas);
     setMaxPriorityFeePerGas(maxPriorityFeePerGas);
     setGasPriceHasBeenManuallySet(true);
+    setEstimateUsed('custom');
   }, [
     setInternalEstimateToUse,
     handleGasLimitOutOfBoundError,
@@ -263,7 +302,7 @@ export function useGasFeeInputs(
     estimatedMaximumNative,
     estimatedMinimumNative,
     isGasEstimatesLoading,
-    isUsingDappSuggestedGasFees,
+    estimateUsed,
     gasFeeEstimates,
     gasEstimateType,
     estimatedGasFeeTimeBounds,
@@ -275,6 +314,25 @@ export function useGasFeeInputs(
     gasErrors,
     gasWarnings,
     hasGasErrors,
+    hasSimulationError,
     supportsEIP1559,
+    supportsEIP1559V2: supportsEIP1559 && EIP_1559_V2_ENABLED,
+    updateTransaction,
+    updateTransactionUsingGasFeeEstimates,
   };
 }
+
+/**
+ * In EIP_1559_V2 implementation as used by useGasfeeInputContext() the use of this hook is evolved.
+ * It is no longer used to keep transient state of advance gas fee inputs.
+ * Transient state of inputs is maintained locally in /ui/components/app/advance-gas-fee-popover component.
+ *
+ * This hook is used now as source of shared data about transaction, it shares details of gas fee in transaction,
+ * estimate used, is EIP-1559 supported and other details. It also  have methods to update transaction.
+ *
+ * Transaction is used as single source of truth and as transaction is updated the fields shared by hook are
+ * also updated using useEffect hook.
+ *
+ * It will be useful to plan a task to create a new hook of this shared information from this hook.
+ * Methods like setEstimateToUse, onManualChange are deprecated in context of EIP_1559_V2 implementation.
+ */
diff --git a/ui/hooks/gasFeeInput/useGasFeeInputs.test.js b/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
index 5127c61b7..f4bf4f908 100644
--- a/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
+++ b/ui/hooks/gasFeeInput/useGasFeeInputs.test.js
@@ -37,6 +37,7 @@ jest.mock('react-redux', () => {
   return {
     ...actual,
     useSelector: jest.fn(),
+    useDispatch: () => jest.fn(),
   };
 });
 
@@ -315,4 +316,38 @@ describe('useGasFeeInputs', () => {
       expect(result.current.estimatedMinimumFiat).toBe('');
     });
   });
+
+  describe('supportsEIP1559V2', () => {
+    beforeEach(() => {
+      configureEIP1559();
+      useSelector.mockImplementation(
+        generateUseSelectorRouter({
+          checkNetworkAndAccountSupports1559Response: true,
+        }),
+      );
+      process.env.EIP_1559_V2 = true;
+    });
+
+    afterEach(() => {
+      process.env.EIP_1559_V2 = false;
+    });
+
+    it('return true for fee_market transaction type', () => {
+      const { result } = renderHook(() =>
+        useGasFeeInputs(null, {
+          txParams: { type: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET },
+        }),
+      );
+      expect(result.current.supportsEIP1559V2).toBe(true);
+    });
+
+    it('return false for legacy transaction type', () => {
+      const { result } = renderHook(() =>
+        useGasFeeInputs(null, {
+          txParams: { type: TRANSACTION_ENVELOPE_TYPES.LEGACY },
+        }),
+      );
+      expect(result.current.supportsEIP1559V2).toBe(false);
+    });
+  });
 });
diff --git a/ui/hooks/gasFeeInput/useMaxFeePerGasInput.js b/ui/hooks/gasFeeInput/useMaxFeePerGasInput.js
index ab3d10122..452c0611e 100644
--- a/ui/hooks/gasFeeInput/useMaxFeePerGasInput.js
+++ b/ui/hooks/gasFeeInput/useMaxFeePerGasInput.js
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { useSelector } from 'react-redux';
 
 import { GAS_ESTIMATE_TYPES } from '../../../shared/constants/gas';
@@ -34,6 +34,7 @@ const getMaxFeePerGasFromTransaction = (transaction) => {
  *  method to update the setMaxFeePerGas.
  */
 export function useMaxFeePerGasInput({
+  EIP_1559_V2,
   estimateToUse,
   gasEstimateType,
   gasFeeEstimates,
@@ -65,6 +66,12 @@ export function useMaxFeePerGasInput({
     return null;
   });
 
+  useEffect(() => {
+    if (EIP_1559_V2) {
+      setMaxFeePerGas(maxFeePerGasFromTransaction);
+    }
+  }, [EIP_1559_V2, maxFeePerGasFromTransaction, setMaxFeePerGas]);
+
   let gasSettings = {
     gasLimit: decimalToHex(gasLimit),
   };
diff --git a/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.js b/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.js
index 1e9a13690..54aeb1093 100644
--- a/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.js
+++ b/ui/hooks/gasFeeInput/useMaxPriorityFeePerGasInput.js
@@ -1,5 +1,5 @@
 import { useSelector } from 'react-redux';
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 
 import { addHexPrefix } from 'ethereumjs-util';
 
@@ -34,6 +34,7 @@ const getMaxPriorityFeePerGasFromTransaction = (transaction) => {
  *  method to update the maxPriorityFeePerGas.
  */
 export function useMaxPriorityFeePerGasInput({
+  EIP_1559_V2,
   estimateToUse,
   gasEstimateType,
   gasFeeEstimates,
@@ -61,6 +62,16 @@ export function useMaxPriorityFeePerGasInput({
     return null;
   });
 
+  useEffect(() => {
+    if (EIP_1559_V2) {
+      setMaxPriorityFeePerGas(maxPriorityFeePerGasFromTransaction);
+    }
+  }, [
+    EIP_1559_V2,
+    maxPriorityFeePerGasFromTransaction,
+    setMaxPriorityFeePerGas,
+  ]);
+
   const maxPriorityFeePerGasToUse =
     maxPriorityFeePerGas ??
     getGasFeeEstimate(
diff --git a/ui/hooks/gasFeeInput/useTransactionFunctions.js b/ui/hooks/gasFeeInput/useTransactionFunctions.js
new file mode 100644
index 000000000..ab3830266
--- /dev/null
+++ b/ui/hooks/gasFeeInput/useTransactionFunctions.js
@@ -0,0 +1,76 @@
+import { useCallback } from 'react';
+import { useDispatch } from 'react-redux';
+
+import { PRIORITY_LEVELS } from '../../../shared/constants/gas';
+import {
+  decimalToHex,
+  decGWEIToHexWEI,
+} from '../../helpers/utils/conversions.util';
+import { updateTransaction as updateTransactionFn } from '../../store/actions';
+
+export const useTransactionFunctions = ({
+  defaultEstimateToUse,
+  gasFeeEstimates,
+  gasLimit,
+  transaction,
+}) => {
+  const dispatch = useDispatch();
+
+  const updateTransaction = useCallback(
+    (estimateUsed, maxFeePerGas, maxPriorityFeePerGas) => {
+      const newGasSettings = {
+        gas: decimalToHex(gasLimit),
+        gasLimit: decimalToHex(gasLimit),
+        estimateSuggested: defaultEstimateToUse,
+        estimateUsed,
+      };
+      if (maxFeePerGas) {
+        newGasSettings.maxFeePerGas = maxFeePerGas;
+      }
+      if (maxPriorityFeePerGas) {
+        newGasSettings.maxPriorityFeePerGas = maxPriorityFeePerGas;
+      }
+
+      const updatedTxMeta = {
+        ...transaction,
+        userFeeLevel: estimateUsed || 'custom',
+        txParams: {
+          ...transaction.txParams,
+          ...newGasSettings,
+        },
+      };
+
+      dispatch(updateTransactionFn(updatedTxMeta));
+    },
+    [defaultEstimateToUse, dispatch, gasLimit, transaction],
+  );
+
+  const updateTransactionUsingGasFeeEstimates = useCallback(
+    (gasFeeEstimateToUse) => {
+      if (gasFeeEstimateToUse === PRIORITY_LEVELS.DAPP_SUGGESTED) {
+        const {
+          maxFeePerGas,
+          maxPriorityFeePerGas,
+        } = transaction?.dappSuggestedGasFees;
+        updateTransaction(
+          PRIORITY_LEVELS.DAPP_SUGGESTED,
+          maxFeePerGas,
+          maxPriorityFeePerGas,
+        );
+      } else {
+        const {
+          suggestedMaxFeePerGas,
+          suggestedMaxPriorityFeePerGas,
+        } = gasFeeEstimates[gasFeeEstimateToUse];
+        updateTransaction(
+          gasFeeEstimateToUse,
+          decGWEIToHexWEI(suggestedMaxFeePerGas),
+          decGWEIToHexWEI(suggestedMaxPriorityFeePerGas),
+        );
+      }
+    },
+    [gasFeeEstimates, transaction?.dappSuggestedGasFees, updateTransaction],
+  );
+
+  return { updateTransaction, updateTransactionUsingGasFeeEstimates };
+};
diff --git a/ui/hooks/useGasFeeEstimates.js b/ui/hooks/useGasFeeEstimates.js
index 7bbdd4fc0..92067e050 100644
--- a/ui/hooks/useGasFeeEstimates.js
+++ b/ui/hooks/useGasFeeEstimates.js
@@ -1,4 +1,5 @@
-import { useSelector } from 'react-redux';
+import isEqual from 'lodash/isEqual';
+import { shallowEqual, useSelector } from 'react-redux';
 import {
   getEstimatedGasFeeTimeBounds,
   getGasEstimateType,
@@ -31,8 +32,11 @@ import { useSafeGasEstimatePolling } from './useSafeGasEstimatePolling';
  */
 export function useGasFeeEstimates() {
   const gasEstimateType = useSelector(getGasEstimateType);
-  const gasFeeEstimates = useSelector(getGasFeeEstimates);
-  const estimatedGasFeeTimeBounds = useSelector(getEstimatedGasFeeTimeBounds);
+  const gasFeeEstimates = useSelector(getGasFeeEstimates, isEqual);
+  const estimatedGasFeeTimeBounds = useSelector(
+    getEstimatedGasFeeTimeBounds,
+    shallowEqual,
+  );
   const isGasEstimatesLoading = useSelector(getIsGasEstimatesLoading);
   useSafeGasEstimatePolling();
 
diff --git a/ui/hooks/useTokenFiatAmount.js b/ui/hooks/useTokenFiatAmount.js
index dc52a979a..8fe0cfc7c 100644
--- a/ui/hooks/useTokenFiatAmount.js
+++ b/ui/hooks/useTokenFiatAmount.js
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useSelector } from 'react-redux';
+import { shallowEqual, useSelector } from 'react-redux';
 import {
   getTokenExchangeRates,
   getCurrentCurrency,
@@ -29,7 +29,10 @@ export function useTokenFiatAmount(
   overrides = {},
   hideCurrencySymbol,
 ) {
-  const contractExchangeRates = useSelector(getTokenExchangeRates);
+  const contractExchangeRates = useSelector(
+    getTokenExchangeRates,
+    shallowEqual,
+  );
   const conversionRate = useSelector(getConversionRate);
   const currentCurrency = useSelector(getCurrentCurrency);
   const userPrefersShownFiat = useSelector(getShouldShowFiat);
diff --git a/ui/hooks/useTokenTracker.js b/ui/hooks/useTokenTracker.js
index 5ad2fb5af..01b56f615 100644
--- a/ui/hooks/useTokenTracker.js
+++ b/ui/hooks/useTokenTracker.js
@@ -1,6 +1,6 @@
 import { useState, useEffect, useRef, useCallback } from 'react';
 import TokenTracker from '@metamask/eth-token-tracker';
-import { useSelector } from 'react-redux';
+import { shallowEqual, useSelector } from 'react-redux';
 import { getCurrentChainId, getSelectedAddress } from '../selectors';
 import { SECOND } from '../../shared/constants/time';
 import { isEqualCaseInsensitive } from '../helpers/utils/util';
@@ -12,7 +12,7 @@ export function useTokenTracker(
   hideZeroBalanceTokens = false,
 ) {
   const chainId = useSelector(getCurrentChainId);
-  const userAddress = useSelector(getSelectedAddress);
+  const userAddress = useSelector(getSelectedAddress, shallowEqual);
   const [loading, setLoading] = useState(() => tokens?.length >= 0);
   const [tokensWithBalances, setTokensWithBalances] = useState([]);
   const [error, setError] = useState(null);
diff --git a/ui/hooks/useTokensToSearch.js b/ui/hooks/useTokensToSearch.js
index 9efba5114..7140737a4 100644
--- a/ui/hooks/useTokensToSearch.js
+++ b/ui/hooks/useTokensToSearch.js
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { useSelector } from 'react-redux';
+import { shallowEqual, useSelector } from 'react-redux';
 import contractMap from '@metamask/contract-metadata';
 import BigNumber from 'bignumber.js';
 import { isEqual, shuffle, uniqBy } from 'lodash';
@@ -94,8 +94,8 @@ export function useTokensToSearch({
   const tokenConversionRates = useSelector(getTokenExchangeRates, isEqual);
   const conversionRate = useSelector(getConversionRate);
   const currentCurrency = useSelector(getCurrentCurrency);
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
-  const tokenList = useSelector(getTokenList);
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken, shallowEqual);
+  const tokenList = useSelector(getTokenList, isEqual);
   const useTokenDetection = useSelector(getUseTokenDetection);
   // token from dynamic api list is fetched when useTokenDetection is true
   const shuffledTokenList = useTokenDetection
@@ -115,7 +115,7 @@ export function useTokensToSearch({
   );
   const memoizedDefaultToken = useEqualityCheck(defaultToken);
 
-  const swapsTokens = useSelector(getSwapsTokens) || [];
+  const swapsTokens = useSelector(getSwapsTokens, isEqual) || [];
 
   const tokensToSearch = swapsTokens.length
     ? swapsTokens
@@ -154,15 +154,15 @@ export function useTokensToSearch({
         tokenList,
         useTokenDetection,
       );
-      if (
+      if (memoizedTopTokens[token.address.toLowerCase()]) {
+        tokensToSearchBuckets.top[
+          memoizedTopTokens[token.address.toLowerCase()].index
+        ] = renderableDataToken;
+      } else if (
         isSwapsDefaultTokenSymbol(renderableDataToken.symbol, chainId) ||
         usersTokensAddressMap[token.address.toLowerCase()]
       ) {
         tokensToSearchBuckets.owned.push(renderableDataToken);
-      } else if (memoizedTopTokens[token.address.toLowerCase()]) {
-        tokensToSearchBuckets.top[
-          memoizedTopTokens[token.address.toLowerCase()].index
-        ] = renderableDataToken;
       } else {
         tokensToSearchBuckets.others.push(renderableDataToken);
       }
diff --git a/ui/pages/add-collectible/add-collectible.component.js b/ui/pages/add-collectible/add-collectible.component.js
index 4bf0ecdb0..a0fc8639f 100644
--- a/ui/pages/add-collectible/add-collectible.component.js
+++ b/ui/pages/add-collectible/add-collectible.component.js
@@ -1,27 +1,43 @@
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
 import { useI18nContext } from '../../hooks/useI18nContext';
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 
 import Box from '../../components/ui/box';
 import TextField from '../../components/ui/text-field';
 import PageContainer from '../../components/ui/page-container';
+import {
+  addCollectibleVerifyOwnership,
+  setNewCollectibleAddedMessage,
+} from '../../store/actions';
 
 export default function AddCollectible() {
   const t = useI18nContext();
   const history = useHistory();
+  const dispatch = useDispatch();
 
   const [address, setAddress] = useState('');
   const [tokenId, setTokenId] = useState('');
 
+  const handleAddCollectible = async () => {
+    try {
+      await dispatch(addCollectibleVerifyOwnership(address, tokenId));
+    } catch (error) {
+      const { message } = error;
+      dispatch(setNewCollectibleAddedMessage(message));
+      history.push(DEFAULT_ROUTE);
+      return;
+    }
+    dispatch(setNewCollectibleAddedMessage('success'));
+    history.push(DEFAULT_ROUTE);
+  };
+
   return (
     <PageContainer
       title={t('addNFT')}
       onSubmit={() => {
-        console.log(
-          `Adding collectible with ID: ${tokenId} and address ${address}`,
-        );
-        history.push(DEFAULT_ROUTE);
+        handleAddCollectible();
       }}
       submitText={t('add')}
       onCancel={() => {
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 fc2d7e29a..342d79f39 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ConfirmPageContainer from '../../components/app/confirm-page-container';
+import TransactionDecoding from '../../components/app/transaction-decoding';
 import { isBalanceSufficient } from '../send/send.utils';
 import {
   addHexes,
@@ -13,21 +14,29 @@ import {
 } from '../../helpers/constants/routes';
 import {
   INSUFFICIENT_FUNDS_ERROR_KEY,
-  TRANSACTION_ERROR_KEY,
   GAS_LIMIT_TOO_LOW_ERROR_KEY,
   ETH_GAS_PRICE_FETCH_WARNING_KEY,
   GAS_PRICE_FETCH_FAILURE_ERROR_KEY,
 } from '../../helpers/constants/error-keys';
 import UserPreferencedCurrencyDisplay from '../../components/app/user-preferenced-currency-display';
+import CopyRawData from '../../components/app/transaction-decoding/components/ui/copy-raw-data';
+
 import { PRIMARY, SECONDARY } from '../../helpers/constants/common';
 import TextField from '../../components/ui/text-field';
+import ActionableMessage from '../../components/ui/actionable-message';
+import Disclosure from '../../components/ui/disclosure';
 import {
   TRANSACTION_TYPES,
   TRANSACTION_STATUSES,
 } from '../../../shared/constants/transaction';
-import { getTransactionTypeTitle } from '../../helpers/utils/transactions.util';
+import { getMethodName } from '../../helpers/utils/metrics';
+import {
+  getTransactionTypeTitle,
+  isLegacyTransaction,
+} from '../../helpers/utils/transactions.util';
 import { toBuffer } from '../../../shared/modules/buffer-utils';
 
+import { TransactionModalContextProvider } from '../../contexts/transaction-modal';
 import TransactionDetail from '../../components/app/transaction-detail/transaction-detail.component';
 import TransactionDetailItem from '../../components/app/transaction-detail-item/transaction-detail-item.component';
 import InfoTooltip from '../../components/ui/info-tooltip/info-tooltip';
@@ -52,10 +61,11 @@ import Typography from '../../components/ui/typography/typography';
 import { MIN_GAS_LIMIT_DEC } from '../send/send.constants';
 
 import GasDetailsItem from './gas-details-item';
-import LowPriorityMessage from './low-priority-message';
+import TransactionAlerts from './transaction-alerts';
 
 // eslint-disable-next-line prefer-destructuring
-const EIP_1559_V2 = process.env.EIP_1559_V2;
+const EIP_1559_V2_ENABLED =
+  process.env.EIP_1559_V2 === true || process.env.EIP_1559_V2 === 'true';
 
 const renderHeartBeatIfNotInTest = () =>
   process.env.IN_TEST === 'true' ? null : <LoadingHeartBeat />;
@@ -104,6 +114,7 @@ export default class ConfirmTransactionBase extends Component {
     actionKey: PropTypes.string,
     contentComponent: PropTypes.node,
     dataComponent: PropTypes.node,
+    dataHexComponent: PropTypes.node,
     hideData: PropTypes.bool,
     hideSubtitle: PropTypes.bool,
     identiconAddress: PropTypes.string,
@@ -143,6 +154,7 @@ export default class ConfirmTransactionBase extends Component {
     submitWarning: '',
     ethGasPriceWarning: '',
     editingGas: false,
+    userAcknowledgedGasMissing: false,
   };
 
   componentDidUpdate(prevProps) {
@@ -216,7 +228,7 @@ export default class ConfirmTransactionBase extends Component {
       balance,
       conversionRate,
       hexMaximumTransactionFee,
-      txData: { simulationFails, txParams: { value: amount } = {} } = {},
+      txData: { txParams: { value: amount } = {} } = {},
       customGas,
       noGasPrice,
       gasFeeIsCustom,
@@ -245,15 +257,6 @@ export default class ConfirmTransactionBase extends Component {
       };
     }
 
-    if (simulationFails) {
-      return {
-        valid: true,
-        errorKey: simulationFails.errorKey
-          ? simulationFails.errorKey
-          : TRANSACTION_ERROR_KEY,
-      };
-    }
-
     if (noGasPrice && !gasFeeIsCustom) {
       return {
         valid: false,
@@ -296,6 +299,10 @@ export default class ConfirmTransactionBase extends Component {
     this.setState({ editingGas: false });
   }
 
+  setUserAcknowledgedGasMissing() {
+    this.setState({ userAcknowledgedGasMissing: true });
+  }
+
   renderDetails() {
     const {
       primaryTotalTextOverride,
@@ -320,6 +327,16 @@ export default class ConfirmTransactionBase extends Component {
       nativeCurrency,
     } = this.props;
     const { t } = this.context;
+    const { userAcknowledgedGasMissing } = this.state;
+
+    const { valid } = this.getErrorKey();
+    const isDisabled = () => {
+      return userAcknowledgedGasMissing ? false : !valid;
+    };
+
+    const hasSimulationError = Boolean(txData.simulationFails);
+    const renderSimulationFailureWarning =
+      hasSimulationError && !userAcknowledgedGasMissing;
 
     const renderTotalMaxAmount = () => {
       if (
@@ -411,147 +428,179 @@ export default class ConfirmTransactionBase extends Component {
       </div>
     ) : null;
 
-    return (
-      <div className="confirm-page-container-content__details">
-        {EIP_1559_V2 && <LowPriorityMessage />}
-        <TransactionDetail
-          onEdit={() => this.handleEditGas()}
-          rows={[
-            EIP_1559_V2 ? (
-              <GasDetailsItem
-                key="gas_details"
-                hexMaximumTransactionFee={hexMaximumTransactionFee}
-                hexMinimumTransactionFee={hexMinimumTransactionFee}
-                isMainnet={isMainnet}
-                maxFeePerGas={maxFeePerGas}
-                maxPriorityFeePerGas={maxPriorityFeePerGas}
-                supportsEIP1559={supportsEIP1559}
-                txData={txData}
-                useNativeCurrencyAsPrimaryCurrency={
-                  useNativeCurrencyAsPrimaryCurrency
-                }
-              />
+    const renderGasDetailsItem = () => {
+      return EIP_1559_V2_ENABLED &&
+        supportsEIP1559 &&
+        !isLegacyTransaction(txData) ? (
+        <GasDetailsItem
+          key="gas_details"
+          hexMaximumTransactionFee={hexMaximumTransactionFee}
+          hexMinimumTransactionFee={hexMinimumTransactionFee}
+          isMainnet={isMainnet}
+          maxFeePerGas={maxFeePerGas}
+          maxPriorityFeePerGas={maxPriorityFeePerGas}
+          supportsEIP1559={supportsEIP1559}
+          txData={txData}
+          useNativeCurrencyAsPrimaryCurrency={
+            useNativeCurrencyAsPrimaryCurrency
+          }
+          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
+        />
+      ) : (
+        <TransactionDetailItem
+          key="gas-item"
+          detailTitle={
+            txData.dappSuggestedGasFees ? (
+              <>
+                {isMultiLayerFeeNetwork
+                  ? t('transactionDetailLayer2GasHeading')
+                  : t('transactionDetailGasHeading')}
+                <InfoTooltip
+                  contentText={t('transactionDetailDappGasTooltip')}
+                  position="top"
+                >
+                  <i className="fa fa-info-circle" />
+                </InfoTooltip>
+              </>
             ) : (
-              <TransactionDetailItem
-                key="gas-item"
-                detailTitle={
-                  txData.dappSuggestedGasFees ? (
-                    <>
-                      {isMultiLayerFeeNetwork
-                        ? t('transactionDetailLayer2GasHeading')
-                        : t('transactionDetailGasHeading')}
-                      <InfoTooltip
-                        contentText={t('transactionDetailDappGasTooltip')}
-                        position="top"
-                      >
-                        <i className="fa fa-info-circle" />
-                      </InfoTooltip>
-                    </>
-                  ) : (
+              <>
+                {isMultiLayerFeeNetwork
+                  ? t('transactionDetailLayer2GasHeading')
+                  : t('transactionDetailGasHeading')}
+                <InfoTooltip
+                  contentText={
                     <>
-                      {isMultiLayerFeeNetwork
-                        ? t('transactionDetailLayer2GasHeading')
-                        : t('transactionDetailGasHeading')}
-                      <InfoTooltip
-                        contentText={
-                          <>
-                            <p>
-                              {t('transactionDetailGasTooltipIntro', [
-                                isMainnet ? t('networkNameEthereum') : '',
-                              ])}
-                            </p>
-                            <p>{t('transactionDetailGasTooltipExplanation')}</p>
-                            <p>
-                              <a
-                                href="https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172"
-                                target="_blank"
-                                rel="noopener noreferrer"
-                              >
-                                {t('transactionDetailGasTooltipConversion')}
-                              </a>
-                            </p>
-                          </>
-                        }
-                        position="top"
-                      >
-                        <i className="fa fa-info-circle" />
-                      </InfoTooltip>
+                      <p>
+                        {t('transactionDetailGasTooltipIntro', [
+                          isMainnet ? t('networkNameEthereum') : '',
+                        ])}
+                      </p>
+                      <p>{t('transactionDetailGasTooltipExplanation')}</p>
+                      <p>
+                        <a
+                          href="https://community.metamask.io/t/what-is-gas-why-do-transactions-take-so-long/3172"
+                          target="_blank"
+                          rel="noopener noreferrer"
+                        >
+                          {t('transactionDetailGasTooltipConversion')}
+                        </a>
+                      </p>
                     </>
-                  )
-                }
-                detailTitleColor={COLORS.BLACK}
-                detailText={
-                  !isMultiLayerFeeNetwork && (
-                    <div className="confirm-page-container-content__currency-container">
-                      {renderHeartBeatIfNotInTest()}
-                      <UserPreferencedCurrencyDisplay
-                        type={SECONDARY}
-                        value={hexMinimumTransactionFee}
-                        hideLabel={Boolean(useNativeCurrencyAsPrimaryCurrency)}
-                      />
-                    </div>
-                  )
-                }
-                detailTotal={
-                  <div className="confirm-page-container-content__currency-container">
-                    {renderHeartBeatIfNotInTest()}
-                    <UserPreferencedCurrencyDisplay
-                      type={PRIMARY}
-                      value={hexMinimumTransactionFee}
-                      hideLabel={!useNativeCurrencyAsPrimaryCurrency}
-                      numberOfDecimals={isMultiLayerFeeNetwork ? 18 : 6}
-                    />
-                  </div>
-                }
-                subText={
-                  !isMultiLayerFeeNetwork &&
-                  t('editGasSubTextFee', [
-                    <b key="editGasSubTextFeeLabel">
-                      {t('editGasSubTextFeeLabel')}
-                    </b>,
-                    <div
-                      key="editGasSubTextFeeValue"
-                      className="confirm-page-container-content__currency-container"
-                    >
-                      {renderHeartBeatIfNotInTest()}
-                      <UserPreferencedCurrencyDisplay
-                        key="editGasSubTextFeeAmount"
-                        type={PRIMARY}
-                        value={hexMaximumTransactionFee}
-                        hideLabel={!useNativeCurrencyAsPrimaryCurrency}
-                      />
-                    </div>,
-                  ])
-                }
-                subTitle={
-                  <>
-                    {txData.dappSuggestedGasFees ? (
-                      <Typography
-                        variant={TYPOGRAPHY.H7}
-                        fontStyle={FONT_STYLE.ITALIC}
-                        color={COLORS.UI4}
-                      >
-                        {t('transactionDetailDappGasMoreInfo')}
-                      </Typography>
-                    ) : (
-                      ''
-                    )}
-                    {supportsEIP1559 && (
-                      <GasTiming
-                        maxPriorityFeePerGas={hexWEIToDecGWEI(
-                          maxPriorityFeePerGas ||
-                            txData.txParams.maxPriorityFeePerGas,
-                        )}
-                        maxFeePerGas={hexWEIToDecGWEI(
-                          maxFeePerGas || txData.txParams.maxFeePerGas,
-                        )}
-                      />
-                    )}
-                  </>
-                }
+                  }
+                  position="top"
+                >
+                  <i className="fa fa-info-circle" />
+                </InfoTooltip>
+              </>
+            )
+          }
+          detailTitleColor={COLORS.BLACK}
+          detailText={
+            !isMultiLayerFeeNetwork && (
+              <div className="confirm-page-container-content__currency-container">
+                {renderHeartBeatIfNotInTest()}
+                <UserPreferencedCurrencyDisplay
+                  type={SECONDARY}
+                  value={hexMinimumTransactionFee}
+                  hideLabel={Boolean(useNativeCurrencyAsPrimaryCurrency)}
+                />
+              </div>
+            )
+          }
+          detailTotal={
+            <div className="confirm-page-container-content__currency-container">
+              {renderHeartBeatIfNotInTest()}
+              <UserPreferencedCurrencyDisplay
+                type={PRIMARY}
+                value={hexMinimumTransactionFee}
+                hideLabel={!useNativeCurrencyAsPrimaryCurrency}
+                numberOfDecimals={isMultiLayerFeeNetwork ? 18 : 6}
               />
-            ),
-            isMultiLayerFeeNetwork && (
+            </div>
+          }
+          subText={
+            !isMultiLayerFeeNetwork && (
+              <>
+                <strong key="editGasSubTextFeeLabel">
+                  {t('editGasSubTextFeeLabel')}
+                </strong>
+                <div
+                  key="editGasSubTextFeeValue"
+                  className="confirm-page-container-content__currency-container"
+                >
+                  {renderHeartBeatIfNotInTest()}
+                  <UserPreferencedCurrencyDisplay
+                    key="editGasSubTextFeeAmount"
+                    type={PRIMARY}
+                    value={hexMaximumTransactionFee}
+                    hideLabel={!useNativeCurrencyAsPrimaryCurrency}
+                  />
+                </div>
+              </>
+            )
+          }
+          subTitle={
+            <>
+              {txData.dappSuggestedGasFees ? (
+                <Typography
+                  variant={TYPOGRAPHY.H7}
+                  fontStyle={FONT_STYLE.ITALIC}
+                  color={COLORS.UI4}
+                >
+                  {t('transactionDetailDappGasMoreInfo')}
+                </Typography>
+              ) : (
+                ''
+              )}
+              {supportsEIP1559 && (
+                <GasTiming
+                  maxPriorityFeePerGas={hexWEIToDecGWEI(
+                    maxPriorityFeePerGas ||
+                      txData.txParams.maxPriorityFeePerGas,
+                  )}
+                  maxFeePerGas={hexWEIToDecGWEI(
+                    maxFeePerGas || txData.txParams.maxFeePerGas,
+                  )}
+                />
+              )}
+            </>
+          }
+        />
+      );
+    };
+
+    const simulationFailureWarning = () => (
+      <div className="confirm-page-container-content__error-container">
+        <ActionableMessage
+          type="danger"
+          primaryAction={{
+            label: this.context.t('tryAnywayOption'),
+            onClick: () => this.setUserAcknowledgedGasMissing(),
+          }}
+          message={this.context.t('simulationErrorMessage')}
+          roundedButtons
+        />
+      </div>
+    );
+
+    return (
+      <div className="confirm-page-container-content__details">
+        <TransactionAlerts
+          setUserAcknowledgedGasMissing={() =>
+            this.setUserAcknowledgedGasMissing()
+          }
+          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
+        />
+        <TransactionDetail
+          disabled={isDisabled()}
+          userAcknowledgedGasMissing={userAcknowledgedGasMissing}
+          onEdit={
+            renderSimulationFailureWarning ? null : () => this.handleEditGas()
+          }
+          rows={[
+            renderSimulationFailureWarning && simulationFailureWarning(),
+            !renderSimulationFailureWarning && renderGasDetailsItem(),
+            !renderSimulationFailureWarning && isMultiLayerFeeNetwork && (
               <MultiLayerFeeMessage
                 transaction={txData}
                 layer2fee={hexMinimumTransactionFee}
@@ -565,12 +614,14 @@ export default class ConfirmTransactionBase extends Component {
                 detailText={renderTotalDetailText()}
                 detailTotal={renderTotalDetailTotal()}
                 subTitle={t('transactionDetailGasTotalSubtitle')}
-                subText={t('editGasSubTextAmount', [
-                  <b key="editGasSubTextAmountLabel">
-                    {t('editGasSubTextAmountLabel')}
-                  </b>,
-                  renderTotalMaxAmount(),
-                ])}
+                subText={
+                  <>
+                    <strong key="editGasSubTextAmountLabel">
+                      {t('editGasSubTextAmountLabel')}
+                    </strong>
+                    {renderTotalMaxAmount()}
+                  </>
+                }
               />
             ),
           ]}
@@ -588,7 +639,7 @@ export default class ConfirmTransactionBase extends Component {
   renderData(functionType) {
     const { t } = this.context;
     const {
-      txData: { txParams: { data } = {} } = {},
+      txData: { txParams } = {},
       methodData: { params } = {},
       hideData,
       dataComponent,
@@ -598,13 +649,51 @@ export default class ConfirmTransactionBase extends Component {
       return null;
     }
 
+    const functionParams = params?.length
+      ? `(${params.map(({ type }) => type).join(', ')})`
+      : '';
+
     return (
       dataComponent || (
         <div className="confirm-page-container-content__data">
           <div className="confirm-page-container-content__data-box-label">
             {`${t('functionType')}:`}
             <span className="confirm-page-container-content__function-type">
-              {functionType}
+              {`${functionType} ${functionParams}`}
+            </span>
+          </div>
+          <Disclosure>
+            <TransactionDecoding to={txParams?.to} inputData={txParams?.data} />
+          </Disclosure>
+        </div>
+      )
+    );
+  }
+
+  renderDataHex(functionType) {
+    const { t } = this.context;
+    const {
+      txData: { txParams } = {},
+      methodData: { params } = {},
+      hideData,
+      dataHexComponent,
+    } = this.props;
+
+    if (hideData || !txParams.to) {
+      return null;
+    }
+
+    const functionParams = params?.length
+      ? `(${params.map(({ type }) => type).join(', ')})`
+      : '';
+
+    return (
+      dataHexComponent || (
+        <div className="confirm-page-container-content__data">
+          <div className="confirm-page-container-content__data-box-label">
+            {`${t('functionType')}:`}
+            <span className="confirm-page-container-content__function-type">
+              {`${functionType} ${functionParams}`}
             </span>
           </div>
           {params && (
@@ -618,9 +707,12 @@ export default class ConfirmTransactionBase extends Component {
             </div>
           )}
           <div className="confirm-page-container-content__data-box-label">
-            {`${t('hexData')}: ${toBuffer(data).length} bytes`}
+            {`${t('hexData')}: ${toBuffer(txParams?.data).length} bytes`}
+          </div>
+          <div className="confirm-page-container-content__data-box">
+            {txParams?.data}
           </div>
-          <div className="confirm-page-container-content__data-box">{data}</div>
+          <CopyRawData data={txParams?.data} />
         </div>
       )
     );
@@ -888,6 +980,7 @@ export default class ConfirmTransactionBase extends Component {
   render() {
     const { t } = this.context;
     const {
+      actionKey,
       fromName,
       fromAddress,
       toName,
@@ -911,6 +1004,7 @@ export default class ConfirmTransactionBase extends Component {
       gasFeeIsCustom,
       nativeCurrency,
       hardwareWalletRequiresConnection,
+      supportsEIP1559,
     } = this.props;
     const {
       submitting,
@@ -918,10 +1012,14 @@ export default class ConfirmTransactionBase extends Component {
       submitWarning,
       ethGasPriceWarning,
       editingGas,
+      userAcknowledgedGasMissing,
     } = this.state;
 
     const { name } = methodData;
     const { valid, errorKey } = this.getErrorKey();
+    const hasSimulationError = Boolean(txData.simulationFails);
+    const renderSimulationFailureWarning =
+      hasSimulationError && !userAcknowledgedGasMissing;
     const {
       totalTx,
       positionOfCurrentTx,
@@ -934,6 +1032,10 @@ export default class ConfirmTransactionBase extends Component {
       requestsWaitingText,
     } = this.getNavigateTxData();
 
+    const isDisabled = () => {
+      return userAcknowledgedGasMissing ? false : !valid;
+    };
+
     let functionType = getMethodName(name);
     if (!functionType) {
       if (type) {
@@ -943,67 +1045,71 @@ export default class ConfirmTransactionBase extends Component {
       }
     }
     return (
-      <ConfirmPageContainer
-        fromName={fromName}
-        fromAddress={fromAddress}
-        showAccountInHeader={showAccountInHeader}
-        toName={toName}
-        toAddress={toAddress}
-        toEns={toEns}
-        toNickname={toNickname}
-        showEdit={Boolean(onEdit)}
-        action={functionType}
-        title={title}
-        titleComponent={this.renderTitleComponent()}
-        subtitleComponent={this.renderSubtitleComponent()}
-        hideSubtitle={hideSubtitle}
-        detailsComponent={this.renderDetails()}
-        dataComponent={this.renderData(functionType)}
-        contentComponent={contentComponent}
-        nonce={customNonceValue || nonce}
-        unapprovedTxCount={unapprovedTxCount}
-        identiconAddress={identiconAddress}
-        errorMessage={submitError}
-        errorKey={errorKey}
-        warning={submitWarning}
-        totalTx={totalTx}
-        positionOfCurrentTx={positionOfCurrentTx}
-        nextTxId={nextTxId}
-        prevTxId={prevTxId}
-        showNavigation={showNavigation}
-        onNextTx={(txId) => this.handleNextTx(txId)}
-        firstTx={firstTx}
-        lastTx={lastTx}
-        ofText={ofText}
-        requestsWaitingText={requestsWaitingText}
-        disabled={
-          !valid ||
-          submitting ||
-          hardwareWalletRequiresConnection ||
-          (gasIsLoading && !gasFeeIsCustom)
-        }
-        onEdit={() => this.handleEdit()}
-        onCancelAll={() => this.handleCancelAll()}
-        onCancel={() => this.handleCancel()}
-        onSubmit={() => this.handleSubmit()}
-        hideSenderToRecipient={hideSenderToRecipient}
-        origin={txData.origin}
-        ethGasPriceWarning={ethGasPriceWarning}
-        editingGas={editingGas}
-        handleCloseEditGas={() => this.handleCloseEditGas()}
-        currentTransaction={txData}
-      />
+      <TransactionModalContextProvider
+        actionKey={actionKey}
+        methodData={methodData}
+      >
+        <ConfirmPageContainer
+          fromName={fromName}
+          fromAddress={fromAddress}
+          showAccountInHeader={showAccountInHeader}
+          toName={toName}
+          toAddress={toAddress}
+          toEns={toEns}
+          toNickname={toNickname}
+          showEdit={Boolean(onEdit)}
+          action={functionType}
+          title={title}
+          titleComponent={this.renderTitleComponent()}
+          subtitleComponent={this.renderSubtitleComponent()}
+          hideSubtitle={hideSubtitle}
+          detailsComponent={this.renderDetails()}
+          dataComponent={this.renderData(functionType)}
+          dataHexComponent={this.renderDataHex(functionType)}
+          contentComponent={contentComponent}
+          nonce={customNonceValue || nonce}
+          unapprovedTxCount={unapprovedTxCount}
+          identiconAddress={identiconAddress}
+          errorMessage={submitError}
+          errorKey={errorKey}
+          hasSimulationError={hasSimulationError}
+          warning={submitWarning}
+          totalTx={totalTx}
+          positionOfCurrentTx={positionOfCurrentTx}
+          nextTxId={nextTxId}
+          prevTxId={prevTxId}
+          showNavigation={showNavigation}
+          onNextTx={(txId) => this.handleNextTx(txId)}
+          firstTx={firstTx}
+          lastTx={lastTx}
+          ofText={ofText}
+          requestsWaitingText={requestsWaitingText}
+          hideUserAcknowledgedGasMissing={!isDisabled()}
+          disabled={
+            renderSimulationFailureWarning ||
+            !valid ||
+            submitting ||
+            hardwareWalletRequiresConnection ||
+            (gasIsLoading && !gasFeeIsCustom)
+          }
+          onEdit={() => this.handleEdit()}
+          onCancelAll={() => this.handleCancelAll()}
+          onCancel={() => this.handleCancel()}
+          onSubmit={() => this.handleSubmit()}
+          setUserAcknowledgedGasMissing={this.setUserAcknowledgedGasMissing}
+          hideSenderToRecipient={hideSenderToRecipient}
+          origin={txData.origin}
+          ethGasPriceWarning={ethGasPriceWarning}
+          editingGas={editingGas}
+          handleCloseEditGas={() => this.handleCloseEditGas()}
+          currentTransaction={txData}
+          supportsEIP1559V2={
+            EIP_1559_V2_ENABLED &&
+            supportsEIP1559 &&
+            !isLegacyTransaction(txData)
+          }
+        />
+      </TransactionModalContextProvider>
     );
   }
 }
-
-export function getMethodName(camelCase) {
-  if (!camelCase || typeof camelCase !== 'string') {
-    return '';
-  }
-
-  return camelCase
-    .replace(/([a-z])([A-Z])/gu, '$1 $2')
-    .replace(/([A-Z])([a-z])/gu, ' $1$2')
-    .replace(/ +/gu, ' ');
-}
diff --git a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.test.js b/ui/pages/confirm-transaction-base/confirm-transaction-base.component.test.js
deleted file mode 100644
index b4d9caa37..000000000
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.component.test.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { getMethodName } from './confirm-transaction-base.component';
-
-describe('ConfirmTransactionBase Component', () => {
-  describe('getMethodName', () => {
-    it('should get correct method names', () => {
-      expect(getMethodName(undefined)).toStrictEqual('');
-      expect(getMethodName({})).toStrictEqual('');
-      expect(getMethodName('confirm')).toStrictEqual('confirm');
-      expect(getMethodName('balanceOf')).toStrictEqual('balance Of');
-      expect(getMethodName('ethToTokenSwapInput')).toStrictEqual(
-        'eth To Token Swap Input',
-      );
-    });
-  });
-});
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 1185c81d1..7361ad8aa 100644
--- a/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
+++ b/ui/pages/confirm-transaction-base/confirm-transaction-base.container.js
@@ -120,7 +120,10 @@ const mapStateToProps = (state, ownProps) => {
     shortenAddress(toChecksumHexAddress(toAddress));
 
   const checksummedAddress = toChecksumHexAddress(toAddress);
-  const addressBookObject = addressBook[checksummedAddress];
+  const addressBookObject =
+    addressBook &&
+    addressBook[chainId] &&
+    addressBook[chainId][checksummedAddress];
   const toEns = ensResolutionsByAddress[checksummedAddress] || '';
   const toNickname = addressBookObject ? addressBookObject.name : '';
   const transactionStatus = transaction ? transaction.status : '';
@@ -231,6 +234,7 @@ const mapStateToProps = (state, ownProps) => {
     nativeCurrency,
     hardwareWalletRequiresConnection,
     isMultiLayerFeeNetwork,
+    chainId,
   };
 };
 
diff --git a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
index 6ac1e0be0..72f9a780e 100644
--- a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.js
@@ -26,12 +26,13 @@ const GasDetailsItem = ({
   isMainnet,
   maxFeePerGas,
   maxPriorityFeePerGas,
-  supportsEIP1559,
-  txData,
+  userAcknowledgedGasMissing,
   useNativeCurrencyAsPrimaryCurrency,
 }) => {
   const t = useI18nContext();
-  const { estimateToUse } = useGasFeeContext();
+  const { estimateUsed, hasSimulationError, transaction } = useGasFeeContext();
+
+  if (hasSimulationError && !userAcknowledgedGasMissing) return null;
 
   return (
     <TransactionDetailItem
@@ -91,45 +92,45 @@ const GasDetailsItem = ({
           />
         </div>
       }
-      subText={t('editGasSubTextFee', [
-        <Box
-          key="editGasSubTextFeeLabel"
-          display="inline-flex"
-          className={classNames('gas-details-item__gasfee-label', {
-            'gas-details-item__gas-fee-warning': estimateToUse === 'high',
-          })}
-        >
-          <Box marginRight={1}>
-            <b>
-              {estimateToUse === 'high' && '⚠ '}
-              <I18nValue messageKey="editGasSubTextFeeLabel" />
-            </b>
-          </Box>
-          <div
-            key="editGasSubTextFeeValue"
-            className="gas-details-item__currency-container"
+      subText={
+        <>
+          <Box
+            key="editGasSubTextFeeLabel"
+            display="inline-flex"
+            className={classNames('gas-details-item__gasfee-label', {
+              'gas-details-item__gas-fee-warning': estimateUsed === 'high',
+            })}
           >
-            <HeartBeat />
-            <UserPreferencedCurrencyDisplay
-              key="editGasSubTextFeeAmount"
-              type={PRIMARY}
-              value={hexMaximumTransactionFee}
-              hideLabel={!useNativeCurrencyAsPrimaryCurrency}
-            />
-          </div>
-        </Box>,
-      ])}
+            <Box marginRight={1}>
+              <strong>
+                {estimateUsed === 'high' && '⚠ '}
+                <I18nValue messageKey="editGasSubTextFeeLabel" />
+              </strong>
+            </Box>
+            <div
+              key="editGasSubTextFeeValue"
+              className="gas-details-item__currency-container"
+            >
+              <HeartBeat />
+              <UserPreferencedCurrencyDisplay
+                key="editGasSubTextFeeAmount"
+                type={PRIMARY}
+                value={hexMaximumTransactionFee}
+                hideLabel={!useNativeCurrencyAsPrimaryCurrency}
+              />
+            </div>
+          </Box>
+        </>
+      }
       subTitle={
-        supportsEIP1559 && (
-          <GasTiming
-            maxPriorityFeePerGas={hexWEIToDecGWEI(
-              maxPriorityFeePerGas || txData.txParams.maxPriorityFeePerGas,
-            )}
-            maxFeePerGas={hexWEIToDecGWEI(
-              maxFeePerGas || txData.txParams.maxFeePerGas,
-            )}
-          />
-        )
+        <GasTiming
+          maxPriorityFeePerGas={hexWEIToDecGWEI(
+            maxPriorityFeePerGas || transaction.txParams.maxPriorityFeePerGas,
+          )}
+          maxFeePerGas={hexWEIToDecGWEI(
+            maxFeePerGas || transaction.txParams.maxFeePerGas,
+          )}
+        />
       }
     />
   );
@@ -141,8 +142,7 @@ GasDetailsItem.propTypes = {
   isMainnet: PropTypes.bool,
   maxFeePerGas: PropTypes.string,
   maxPriorityFeePerGas: PropTypes.string,
-  supportsEIP1559: PropTypes.bool,
-  txData: PropTypes.object,
+  userAcknowledgedGasMissing: PropTypes.bool.isRequired,
   useNativeCurrencyAsPrimaryCurrency: PropTypes.bool,
 };
 
diff --git a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.scss b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.scss
index e65e3f362..2f1dff574 100644
--- a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.scss
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.scss
@@ -11,10 +11,6 @@
     color: $secondary-1;
   }
 
-  &__gasfee-label {
-    font-weight: bold;
-  }
-
   &__currency-container {
     position: relative;
   }
diff --git a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.test.js b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.test.js
index 2d8c97fab..d149a6398 100644
--- a/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.test.js
+++ b/ui/pages/confirm-transaction-base/gas-details-item/gas-details-item.test.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import { screen } from '@testing-library/react';
+import { screen, waitFor } from '@testing-library/react';
 
 import { ETH } from '../../../helpers/constants/common';
 import { GasFeeContextProvider } from '../../../contexts/gasFee';
@@ -14,9 +14,10 @@ jest.mock('../../../store/actions', () => ({
     .fn()
     .mockImplementation(() => Promise.resolve()),
   addPollingTokenToAppState: jest.fn(),
+  getGasFeeTimeEstimate: jest.fn().mockImplementation(() => Promise.resolve()),
 }));
 
-const render = (props) => {
+const render = ({ componentProps, contextProps } = {}) => {
   const store = configureStore({
     metamask: {
       nativeCurrency: ETH,
@@ -36,29 +37,73 @@ const render = (props) => {
   });
 
   return renderWithProvider(
-    <GasFeeContextProvider {...props}>
-      <GasDetailsItem txData={{}} {...props} />
+    <GasFeeContextProvider transaction={{ txParams: {} }} {...contextProps}>
+      <GasDetailsItem userAcknowledgedGasMissing={false} {...componentProps} />
     </GasFeeContextProvider>,
     store,
   );
 };
 
 describe('GasDetailsItem', () => {
-  it('should render label', () => {
+  it('should render label', async () => {
     render();
-    expect(screen.queryByText('Gas')).toBeInTheDocument();
-    expect(screen.queryByText('(estimated)')).toBeInTheDocument();
-    expect(screen.queryByText('Max fee:')).toBeInTheDocument();
-    expect(screen.queryByText('ETH')).toBeInTheDocument();
+    await waitFor(() => {
+      expect(screen.queryByText('Gas')).toBeInTheDocument();
+      expect(screen.queryByText('(estimated)')).toBeInTheDocument();
+      expect(screen.queryByText('Max fee:')).toBeInTheDocument();
+      expect(screen.queryByText('ETH')).toBeInTheDocument();
+    });
   });
 
-  it('should show warning icon if estimates are high', () => {
-    render({ defaultEstimateToUse: 'high' });
-    expect(screen.queryByText('⚠ Max fee:')).toBeInTheDocument();
+  it('should show warning icon if estimates are high', async () => {
+    render({
+      contextProps: { transaction: { txParams: {}, userFeeLevel: 'high' } },
+    });
+    await waitFor(() => {
+      expect(screen.queryByText('⚠ Max fee:')).toBeInTheDocument();
+    });
   });
 
-  it('should not show warning icon if estimates are not high', () => {
-    render({ defaultEstimateToUse: 'low' });
-    expect(screen.queryByText('Max fee:')).toBeInTheDocument();
+  it('should not show warning icon if estimates are not high', async () => {
+    render({
+      contextProps: { transaction: { txParams: {}, userFeeLevel: 'low' } },
+    });
+    await waitFor(() => {
+      expect(screen.queryByText('Max fee:')).toBeInTheDocument();
+    });
+  });
+
+  it('should return null if there is simulationError and user has not acknowledged gasMissing warning', () => {
+    const { container } = render({
+      contextProps: {
+        transaction: {
+          txParams: {},
+          simulationFails: true,
+          userFeeLevel: 'low',
+        },
+      },
+    });
+    expect(container.innerHTML).toHaveLength(0);
+  });
+
+  it('should not return null even if there is simulationError if user acknowledged gasMissing warning', async () => {
+    render();
+    await waitFor(() => {
+      expect(screen.queryByText('Gas')).toBeInTheDocument();
+    });
+  });
+
+  it('should should render gas fee details', async () => {
+    render({
+      componentProps: {
+        hexMinimumTransactionFee: '0x1ca62a4f7800',
+        hexMaximumTransactionFee: '0x290ee75e3d900',
+      },
+    });
+    await waitFor(() => {
+      expect(screen.queryByTitle('0.0000315 ETH')).toBeInTheDocument();
+      expect(screen.queryByText('ETH')).toBeInTheDocument();
+      expect(screen.queryByTitle('0.0007223')).toBeInTheDocument();
+    });
   });
 });
diff --git a/ui/pages/confirm-transaction-base/low-priority-message/index.js b/ui/pages/confirm-transaction-base/low-priority-message/index.js
deleted file mode 100644
index 7b2838d48..000000000
--- a/ui/pages/confirm-transaction-base/low-priority-message/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default } from './low-priority-message';
diff --git a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.js b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.js
deleted file mode 100644
index 41bb5d132..000000000
--- a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import React from 'react';
-
-import ActionableMessage from '../../../components/ui/actionable-message/actionable-message';
-import { useGasFeeContext } from '../../../contexts/gasFee';
-import { useI18nContext } from '../../../hooks/useI18nContext';
-
-const LowPriorityMessage = () => {
-  const { estimateToUse } = useGasFeeContext();
-  const t = useI18nContext();
-
-  if (estimateToUse !== 'low') return null;
-  return (
-    <div className="low-priority-message">
-      <ActionableMessage
-        className="actionable-message--warning"
-        message={t('lowPriorityMessage')}
-        useIcon
-        iconFillColor="#f8c000"
-      />
-    </div>
-  );
-};
-
-export default LowPriorityMessage;
diff --git a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.scss b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.scss
deleted file mode 100644
index 1a99a03af..000000000
--- a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.low-priority-message {
-  margin-top: 20px;
-}
diff --git a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.test.js b/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.test.js
deleted file mode 100644
index 9d8e233f3..000000000
--- a/ui/pages/confirm-transaction-base/low-priority-message/low-priority-message.test.js
+++ /dev/null
@@ -1,59 +0,0 @@
-import React from 'react';
-
-import { renderWithProvider } from '../../../../test/lib/render-helpers';
-import { ETH } from '../../../helpers/constants/common';
-import { GasFeeContextProvider } from '../../../contexts/gasFee';
-import configureStore from '../../../store/store';
-
-import LowPriorityMessage from './low-priority-message';
-
-jest.mock('../../../store/actions', () => ({
-  disconnectGasFeeEstimatePoller: jest.fn(),
-  getGasFeeEstimatesAndStartPolling: jest
-    .fn()
-    .mockImplementation(() => Promise.resolve()),
-  addPollingTokenToAppState: jest.fn(),
-}));
-
-const render = (props) => {
-  const store = configureStore({
-    metamask: {
-      nativeCurrency: ETH,
-      preferences: {
-        useNativeCurrencyAsPrimaryCurrency: true,
-      },
-      provider: {},
-      cachedBalances: {},
-      accounts: {
-        '0xAddress': {
-          address: '0xAddress',
-          balance: '0x176e5b6f173ebe66',
-        },
-      },
-      selectedAddress: '0xAddress',
-    },
-  });
-
-  return renderWithProvider(
-    <GasFeeContextProvider {...props}>
-      <LowPriorityMessage />
-    </GasFeeContextProvider>,
-    store,
-  );
-};
-
-describe('LowPriorityMessage', () => {
-  it('should returning warning message for low gas estimate', () => {
-    render({ transaction: { userFeeLevel: 'low' } });
-    expect(
-      document.getElementsByClassName('actionable-message--warning'),
-    ).toHaveLength(1);
-  });
-
-  it('should return null for gas estimate other than low', () => {
-    render({ transaction: { userFeeLevel: 'high' } });
-    expect(
-      document.getElementsByClassName('actionable-message--warning'),
-    ).toHaveLength(0);
-  });
-});
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/index.js b/ui/pages/confirm-transaction-base/transaction-alerts/index.js
new file mode 100644
index 000000000..48b2d29af
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/index.js
@@ -0,0 +1 @@
+export { default } from './transaction-alerts';
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
new file mode 100644
index 000000000..fe7d6a6ae
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.js
@@ -0,0 +1,110 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from 'react-redux';
+
+import { PRIORITY_LEVELS } from '../../../../shared/constants/gas';
+import { INSUFFICIENT_FUNDS_ERROR_KEY } from '../../../helpers/constants/error-keys';
+import { submittedPendingTransactionsSelector } from '../../../selectors/transactions';
+import { useGasFeeContext } from '../../../contexts/gasFee';
+import { useI18nContext } from '../../../hooks/useI18nContext';
+import ActionableMessage from '../../../components/ui/actionable-message/actionable-message';
+import ErrorMessage from '../../../components/ui/error-message';
+import I18nValue from '../../../components/ui/i18n-value';
+import Typography from '../../../components/ui/typography';
+
+const TransactionAlerts = ({
+  userAcknowledgedGasMissing,
+  setUserAcknowledgedGasMissing,
+}) => {
+  const {
+    balanceError,
+    estimateUsed,
+    hasSimulationError,
+    supportsEIP1559V2,
+  } = useGasFeeContext();
+  const pendingTransactions = useSelector(submittedPendingTransactionsSelector);
+  const t = useI18nContext();
+
+  if (!supportsEIP1559V2) return null;
+
+  return (
+    <div className="transaction-alerts">
+      {hasSimulationError && (
+        <ActionableMessage
+          message={<I18nValue messageKey="simulationErrorMessageV2" />}
+          useIcon
+          iconFillColor="#d73a49"
+          type="danger"
+          primaryActionV2={
+            userAcknowledgedGasMissing === true
+              ? undefined
+              : {
+                  label: t('proceedWithTransaction'),
+                  onClick: setUserAcknowledgedGasMissing,
+                }
+          }
+        />
+      )}
+      {pendingTransactions?.length > 0 && (
+        <ActionableMessage
+          message={
+            <Typography
+              className="transaction-alerts__pending-transactions"
+              align="left"
+              fontSize="12px"
+              margin={[0, 0]}
+            >
+              <strong>
+                <I18nValue
+                  messageKey={
+                    pendingTransactions?.length === 1
+                      ? 'pendingTransactionSingle'
+                      : 'pendingTransactionMultiple'
+                  }
+                  options={[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>,
+                ]}
+              />
+            </Typography>
+          }
+          useIcon
+          iconFillColor="#f8c000"
+          type="warning"
+        />
+      )}
+      {balanceError && <ErrorMessage errorKey={INSUFFICIENT_FUNDS_ERROR_KEY} />}
+      {estimateUsed === PRIORITY_LEVELS.LOW && (
+        <ActionableMessage
+          message={
+            <Typography align="left" fontSize="12px" margin={[0, 0]}>
+              <I18nValue messageKey="lowPriorityMessage" />
+            </Typography>
+          }
+          useIcon
+          iconFillColor="#f8c000"
+          type="warning"
+        />
+      )}
+    </div>
+  );
+};
+
+TransactionAlerts.propTypes = {
+  userAcknowledgedGasMissing: PropTypes.bool,
+  setUserAcknowledgedGasMissing: PropTypes.func,
+};
+
+export default TransactionAlerts;
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.scss b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.scss
new file mode 100644
index 000000000..df6974e99
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.scss
@@ -0,0 +1,21 @@
+.transaction-alerts {
+  text-align: left;
+
+  & > *:first-of-type {
+    margin-top: 20px;
+  }
+
+  & > *:not(:first-of-type) {
+    margin-top: 12px;
+  }
+
+  & strong {
+    font-weight: bold;
+  }
+
+  &__pending-transactions {
+    & a {
+      color: $primary-1;
+    }
+  }
+}
diff --git a/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js
new file mode 100644
index 000000000..555a091a4
--- /dev/null
+++ b/ui/pages/confirm-transaction-base/transaction-alerts/transaction-alerts.test.js
@@ -0,0 +1,172 @@
+import React from 'react';
+import { fireEvent, screen } from '@testing-library/react';
+
+import { GAS_ESTIMATE_TYPES } from '../../../../shared/constants/gas';
+import {
+  TRANSACTION_ENVELOPE_TYPES,
+  TRANSACTION_STATUSES,
+} from '../../../../shared/constants/transaction';
+import { renderWithProvider } from '../../../../test/lib/render-helpers';
+import mockEstimates from '../../../../test/data/mock-estimates.json';
+import mockState from '../../../../test/data/mock-state.json';
+import { GasFeeContextProvider } from '../../../contexts/gasFee';
+import configureStore from '../../../store/store';
+
+import TransactionAlerts from './transaction-alerts';
+
+jest.mock('../../../store/actions', () => ({
+  disconnectGasFeeEstimatePoller: jest.fn(),
+  getGasFeeEstimatesAndStartPolling: jest
+    .fn()
+    .mockImplementation(() => Promise.resolve()),
+  addPollingTokenToAppState: jest.fn(),
+}));
+
+const render = ({ componentProps, transactionProps, state }) => {
+  const store = configureStore({
+    metamask: {
+      ...mockState.metamask,
+      accounts: {
+        [mockState.metamask.selectedAddress]: {
+          address: mockState.metamask.selectedAddress,
+          balance: '0x1F4',
+        },
+      },
+      gasFeeEstimates: mockEstimates[GAS_ESTIMATE_TYPES.FEE_MARKET],
+      ...state,
+    },
+  });
+
+  return renderWithProvider(
+    <GasFeeContextProvider
+      transaction={{
+        txParams: {
+          type: TRANSACTION_ENVELOPE_TYPES.FEE_MARKET,
+        },
+        ...transactionProps,
+      }}
+    >
+      <TransactionAlerts {...componentProps} />
+    </GasFeeContextProvider>,
+    store,
+  );
+};
+
+describe('TransactionAlerts', () => {
+  beforeEach(() => {
+    process.env.EIP_1559_V2 = true;
+  });
+
+  afterEach(() => {
+    process.env.EIP_1559_V2 = false;
+  });
+
+  it('should returning warning message for low gas estimate', () => {
+    render({ transactionProps: { userFeeLevel: 'low' } });
+    expect(
+      document.getElementsByClassName('actionable-message--warning'),
+    ).toHaveLength(1);
+  });
+
+  it('should return null for gas estimate other than low', () => {
+    render({ transactionProps: { userFeeLevel: 'high' } });
+    expect(
+      document.getElementsByClassName('actionable-message--warning'),
+    ).toHaveLength(0);
+  });
+
+  it('should not show insufficient balance message if transaction value is less than balance', () => {
+    render({
+      transactionProps: {
+        userFeeLevel: 'high',
+        txParams: { value: '0x64' },
+      },
+    });
+    expect(screen.queryByText('Insufficient funds.')).not.toBeInTheDocument();
+  });
+
+  it('should show insufficient balance message if transaction value is more than balance', () => {
+    render({
+      transactionProps: {
+        userFeeLevel: 'high',
+        txParams: { value: '0x5208' },
+      },
+    });
+    expect(screen.queryByText('Insufficient funds.')).toBeInTheDocument();
+  });
+
+  it('should show pending transaction message if there are >= 1 pending transactions', () => {
+    render({
+      state: {
+        currentNetworkTxList: [
+          {
+            id: 0,
+            time: 0,
+            txParams: {
+              from: mockState.metamask.selectedAddress,
+              to: '0xRecipient',
+            },
+            status: TRANSACTION_STATUSES.SUBMITTED,
+          },
+        ],
+      },
+    });
+    expect(
+      screen.queryByText('You have (1) pending transaction.'),
+    ).toBeInTheDocument();
+  });
+
+  describe('SimulationError Message', () => {
+    it('should show simulation error message along with option to proceed anyway if transaction.simulationFails is true', () => {
+      render({ transactionProps: { simulationFails: true } });
+      expect(
+        screen.queryByText(
+          'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.',
+        ),
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByText('I want to proceed anyway'),
+      ).toBeInTheDocument();
+    });
+
+    it('should not show options to acknowledge gas-missing warning if component prop userAcknowledgedGasMissing is already true', () => {
+      render({
+        componentProps: {
+          userAcknowledgedGasMissing: true,
+        },
+        transactionProps: { simulationFails: true },
+      });
+      expect(
+        screen.queryByText(
+          'We were not able to estimate gas. There might be an error in the contract and this transaction may fail.',
+        ),
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByText('I want to proceed anyway'),
+      ).not.toBeInTheDocument();
+    });
+
+    it('should call prop setUserAcknowledgedGasMissing if option to acknowledge gas-missing warning is clicked', () => {
+      const setUserAcknowledgedGasMissing = jest.fn();
+      render({
+        componentProps: {
+          setUserAcknowledgedGasMissing,
+        },
+        transactionProps: { simulationFails: true },
+      });
+      fireEvent.click(screen.queryByText('I want to proceed anyway'));
+      expect(setUserAcknowledgedGasMissing).toHaveBeenCalledTimes(1);
+    });
+
+    it('should return null for legacy transactions', () => {
+      const { container } = render({
+        transactionProps: {
+          txParams: {
+            type: TRANSACTION_ENVELOPE_TYPES.LEGACY,
+          },
+        },
+      });
+      expect(container.firstChild).toBeNull();
+    });
+  });
+});
diff --git a/ui/pages/create-account/connect-hardware/account-list.js b/ui/pages/create-account/connect-hardware/account-list.js
index caf7ff580..3d4c4522a 100644
--- a/ui/pages/create-account/connect-hardware/account-list.js
+++ b/ui/pages/create-account/connect-hardware/account-list.js
@@ -61,8 +61,9 @@ class AccountList extends Component {
 
   renderHeader() {
     const { device } = this.props;
-    const shouldShowHDPaths =
-      device.toLowerCase() === 'ledger' || device.toLowerCase() === 'lattice';
+    const shouldShowHDPaths = ['ledger', 'lattice', 'trezor'].includes(
+      device.toLowerCase(),
+    );
     return (
       <div className="hw-connect">
         <h3 className="hw-connect__unlock-title">
diff --git a/ui/pages/create-account/connect-hardware/index.js b/ui/pages/create-account/connect-hardware/index.js
index 6b6c3bab5..0e784c7c5 100644
--- a/ui/pages/create-account/connect-hardware/index.js
+++ b/ui/pages/create-account/connect-hardware/index.js
@@ -11,7 +11,10 @@ import {
 import { formatBalance } from '../../../helpers/utils/util';
 import { getMostRecentOverviewPage } from '../../../ducks/history/history';
 import { SECOND } from '../../../../shared/constants/time';
-import { LEDGER_TRANSPORT_TYPES } from '../../../../shared/constants/hardware-wallets';
+import {
+  DEVICE_NAMES,
+  LEDGER_TRANSPORT_TYPES,
+} from '../../../../shared/constants/hardware-wallets';
 import SelectHardware from './select-hardware';
 import AccountList from './account-list';
 
@@ -41,9 +44,16 @@ const LATTICE_HD_PATHS = [
   { name: `Ledger Legacy (${LATTICE_MEW_PATH})`, value: LATTICE_MEW_PATH },
 ];
 
+const TREZOR_TESTNET_PATH = `m/44'/1'/0'/0`;
+const TREZOR_HD_PATHS = [
+  { name: `BIP44 Standard (e.g. MetaMask, Trezor)`, value: BIP44_PATH },
+  { name: `Trezor Testnets`, value: TREZOR_TESTNET_PATH },
+];
+
 const HD_PATHS = {
   ledger: LEDGER_HD_PATHS,
   lattice: LATTICE_HD_PATHS,
+  trezor: TREZOR_HD_PATHS,
 };
 
 class ConnectHardwareForm extends Component {
@@ -76,7 +86,11 @@ class ConnectHardwareForm extends Component {
   }
 
   async checkIfUnlocked() {
-    for (const device of ['trezor', 'ledger', 'lattice']) {
+    for (const device of [
+      DEVICE_NAMES.TREZOR,
+      DEVICE_NAMES.LEDGER,
+      DEVICE_NAMES.LATTICE,
+    ]) {
       const path = this.props.defaultHdPaths[device];
       const unlocked = await this.props.checkHardwareStatus(device, path);
       if (unlocked) {
@@ -176,9 +190,22 @@ class ConnectHardwareForm extends Component {
           this.setState({
             error: this.context.t('ledgerTimeout'),
           });
+        } else if (
+          errorMessage
+            .toLowerCase()
+            .includes(
+              'KeystoneError#pubkey_account.no_expected_account'.toLowerCase(),
+            )
+        ) {
+          this.setState({
+            error: this.context.t('QRHardwarePubkeyAccountOutOfRange'),
+          });
         } else if (
           errorMessage !== 'Window closed' &&
-          errorMessage !== 'Popup closed'
+          errorMessage !== 'Popup closed' &&
+          errorMessage
+            .toLowerCase()
+            .includes('KeystoneError#sync_cancel'.toLowerCase()) === false
         ) {
           this.setState({
             error: errorMessage,
diff --git a/ui/pages/create-account/connect-hardware/index.scss b/ui/pages/create-account/connect-hardware/index.scss
index b796812cf..977b4af96 100644
--- a/ui/pages/create-account/connect-hardware/index.scss
+++ b/ui/pages/create-account/connect-hardware/index.scss
@@ -52,6 +52,7 @@
     justify-content: center;
     border-radius: 5px;
     padding: 0;
+    margin-right: 15px;
 
     &__img {
       width: 95px;
@@ -64,7 +65,6 @@
   }
 
   &__btn:first-child {
-    margin-right: 15px;
     margin-left: 20px;
   }
 
diff --git a/ui/pages/create-account/connect-hardware/select-hardware.js b/ui/pages/create-account/connect-hardware/select-hardware.js
index 3f7e6cbe8..375b33f23 100644
--- a/ui/pages/create-account/connect-hardware/select-hardware.js
+++ b/ui/pages/create-account/connect-hardware/select-hardware.js
@@ -2,7 +2,10 @@ import classnames from 'classnames';
 import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import Button from '../../../components/ui/button';
-import { LEDGER_TRANSPORT_TYPES } from '../../../../shared/constants/hardware-wallets';
+import {
+  DEVICE_NAMES,
+  LEDGER_TRANSPORT_TYPES,
+} from '../../../../shared/constants/hardware-wallets';
 
 export default class SelectHardware extends Component {
   static contextTypes = {
@@ -30,9 +33,9 @@ export default class SelectHardware extends Component {
     return (
       <button
         className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === 'trezor',
+          selected: this.state.selectedDevice === DEVICE_NAMES.TREZOR,
         })}
-        onClick={(_) => this.setState({ selectedDevice: 'trezor' })}
+        onClick={(_) => this.setState({ selectedDevice: DEVICE_NAMES.TREZOR })}
       >
         <img
           className="hw-connect__btn__img"
@@ -47,9 +50,9 @@ export default class SelectHardware extends Component {
     return (
       <button
         className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === 'lattice',
+          selected: this.state.selectedDevice === DEVICE_NAMES.LATTICE,
         })}
-        onClick={(_) => this.setState({ selectedDevice: 'lattice' })}
+        onClick={(_) => this.setState({ selectedDevice: DEVICE_NAMES.LATTICE })}
       >
         <img
           className="hw-connect__btn__img"
@@ -64,9 +67,9 @@ export default class SelectHardware extends Component {
     return (
       <button
         className={classnames('hw-connect__btn', {
-          selected: this.state.selectedDevice === 'ledger',
+          selected: this.state.selectedDevice === DEVICE_NAMES.LEDGER,
         })}
-        onClick={(_) => this.setState({ selectedDevice: 'ledger' })}
+        onClick={(_) => this.setState({ selectedDevice: DEVICE_NAMES.LEDGER })}
       >
         <img
           className="hw-connect__btn__img"
@@ -77,6 +80,23 @@ export default class SelectHardware extends Component {
     );
   }
 
+  renderConnectToQRButton() {
+    return (
+      <button
+        className={classnames('hw-connect__btn', {
+          selected: this.state.selectedDevice === DEVICE_NAMES.QR,
+        })}
+        onClick={(_) => this.setState({ selectedDevice: DEVICE_NAMES.QR })}
+      >
+        <img
+          className="hw-connect__btn__img"
+          src="images/qrcode-wallet-logo.svg"
+          alt="QRCode"
+        />
+      </button>
+    );
+  }
+
   renderButtons() {
     return (
       <>
@@ -89,6 +109,7 @@ export default class SelectHardware extends Component {
           style={{ margin: '10px 0 0 0' }}
         >
           {this.renderConnectToLatticeButton()}
+          {this.renderConnectToQRButton()}
         </div>
       </>
     );
@@ -149,12 +170,14 @@ export default class SelectHardware extends Component {
 
   renderTutorialsteps() {
     switch (this.state.selectedDevice) {
-      case 'ledger':
+      case DEVICE_NAMES.LEDGER:
         return this.renderLedgerTutorialSteps();
-      case 'trezor':
+      case DEVICE_NAMES.TREZOR:
         return this.renderTrezorTutorialSteps();
-      case 'lattice':
+      case DEVICE_NAMES.LATTICE:
         return this.renderLatticeTutorialSteps();
+      case DEVICE_NAMES.QR:
+        return this.renderQRHardwareWalletSteps();
       default:
         return '';
     }
@@ -296,6 +319,65 @@ export default class SelectHardware extends Component {
     );
   }
 
+  renderQRHardwareWalletSteps() {
+    const steps = [];
+    steps.push(
+      {
+        title: this.context.t('QRHardwareWalletSteps1Title'),
+        message: this.context.t('QRHardwareWalletSteps1Description'),
+      },
+      {
+        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>
+          </>
+        ),
+      },
+      {
+        message: this.context.t('QRHardwareWalletSteps2Description'),
+      },
+      {
+        asset: 'qrcode-wallet-demo',
+        dimensions: { width: '225px', height: '75px' },
+      },
+    );
+    return (
+      <div className="hw-tutorial">
+        {steps.map((step, index) => (
+          <div className="hw-connect" key={index}>
+            {step.title && <h3 className="hw-connect__title">{step.title}</h3>}
+            <p className="hw-connect__msg">{step.message}</p>
+            {step.asset && (
+              <img
+                className="hw-connect__step-asset"
+                src={`images/${step.asset}.svg`}
+                {...step.dimensions}
+                alt=""
+              />
+            )}
+          </div>
+        ))}
+      </div>
+    );
+  }
+
   renderConnectScreen() {
     return (
       <div className="new-external-account-form">
diff --git a/ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js b/ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
index 7522899c6..a7259bf9b 100644
--- a/ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
+++ b/ui/pages/first-time-flow/create-password/import-with-seed-phrase/import-with-seed-phrase.component.js
@@ -7,6 +7,7 @@ import {
   INITIALIZE_SELECT_ACTION_ROUTE,
   INITIALIZE_END_OF_FLOW_ROUTE,
 } from '../../../../helpers/constants/routes';
+import { clearClipboard } from '../../../../helpers/utils/util';
 
 const { isValidMnemonic } = ethers.utils;
 
@@ -244,6 +245,7 @@ export default class ImportWithSeedPhrase extends PureComponent {
             <textarea
               className="first-time-flow__textarea"
               onChange={(e) => this.handleSeedPhraseChange(e.target.value)}
+              onPaste={clearClipboard}
               value={this.state.seedPhrase}
               placeholder={t('seedPhrasePlaceholder')}
               autoComplete="off"
@@ -256,6 +258,7 @@ export default class ImportWithSeedPhrase extends PureComponent {
               value={this.state.seedPhrase}
               placeholder={t('seedPhrasePlaceholderPaste')}
               autoComplete="off"
+              onPaste={clearClipboard}
             />
           )}
           {seedPhraseError ? (
diff --git a/ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js b/ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js
index be27ee7cf..586db5915 100644
--- a/ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js
+++ b/ui/pages/first-time-flow/first-time-flow-switch/first-time-flow-switch.component.js
@@ -5,8 +5,13 @@ import {
   DEFAULT_ROUTE,
   LOCK_ROUTE,
   INITIALIZE_END_OF_FLOW_ROUTE,
-  INITIALIZE_WELCOME_ROUTE,
   INITIALIZE_UNLOCK_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  INITIALIZE_EXPERIMENTAL_AREA,
+  ///: END:ONLY_INCLUDE_IN
+  ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+  INITIALIZE_WELCOME_ROUTE,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/routes';
 
 export default class FirstTimeFlowSwitch extends PureComponent {
@@ -38,7 +43,16 @@ export default class FirstTimeFlowSwitch extends PureComponent {
     }
 
     if (!isInitialized) {
-      return <Redirect to={{ pathname: INITIALIZE_WELCOME_ROUTE }} />;
+      /* eslint-disable prefer-const */
+      let redirect;
+      ///: BEGIN:ONLY_INCLUDE_IN(flask)
+      redirect = <Redirect to={{ pathname: INITIALIZE_EXPERIMENTAL_AREA }} />;
+      ///: END:ONLY_INCLUDE_IN
+      ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+      redirect = <Redirect to={{ pathname: INITIALIZE_WELCOME_ROUTE }} />;
+      ///: END:ONLY_INCLUDE_IN
+      /* eslint-enable prefer-const */
+      return redirect;
     }
 
     return <Redirect to={{ pathname: INITIALIZE_UNLOCK_ROUTE }} />;
diff --git a/ui/pages/first-time-flow/first-time-flow.component.js b/ui/pages/first-time-flow/first-time-flow.component.js
index 974c37020..069491a17 100644
--- a/ui/pages/first-time-flow/first-time-flow.component.js
+++ b/ui/pages/first-time-flow/first-time-flow.component.js
@@ -13,7 +13,13 @@ import {
   INITIALIZE_METAMETRICS_OPT_IN_ROUTE,
   INITIALIZE_BACKUP_SEED_PHRASE_ROUTE,
   INITIALIZE_SEED_PHRASE_INTRO_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  INITIALIZE_EXPERIMENTAL_AREA,
+  ///: END:ONLY_INCLUDE_IN
 } from '../../helpers/constants/routes';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import ExperimentalArea from '../../components/app/flask/experimental-area';
+///: END:ONLY_INCLUDE_IN
 import FirstTimeFlowSwitch from './first-time-flow-switch';
 import Welcome from './welcome';
 import SelectAction from './select-action';
@@ -162,6 +168,22 @@ export default class FirstTimeFlow extends PureComponent {
             component={EndOfFlow}
           />
           <Route exact path={INITIALIZE_WELCOME_ROUTE} component={Welcome} />
+          {
+            ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          }
+          <Route
+            exact
+            path={INITIALIZE_EXPERIMENTAL_AREA}
+            render={(routeProps) => (
+              <ExperimentalArea
+                {...routeProps}
+                redirectTo={INITIALIZE_SELECT_ACTION_ROUTE}
+              />
+            )}
+          />
+          {
+            ///: END:ONLY_INCLUDE_IN
+          }
           <Route
             exact
             path={INITIALIZE_METAMETRICS_OPT_IN_ROUTE}
diff --git a/ui/pages/home/home.component.js b/ui/pages/home/home.component.js
index ba99b1035..c9c03aa64 100644
--- a/ui/pages/home/home.component.js
+++ b/ui/pages/home/home.component.js
@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import { Redirect, Route } from 'react-router-dom';
 import { formatDate } from '../../helpers/utils/util';
 import AssetList from '../../components/app/asset-list';
-import CollectiblesList from '../../components/app/collectibles-list';
+import CollectiblesTab from '../../components/app/collectibles-tab';
 import HomeNotification from '../../components/app/home-notification';
 import MultipleNotifications from '../../components/app/multiple-notifications';
 import TransactionList from '../../components/app/transaction-list';
@@ -91,6 +91,9 @@ export default class Home extends PureComponent {
     seedPhraseBackedUp: PropTypes.bool.isRequired,
     newNetworkAdded: PropTypes.string,
     setNewNetworkAdded: PropTypes.func.isRequired,
+    isSigningQRHardwareTransaction: PropTypes.bool.isRequired,
+    newCollectibleAddedMessage: PropTypes.string,
+    setNewCollectibleAddedMessage: PropTypes.func.isRequired,
   };
 
   state = {
@@ -99,7 +102,7 @@ export default class Home extends PureComponent {
     canShowBlockageNotification: true,
   };
 
-  componentDidMount() {
+  checkStatusAndNavigate() {
     const {
       firstPermissionsRequestId,
       history,
@@ -111,11 +114,13 @@ export default class Home extends PureComponent {
       showAwaitingSwapScreen,
       swapsFetchParams,
       pendingConfirmations,
+      isSigningQRHardwareTransaction,
     } = this.props;
-
-    // eslint-disable-next-line react/no-unused-state
-    this.setState({ mounted: true });
-    if (isNotification && totalUnapprovedCount === 0) {
+    if (
+      isNotification &&
+      totalUnapprovedCount === 0 &&
+      !isSigningQRHardwareTransaction
+    ) {
       global.platform.closeCurrentWindow();
     } else if (!isNotification && showAwaitingSwapScreen) {
       history.push(AWAITING_SWAP_ROUTE);
@@ -134,6 +139,12 @@ export default class Home extends PureComponent {
     }
   }
 
+  componentDidMount() {
+    // eslint-disable-next-line react/no-unused-state
+    this.setState({ mounted: true });
+    this.checkStatusAndNavigate();
+  }
+
   static getDerivedStateFromProps(
     {
       firstPermissionsRequestId,
@@ -144,11 +155,16 @@ export default class Home extends PureComponent {
       haveSwapsQuotes,
       showAwaitingSwapScreen,
       swapsFetchParams,
+      isSigningQRHardwareTransaction,
     },
     { mounted },
   ) {
     if (!mounted) {
-      if (isNotification && totalUnapprovedCount === 0) {
+      if (
+        isNotification &&
+        totalUnapprovedCount === 0 &&
+        !isSigningQRHardwareTransaction
+      ) {
         return { closing: true };
       } else if (
         firstPermissionsRequestId ||
@@ -169,12 +185,15 @@ export default class Home extends PureComponent {
       showRestorePrompt,
       threeBoxLastUpdated,
       threeBoxSynced,
+      isNotification,
     } = this.props;
 
     if (!prevState.closing && this.state.closing) {
       global.platform.closeCurrentWindow();
     }
 
+    isNotification && this.checkStatusAndNavigate();
+
     if (threeBoxSynced && showRestorePrompt && threeBoxLastUpdated === null) {
       setupThreeBox();
     }
@@ -208,9 +227,42 @@ export default class Home extends PureComponent {
       infuraBlocked,
       newNetworkAdded,
       setNewNetworkAdded,
+      newCollectibleAddedMessage,
+      setNewCollectibleAddedMessage,
     } = this.props;
     return (
       <MultipleNotifications>
+        {newCollectibleAddedMessage ? (
+          <ActionableMessage
+            type={newCollectibleAddedMessage === 'success' ? 'info' : 'warning'}
+            className="home__new-network-notification"
+            message={
+              <div className="home__new-network-notification-message">
+                {newCollectibleAddedMessage === 'success' ? (
+                  <img
+                    src="./images/check_circle.svg"
+                    className="home__new-network-notification-message--image"
+                  />
+                ) : null}
+                <Typography
+                  variant={TYPOGRAPHY.H7}
+                  fontWeight={FONT_WEIGHT.NORMAL}
+                >
+                  {newCollectibleAddedMessage === 'success'
+                    ? t('newCollectibleAddedMessage')
+                    : t('newCollectibleAddFailed', [
+                        newCollectibleAddedMessage,
+                      ])}
+                </Typography>
+                <button
+                  className="fas fa-times home__close"
+                  title={t('close')}
+                  onClick={() => setNewCollectibleAddedMessage('')}
+                />
+              </div>
+            }
+          />
+        ) : null}
         {newNetworkAdded ? (
           <ActionableMessage
             type="info"
@@ -225,7 +277,7 @@ export default class Home extends PureComponent {
                   variant={TYPOGRAPHY.H7}
                   fontWeight={FONT_WEIGHT.NORMAL}
                 >
-                  {this.context.t('newNetworkAdded', [newNetworkAdded])}
+                  {t('newNetworkAdded', [newNetworkAdded])}
                 </Typography>
                 <button
                   className="fas fa-times home__close"
@@ -437,7 +489,7 @@ export default class Home extends PureComponent {
                   data-testid="home__nfts-tab"
                   name={t('nfts')}
                 >
-                  <CollectiblesList
+                  <CollectiblesTab
                     onAddNFT={() => {
                       history.push(ADD_COLLECTIBLE_ROUTE);
                     }}
diff --git a/ui/pages/home/home.container.js b/ui/pages/home/home.container.js
index 7fad95d83..fcf09c1c4 100644
--- a/ui/pages/home/home.container.js
+++ b/ui/pages/home/home.container.js
@@ -16,6 +16,9 @@ import {
   getSortedNotificationsToShow,
   getShowRecoveryPhraseReminder,
   getNewNetworkAdded,
+  hasUnsignedQRHardwareTransaction,
+  hasUnsignedQRHardwareMessage,
+  getNewCollectibleAddedMessage,
 } from '../../selectors';
 
 import {
@@ -30,6 +33,7 @@ import {
   setRecoveryPhraseReminderHasBeenShown,
   setRecoveryPhraseReminderLastShown,
   setNewNetworkAdded,
+  setNewCollectibleAddedMessage,
 } from '../../store/actions';
 import { setThreeBoxLastUpdated, hideWhatsNewPopup } from '../../ducks/app/app';
 import { getWeb3ShimUsageAlertEnabledness } from '../../ducks/metamask/metamask';
@@ -83,6 +87,10 @@ const mapStateToProps = (state) => {
     getWeb3ShimUsageStateForOrigin(state, originOfCurrentTab) ===
       WEB3_SHIM_USAGE_ALERT_STATES.RECORDED;
 
+  const isSigningQRHardwareTransaction =
+    hasUnsignedQRHardwareTransaction(state) ||
+    hasUnsignedQRHardwareMessage(state);
+
   return {
     forgottenPassword,
     suggestedAssets,
@@ -115,6 +123,8 @@ const mapStateToProps = (state) => {
     showRecoveryPhraseReminder: getShowRecoveryPhraseReminder(state),
     seedPhraseBackedUp,
     newNetworkAdded: getNewNetworkAdded(state),
+    isSigningQRHardwareTransaction,
+    newCollectibleAddedMessage: getNewCollectibleAddedMessage(state),
   };
 };
 
@@ -147,6 +157,9 @@ const mapDispatchToProps = (dispatch) => ({
   setNewNetworkAdded: (newNetwork) => {
     dispatch(setNewNetworkAdded(newNetwork));
   },
+  setNewCollectibleAddedMessage: (message) => {
+    dispatch(setNewCollectibleAddedMessage(message));
+  },
 });
 
 export default compose(
diff --git a/ui/pages/import-token/import-token.component.js b/ui/pages/import-token/import-token.component.js
index 2abaf245b..1d4866dc2 100644
--- a/ui/pages/import-token/import-token.component.js
+++ b/ui/pages/import-token/import-token.component.js
@@ -44,6 +44,7 @@ class ImportToken extends Component {
     chainId: PropTypes.string,
     rpcPrefs: PropTypes.object,
     tokenList: PropTypes.object,
+    useTokenDetection: PropTypes.bool,
   };
 
   static defaultProps = {
@@ -391,26 +392,28 @@ class ImportToken extends Component {
   }
 
   renderSearchToken() {
-    const { tokenList, history } = this.props;
+    const { tokenList, history, useTokenDetection } = this.props;
     const { tokenSelectorError, selectedTokens, searchResults } = this.state;
     return (
       <div className="import-token__search-token">
-        <ActionableMessage
-          message={this.context.t('tokenDetectionAnnouncement', [
-            <Button
-              type="link"
-              key="token-detection-announcement"
-              className="import-token__link"
-              onClick={() => history.push(EXPERIMENTAL_ROUTE)}
-            >
-              {this.context.t('enableFromSettings')}
-            </Button>,
-          ])}
-          withRightButton
-          useIcon
-          iconFillColor="#037DD6"
-          className="import-token__token-detection-announcement"
-        />
+        {!useTokenDetection && (
+          <ActionableMessage
+            message={this.context.t('tokenDetectionAnnouncement', [
+              <Button
+                type="link"
+                key="token-detection-announcement"
+                className="import-token__link"
+                onClick={() => history.push(EXPERIMENTAL_ROUTE)}
+              >
+                {this.context.t('enableFromSettings')}
+              </Button>,
+            ])}
+            withRightButton
+            useIcon
+            iconFillColor="#037DD6"
+            className="import-token__token-detection-announcement"
+          />
+        )}
         <TokenSearch
           onSearch={({ results = [] }) =>
             this.setState({ searchResults: results })
diff --git a/ui/pages/import-token/import-token.container.js b/ui/pages/import-token/import-token.container.js
index 8a0099f98..007fa84a5 100644
--- a/ui/pages/import-token/import-token.container.js
+++ b/ui/pages/import-token/import-token.container.js
@@ -34,6 +34,7 @@ const mapStateToProps = (state) => {
     chainId,
     rpcPrefs: getRpcPrefsForCurrentProvider(state),
     tokenList,
+    useTokenDetection,
   };
 };
 
diff --git a/ui/pages/import-token/index.scss b/ui/pages/import-token/index.scss
index 378801a33..4fa718bcc 100644
--- a/ui/pages/import-token/index.scss
+++ b/ui/pages/import-token/index.scss
@@ -21,7 +21,7 @@
   }
 
   &__search-token {
-    padding: 0 16px 16px 16px;
+    padding: 16px 16px 16px 16px;
   }
 
   &__token-list {
@@ -57,5 +57,6 @@
 
   &__token-detection-announcement {
     margin-bottom: 16px;
+    margin-top: 0;
   }
 }
diff --git a/ui/pages/keychains/restore-vault.js b/ui/pages/keychains/restore-vault.js
index 72a7bd9a1..f300326e6 100644
--- a/ui/pages/keychains/restore-vault.js
+++ b/ui/pages/keychains/restore-vault.js
@@ -10,6 +10,7 @@ import {
 import { DEFAULT_ROUTE } from '../../helpers/constants/routes';
 import TextField from '../../components/ui/text-field';
 import Button from '../../components/ui/button';
+import { clearClipboard } from '../../helpers/utils/util';
 
 const { isValidMnemonic } = ethers.utils;
 
@@ -173,6 +174,7 @@ class RestoreVaultPage extends Component {
               {showSeedPhrase ? (
                 <textarea
                   className="import-account__secret-phrase"
+                  onPaste={clearClipboard}
                   onChange={(e) => this.handleSeedPhraseChange(e.target.value)}
                   value={seedPhrase}
                   autoFocus
@@ -182,6 +184,7 @@ class RestoreVaultPage extends Component {
                 <TextField
                   className="import-account__textarea import-account__seedphrase"
                   type="password"
+                  onPaste={clearClipboard}
                   onChange={(e) => this.handleSeedPhraseChange(e.target.value)}
                   value={seedPhrase}
                   autoFocus
diff --git a/ui/pages/onboarding-flow/import-srp/import-srp.js b/ui/pages/onboarding-flow/import-srp/import-srp.js
index 5d3f6b7f1..648a48c9b 100644
--- a/ui/pages/onboarding-flow/import-srp/import-srp.js
+++ b/ui/pages/onboarding-flow/import-srp/import-srp.js
@@ -16,6 +16,7 @@ import {
   TYPOGRAPHY,
 } from '../../../helpers/constants/design-system';
 import { ONBOARDING_CREATE_PASSWORD_ROUTE } from '../../../helpers/constants/routes';
+import { clearClipboard } from '../../../helpers/utils/util';
 import { useI18nContext } from '../../../hooks/useI18nContext';
 
 export default function ImportSRP({ submitSecretRecoveryPhrase }) {
@@ -86,6 +87,7 @@ export default function ImportSRP({ submitSecretRecoveryPhrase }) {
               onChange={({ target: { value } }) =>
                 handleSecretRecoveryPhraseChange(value)
               }
+              onPaste={clearClipboard}
               autoComplete="off"
               autoCorrect="off"
             />
diff --git a/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js b/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
index 2c3a008ef..24c8310ed 100644
--- a/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
+++ b/ui/pages/onboarding-flow/onboarding-flow-switch/onboarding-flow-switch.js
@@ -6,7 +6,12 @@ import {
   ONBOARDING_COMPLETION_ROUTE,
   ONBOARDING_UNLOCK_ROUTE,
   LOCK_ROUTE,
-  ONBOARDING_WELCOME_ROUTE,
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  ONBOARDING_EXPERIMENTAL_AREA, // eslint-disable-line no-unused-vars
+  ///: END:ONLY_INCLUDE_IN
+  ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+  ONBOARDING_WELCOME_ROUTE, // eslint-disable-line no-unused-vars
+  ///: END:ONLY_INCLUDE_IN
 } from '../../../helpers/constants/routes';
 import {
   getCompletedOnboarding,
@@ -16,6 +21,7 @@ import {
 } from '../../../ducks/metamask/metamask';
 
 export default function OnboardingFlowSwitch() {
+  /* eslint-disable prefer-const */
   const completedOnboarding = useSelector(getCompletedOnboarding);
   const isInitialized = useSelector(getIsInitialized);
   const seedPhraseBackedUp = useSelector(getSeedPhraseBackedUp);
@@ -34,7 +40,16 @@ export default function OnboardingFlowSwitch() {
   }
 
   if (!isInitialized) {
-    return <Redirect to={{ pathname: ONBOARDING_WELCOME_ROUTE }} />;
+    let redirect;
+    /* eslint-disable prefer-const */
+    ///: BEGIN:ONLY_INCLUDE_IN(flask)
+    redirect = <Redirect to={{ pathname: ONBOARDING_EXPERIMENTAL_AREA }} />;
+    ///: END:ONLY_INCLUDE_IN
+    ///: BEGIN:ONLY_INCLUDE_IN(main,beta)
+    redirect = <Redirect to={{ pathname: ONBOARDING_WELCOME_ROUTE }} />;
+    ///: END:ONLY_INCLUDE_IN
+    /* eslint-enable prefer-const */
+    return redirect;
   }
 
   return <Redirect to={{ pathname: ONBOARDING_UNLOCK_ROUTE }} />;
diff --git a/ui/pages/onboarding-flow/onboarding-flow.js b/ui/pages/onboarding-flow/onboarding-flow.js
index 78f7d3144..4d8bf1111 100644
--- a/ui/pages/onboarding-flow/onboarding-flow.js
+++ b/ui/pages/onboarding-flow/onboarding-flow.js
@@ -3,6 +3,9 @@ import { Switch, Route, useHistory, useLocation } from 'react-router-dom';
 import { useDispatch, useSelector } from 'react-redux';
 import Unlock from '../unlock-page';
 import {
+  ///: BEGIN:ONLY_INCLUDE_IN(flask)
+  ONBOARDING_EXPERIMENTAL_AREA,
+  ///: END:ONLY_INCLUDE_IN
   ONBOARDING_CREATE_PASSWORD_ROUTE,
   ONBOARDING_REVIEW_SRP_ROUTE,
   ONBOARDING_CONFIRM_SRP_ROUTE,
@@ -30,6 +33,9 @@ import {
 import { getFirstTimeFlowTypeRoute } from '../../selectors';
 import Button from '../../components/ui/button';
 import { useI18nContext } from '../../hooks/useI18nContext';
+///: BEGIN:ONLY_INCLUDE_IN(flask)
+import ExperimentalArea from '../../components/app/flask/experimental-area';
+///: END:ONLY_INCLUDE_IN
 import OnboardingFlowSwitch from './onboarding-flow-switch/onboarding-flow-switch';
 import CreatePassword from './create-password/create-password';
 import ReviewRecoveryPhrase from './recovery-phrase/review-recovery-phrase';
@@ -161,6 +167,21 @@ export default function OnboardingFlow() {
             path={ONBOARDING_METAMETRICS}
             component={MetaMetricsComponent}
           />
+          {
+            ///: BEGIN:ONLY_INCLUDE_IN(flask)
+          }
+          <Route
+            path={ONBOARDING_EXPERIMENTAL_AREA}
+            render={(routeProps) => (
+              <ExperimentalArea
+                {...routeProps}
+                redirectTo={ONBOARDING_WELCOME_ROUTE}
+              />
+            )}
+          />
+          {
+            ///: END:ONLY_INCLUDE_IN
+          }
           <Route exact path="*" component={OnboardingFlowSwitch} />
         </Switch>
       </div>
diff --git a/ui/pages/pages.scss b/ui/pages/pages.scss
index 878344063..756a92df2 100644
--- a/ui/pages/pages.scss
+++ b/ui/pages/pages.scss
@@ -6,7 +6,7 @@
 @import 'confirm-decrypt-message/confirm-decrypt-message';
 @import 'confirm-encryption-public-key/confirm-encryption-public-key';
 @import 'confirm-transaction-base/gas-details-item/gas-details-item';
-@import 'confirm-transaction-base/low-priority-message/low-priority-message';
+@import 'confirm-transaction-base/transaction-alerts/transaction-alerts';
 @import 'confirmation/confirmation';
 @import 'connected-sites/index';
 @import 'connected-accounts/index';
diff --git a/ui/pages/routes/routes.component.js b/ui/pages/routes/routes.component.js
index 8e4ca834f..ae2142891 100644
--- a/ui/pages/routes/routes.component.js
+++ b/ui/pages/routes/routes.component.js
@@ -66,6 +66,7 @@ import {
 import { getEnvironmentType } from '../../../app/scripts/lib/util';
 import ConfirmationPage from '../confirmation';
 import OnboardingFlow from '../onboarding-flow/onboarding-flow';
+import QRHardwarePopover from '../../components/app/qr-hardware-popover';
 
 export default class Routes extends Component {
   static propTypes = {
@@ -76,8 +77,6 @@ export default class Routes extends Component {
     alertMessage: PropTypes.string,
     textDirection: PropTypes.string,
     isNetworkLoading: PropTypes.bool,
-    provider: PropTypes.object,
-    frequentRpcListDetail: PropTypes.array,
     alertOpen: PropTypes.bool,
     isUnlocked: PropTypes.bool,
     setLastActiveTime: PropTypes.func,
@@ -87,10 +86,12 @@ export default class Routes extends Component {
     isMouseUser: PropTypes.bool,
     setMouseUserState: PropTypes.func,
     providerId: PropTypes.string,
+    providerType: PropTypes.string,
     autoLockTimeLimit: PropTypes.number,
     pageChanged: PropTypes.func.isRequired,
     prepareToLeaveSwaps: PropTypes.func,
-    browserEnvironment: PropTypes.object,
+    browserEnvironmentOs: PropTypes.string,
+    browserEnvironmentBrowser: PropTypes.string,
   };
 
   static contextTypes = {
@@ -285,6 +286,13 @@ export default class Routes extends Component {
     );
   }
 
+  onAppHeaderClick = async () => {
+    const { prepareToLeaveSwaps } = this.props;
+    if (this.onSwapsPage()) {
+      await prepareToLeaveSwaps();
+    }
+  };
+
   render() {
     const {
       isLoading,
@@ -293,19 +301,16 @@ export default class Routes extends Component {
       textDirection,
       loadingMessage,
       isNetworkLoading,
-      provider,
-      frequentRpcListDetail,
       setMouseUserState,
       isMouseUser,
-      prepareToLeaveSwaps,
-      browserEnvironment,
+      browserEnvironmentOs: os,
+      browserEnvironmentBrowser: browser,
     } = this.props;
     const loadMessage =
       loadingMessage || isNetworkLoading
         ? this.getConnectingLabel(loadingMessage)
         : null;
 
-    const { os, browser } = browserEnvironment;
     return (
       <div
         className={classnames('app', {
@@ -321,17 +326,14 @@ export default class Routes extends Component {
           }
         }}
       >
+        <QRHardwarePopover />
         <Modal />
         <Alert visible={this.props.alertOpen} msg={alertMessage} />
         {!this.hideAppHeader() && (
           <AppHeader
             hideNetworkIndicator={this.onInitializationUnlockPage()}
             disableNetworkIndicator={this.onSwapsPage()}
-            onClick={async () => {
-              if (this.onSwapsPage()) {
-                await prepareToLeaveSwaps();
-              }
-            }}
+            onClick={this.onAppHeaderClick}
             disabled={
               this.onConfirmPage() ||
               (this.onSwapsPage() && !this.onSwapsBuildQuotePage())
@@ -341,10 +343,7 @@ export default class Routes extends Component {
         {process.env.ONBOARDING_V2 && this.showOnboardingHeader() && (
           <OnboardingAppHeader />
         )}
-        <NetworkDropdown
-          provider={provider}
-          frequentRpcListDetail={frequentRpcListDetail}
-        />
+        <NetworkDropdown />
         <AccountMenu />
         <div className="main-container-wrapper">
           {isLoading ? <Loading loadingMessage={loadMessage} /> : null}
@@ -374,9 +373,9 @@ export default class Routes extends Component {
     if (loadingMessage) {
       return loadingMessage;
     }
-    const { provider, providerId } = this.props;
+    const { providerType, providerId } = this.props;
 
-    switch (provider.type) {
+    switch (providerType) {
       case 'mainnet':
         return this.context.t('connectingToMainnet');
       case 'ropsten':
@@ -391,21 +390,4 @@ export default class Routes extends Component {
         return this.context.t('connectingTo', [providerId]);
     }
   }
-
-  getNetworkName() {
-    switch (this.props.provider.type) {
-      case 'mainnet':
-        return this.context.t('mainnet');
-      case 'ropsten':
-        return this.context.t('ropsten');
-      case 'kovan':
-        return this.context.t('kovan');
-      case 'rinkeby':
-        return this.context.t('rinkeby');
-      case 'goerli':
-        return this.context.t('goerli');
-      default:
-        return this.context.t('unknownNetwork');
-    }
-  }
 }
diff --git a/ui/pages/routes/routes.container.js b/ui/pages/routes/routes.container.js
index a9f0d977a..e8f6ba6ad 100644
--- a/ui/pages/routes/routes.container.js
+++ b/ui/pages/routes/routes.container.js
@@ -5,7 +5,6 @@ import {
   getNetworkIdentifier,
   getPreferences,
   isNetworkLoading,
-  submittedPendingTransactionsSelector,
 } from '../../selectors';
 import {
   lockMetamask,
@@ -29,15 +28,14 @@ function mapStateToProps(state) {
     isLoading,
     loadingMessage,
     isUnlocked: state.metamask.isUnlocked,
-    submittedPendingTransactions: submittedPendingTransactionsSelector(state),
     isNetworkLoading: isNetworkLoading(state),
-    provider: state.metamask.provider,
-    frequentRpcListDetail: state.metamask.frequentRpcListDetail || [],
     currentCurrency: state.metamask.currentCurrency,
     isMouseUser: state.appState.isMouseUser,
-    providerId: getNetworkIdentifier(state),
     autoLockTimeLimit,
-    browserEnvironment: state.metamask.browserEnvironment,
+    browserEnvironmentOs: state.metamask.browserEnvironment?.os,
+    browserEnvironmentContainter: state.metamask.browserEnvironment?.browser,
+    providerId: getNetworkIdentifier(state),
+    providerType: state.metamask.provider?.type,
   };
 }
 
diff --git a/ui/pages/send/send-content/send-content.component.js b/ui/pages/send/send-content/send-content.component.js
index fd44a1c41..9f9acd944 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 NicknamePopovers from '../../../components/app/modals/nickname-popovers';
 import {
   ETH_GAS_PRICE_FETCH_WARNING_KEY,
   GAS_PRICE_FETCH_FAILURE_ERROR_KEY,
@@ -16,13 +17,16 @@ import SendAssetRow from './send-asset-row';
 import SendGasRow from './send-gas-row';
 
 export default class SendContent extends Component {
+  state = {
+    showNicknamePopovers: false,
+  };
+
   static contextTypes = {
     t: PropTypes.func,
   };
 
   static propTypes = {
     isAssetSendable: PropTypes.bool,
-    showAddToAddressBookModal: PropTypes.func,
     showHexData: PropTypes.bool,
     contact: PropTypes.object,
     isOwnedAccount: PropTypes.bool,
@@ -34,6 +38,7 @@ export default class SendContent extends Component {
     networkOrAccountNotSupports1559: PropTypes.bool,
     getIsBalanceInsufficient: PropTypes.bool,
     asset: PropTypes.object,
+    to: PropTypes.string,
   };
 
   render() {
@@ -81,24 +86,29 @@ export default class SendContent extends Component {
 
   maybeRenderAddContact() {
     const { t } = this.context;
-    const {
-      isOwnedAccount,
-      showAddToAddressBookModal,
-      contact = {},
-    } = this.props;
+    const { isOwnedAccount, contact = {}, to } = this.props;
+    const { showNicknamePopovers } = this.state;
 
     if (isOwnedAccount || contact.name) {
       return null;
     }
 
     return (
-      <Dialog
-        type="message"
-        className="send__dialog"
-        onClick={showAddToAddressBookModal}
-      >
-        {t('newAccountDetectedDialogMessage')}
-      </Dialog>
+      <>
+        <Dialog
+          type="message"
+          className="send__dialog"
+          onClick={() => this.setState({ showNicknamePopovers: true })}
+        >
+          {t('newAccountDetectedDialogMessage')}
+        </Dialog>
+        {showNicknamePopovers ? (
+          <NicknamePopovers
+            onClose={() => this.setState({ showNicknamePopovers: false })}
+            address={to}
+          />
+        ) : null}
+      </>
     );
   }
 
diff --git a/ui/pages/send/send-content/send-content.container.js b/ui/pages/send/send-content/send-content.container.js
index e5d1c62b9..814af712d 100644
--- a/ui/pages/send/send-content/send-content.container.js
+++ b/ui/pages/send/send-content/send-content.container.js
@@ -13,7 +13,6 @@ import {
   getSendAsset,
 } from '../../../ducks/send';
 
-import * as actions from '../../../store/actions';
 import SendContent from './send-content.component';
 
 function mapStateToProps(state) {
@@ -38,30 +37,4 @@ function mapStateToProps(state) {
   };
 }
 
-function mapDispatchToProps(dispatch) {
-  return {
-    showAddToAddressBookModal: (recipient) =>
-      dispatch(
-        actions.showModal({
-          name: 'ADD_TO_ADDRESSBOOK',
-          recipient,
-        }),
-      ),
-  };
-}
-
-function mergeProps(stateProps, dispatchProps, ownProps) {
-  const { to, ...restStateProps } = stateProps;
-  return {
-    ...ownProps,
-    ...restStateProps,
-    showAddToAddressBookModal: () =>
-      dispatchProps.showAddToAddressBookModal(to),
-  };
-}
-
-export default connect(
-  mapStateToProps,
-  mapDispatchToProps,
-  mergeProps,
-)(SendContent);
+export default connect(mapStateToProps)(SendContent);
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.component.js b/ui/pages/settings/experimental-tab/experimental-tab.component.js
index db41d008a..1dc9cb549 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.component.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.component.js
@@ -11,6 +11,10 @@ export default class ExperimentalTab extends PureComponent {
   static propTypes = {
     useTokenDetection: PropTypes.bool,
     setUseTokenDetection: PropTypes.func,
+    useCollectibleDetection: PropTypes.bool,
+    setUseCollectibleDetection: PropTypes.func,
+    setOpenSeaEnabled: PropTypes.func,
+    openSeaEnabled: PropTypes.func,
   };
 
   renderTokenDetectionToggle() {
@@ -48,10 +52,94 @@ export default class ExperimentalTab extends PureComponent {
     );
   }
 
+  renderCollectibleDetectionToggle() {
+    if (!process.env.COLLECTIBLES_V1) {
+      return null;
+    }
+
+    const { t } = this.context;
+    const {
+      useCollectibleDetection,
+      setUseCollectibleDetection,
+      openSeaEnabled,
+    } = this.props;
+
+    return (
+      <div className="settings-page__content-row">
+        <div className="settings-page__content-item">
+          <span>{t('useCollectibleDetection')}</span>
+          <div className="settings-page__content-description">
+            {t('useCollectibleDetectionDescription')}
+          </div>
+        </div>
+        <div className="settings-page__content-item">
+          <div className="settings-page__content-item-col">
+            <ToggleButton
+              disabled={!openSeaEnabled}
+              value={useCollectibleDetection}
+              onToggle={(value) => {
+                this.context.metricsEvent({
+                  eventOpts: {
+                    category: 'Settings',
+                    action: 'Collectible Detection',
+                    name: 'Collectible Detection',
+                  },
+                });
+                setUseCollectibleDetection(!value);
+              }}
+              offLabel={t('off')}
+              onLabel={t('on')}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  renderOpenSeaEnabledToggle() {
+    if (!process.env.COLLECTIBLES_V1) {
+      return null;
+    }
+    const { t } = this.context;
+    const { openSeaEnabled, setOpenSeaEnabled } = this.props;
+
+    return (
+      <div className="settings-page__content-row">
+        <div className="settings-page__content-item">
+          <span>{t('enableOpenSeaAPI')}</span>
+          <div className="settings-page__content-description">
+            {t('enableOpenSeaAPIDescription')}
+          </div>
+        </div>
+        <div className="settings-page__content-item">
+          <div className="settings-page__content-item-col">
+            <ToggleButton
+              value={openSeaEnabled}
+              onToggle={(value) => {
+                this.context.metricsEvent({
+                  eventOpts: {
+                    category: 'Settings',
+                    action: 'Enabled/Disable OpenSea',
+                    name: 'Enabled/Disable OpenSea',
+                  },
+                });
+                setOpenSeaEnabled(!value);
+              }}
+              offLabel={t('off')}
+              onLabel={t('on')}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   render() {
     return (
       <div className="settings-page__body">
         {this.renderTokenDetectionToggle()}
+        {this.renderOpenSeaEnabledToggle()}
+        {this.renderCollectibleDetectionToggle()}
       </div>
     );
   }
diff --git a/ui/pages/settings/experimental-tab/experimental-tab.container.js b/ui/pages/settings/experimental-tab/experimental-tab.container.js
index 6af85154d..ac26f10ab 100644
--- a/ui/pages/settings/experimental-tab/experimental-tab.container.js
+++ b/ui/pages/settings/experimental-tab/experimental-tab.container.js
@@ -1,19 +1,32 @@
 import { compose } from 'redux';
 import { connect } from 'react-redux';
 import { withRouter } from 'react-router-dom';
-import { setUseTokenDetection } from '../../../store/actions';
-import { getUseTokenDetection } from '../../../selectors';
+import {
+  setUseTokenDetection,
+  setUseCollectibleDetection,
+  setOpenSeaEnabled,
+} from '../../../store/actions';
+import {
+  getUseTokenDetection,
+  getUseCollectibleDetection,
+  getOpenSeaEnabled,
+} from '../../../selectors';
 import ExperimentalTab from './experimental-tab.component';
 
 const mapStateToProps = (state) => {
   return {
     useTokenDetection: getUseTokenDetection(state),
+    useCollectibleDetection: getUseCollectibleDetection(state),
+    openSeaEnabled: getOpenSeaEnabled(state),
   };
 };
 
 const mapDispatchToProps = (dispatch) => {
   return {
     setUseTokenDetection: (val) => dispatch(setUseTokenDetection(val)),
+    setUseCollectibleDetection: (val) =>
+      dispatch(setUseCollectibleDetection(val)),
+    setOpenSeaEnabled: (val) => dispatch(setOpenSeaEnabled(val)),
   };
 };
 
diff --git a/ui/pages/swaps/__snapshots__/index.test.js.snap b/ui/pages/swaps/__snapshots__/index.test.js.snap
index e35876ecb..779bb7855 100644
--- a/ui/pages/swaps/__snapshots__/index.test.js.snap
+++ b/ui/pages/swaps/__snapshots__/index.test.js.snap
@@ -11,6 +11,9 @@ exports[`Swap renders the component with initial props 1`] = `
       <div
         class="swaps__header"
       >
+        <div
+          class="swaps__header-edit"
+        />
         <div
           class="swaps__title"
         >
diff --git a/ui/pages/swaps/awaiting-swap/awaiting-swap.js b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
index 8fbeeab83..f3c1b5f5d 100644
--- a/ui/pages/swaps/awaiting-swap/awaiting-swap.js
+++ b/ui/pages/swaps/awaiting-swap/awaiting-swap.js
@@ -26,6 +26,8 @@ import {
   navigateBackToBuildQuote,
   prepareForRetryGetQuotes,
   prepareToLeaveSwaps,
+  getFromTokenInputValue,
+  getMaxSlippage,
 } from '../../../ducks/swaps/swaps';
 import Mascot from '../../../components/ui/mascot';
 import Box from '../../../components/ui/box';
@@ -58,8 +60,6 @@ export default function AwaitingSwap({
   txHash,
   tokensReceived,
   submittingSwap,
-  inputValue,
-  maxSlippage,
 }) {
   const t = useContext(I18nContext);
   const metaMetricsEvent = useContext(MetaMetricsContext);
@@ -69,6 +69,8 @@ export default function AwaitingSwap({
 
   const fetchParams = useSelector(getFetchParams);
   const { destinationTokenInfo, sourceTokenInfo } = fetchParams?.metaData || {};
+  const fromTokenInputValue = useSelector(getFromTokenInputValue);
+  const maxSlippage = useSelector(getMaxSlippage);
   const usedQuote = useSelector(getUsedQuote);
   const approveTxParams = useSelector(getApproveTxParams);
   const swapsGasPrice = useSelector(getUsedSwapsGasPrice);
@@ -283,7 +285,7 @@ export default function AwaitingSwap({
             await dispatch(
               fetchQuotesAndSetQuoteState(
                 history,
-                inputValue,
+                fromTokenInputValue,
                 maxSlippage,
                 metaMetricsEvent,
               ),
@@ -321,6 +323,4 @@ AwaitingSwap.propTypes = {
     CONTRACT_DATA_DISABLED_ERROR,
   ]),
   submittingSwap: PropTypes.bool,
-  inputValue: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  maxSlippage: PropTypes.number,
 };
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 844710b12..4314aea3a 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
@@ -14,25 +14,20 @@ exports[`BuildQuote renders the component with initial props 1`] = `
     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"
   >
     3%
   </button>
   <button
-    aria-checked="true"
-    class="button-group__button slippage-buttons__button-group-custom-button radio-button--danger radio-button button-group__button--active radio-button--active"
+    aria-checked="false"
+    class="button-group__button slippage-buttons__button-group-custom-button radio-button"
     data-testid="button-group__button2"
     role="radio"
   >
-    15
-    <div
-      class="slippage-buttons__percentage-suffix"
-    >
-      %
-    </div>
+    custom
   </button>
 </div>
 `;
diff --git a/ui/pages/swaps/build-quote/build-quote.js b/ui/pages/swaps/build-quote/build-quote.js
index 32e25816d..04fb4553a 100644
--- a/ui/pages/swaps/build-quote/build-quote.js
+++ b/ui/pages/swaps/build-quote/build-quote.js
@@ -1,6 +1,7 @@
 import React, { useContext, useEffect, useState, useCallback } from 'react';
+import BigNumber from 'bignumber.js';
 import PropTypes from 'prop-types';
-import { useDispatch, useSelector } from 'react-redux';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import classnames from 'classnames';
 import { uniqBy, isEqual } from 'lodash';
 import { useHistory } from 'react-router-dom';
@@ -34,7 +35,15 @@ import {
   getTopAssets,
   getFetchParams,
   getQuotes,
+  setBalanceError,
+  setFromTokenInputValue,
+  setFromTokenError,
+  setMaxSlippage,
   setReviewSwapClickedTimestamp,
+  getFromTokenInputValue,
+  getFromTokenError,
+  getMaxSlippage,
+  getIsFeatureFlagLoaded,
 } from '../../../ducks/swaps/swaps';
 import {
   getSwapsDefaultToken,
@@ -77,6 +86,7 @@ import {
   stopPollingForQuotes,
 } from '../../../store/actions';
 import {
+  countDecimals,
   fetchTokenPrice,
   fetchTokenBalance,
   shouldEnableDirectWrapping,
@@ -94,14 +104,8 @@ const MAX_ALLOWED_SLIPPAGE = 15;
 let timeoutIdForQuotesPrefetching;
 
 export default function BuildQuote({
-  inputValue,
-  onInputChange,
   ethBalance,
-  setMaxSlippage,
-  maxSlippage,
   selectedAccountAddress,
-  isFeatureFlagLoaded,
-  tokenFromError,
   shuffledTokensList,
 }) {
   const t = useContext(I18nContext);
@@ -114,18 +118,22 @@ export default function BuildQuote({
   );
   const [verificationClicked, setVerificationClicked] = useState(false);
 
+  const isFeatureFlagLoaded = useSelector(getIsFeatureFlagLoaded);
   const balanceError = useSelector(getBalanceError);
-  const fetchParams = useSelector(getFetchParams);
+  const fetchParams = useSelector(getFetchParams, isEqual);
   const { sourceTokenInfo = {}, destinationTokenInfo = {} } =
     fetchParams?.metaData || {};
-  const tokens = useSelector(getTokens);
+  const tokens = useSelector(getTokens, isEqual);
   const topAssets = useSelector(getTopAssets);
-  const fromToken = useSelector(getFromToken);
+  const fromToken = useSelector(getFromToken, isEqual);
+  const fromTokenInputValue = useSelector(getFromTokenInputValue);
+  const fromTokenError = useSelector(getFromTokenError);
+  const maxSlippage = useSelector(getMaxSlippage);
   const toToken = useSelector(getToToken) || destinationTokenInfo;
-  const defaultSwapsToken = useSelector(getSwapsDefaultToken);
+  const defaultSwapsToken = useSelector(getSwapsDefaultToken, isEqual);
   const chainId = useSelector(getCurrentChainId);
-  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider);
-  const tokenList = useSelector(getTokenList);
+  const rpcPrefs = useSelector(getRpcPrefsForCurrentProvider, shallowEqual);
+  const tokenList = useSelector(getTokenList, isEqual);
   const useTokenDetection = useSelector(getUseTokenDetection);
   const quotes = useSelector(getQuotes, isEqual);
   const areQuotesPresent = Object.keys(quotes).length > 0;
@@ -198,7 +206,7 @@ export default function BuildQuote({
 
   const swapFromTokenFiatValue = useTokenFiatAmount(
     fromTokenAddress,
-    inputValue || 0,
+    fromTokenInputValue || 0,
     fromTokenSymbol,
     {
       showFiat: true,
@@ -206,7 +214,7 @@ export default function BuildQuote({
     true,
   );
   const swapFromEthFiatValue = useEthFiatAmount(
-    inputValue || 0,
+    fromTokenInputValue || 0,
     { showFiat: true },
     true,
   );
@@ -214,6 +222,27 @@ export default function BuildQuote({
     ? swapFromEthFiatValue
     : swapFromTokenFiatValue;
 
+  const onInputChange = useCallback(
+    (newInputValue, balance) => {
+      dispatch(setFromTokenInputValue(newInputValue));
+      const newBalanceError = new BigNumber(newInputValue || 0).gt(
+        balance || 0,
+      );
+      // "setBalanceError" is just a warning, a user can still click on the "Review Swap" button.
+      if (balanceError !== newBalanceError) {
+        dispatch(setBalanceError(newBalanceError));
+      }
+      dispatch(
+        setFromTokenError(
+          fromToken && countDecimals(newInputValue) > fromToken.decimals
+            ? 'tooManyDecimals'
+            : null,
+        ),
+      );
+    },
+    [dispatch, fromToken, balanceError],
+  );
+
   const onFromSelect = (token) => {
     if (
       token?.address &&
@@ -255,7 +284,7 @@ export default function BuildQuote({
     }
     dispatch(setSwapsFromToken(token));
     onInputChange(
-      token?.address ? inputValue : '',
+      token?.address ? fromTokenInputValue : '',
       token.string,
       token.decimals,
     );
@@ -364,9 +393,14 @@ export default function BuildQuote({
 
   useEffect(() => {
     if (prevFromTokenBalance !== fromTokenBalance) {
-      onInputChange(inputValue, fromTokenBalance);
+      onInputChange(fromTokenInputValue, fromTokenBalance);
     }
-  }, [onInputChange, prevFromTokenBalance, inputValue, fromTokenBalance]);
+  }, [
+    onInputChange,
+    prevFromTokenBalance,
+    fromTokenInputValue,
+    fromTokenBalance,
+  ]);
 
   useEffect(() => {
     dispatch(resetSwapsPostFetchState());
@@ -416,9 +450,9 @@ export default function BuildQuote({
     selectedToToken.address,
   );
   const isReviewSwapButtonDisabled =
-    tokenFromError ||
+    fromTokenError ||
     !isFeatureFlagLoaded ||
-    !Number(inputValue) ||
+    !Number(fromTokenInputValue) ||
     !selectedToToken?.address ||
     Number(maxSlippage) < 0 ||
     Number(maxSlippage) > MAX_ALLOWED_SLIPPAGE ||
@@ -433,7 +467,7 @@ export default function BuildQuote({
       await dispatch(
         fetchQuotesAndSetQuoteState(
           history,
-          inputValue,
+          fromTokenInputValue,
           maxSlippage,
           metaMetricsEvent,
           pageRedirectionDisabled,
@@ -456,7 +490,7 @@ export default function BuildQuote({
     maxSlippage,
     metaMetricsEvent,
     isReviewSwapButtonDisabled,
-    inputValue,
+    fromTokenInputValue,
     fromTokenAddress,
     toTokenAddress,
   ]);
@@ -484,8 +518,8 @@ export default function BuildQuote({
           onInputChange={(value) => {
             onInputChange(value, fromTokenBalance);
           }}
-          inputValue={inputValue}
-          leftValue={inputValue && swapFromFiatValue}
+          inputValue={fromTokenInputValue}
+          leftValue={fromTokenInputValue && swapFromFiatValue}
           selectedItem={selectedFromToken}
           maxListItems={30}
           loading={
@@ -504,14 +538,14 @@ export default function BuildQuote({
         <div
           className={classnames('build-quote__balance-message', {
             'build-quote__balance-message--error':
-              balanceError || tokenFromError,
+              balanceError || fromTokenError,
           })}
         >
-          {!tokenFromError &&
+          {!fromTokenError &&
             !balanceError &&
             fromTokenSymbol &&
             swapYourTokenBalance}
-          {!tokenFromError && balanceError && fromTokenSymbol && (
+          {!fromTokenError && balanceError && fromTokenSymbol && (
             <div className="build-quite__insufficient-funds">
               <div className="build-quite__insufficient-funds-first">
                 {t('swapsNotEnoughForTx', [fromTokenSymbol])}
@@ -521,7 +555,7 @@ export default function BuildQuote({
               </div>
             </div>
           )}
-          {tokenFromError && (
+          {fromTokenError && (
             <>
               <div className="build-quote__form-error">
                 {t('swapTooManyDecimalsError', [
@@ -645,7 +679,7 @@ export default function BuildQuote({
           <div className="build-quote__slippage-buttons-container">
             <SlippageButtons
               onSelect={(newSlippage) => {
-                setMaxSlippage(newSlippage);
+                dispatch(setMaxSlippage(newSlippage));
               }}
               maxAllowedSlippage={MAX_ALLOWED_SLIPPAGE}
               currentSlippage={maxSlippage}
@@ -664,7 +698,7 @@ export default function BuildQuote({
             dispatch(
               fetchQuotesAndSetQuoteState(
                 history,
-                inputValue,
+                fromTokenInputValue,
                 maxSlippage,
                 metaMetricsEvent,
               ),
@@ -688,13 +722,7 @@ export default function BuildQuote({
 }
 
 BuildQuote.propTypes = {
-  maxSlippage: PropTypes.number,
-  inputValue: PropTypes.string,
-  onInputChange: PropTypes.func,
   ethBalance: PropTypes.string,
-  setMaxSlippage: PropTypes.func,
   selectedAccountAddress: PropTypes.string,
-  isFeatureFlagLoaded: PropTypes.bool.isRequired,
-  tokenFromError: PropTypes.string,
   shuffledTokensList: PropTypes.array,
 };
diff --git a/ui/pages/swaps/build-quote/build-quote.test.js b/ui/pages/swaps/build-quote/build-quote.test.js
index 759ebb9b2..12f1b27bc 100644
--- a/ui/pages/swaps/build-quote/build-quote.test.js
+++ b/ui/pages/swaps/build-quote/build-quote.test.js
@@ -1,7 +1,6 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { fireEvent } from '@testing-library/react';
 
 import {
   renderWithProvider,
@@ -13,11 +12,7 @@ import BuildQuote from '.';
 const middleware = [thunk];
 const createProps = (customProps = {}) => {
   return {
-    inputValue: '5',
-    onInputChange: jest.fn(),
     ethBalance: '0x8',
-    setMaxSlippage: jest.fn(),
-    maxSlippage: 15,
     selectedAccountAddress: 'selectedAccountAddress',
     isFeatureFlagLoaded: false,
     shuffledTokensList: [],
@@ -49,28 +44,4 @@ describe('BuildQuote', () => {
       document.querySelector('.slippage-buttons__button-group'),
     ).toMatchSnapshot();
   });
-
-  it('clicks on the max button', () => {
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const props = createProps();
-    const { getByTestId } = renderWithProvider(
-      <BuildQuote {...props} />,
-      store,
-    );
-    fireEvent.click(getByTestId('build-quote__max-button'));
-    expect(props.onInputChange).toHaveBeenCalled();
-  });
-
-  it('types a number inside the input field', () => {
-    const store = configureMockStore(middleware)(createSwapsMockStore());
-    const props = createProps();
-    const { getByDisplayValue } = renderWithProvider(
-      <BuildQuote {...props} />,
-      store,
-    );
-    fireEvent.change(getByDisplayValue('5'), {
-      target: { value: '8' },
-    });
-    expect(props.onInputChange).toHaveBeenCalled();
-  });
 });
diff --git a/ui/pages/swaps/countdown-timer/__snapshots__/timer-icon.test.js.snap b/ui/pages/swaps/countdown-timer/__snapshots__/timer-icon.test.js.snap
new file mode 100644
index 000000000..e6649485e
--- /dev/null
+++ b/ui/pages/swaps/countdown-timer/__snapshots__/timer-icon.test.js.snap
@@ -0,0 +1,18 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`TimerIcon renders the TimerIcon component 1`] = `
+<div>
+  <svg
+    fill="none"
+    height="15"
+    viewBox="0 0 15 15"
+    width="15"
+    xmlns="http://www.w3.org/2000/svg"
+  >
+    <path
+      d="M7.49835 0.510498C3.75226 0.510498 0.717102 3.54565 0.717102 7.29175C0.717102 11.0378 3.75226 14.073 7.49835 14.073C11.2444 14.073 14.2796 11.0378 14.2796 7.29175C14.2796 3.54565 11.2444 0.510498 7.49835 0.510498ZM7.49835 12.7605C4.4632 12.7605 2.0296 10.3269 2.0296 7.29175C2.0296 4.28394 4.4632 1.823 7.49835 1.823C10.5062 1.823 12.9671 4.28394 12.9671 7.29175C12.9671 10.3269 10.5062 12.7605 7.49835 12.7605ZM9.16632 9.91675C9.33038 10.0261 9.52179 9.99878 9.63116 9.83472L10.1507 9.15112C10.2601 8.98706 10.2327 8.79565 10.0687 8.68628L8.26398 7.34644V3.46362C8.26398 3.29956 8.09991 3.1355 7.93585 3.1355H7.06085C6.86945 3.1355 6.73273 3.29956 6.73273 3.46362V7.97534C6.73273 8.05737 6.76007 8.16675 6.8421 8.22144L9.16632 9.91675Z"
+      fill="#037DD6"
+    />
+  </svg>
+</div>
+`;
diff --git a/ui/pages/swaps/countdown-timer/countdown-timer.js b/ui/pages/swaps/countdown-timer/countdown-timer.js
index e35f666ce..b34301ebb 100644
--- a/ui/pages/swaps/countdown-timer/countdown-timer.js
+++ b/ui/pages/swaps/countdown-timer/countdown-timer.js
@@ -7,6 +7,7 @@ import { I18nContext } from '../../../contexts/i18n';
 import InfoTooltip from '../../../components/ui/info-tooltip';
 import { getSwapsQuoteRefreshTime } from '../../../ducks/swaps/swaps';
 import { SECOND } from '../../../../shared/constants/time';
+import TimerIcon from './timer-icon';
 
 // Return the mm:ss start time of the countdown timer.
 // If time has elapsed between `timeStarted` the time current time,
@@ -101,6 +102,7 @@ export default function CountdownTimer({
             warningTime && timeBelowWarningTime(timer, warningTime),
         })}
       >
+        <TimerIcon />
         {time}
       </div>
       {!timeOnly && infoTooltipLabelKey ? (
diff --git a/ui/pages/swaps/countdown-timer/countdown-timer.test.js b/ui/pages/swaps/countdown-timer/countdown-timer.test.js
index 49f37dcd6..a6317785d 100644
--- a/ui/pages/swaps/countdown-timer/countdown-timer.test.js
+++ b/ui/pages/swaps/countdown-timer/countdown-timer.test.js
@@ -14,7 +14,6 @@ const createProps = (customProps = {}) => {
     timerBase: 5,
     warningTime: '0:30',
     labelKey: 'swapNewQuoteIn',
-    infoTooltipLabelKey: 'swapQuotesAreRefreshed',
     ...customProps,
   };
 };
diff --git a/ui/pages/swaps/countdown-timer/index.scss b/ui/pages/swaps/countdown-timer/index.scss
index f7ae64368..8f065a402 100644
--- a/ui/pages/swaps/countdown-timer/index.scss
+++ b/ui/pages/swaps/countdown-timer/index.scss
@@ -1,7 +1,6 @@
 .countdown-timer {
   @include H7;
 
-  font-weight: bold;
   display: flex;
   justify-content: center;
 
@@ -15,6 +14,7 @@
 
     > span {
       display: flex;
+      padding-left: 4px;
     }
 
     &--warning {
@@ -27,6 +27,7 @@
   &__time {
     @include H7;
 
+    font-weight: bold;
     width: 24px;
     margin-left: 4px;
     margin-right: 2px;
diff --git a/ui/pages/swaps/countdown-timer/timer-icon.js b/ui/pages/swaps/countdown-timer/timer-icon.js
new file mode 100644
index 000000000..8f4974f72
--- /dev/null
+++ b/ui/pages/swaps/countdown-timer/timer-icon.js
@@ -0,0 +1,18 @@
+import React from 'react';
+
+export default function TimerIcon() {
+  return (
+    <svg
+      width="15"
+      height="15"
+      viewBox="0 0 15 15"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <path
+        d="M7.49835 0.510498C3.75226 0.510498 0.717102 3.54565 0.717102 7.29175C0.717102 11.0378 3.75226 14.073 7.49835 14.073C11.2444 14.073 14.2796 11.0378 14.2796 7.29175C14.2796 3.54565 11.2444 0.510498 7.49835 0.510498ZM7.49835 12.7605C4.4632 12.7605 2.0296 10.3269 2.0296 7.29175C2.0296 4.28394 4.4632 1.823 7.49835 1.823C10.5062 1.823 12.9671 4.28394 12.9671 7.29175C12.9671 10.3269 10.5062 12.7605 7.49835 12.7605ZM9.16632 9.91675C9.33038 10.0261 9.52179 9.99878 9.63116 9.83472L10.1507 9.15112C10.2601 8.98706 10.2327 8.79565 10.0687 8.68628L8.26398 7.34644V3.46362C8.26398 3.29956 8.09991 3.1355 7.93585 3.1355H7.06085C6.86945 3.1355 6.73273 3.29956 6.73273 3.46362V7.97534C6.73273 8.05737 6.76007 8.16675 6.8421 8.22144L9.16632 9.91675Z"
+        fill="#037DD6"
+      />
+    </svg>
+  );
+}
diff --git a/ui/pages/swaps/countdown-timer/timer-icon.test.js b/ui/pages/swaps/countdown-timer/timer-icon.test.js
new file mode 100644
index 000000000..e1cd9d628
--- /dev/null
+++ b/ui/pages/swaps/countdown-timer/timer-icon.test.js
@@ -0,0 +1,11 @@
+import React from 'react';
+
+import { renderWithProvider } from '../../../../test/jest';
+import TimerIcon from './timer-icon';
+
+describe('TimerIcon', () => {
+  it('renders the TimerIcon component', () => {
+    const { container } = renderWithProvider(<TimerIcon />);
+    expect(container).toMatchSnapshot();
+  });
+});
diff --git a/ui/pages/swaps/dropdown-search-list/__snapshots__/dropdown-search-list.test.js.snap b/ui/pages/swaps/dropdown-search-list/__snapshots__/dropdown-search-list.test.js.snap
index 6d8710731..e92d6b8cf 100644
--- a/ui/pages/swaps/dropdown-search-list/__snapshots__/dropdown-search-list.test.js.snap
+++ b/ui/pages/swaps/dropdown-search-list/__snapshots__/dropdown-search-list.test.js.snap
@@ -13,7 +13,7 @@ exports[`DropdownSearchList renders the component with initial props 1`] = `
         class="dropdown-search-list__selector-closed"
       >
         <img
-          alt=""
+          alt="symbol"
           class="url-icon dropdown-search-list__selector-closed-icon"
           src="iconUrl"
         />
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 6d1efdfaa..dea196ec9 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,151 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`FeeCard renders the component with EIP-1559 enabled 1`] = `
-<div
-  class="fee-card__savings-and-quotes-header"
-  data-testid="fee-card__savings-and-quotes-header"
->
-  <div
-    class="fee-card__savings-and-quotes-row"
-  >
-    <p
-      class="fee-card__savings-text"
-    >
-      Using the best quote
-    </p>
-    <div
-      class="fee-card__quote-link-container"
-    >
-      <p
-        class="fee-card__quote-link-text"
-      >
-        6 quotes
-      </p>
-      <div
-        class="fee-card__caret-right"
-      >
-        <i
-          class="fa fa-angle-up"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
+exports[`FeeCard renders the component with EIP-1559 enabled 1`] = `null`;
 
-exports[`FeeCard renders the component with EIP-1559 enabled 2`] = `
-<div
-  class="fee-card__top-bordered-row"
->
-  <div
-    class="fee-card__row-label"
-  >
-    <div
-      class="fee-card__row-header-text"
-    >
-      Quote includes a 0.875% MetaMask fee
-    </div>
-    <div
-      class="info-tooltip"
-    >
-      <div
-        class="fee-card__info-tooltip-container"
-      >
-        <div
-          aria-describedby="tippy-tooltip-7"
-          class="info-tooltip__tooltip-container"
-          data-original-title="null"
-          data-tooltipped=""
-          style="display: inline;"
-          tabindex="0"
-        >
-          <svg
-            viewBox="0 0 10 10"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M5 0C2.2 0 0 2.2 0 5s2.2 5 5 5 5-2.2 5-5-2.2-5-5-5zm0 2c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.2-.7-.6.3-.8.7-.8zm.7 6H4.3V4.3h1.5V8z"
-              fill="#b8b8b8"
-            />
-          </svg>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`FeeCard renders the component with initial props 1`] = `
-<div
-  class="fee-card__savings-and-quotes-header"
-  data-testid="fee-card__savings-and-quotes-header"
->
-  <div
-    class="fee-card__savings-and-quotes-row"
-  >
-    <p
-      class="fee-card__savings-text"
-    >
-      Using the best quote
-    </p>
-    <div
-      class="fee-card__quote-link-container"
-    >
-      <p
-        class="fee-card__quote-link-text"
-      >
-        6 quotes
-      </p>
-      <div
-        class="fee-card__caret-right"
-      >
-        <i
-          class="fa fa-angle-up"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`FeeCard renders the component with initial props 2`] = `
-<div
-  class="fee-card__top-bordered-row"
->
-  <div
-    class="fee-card__row-label"
-  >
-    <div
-      class="fee-card__row-header-text"
-    >
-      Quote includes a 0.875% MetaMask fee
-    </div>
-    <div
-      class="info-tooltip"
-    >
-      <div
-        class="fee-card__info-tooltip-container"
-      >
-        <div
-          aria-describedby="tippy-tooltip-3"
-          class="info-tooltip__tooltip-container"
-          data-original-title="null"
-          data-tooltipped=""
-          style="display: inline;"
-          tabindex="0"
-        >
-          <svg
-            viewBox="0 0 10 10"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M5 0C2.2 0 0 2.2 0 5s2.2 5 5 5 5-2.2 5-5-2.2-5-5-5zm0 2c.4 0 .7.3.7.7s-.3.7-.7.7-.7-.2-.7-.6.3-.8.7-.8zm.7 6H4.3V4.3h1.5V8z"
-              fill="#b8b8b8"
-            />
-          </svg>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
+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 f27a9b566..8bde98618 100644
--- a/ui/pages/swaps/fee-card/fee-card.js
+++ b/ui/pages/swaps/fee-card/fee-card.js
@@ -12,7 +12,6 @@ import {
 } from '../../../../shared/constants/network';
 import TransactionDetail from '../../../components/app/transaction-detail/transaction-detail.component';
 import TransactionDetailItem from '../../../components/app/transaction-detail-item/transaction-detail-item.component';
-import GasTiming from '../../../components/app/gas-timing/gas-timing.component';
 import Typography from '../../../components/ui/typography';
 import {
   COLORS,
@@ -28,28 +27,16 @@ export default function FeeCard({
   secondaryFee,
   hideTokenApprovalRow,
   onFeeCardMaxRowClick,
-  tokenApprovalTextComponent,
   tokenApprovalSourceTokenSymbol,
   onTokenApprovalClick,
   metaMaskFee,
-  isBestQuote,
   numberOfQuotes,
   onQuotesClick,
-  tokenConversionRate,
   chainId,
-  networkAndAccountSupports1559,
-  maxPriorityFeePerGasDecGWEI,
-  maxFeePerGasDecGWEI,
+  isBestQuote,
 }) {
   const t = useContext(I18nContext);
 
-  let bestQuoteText = '';
-  if (isBestQuote && tokenConversionRate) {
-    bestQuoteText = t('swapUsingBestQuote');
-  } else if (tokenConversionRate) {
-    bestQuoteText = t('swapBetterQuoteAvailable');
-  }
-
   const getTranslatedNetworkName = () => {
     switch (chainId) {
       case MAINNET_CHAIN_ID:
@@ -72,194 +59,96 @@ export default function FeeCard({
     event: 'Clicked "Gas Fees: Learn More" Link',
   });
 
+  const tokenApprovalTextComponent = (
+    <span key="fee-card-approve-symbol" className="fee-card__bold">
+      {t('enableToken', [tokenApprovalSourceTokenSymbol])}
+    </span>
+  );
+
   return (
     <div className="fee-card">
-      <div
-        className="fee-card__savings-and-quotes-header"
-        data-testid="fee-card__savings-and-quotes-header"
-      >
-        <div className="fee-card__savings-and-quotes-row">
-          {bestQuoteText && (
-            <p className="fee-card__savings-text">{bestQuoteText}</p>
-          )}
-          {numberOfQuotes > 1 && (
-            <div
-              className="fee-card__quote-link-container"
-              onClick={onQuotesClick}
-            >
-              <p className="fee-card__quote-link-text">
-                {t('swapNQuotes', [numberOfQuotes])}
-              </p>
-              <div className="fee-card__caret-right">
-                <i className="fa fa-angle-up" />
-              </div>
-            </div>
-          )}
-        </div>
-      </div>
       <div className="fee-card__main">
-        {networkAndAccountSupports1559 && (
-          <TransactionDetail
-            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={() => {
-                                gasFeesLearnMoreLinkClickedEvent();
-                                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}
-                subTitle={
-                  <GasTiming
-                    maxPriorityFeePerGas={maxPriorityFeePerGasDecGWEI}
-                    maxFeePerGas={maxFeePerGasDecGWEI}
+        <TransactionDetail
+          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={() => {
+                              gasFeesLearnMoreLinkClickedEvent();
+                              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
                   />
-                }
-                subText={
-                  secondaryFee?.maxFee !== undefined && (
-                    <>
-                      <Typography
-                        tag="span"
-                        fontWeight={FONT_WEIGHT.BOLD}
-                        color={COLORS.UI4}
-                        variant={TYPOGRAPHY.H7}
-                      >
-                        {t('maxFee')}
-                      </Typography>
-                      {`: ${secondaryFee.maxFee}`}
-                      <span
-                        className="fee-card__edit-link"
-                        onClick={() => onFeeCardMaxRowClick()}
-                      >
-                        {t('edit')}
-                      </span>
-                    </>
-                  )
-                }
-              />,
-            ]}
-          />
-        )}
-        {!networkAndAccountSupports1559 && (
-          <div
-            className="fee-card__row-header"
-            data-testid="fee-card__row-header"
-          >
-            <div>
-              <div className="fee-card__row-header-text--bold">
-                {t('swapEstimatedNetworkFee')}
-              </div>
-              <InfoTooltip
-                position="top"
-                contentText={
+                </>
+              }
+              detailText={primaryFee.fee}
+              detailTotal={secondaryFee.fee}
+              subText={
+                secondaryFee?.maxFee !== undefined && (
                   <>
-                    <p className="fee-card__info-tooltip-paragraph">
-                      {t('swapNetworkFeeSummary', [getTranslatedNetworkName()])}
-                    </p>
-                    <p className="fee-card__info-tooltip-paragraph">
-                      {t('swapEstimatedNetworkFeeSummary', [
-                        <span className="fee-card__bold" key="fee-card-bold-1">
-                          {t('swapEstimatedNetworkFee')}
-                        </span>,
-                      ])}
-                    </p>
-                    <p className="fee-card__info-tooltip-paragraph">
-                      {t('swapMaxNetworkFeeInfo', [
-                        <span className="fee-card__bold" key="fee-card-bold-2">
-                          {t('swapMaxNetworkFees')}
-                        </span>,
-                      ])}
-                    </p>
+                    <Typography
+                      tag="span"
+                      fontWeight={FONT_WEIGHT.BOLD}
+                      color={COLORS.UI4}
+                      variant={TYPOGRAPHY.H7}
+                    >
+                      {t('maxFee')}
+                    </Typography>
+                    {`: ${secondaryFee.maxFee}`}
+                    <span
+                      className="fee-card__edit-link"
+                      onClick={() => onFeeCardMaxRowClick()}
+                    >
+                      {t('edit')}
+                    </span>
                   </>
-                }
-                containerClassName="fee-card__info-tooltip-content-container"
-                wrapperClassName="fee-card__row-label fee-card__info-tooltip-container"
-                wide
-              />
-            </div>
-            <div>
-              <div className="fee-card__row-header-secondary--bold">
-                {primaryFee.fee}
-              </div>
-              {secondaryFee && (
-                <div className="fee-card__row-header-primary--bold">
-                  {secondaryFee.fee}
-                </div>
-              )}
-            </div>
-          </div>
-        )}
-        {!networkAndAccountSupports1559 && (
-          <div
-            className="fee-card__row-header"
-            onClick={() => onFeeCardMaxRowClick()}
-          >
-            <div>
-              <div className="fee-card__row-header-text">
-                {t('swapMaxNetworkFees')}
-              </div>
-              <div className="fee-card__link">{t('edit')}</div>
-            </div>
-            <div>
-              <div className="fee-card__row-header-secondary">
-                {primaryFee.maxFee}
-              </div>
-              {secondaryFee?.maxFee !== undefined && (
-                <div className="fee-card__row-header-primary">
-                  {secondaryFee.maxFee}
-                </div>
-              )}
-            </div>
-          </div>
-        )}
-
+                )
+              }
+            />,
+          ]}
+        />
         {!hideTokenApprovalRow && (
           <div className="fee-card__row-header">
             <div className="fee-card__row-label">
               <div className="fee-card__row-header-text">
-                {t('swapThisWillAllowApprove', [tokenApprovalTextComponent])}
+                {t('swapEnableTokenForSwapping', [tokenApprovalTextComponent])}
+                <InfoTooltip
+                  position="top"
+                  contentText={t('swapEnableDescription', [
+                    tokenApprovalSourceTokenSymbol,
+                  ])}
+                  containerClassName="fee-card__info-tooltip-container"
+                />
               </div>
-              <InfoTooltip
-                position="top"
-                contentText={t('swapEnableDescription', [
-                  tokenApprovalSourceTokenSymbol,
-                ])}
-                containerClassName="fee-card__info-tooltip-container"
-              />
             </div>
             <div
               className="fee-card__link"
@@ -269,16 +158,26 @@ export default function FeeCard({
             </div>
           </div>
         )}
-        <div className="fee-card__top-bordered-row">
+        <div className="fee-card__row-header">
           <div className="fee-card__row-label">
             <div className="fee-card__row-header-text">
-              {t('swapQuoteIncludesRate', [metaMaskFee])}
+              {numberOfQuotes > 1 && (
+                <span
+                  onClick={onQuotesClick}
+                  className="fee-card__quote-link-text"
+                >
+                  {isBestQuote
+                    ? t('swapBestOfNQuotes', [numberOfQuotes])
+                    : t('swapNQuotesWithDot', [numberOfQuotes])}
+                </span>
+              )}
+              {t('swapIncludesMMFee', [metaMaskFee])}
+              <InfoTooltip
+                position="top"
+                contentText={t('swapMetaMaskFeeDescription', [metaMaskFee])}
+                wrapperClassName="fee-card__info-tooltip-container"
+              />
             </div>
-            <InfoTooltip
-              position="top"
-              contentText={t('swapMetaMaskFeeDescription', [metaMaskFee])}
-              wrapperClassName="fee-card__info-tooltip-container"
-            />
           </div>
         </div>
       </div>
@@ -297,16 +196,11 @@ FeeCard.propTypes = {
   }),
   onFeeCardMaxRowClick: PropTypes.func.isRequired,
   hideTokenApprovalRow: PropTypes.bool.isRequired,
-  tokenApprovalTextComponent: PropTypes.node,
   tokenApprovalSourceTokenSymbol: PropTypes.string,
   onTokenApprovalClick: PropTypes.func,
   metaMaskFee: PropTypes.string.isRequired,
-  isBestQuote: PropTypes.bool,
   onQuotesClick: PropTypes.func.isRequired,
   numberOfQuotes: PropTypes.number.isRequired,
-  tokenConversionRate: PropTypes.number,
   chainId: PropTypes.string.isRequired,
-  networkAndAccountSupports1559: PropTypes.bool.isRequired,
-  maxPriorityFeePerGasDecGWEI: PropTypes.string,
-  maxFeePerGasDecGWEI: PropTypes.string,
+  isBestQuote: PropTypes.bool.isRequired,
 };
diff --git a/ui/pages/swaps/fee-card/fee-card.stories.js b/ui/pages/swaps/fee-card/fee-card.stories.js
index b25c4b575..5239f9aee 100644
--- a/ui/pages/swaps/fee-card/fee-card.stories.js
+++ b/ui/pages/swaps/fee-card/fee-card.stories.js
@@ -5,7 +5,7 @@ import { MAINNET_CHAIN_ID } from '../../../../shared/constants/network';
 import FeeCard from './fee-card';
 
 const tokenApprovalTextComponent = (
-  <span key="swaps-view-quote-approve-symbol-1" className="view-quote__bold">
+  <span key="fee-card-approve-symbol" className="view-quote__bold">
     ABC
   </span>
 );
diff --git a/ui/pages/swaps/fee-card/fee-card.test.js b/ui/pages/swaps/fee-card/fee-card.test.js
index ffa54affe..ac8d69558 100644
--- a/ui/pages/swaps/fee-card/fee-card.test.js
+++ b/ui/pages/swaps/fee-card/fee-card.test.js
@@ -65,10 +65,7 @@ const createProps = (customProps = {}) => {
     hideTokenApprovalRow: false,
     onFeeCardMaxRowClick: jest.fn(),
     tokenApprovalTextComponent: (
-      <span
-        key="swaps-view-quote-approve-symbol-1"
-        className="view-quote__bold"
-      >
+      <span key="fee-card-approve-symbol" className="fee-card__bold">
         ABC
       </span>
     ),
@@ -90,20 +87,13 @@ describe('FeeCard', () => {
     useSelector.mockImplementation(generateUseSelectorRouter());
     const props = createProps();
     const { getByText } = renderWithProvider(<FeeCard {...props} />);
-    expect(getByText('Using the best quote')).toBeInTheDocument();
-    expect(getByText('6 quotes')).toBeInTheDocument();
-    expect(getByText('Max network fee')).toBeInTheDocument();
-    expect(getByText('Estimated network fee')).toBeInTheDocument();
+    expect(getByText('Best of 6 quotes.')).toBeInTheDocument();
+    expect(getByText('Estimated gas fee')).toBeInTheDocument();
+    expect(getByText('Max fee')).toBeInTheDocument();
     expect(getByText(props.primaryFee.fee)).toBeInTheDocument();
-    expect(getByText(props.primaryFee.maxFee)).toBeInTheDocument();
     expect(getByText(props.secondaryFee.fee)).toBeInTheDocument();
-    expect(getByText(props.secondaryFee.maxFee)).toBeInTheDocument();
-    expect(
-      getByText('Quote includes a 0.875% MetaMask fee'),
-    ).toBeInTheDocument();
-    expect(
-      document.querySelector('.fee-card__savings-and-quotes-header'),
-    ).toMatchSnapshot();
+    expect(getByText(`: ${props.secondaryFee.maxFee}`)).toBeInTheDocument();
+    expect(getByText('Includes a 0.875% MetaMask fee.')).toBeInTheDocument();
     expect(
       document.querySelector('.fee-card__top-bordered-row'),
     ).toMatchSnapshot();
@@ -117,19 +107,13 @@ describe('FeeCard', () => {
       maxFeePerGasDecGWEI: '4',
     });
     const { getByText } = renderWithProvider(<FeeCard {...props} />, store);
-    expect(getByText('Using the best quote')).toBeInTheDocument();
-    expect(getByText('6 quotes')).toBeInTheDocument();
+    expect(getByText('Best of 6 quotes.')).toBeInTheDocument();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
-    expect(getByText('Maybe in 5 minutes')).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('Quote includes a 0.875% MetaMask fee'),
-    ).toBeInTheDocument();
-    expect(
-      document.querySelector('.fee-card__savings-and-quotes-header'),
-    ).toMatchSnapshot();
+    expect(getByText('Includes a 0.875% MetaMask fee.')).toBeInTheDocument();
     expect(
       document.querySelector('.fee-card__top-bordered-row'),
     ).toMatchSnapshot();
diff --git a/ui/pages/swaps/fee-card/index.scss b/ui/pages/swaps/fee-card/index.scss
index 1737fa1b3..3e39de1b5 100644
--- a/ui/pages/swaps/fee-card/index.scss
+++ b/ui/pages/swaps/fee-card/index.scss
@@ -3,26 +3,20 @@
 
   @include H7;
 
-  &__savings-and-quotes-header {
-    display: flex;
-    position: relative;
-    align-items: center;
+  .transaction-detail-rows {
+    margin-top: 8px;
+
+    .transaction-detail-item {
+      &:last-of-type {
+        margin-bottom: 8px;
+      }
+    }
   }
 
-  &__savings-and-quotes-row {
+  &__savings-and-quotes-header {
     display: flex;
-    justify-content: space-between;
+    position: relative;
     align-items: center;
-    width: 100%;
-    left: 58px;
-    height: 39px;
-    background: $Blue-000;
-    border: 1px solid $Blue-500;
-    border-top-right-radius: 8px;
-    border-top-left-radius: 8px;
-    border-bottom: 0;
-    padding-left: 16px;
-    padding-right: 16px;
   }
 
   &__savings-text {
@@ -42,6 +36,8 @@
     @include H7;
 
     color: $Blue-500;
+    cursor: pointer;
+    padding-right: 4px;
   }
 
   &__caret-right {
@@ -59,12 +55,11 @@
   }
 
   &__main {
-    border: 1px solid $Blue-500;
-    border-bottom-left-radius: 8px;
-    border-bottom-right-radius: 8px;
-    width: 100%;
-    max-width: 311px;
-    padding: 16px 16px 12px 16px;
+    .transaction-detail {
+      border-top: 1px solid #bbc0c5;
+      border-bottom: 1px solid #bbc0c5;
+      margin-bottom: 12px;
+    }
   }
 
   &__row-header {
@@ -86,13 +81,22 @@
   &__row-header-text,
   &__row-header-text--bold {
     margin-right: 4px;
-    cursor: pointer;
   }
 
   &__row-header-text--bold {
     color: $Black-100;
   }
 
+  &__row-header-text {
+    display: block;
+    white-space: nowrap;
+
+    .info-tooltip {
+      padding-left: 4px;
+      padding-bottom: 2px;
+    }
+  }
+
   &__row,
   &__top-bordered-row {
     display: flex;
@@ -103,12 +107,12 @@
 
   &__top-bordered-row {
     border-top: 1px solid #bbc0c5;
-    padding-top: 10px;
+    padding-top: 12px;
   }
 
   &__row-label {
     display: flex;
-    align-items: center;
+    align-items: flex-start;
 
     img {
       height: 10px;
diff --git a/ui/pages/swaps/index.js b/ui/pages/swaps/index.js
index d10cf24e4..316e6fc34 100644
--- a/ui/pages/swaps/index.js
+++ b/ui/pages/swaps/index.js
@@ -1,5 +1,5 @@
-import React, { useState, useEffect, useRef, useContext } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import React, { useEffect, useRef, useContext } from 'react';
+import { shallowEqual, useDispatch, useSelector } from 'react-redux';
 import {
   Switch,
   Route,
@@ -7,8 +7,7 @@ import {
   useHistory,
   Redirect,
 } from 'react-router-dom';
-import BigNumber from 'bignumber.js';
-import { shuffle } from 'lodash';
+import { shuffle, isEqual } from 'lodash';
 import { I18nContext } from '../../contexts/i18n';
 import {
   getSelectedAccount,
@@ -24,7 +23,6 @@ import {
   getTradeTxId,
   getApproveTxId,
   getFetchingQuotes,
-  setBalanceError,
   setTopAssets,
   getFetchParams,
   setAggregatorMetadata,
@@ -35,9 +33,8 @@ import {
   prepareToLeaveSwaps,
   fetchAndSetSwapsGasPriceInfo,
   fetchSwapsLiveness,
-  getUseNewSwapsApi,
-  getFromToken,
   getReviewSwapClickedTimestamp,
+  navigateBackToBuildQuote,
 } from '../../ducks/swaps/swaps';
 import {
   checkNetworkAndAccountSupports1559,
@@ -78,7 +75,6 @@ import {
   fetchTopAssets,
   getSwapsTokensReceivedFromTxMeta,
   fetchAggregatorMetadata,
-  countDecimals,
 } from './swaps.util';
 import AwaitingSignatures from './awaiting-signatures';
 import AwaitingSwap from './awaiting-swap';
@@ -96,34 +92,27 @@ export default function Swap() {
   const isAwaitingSignaturesRoute = pathname === AWAITING_SIGNATURES_ROUTE;
   const isSwapsErrorRoute = pathname === SWAPS_ERROR_ROUTE;
   const isLoadingQuotesRoute = pathname === LOADING_QUOTES_ROUTE;
+  const isViewQuoteRoute = pathname === VIEW_QUOTE_ROUTE;
 
-  const fetchParams = useSelector(getFetchParams);
+  const fetchParams = useSelector(getFetchParams, isEqual);
   const { destinationTokenInfo = {} } = fetchParams?.metaData || {};
 
-  const [inputValue, setInputValue] = useState(fetchParams?.value || '');
-  const [maxSlippage, setMaxSlippage] = useState(fetchParams?.slippage || 3);
-  const [isFeatureFlagLoaded, setIsFeatureFlagLoaded] = useState(false);
-  const [tokenFromError, setTokenFromError] = useState(null);
-
   const routeState = useSelector(getBackgroundSwapRouteState);
-  const selectedAccount = useSelector(getSelectedAccount);
-  const quotes = useSelector(getQuotes);
-  const txList = useSelector(currentNetworkTxListSelector);
+  const selectedAccount = useSelector(getSelectedAccount, shallowEqual);
+  const quotes = useSelector(getQuotes, isEqual);
+  const txList = useSelector(currentNetworkTxListSelector, shallowEqual);
   const tradeTxId = useSelector(getTradeTxId);
   const approveTxId = useSelector(getApproveTxId);
-  const aggregatorMetadata = useSelector(getAggregatorMetadata);
+  const aggregatorMetadata = useSelector(getAggregatorMetadata, shallowEqual);
   const fetchingQuotes = useSelector(getFetchingQuotes);
   let swapsErrorKey = useSelector(getSwapsErrorKey);
   const swapsEnabled = useSelector(getSwapsFeatureIsLive);
   const chainId = useSelector(getCurrentChainId);
   const isSwapsChain = useSelector(getIsSwapsChain);
-  const useNewSwapsApi = useSelector(getUseNewSwapsApi);
-  const prevUseNewSwapsApi = useRef(useNewSwapsApi);
   const networkAndAccountSupports1559 = useSelector(
     checkNetworkAndAccountSupports1559,
   );
-  const fromToken = useSelector(getFromToken);
-  const tokenList = useSelector(getTokenList);
+  const tokenList = useSelector(getTokenList, isEqual);
   const listTokenValues = shuffle(Object.values(tokenList));
   const reviewSwapClickedTimestamp = useSelector(getReviewSwapClickedTimestamp);
   const reviewSwapClicked = Boolean(reviewSwapClickedTimestamp);
@@ -194,35 +183,24 @@ export default function Swap() {
 
   // eslint-disable-next-line
   useEffect(() => {
-    if (isFeatureFlagLoaded && prevUseNewSwapsApi.current === useNewSwapsApi) {
-      fetchTokens(chainId, useNewSwapsApi)
-        .then((tokens) => {
-          dispatch(setSwapsTokens(tokens));
-        })
-        .catch((error) => console.error(error));
-      fetchTopAssets(chainId, useNewSwapsApi).then((topAssets) => {
-        dispatch(setTopAssets(topAssets));
-      });
-      fetchAggregatorMetadata(chainId, useNewSwapsApi).then(
-        (newAggregatorMetadata) => {
-          dispatch(setAggregatorMetadata(newAggregatorMetadata));
-        },
-      );
-      if (!networkAndAccountSupports1559) {
-        dispatch(fetchAndSetSwapsGasPriceInfo(chainId));
-      }
-      return () => {
-        dispatch(prepareToLeaveSwaps());
-      };
+    fetchTokens(chainId)
+      .then((tokens) => {
+        dispatch(setSwapsTokens(tokens));
+      })
+      .catch((error) => console.error(error));
+    fetchTopAssets(chainId).then((topAssets) => {
+      dispatch(setTopAssets(topAssets));
+    });
+    fetchAggregatorMetadata(chainId).then((newAggregatorMetadata) => {
+      dispatch(setAggregatorMetadata(newAggregatorMetadata));
+    });
+    if (!networkAndAccountSupports1559) {
+      dispatch(fetchAndSetSwapsGasPriceInfo(chainId));
     }
-    prevUseNewSwapsApi.current = useNewSwapsApi;
-  }, [
-    dispatch,
-    chainId,
-    isFeatureFlagLoaded,
-    useNewSwapsApi,
-    networkAndAccountSupports1559,
-  ]);
+    return () => {
+      dispatch(prepareToLeaveSwaps());
+    };
+  }, [dispatch, chainId, networkAndAccountSupports1559]);
 
   const hardwareWalletUsed = useSelector(isHardwareWallet);
   const hardwareWalletType = useSelector(getHardwareWalletType);
@@ -251,7 +229,6 @@ export default function Swap() {
   useEffect(() => {
     const fetchSwapsLivenessWrapper = async () => {
       await dispatch(fetchSwapsLiveness());
-      setIsFeatureFlagLoaded(true);
     };
     fetchSwapsLivenessWrapper();
     return () => {
@@ -291,20 +268,26 @@ export default function Swap() {
     <div className="swaps">
       <div className="swaps__container">
         <div className="swaps__header">
+          <div
+            className="swaps__header-edit"
+            onClick={async () => {
+              await dispatch(navigateBackToBuildQuote(history));
+            }}
+          >
+            {isViewQuoteRoute && t('edit')}
+          </div>
           <div className="swaps__title">{t('swap')}</div>
-          {!isAwaitingSwapRoute && !isAwaitingSignaturesRoute && (
-            <div
-              className="swaps__header-cancel"
-              onClick={async () => {
-                clearTemporaryTokenRef.current();
-                dispatch(clearSwapsState());
-                await dispatch(resetBackgroundSwapsState());
-                history.push(DEFAULT_ROUTE);
-              }}
-            >
-              {t('cancel')}
-            </div>
-          )}
+          <div
+            className="swaps__header-cancel"
+            onClick={async () => {
+              clearTemporaryTokenRef.current();
+              dispatch(clearSwapsState());
+              await dispatch(resetBackgroundSwapsState());
+              history.push(DEFAULT_ROUTE);
+            }}
+          >
+            {!isAwaitingSwapRoute && !isAwaitingSignaturesRoute && t('cancel')}
+          </div>
         </div>
         <div className="swaps__content">
           <Switch>
@@ -322,31 +305,10 @@ export default function Swap() {
                   return <Redirect to={{ pathname: LOADING_QUOTES_ROUTE }} />;
                 }
 
-                const onInputChange = (newInputValue, balance) => {
-                  setInputValue(newInputValue);
-                  const balanceError = new BigNumber(newInputValue || 0).gt(
-                    balance || 0,
-                  );
-                  // "setBalanceError" is just a warning, a user can still click on the "Review Swap" button.
-                  dispatch(setBalanceError(balanceError));
-                  setTokenFromError(
-                    fromToken &&
-                      countDecimals(newInputValue) > fromToken.decimals
-                      ? 'tooManyDecimals'
-                      : null,
-                  );
-                };
-
                 return (
                   <BuildQuote
-                    inputValue={inputValue}
-                    onInputChange={onInputChange}
                     ethBalance={ethBalance}
-                    setMaxSlippage={setMaxSlippage}
                     selectedAccountAddress={selectedAccountAddress}
-                    maxSlippage={maxSlippage}
-                    isFeatureFlagLoaded={isFeatureFlagLoaded}
-                    tokenFromError={tokenFromError}
                     shuffledTokensList={listTokenValues}
                   />
                 );
@@ -378,8 +340,6 @@ export default function Swap() {
                       swapComplete={false}
                       errorKey={swapsErrorKey}
                       txHash={tradeTxData?.hash}
-                      inputValue={inputValue}
-                      maxSlippage={maxSlippage}
                       submittedTime={tradeTxData?.submittedTime}
                     />
                   );
@@ -447,8 +407,6 @@ export default function Swap() {
                     submittingSwap={
                       routeState === 'awaiting' && !(approveTxId || tradeTxId)
                     }
-                    inputValue={inputValue}
-                    maxSlippage={maxSlippage}
                   />
                 ) : (
                   <Redirect to={{ pathname: DEFAULT_ROUTE }} />
diff --git a/ui/pages/swaps/index.scss b/ui/pages/swaps/index.scss
index af280f00f..75d5db813 100644
--- a/ui/pages/swaps/index.scss
+++ b/ui/pages/swaps/index.scss
@@ -68,6 +68,8 @@
     font-weight: bold;
     color: $Black-100;
     margin-top: -5px;
+    flex: 1;
+    text-align: center;
   }
 
   &__header {
@@ -80,6 +82,7 @@
     background: $Grey-000;
     width: 100%;
     position: relative;
+    flex-direction: row;
 
     @media screen and (min-width: $break-large) {
       padding-top: 8px;
@@ -93,7 +96,17 @@
 
     color: $Blue-500;
     cursor: pointer;
-    position: absolute;
-    right: 24px;
+    padding-right: 24px;
+    flex: 1;
+    text-align: right;
+  }
+
+  &__header-edit {
+    @include H7;
+
+    color: $Blue-500;
+    cursor: pointer;
+    padding-left: 24px;
+    flex: 1;
   }
 }
diff --git a/ui/pages/swaps/index.test.js b/ui/pages/swaps/index.test.js
index a380171da..e56483421 100644
--- a/ui/pages/swaps/index.test.js
+++ b/ui/pages/swaps/index.test.js
@@ -30,7 +30,7 @@ describe('Swap', () => {
 
   beforeEach(() => {
     nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/topAssets')
+      .get('/networks/1/topAssets')
       .reply(200, MOCKS.TOP_ASSETS_GET_RESPONSE);
 
     nock(CONSTANTS.METASWAP_BASE_URL)
@@ -38,18 +38,18 @@ describe('Swap', () => {
       .reply(200, MOCKS.REFRESH_TIME_GET_RESPONSE);
 
     nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/aggregatorMetadata')
+      .get('/networks/1/aggregatorMetadata')
       .reply(200, MOCKS.AGGREGATOR_METADATA_GET_RESPONSE);
 
-    nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/gasPrices')
+    nock(CONSTANTS.GAS_API_URL)
+      .get('/networks/1/gasPrices')
       .reply(200, MOCKS.GAS_PRICES_GET_RESPONSE);
 
     nock(CONSTANTS.METASWAP_BASE_URL)
-      .get('/tokens')
+      .get('/networks/1/tokens')
       .reply(200, MOCKS.TOKENS_GET_RESPONSE);
 
-    featureFlagsNock = nock(CONSTANTS.METASWAP_API_V2_BASE_URL)
+    featureFlagsNock = nock(CONSTANTS.METASWAP_BASE_URL)
       .get('/featureFlags')
       .reply(200, MOCKS.createFeatureFlagsResponse());
   });
diff --git a/ui/pages/swaps/main-quote-summary/__snapshots__/main-quote-summary.test.js.snap b/ui/pages/swaps/main-quote-summary/__snapshots__/main-quote-summary.test.js.snap
index 2e67e465f..c94a42158 100644
--- a/ui/pages/swaps/main-quote-summary/__snapshots__/main-quote-summary.test.js.snap
+++ b/ui/pages/swaps/main-quote-summary/__snapshots__/main-quote-summary.test.js.snap
@@ -11,11 +11,11 @@ exports[`MainQuoteSummary renders the component with initial props 1`] = `
   >
     2
   </span>
-  <i
+  <span
     class="icon-with-fallback__fallback url-icon__fallback main-quote-summary__icon-fallback"
   >
     E
-  </i>
+  </span>
   <span
     class="main-quote-summary__source-row-symbol"
     title="ETH"
@@ -29,11 +29,11 @@ exports[`MainQuoteSummary renders the component with initial props 2`] = `
 <div
   class="main-quote-summary__destination-row"
 >
-  <i
+  <span
     class="icon-with-fallback__fallback url-icon__fallback main-quote-summary__icon-fallback"
   >
     B
-  </i>
+  </span>
   <span
     class="main-quote-summary__destination-row-symbol"
   >
@@ -55,7 +55,7 @@ exports[`MainQuoteSummary renders the component with initial props 3`] = `
     >
       <span
         class="main-quote-summary__quote-large-number"
-        style="font-size: 60px; line-height: 48px;"
+        style="font-size: 50px; line-height: 48px;"
       >
         0.2
       </span>
diff --git a/ui/pages/swaps/main-quote-summary/index.scss b/ui/pages/swaps/main-quote-summary/index.scss
index dfdc882f1..28d47f7e3 100644
--- a/ui/pages/swaps/main-quote-summary/index.scss
+++ b/ui/pages/swaps/main-quote-summary/index.scss
@@ -4,10 +4,10 @@
   justify-content: center;
   align-items: center;
   position: relative;
-  max-height: 196px;
-  min-height: 196px;
   width: 100%;
   color: $Black-100;
+  margin-top: 28px;
+  margin-bottom: 56px;
 
   &__source-row,
   &__destination-row {
@@ -96,7 +96,7 @@
   }
 
   &__quote-large-number {
-    font-size: 60px;
+    font-size: 50px;
     line-height: 48px;
   }
 
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 c54f78b7b..1c45b5c26 100644
--- a/ui/pages/swaps/main-quote-summary/main-quote-summary.js
+++ b/ui/pages/swaps/main-quote-summary/main-quote-summary.js
@@ -10,7 +10,7 @@ import { formatSwapsValueForDisplay } from '../swaps.util';
 
 function getFontSizesAndLineHeights(fontSizeScore) {
   if (fontSizeScore <= 9) {
-    return [60, 48];
+    return [50, 48];
   }
   if (fontSizeScore <= 13) {
     return [40, 32];
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 29affeb5d..be6f2c9c8 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
@@ -37,7 +37,7 @@ exports[`SearchableItemList renders the component with initial props 2`] = `
   tabindex="0"
 >
   <img
-    alt=""
+    alt="primaryLabel"
     class="url-icon"
     src="iconUrl"
   />
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 ed1b9e257..26fbc0124 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,7 +9,6 @@ import { usePrevious } from '../../../../hooks/usePrevious';
 import { isValidHexAddress } from '../../../../../shared/modules/hexstring-utils';
 import { fetchToken } from '../../swaps.util';
 import { getCurrentChainId } from '../../../../selectors/selectors';
-import { getUseNewSwapsApi } from '../../../../ducks/swaps/swaps';
 
 const renderAdornment = () => (
   <InputAdornment position="start" style={{ marginRight: '12px' }}>
@@ -29,7 +28,6 @@ export default function ListItemSearch({
   const fuseRef = useRef();
   const [searchQuery, setSearchQuery] = useState('');
   const chainId = useSelector(getCurrentChainId);
-  const useNewSwapsApi = useSelector(getUseNewSwapsApi);
 
   /**
    * Search a custom token for import based on a contract address.
@@ -38,7 +36,7 @@ export default function ListItemSearch({
   const handleSearchTokenForImport = async (contractAddress) => {
     setSearchQuery(contractAddress);
     try {
-      const token = await fetchToken(contractAddress, chainId, useNewSwapsApi);
+      const token = await fetchToken(contractAddress, chainId);
       if (token) {
         token.primaryLabel = token.symbol;
         token.secondaryLabel = token.name;
diff --git a/ui/pages/swaps/swaps-footer/index.scss b/ui/pages/swaps/swaps-footer/index.scss
index c36110196..6827eac88 100644
--- a/ui/pages/swaps/swaps-footer/index.scss
+++ b/ui/pages/swaps/swaps-footer/index.scss
@@ -48,14 +48,4 @@
       margin-top: 0;
     }
   }
-
-  &__buttons {
-    @media screen and (max-width: $break-small) {
-      &--border {
-        .swaps-footer__custom-page-container-footer-class {
-          border-top: 1px solid #d2d8dd;
-        }
-      }
-    }
-  }
 }
diff --git a/ui/pages/swaps/swaps.util.js b/ui/pages/swaps/swaps.util.js
index 3089d485d..789a06073 100644
--- a/ui/pages/swaps/swaps.util.js
+++ b/ui/pages/swaps/swaps.util.js
@@ -3,7 +3,6 @@ import BigNumber from 'bignumber.js';
 import abi from 'human-standard-token-abi';
 import {
   SWAPS_CHAINID_DEFAULT_TOKEN_MAP,
-  METASWAP_CHAINID_API_HOST_MAP,
   ALLOWED_CONTRACT_ADDRESSES,
   SWAPS_WRAPPED_TOKENS_ADDRESSES,
   ETHEREUM,
@@ -79,14 +78,10 @@ const getBaseUrlForNewSwapsApi = (type, chainId) => {
   return `${v2ApiBaseUrl}/networks/${chainIdDecimal}`;
 };
 
-export const getBaseApi = function (
-  type,
-  chainId = MAINNET_CHAIN_ID,
-  useNewSwapsApi = false,
-) {
-  const baseUrl = useNewSwapsApi
-    ? getBaseUrlForNewSwapsApi(type, chainId)
-    : METASWAP_CHAINID_API_HOST_MAP[chainId];
+export const getBaseApi = function (type, chainId = MAINNET_CHAIN_ID) {
+  // eslint-disable-next-line no-param-reassign
+  chainId = chainId === RINKEBY_CHAIN_ID ? MAINNET_CHAIN_ID : chainId;
+  const baseUrl = getBaseUrlForNewSwapsApi(type, chainId);
   const chainIdDecimal = chainId && parseInt(chainId, 16);
   if (!baseUrl) {
     throw new Error(`Swaps API calls are disabled for chainId: ${chainId}`);
@@ -300,7 +295,7 @@ export async function fetchTradesInfo(
     fromAddress,
     exchangeList,
   },
-  { chainId, useNewSwapsApi },
+  { chainId },
 ) {
   const urlParams = {
     destinationToken,
@@ -319,11 +314,7 @@ export async function fetchTradesInfo(
   }
 
   const queryString = new URLSearchParams(urlParams).toString();
-  const tradeURL = `${getBaseApi(
-    'trade',
-    chainId,
-    useNewSwapsApi,
-  )}${queryString}`;
+  const tradeURL = `${getBaseApi('trade', chainId)}${queryString}`;
   const tradesResponse = await fetchWithCache(
     tradeURL,
     { method: 'GET', headers: clientIdHeader },
@@ -367,8 +358,8 @@ export async function fetchTradesInfo(
   return newQuotes;
 }
 
-export async function fetchToken(contractAddress, chainId, useNewSwapsApi) {
-  const tokenUrl = getBaseApi('token', chainId, useNewSwapsApi);
+export async function fetchToken(contractAddress, chainId) {
+  const tokenUrl = getBaseApi('token', chainId);
   const token = await fetchWithCache(
     `${tokenUrl}?address=${contractAddress}`,
     { method: 'GET', headers: clientIdHeader },
@@ -377,8 +368,8 @@ export async function fetchToken(contractAddress, chainId, useNewSwapsApi) {
   return token;
 }
 
-export async function fetchTokens(chainId, useNewSwapsApi) {
-  const tokensUrl = getBaseApi('tokens', chainId, useNewSwapsApi);
+export async function fetchTokens(chainId) {
+  const tokensUrl = getBaseApi('tokens', chainId);
   const tokens = await fetchWithCache(
     tokensUrl,
     { method: 'GET', headers: clientIdHeader },
@@ -399,12 +390,8 @@ export async function fetchTokens(chainId, useNewSwapsApi) {
   return filteredTokens;
 }
 
-export async function fetchAggregatorMetadata(chainId, useNewSwapsApi) {
-  const aggregatorMetadataUrl = getBaseApi(
-    'aggregatorMetadata',
-    chainId,
-    useNewSwapsApi,
-  );
+export async function fetchAggregatorMetadata(chainId) {
+  const aggregatorMetadataUrl = getBaseApi('aggregatorMetadata', chainId);
   const aggregators = await fetchWithCache(
     aggregatorMetadataUrl,
     { method: 'GET', headers: clientIdHeader },
@@ -425,8 +412,8 @@ export async function fetchAggregatorMetadata(chainId, useNewSwapsApi) {
   return filteredAggregators;
 }
 
-export async function fetchTopAssets(chainId, useNewSwapsApi) {
-  const topAssetsUrl = getBaseApi('topAssets', chainId, useNewSwapsApi);
+export async function fetchTopAssets(chainId) {
+  const topAssetsUrl = getBaseApi('topAssets', chainId);
   const response = await fetchWithCache(
     topAssetsUrl,
     { method: 'GET', headers: clientIdHeader },
@@ -473,8 +460,8 @@ export async function fetchTokenBalance(address, userAddress) {
   return usersToken;
 }
 
-export async function fetchSwapsGasPrices(chainId, useNewSwapsApi) {
-  const gasPricesUrl = getBaseApi('gasPrices', chainId, useNewSwapsApi);
+export async function fetchSwapsGasPrices(chainId) {
+  const gasPricesUrl = getBaseApi('gasPrices', chainId);
   const response = await fetchWithCache(
     gasPricesUrl,
     { method: 'GET', headers: clientIdHeader },
@@ -816,7 +803,7 @@ export const getNetworkNameByChainId = (chainId) => {
  * It returns info about if Swaps are enabled and if we should use our new APIs for it.
  * @param {object} swapsFeatureFlags
  * @param {string} chainId
- * @returns object with 2 items: "swapsFeatureIsLive" and "useNewSwapsApi"
+ * @returns object with 2 items: "swapsFeatureIsLive"
  */
 export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
   const networkName = getNetworkNameByChainId(chainId);
@@ -824,14 +811,12 @@ export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
   if ([LOCALHOST_CHAIN_ID, RINKEBY_CHAIN_ID].includes(chainId)) {
     return {
       swapsFeatureIsLive: true,
-      useNewSwapsApi: false,
     };
   }
   // If a network name is not found in the list of feature flags, disable Swaps.
   if (!swapsFeatureFlags[networkName]) {
     return {
       swapsFeatureIsLive: false,
-      useNewSwapsApi: false,
     };
   }
   const isNetworkEnabledForNewApi =
@@ -839,12 +824,10 @@ export const getSwapsLivenessForNetwork = (swapsFeatureFlags = {}, chainId) => {
   if (isNetworkEnabledForNewApi) {
     return {
       swapsFeatureIsLive: true,
-      useNewSwapsApi: true,
     };
   }
   return {
     swapsFeatureIsLive: swapsFeatureFlags[networkName].fallback_to_v1,
-    useNewSwapsApi: false,
   };
 };
 
diff --git a/ui/pages/swaps/swaps.util.test.js b/ui/pages/swaps/swaps.util.test.js
index a721c585c..041744e8c 100644
--- a/ui/pages/swaps/swaps.util.test.js
+++ b/ui/pages/swaps/swaps.util.test.js
@@ -91,8 +91,8 @@ describe('Swaps Util', () => {
       },
     };
     it('should fetch trade info on prod', async () => {
-      nock('https://api.metaswap.codefi.network')
-        .get('/trades')
+      nock('https://api2.metaswap.codefi.network')
+        .get('/networks/1/trades')
         .query(true)
         .reply(200, MOCK_TRADE_RESPONSE_2);
 
@@ -117,9 +117,9 @@ describe('Swaps Util', () => {
 
   describe('fetchTokens', () => {
     beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
         .persist()
-        .get('/tokens')
+        .get('/networks/1/tokens')
         .reply(200, TOKENS);
     });
 
@@ -136,9 +136,9 @@ describe('Swaps Util', () => {
 
   describe('fetchAggregatorMetadata', () => {
     beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
         .persist()
-        .get('/aggregatorMetadata')
+        .get('/networks/1/aggregatorMetadata')
         .reply(200, AGGREGATOR_METADATA);
     });
 
@@ -155,9 +155,9 @@ describe('Swaps Util', () => {
 
   describe('fetchTopAssets', () => {
     beforeAll(() => {
-      nock('https://api.metaswap.codefi.network')
+      nock('https://api2.metaswap.codefi.network')
         .persist()
-        .get('/topAssets')
+        .get('/networks/1/topAssets')
         .reply(200, TOP_ASSETS);
     });
 
@@ -327,7 +327,6 @@ describe('Swaps Util', () => {
     it('returns info that Swaps are enabled and cannot use API v2 for localhost chain ID', () => {
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
       };
       expect(
         getSwapsLivenessForNetwork(
@@ -340,7 +339,6 @@ describe('Swaps Util', () => {
     it('returns info that Swaps are enabled and cannot use API v2 for Rinkeby chain ID', () => {
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
       };
       expect(
         getSwapsLivenessForNetwork(
@@ -353,7 +351,6 @@ describe('Swaps Util', () => {
     it('returns info that Swaps are disabled and cannot use API v2 if network name is not found', () => {
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: false,
-        useNewSwapsApi: false,
       };
       expect(
         getSwapsLivenessForNetwork(
@@ -366,7 +363,6 @@ describe('Swaps Util', () => {
     it('returns info that Swaps are enabled and can use API v2 for mainnet chain ID', () => {
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: true,
       };
       expect(
         getSwapsLivenessForNetwork(
@@ -379,7 +375,6 @@ describe('Swaps Util', () => {
     it('returns info that Swaps are enabled but can only use API v1 for mainnet chain ID', () => {
       const expectedSwapsLiveness = {
         swapsFeatureIsLive: true,
-        useNewSwapsApi: false,
       };
       const swapsFeatureFlags = MOCKS.createFeatureFlagsResponse();
       swapsFeatureFlags[ETHEREUM].extension_active = false;
diff --git a/ui/pages/swaps/view-quote/__snapshots__/view-quote.test.js.snap b/ui/pages/swaps/view-quote/__snapshots__/view-quote.test.js.snap
index b0f5bc601..60b161093 100644
--- a/ui/pages/swaps/view-quote/__snapshots__/view-quote.test.js.snap
+++ b/ui/pages/swaps/view-quote/__snapshots__/view-quote.test.js.snap
@@ -12,7 +12,7 @@ exports[`ViewQuote renders the component with EIP-1559 enabled 1`] = `
     10
   </span>
   <img
-    alt=""
+    alt="DAI"
     class="url-icon main-quote-summary__icon"
     src="https://foo.bar/logo.png"
   />
@@ -72,35 +72,6 @@ exports[`ViewQuote renders the component with EIP-1559 enabled 2`] = `
 </div>
 `;
 
-exports[`ViewQuote renders the component with EIP-1559 enabled 3`] = `
-<div
-  class="fee-card__savings-and-quotes-header"
-  data-testid="fee-card__savings-and-quotes-header"
->
-  <div
-    class="fee-card__savings-and-quotes-row"
-  >
-    
-    <div
-      class="fee-card__quote-link-container"
-    >
-      <p
-        class="fee-card__quote-link-text"
-      >
-        3 quotes
-      </p>
-      <div
-        class="fee-card__caret-right"
-      >
-        <i
-          class="fa fa-angle-up"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
 exports[`ViewQuote renders the component with initial props 1`] = `
 <div
   class="main-quote-summary__source-row"
@@ -113,7 +84,7 @@ exports[`ViewQuote renders the component with initial props 1`] = `
     10
   </span>
   <img
-    alt=""
+    alt="DAI"
     class="url-icon main-quote-summary__icon"
     src="https://foo.bar/logo.png"
   />
@@ -172,77 +143,3 @@ exports[`ViewQuote renders the component with initial props 2`] = `
   </div>
 </div>
 `;
-
-exports[`ViewQuote renders the component with initial props 3`] = `
-<div
-  class="fee-card__savings-and-quotes-header"
-  data-testid="fee-card__savings-and-quotes-header"
->
-  <div
-    class="fee-card__savings-and-quotes-row"
-  >
-    
-    <div
-      class="fee-card__quote-link-container"
-    >
-      <p
-        class="fee-card__quote-link-text"
-      >
-        3 quotes
-      </p>
-      <div
-        class="fee-card__caret-right"
-      >
-        <i
-          class="fa fa-angle-up"
-        />
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`ViewQuote renders the component with initial props 4`] = `
-<div
-  class="fee-card__row-header"
-  data-testid="fee-card__row-header"
->
-  <div>
-    <div
-      class="fee-card__row-header-text--bold"
-    >
-      Estimated network fee
-    </div>
-    <div
-      class="info-tooltip"
-    >
-      <div
-        class="fee-card__row-label fee-card__info-tooltip-container"
-      >
-        <div
-          aria-describedby="tippy-tooltip-2"
-          class="info-tooltip__tooltip-container fee-card__info-tooltip-content-container"
-          data-original-title="null"
-          data-tooltipped=""
-          style="display: inline;"
-          tabindex="0"
-        >
-          &lt;InfoTooltipIcon /&gt;
-        </div>
-      </div>
-    </div>
-  </div>
-  <div>
-    <div
-      class="fee-card__row-header-secondary--bold"
-    >
-      0 ETH
-    </div>
-    <div
-      class="fee-card__row-header-primary--bold"
-    >
-      0
-    </div>
-  </div>
-</div>
-`;
diff --git a/ui/pages/swaps/view-quote/index.scss b/ui/pages/swaps/view-quote/index.scss
index 31437dbe9..f7048df2c 100644
--- a/ui/pages/swaps/view-quote/index.scss
+++ b/ui/pages/swaps/view-quote/index.scss
@@ -13,7 +13,6 @@
     height: 100%;
     padding-left: 20px;
     padding-right: 20px;
-    justify-content: space-between;
 
     &_modal > div:not(.view-quote__warning-wrapper) {
       opacity: 0.6;
@@ -169,7 +168,7 @@
     justify-content: center;
     max-width: 340px;
     margin-top: 8px;
-    margin-bottom: 28px;
+    margin-bottom: 8px;
 
     @media screen and (min-width: $break-large) {
       &--thin {
@@ -185,12 +184,8 @@
   }
 
   &__countdown-timer-container {
-    width: 152px;
-    min-height: 32px;
     display: flex;
     justify-content: center;
-    border-radius: 42px;
-    background: #f2f3f4;
     margin-top: 8px;
   }
 
diff --git a/ui/pages/swaps/view-quote/view-quote.js b/ui/pages/swaps/view-quote/view-quote.js
index 7ec692c80..f78392473 100644
--- a/ui/pages/swaps/view-quote/view-quote.js
+++ b/ui/pages/swaps/view-quote/view-quote.js
@@ -30,7 +30,6 @@ import {
   getDestinationTokenInfo,
   getUsedSwapsGasPrice,
   getTopQuote,
-  navigateBackToBuildQuote,
   signAndSendTransactions,
   getBackgroundSwapRouteState,
   swapsQuoteSelected,
@@ -80,7 +79,6 @@ import {
   hexToDecimal,
   getValueFromWeiHex,
   decGWEIToHexWEI,
-  hexWEIToDecGWEI,
   addHexes,
 } from '../../../helpers/utils/conversions.util';
 import MainQuoteSummary from '../main-quote-summary';
@@ -573,12 +571,6 @@ export default function ViewQuote() {
         );
   };
 
-  const tokenApprovalTextComponent = (
-    <span key="swaps-view-quote-approve-symbol-1" className="view-quote__bold">
-      {sourceTokenSymbol}
-    </span>
-  );
-
   const actionableBalanceErrorMessage = tokenBalanceUnavailable
     ? t('swapTokenBalanceUnavailable', [sourceTokenSymbol])
     : t('swapApproveNeedMoreTokens', [
@@ -733,7 +725,6 @@ export default function ViewQuote() {
           <CountdownTimer
             timeStarted={quotesLastFetched}
             warningTime="0:30"
-            infoTooltipLabelKey="swapQuotesAreRefreshed"
             labelKey="swapNewQuoteIn"
           />
         </div>
@@ -769,25 +760,16 @@ export default function ViewQuote() {
             hideTokenApprovalRow={
               !approveTxParams || (balanceError && !warningHidden)
             }
-            tokenApprovalTextComponent={tokenApprovalTextComponent}
             tokenApprovalSourceTokenSymbol={sourceTokenSymbol}
             onTokenApprovalClick={onFeeCardTokenApprovalClick}
             metaMaskFee={String(metaMaskFee)}
-            isBestQuote={isBestQuote}
             numberOfQuotes={Object.values(quotes).length}
             onQuotesClick={() => {
               allAvailableQuotesOpened();
               setSelectQuotePopoverShown(true);
             }}
-            tokenConversionRate={
-              destinationTokenSymbol === defaultSwapsToken.symbol
-                ? 1
-                : memoizedTokenConversionRates[destinationToken.address]
-            }
             chainId={chainId}
-            networkAndAccountSupports1559={networkAndAccountSupports1559}
-            maxPriorityFeePerGasDecGWEI={hexWEIToDecGWEI(maxPriorityFeePerGas)}
-            maxFeePerGasDecGWEI={hexWEIToDecGWEI(maxFeePerGas)}
+            isBestQuote={isBestQuote}
           />
         </div>
       </div>
@@ -803,7 +785,7 @@ export default function ViewQuote() {
           }
         }}
         submitText={t('swap')}
-        onCancel={async () => await dispatch(navigateBackToBuildQuote(history))}
+        hideCancel
         disabled={
           submitClicked ||
           balanceError ||
diff --git a/ui/pages/swaps/view-quote/view-quote.test.js b/ui/pages/swaps/view-quote/view-quote.test.js
index 7452c950b..5145f303e 100644
--- a/ui/pages/swaps/view-quote/view-quote.test.js
+++ b/ui/pages/swaps/view-quote/view-quote.test.js
@@ -63,11 +63,9 @@ describe('ViewQuote', () => {
     expect(
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
-    expect(
-      getByTestId('fee-card__savings-and-quotes-header'),
-    ).toMatchSnapshot();
-    expect(getByTestId('fee-card__row-header')).toMatchSnapshot();
-    expect(getByText('Back')).toBeInTheDocument();
+    expect(getByText('Estimated gas fee')).toBeInTheDocument();
+    expect(getByText('Max fee')).toBeInTheDocument();
+    expect(getByText('Edit')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
 
@@ -89,13 +87,10 @@ describe('ViewQuote', () => {
     expect(
       getByTestId('main-quote-summary__exchange-rate-container'),
     ).toMatchSnapshot();
-    expect(
-      getByTestId('fee-card__savings-and-quotes-header'),
-    ).toMatchSnapshot();
     expect(getByText('Estimated gas fee')).toBeInTheDocument();
     expect(getByText('0.01044 ETH')).toBeInTheDocument();
     expect(getByText('Max fee')).toBeInTheDocument();
-    expect(getByText('Back')).toBeInTheDocument();
+    expect(getByText('Edit')).toBeInTheDocument();
     expect(getByText('Swap')).toBeInTheDocument();
   });
 });
diff --git a/ui/selectors/selectors.js b/ui/selectors/selectors.js
index cc8283262..590a3414d 100644
--- a/ui/selectors/selectors.js
+++ b/ui/selectors/selectors.js
@@ -49,6 +49,7 @@ import {
   getLedgerWebHidConnectedStatus,
   getLedgerTransportStatus,
 } from '../ducks/app/app';
+import { MESSAGE_TYPE } from '../../shared/constants/app';
 
 /**
  * One of the only remaining valid uses of selecting the network subkey of the
@@ -82,6 +83,48 @@ export function getCurrentChainId(state) {
   return chainId;
 }
 
+export function getCurrentQRHardwareState(state) {
+  const { qrHardware } = state.metamask;
+  return qrHardware || {};
+}
+
+export function hasUnsignedQRHardwareTransaction(state) {
+  const { txParams } = state.confirmTransaction.txData;
+  if (!txParams) return false;
+  const { from } = txParams;
+  const { keyrings } = state.metamask;
+  const qrKeyring = keyrings.find((kr) => kr.type === KEYRING_TYPES.QR);
+  if (!qrKeyring) return false;
+  return Boolean(
+    qrKeyring.accounts.find(
+      (account) => account.toLowerCase() === from.toLowerCase(),
+    ),
+  );
+}
+
+export function hasUnsignedQRHardwareMessage(state) {
+  const { type, msgParams } = state.confirmTransaction.txData;
+  if (!type || !msgParams) {
+    return false;
+  }
+  const { from } = msgParams;
+  const { keyrings } = state.metamask;
+  const qrKeyring = keyrings.find((kr) => kr.type === KEYRING_TYPES.QR);
+  if (!qrKeyring) return false;
+  switch (type) {
+    case MESSAGE_TYPE.ETH_SIGN_TYPED_DATA:
+    case MESSAGE_TYPE.ETH_SIGN:
+    case MESSAGE_TYPE.PERSONAL_SIGN:
+      return Boolean(
+        qrKeyring.accounts.find(
+          (account) => account.toLowerCase() === from.toLowerCase(),
+        ),
+      );
+    default:
+      return false;
+  }
+}
+
 export function getCurrentKeyring(state) {
   const identity = getSelectedIdentity(state);
 
@@ -98,10 +141,8 @@ export function getParticipateInMetaMetrics(state) {
   return Boolean(state.metamask.participateInMetaMetrics);
 }
 
-export function isEIP1559Account(state) {
-  // Trezor does not support 1559 at this time
-  const currentKeyring = getCurrentKeyring(state);
-  return currentKeyring && currentKeyring.type !== KEYRING_TYPES.TREZOR;
+export function isEIP1559Account() {
+  return true;
 }
 
 /**
@@ -601,6 +642,7 @@ function getAllowedNotificationIds(state) {
     6: false,
     7: false,
     8: supportsWebHid && currentKeyringIsLedger && currentlyUsingLedgerLive,
+    9: getIsMainnet(state),
   };
 }
 
@@ -656,6 +698,24 @@ export function getUseTokenDetection(state) {
   return Boolean(state.metamask.useTokenDetection);
 }
 
+/**
+ * To get the useCollectibleDetection flag which determines whether we autodetect NFTs
+ * @param {*} state
+ * @returns Boolean
+ */
+export function getUseCollectibleDetection(state) {
+  return Boolean(state.metamask.useCollectibleDetection);
+}
+
+/**
+ * To get the openSeaEnabled flag which determines whether we use OpenSea's API
+ * @param {*} state
+ * @returns Boolean
+ */
+export function getOpenSeaEnabled(state) {
+  return Boolean(state.metamask.openSeaEnabled);
+}
+
 /**
  * To retrieve the tokenList produced by TokenListcontroller
  * @param {*} state
@@ -683,6 +743,10 @@ export function doesAddressRequireLedgerHidConnection(state, address) {
   );
 }
 
+export function getNewCollectibleAddedMessage(state) {
+  return state.appState.newCollectibleAddedMessage;
+}
+
 /**
  * To retrieve the name of the new Network added using add network form
  * @param {*} state
diff --git a/ui/selectors/selectors.test.js b/ui/selectors/selectors.test.js
index 9b587dc91..384030fc2 100644
--- a/ui/selectors/selectors.test.js
+++ b/ui/selectors/selectors.test.js
@@ -102,7 +102,7 @@ describe('Selectors', () => {
         metamask: {
           ...mockState.metamask,
           networkDetails: {
-            EIPS: { 1559: undefined },
+            EIPS: { 1559: false },
           },
         },
       });
@@ -118,24 +118,6 @@ describe('Selectors', () => {
       });
       expect(not1559Network).toStrictEqual(true);
     });
-
-    it('returns true if account does not support EIP-1559', () => {
-      const networkOrAccountNotSupports1559 = selectors.checkNetworkOrAccountNotSupports1559(
-        {
-          ...mockState,
-          metamask: {
-            ...mockState.metamask,
-            keyrings: [
-              {
-                type: KEYRING_TYPES.TREZOR,
-                accounts: ['0x0dcd5d886577d5081b0c52e242ef29e70be3e7bc'],
-              },
-            ],
-          },
-        },
-      );
-      expect(networkOrAccountNotSupports1559).toStrictEqual(true);
-    });
   });
 
   describe('#getAddressBook', () => {
diff --git a/ui/store/actionConstants.js b/ui/store/actionConstants.js
index 81683dcb4..f3a86abd8 100644
--- a/ui/store/actionConstants.js
+++ b/ui/store/actionConstants.js
@@ -90,6 +90,8 @@ export const SET_FIRST_TIME_FLOW_TYPE = 'SET_FIRST_TIME_FLOW_TYPE';
 
 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 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 b19ae3e9d..3262c0d19 100644
--- a/ui/store/actions.js
+++ b/ui/store/actions.js
@@ -29,6 +29,7 @@ import { switchedToUnconnectedAccount } from '../ducks/alerts/unconnected-accoun
 import { getUnconnectedAccountAlertEnabledness } from '../ducks/metamask/metamask';
 import { toChecksumHexAddress } from '../../shared/modules/hexstring-utils';
 import {
+  DEVICE_NAMES,
   LEDGER_TRANSPORT_TYPES,
   LEDGER_USB_VENDOR_ID,
 } from '../../shared/constants/hardware-wallets';
@@ -68,19 +69,6 @@ export function tryUnlockMetamask(password) {
         dispatch(unlockSucceeded());
         return forceUpdateMetamaskState(dispatch);
       })
-      .then(() => {
-        return new Promise((resolve, reject) => {
-          background.verifySeedPhrase((err) => {
-            if (err) {
-              dispatch(displayWarning(err.message));
-              reject(err);
-              return;
-            }
-
-            resolve();
-          });
-        });
-      })
       .then(() => {
         dispatch(hideLoadingIndication());
       })
@@ -414,7 +402,7 @@ export function connectHardware(deviceName, page, hdPath, t) {
         await promisifiedBackground.establishLedgerTransportPreference();
       }
       if (
-        deviceName === 'ledger' &&
+        deviceName === DEVICE_NAMES.LEDGER &&
         ledgerTransportType === LEDGER_TRANSPORT_TYPES.WEBHID
       ) {
         const connectedDevices = await window.navigator.hid.requestDevice({
@@ -443,7 +431,8 @@ export function connectHardware(deviceName, page, hdPath, t) {
         dispatch(displayWarning(t('ledgerDeviceOpenFailureMessage')));
         throw new Error(t('ledgerDeviceOpenFailureMessage'));
       } else {
-        dispatch(displayWarning(error.message));
+        if (deviceName !== DEVICE_NAMES.QR)
+          dispatch(displayWarning(error.message));
         throw error;
       }
     } finally {
@@ -1292,6 +1281,116 @@ export function addToken(
   };
 }
 
+export function addCollectible(address, tokenID, dontShowLoadingIndicator) {
+  return async (dispatch) => {
+    if (!address) {
+      throw new Error('MetaMask - Cannot add collectible without address');
+    }
+    if (!tokenID) {
+      throw new Error('MetaMask - Cannot add collectible without tokenID');
+    }
+    if (!dontShowLoadingIndicator) {
+      dispatch(showLoadingIndication());
+    }
+    try {
+      await promisifiedBackground.addCollectible(address, tokenID);
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning(error.message));
+    } finally {
+      await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
+export function addCollectibleVerifyOwnership(
+  address,
+  tokenID,
+  dontShowLoadingIndicator,
+) {
+  return async (dispatch) => {
+    if (!address) {
+      throw new Error('MetaMask - Cannot add collectible without address');
+    }
+    if (!tokenID) {
+      throw new Error('MetaMask - Cannot add collectible without tokenID');
+    }
+    if (!dontShowLoadingIndicator) {
+      dispatch(showLoadingIndication());
+    }
+    try {
+      await promisifiedBackground.addCollectibleVerifyOwnership(
+        address,
+        tokenID,
+      );
+    } catch (error) {
+      if (
+        error.message.includes('This collectible is not owned by the user') ||
+        error.message.includes('Unable to verify ownership.')
+      ) {
+        throw error;
+      } else {
+        log.error(error);
+        dispatch(displayWarning(error.message));
+      }
+    } finally {
+      await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
+export function removeAndIgnoreCollectible(
+  address,
+  tokenID,
+  dontShowLoadingIndicator,
+) {
+  return async (dispatch) => {
+    if (!address) {
+      throw new Error('MetaMask - Cannot ignore collectible without address');
+    }
+    if (!tokenID) {
+      throw new Error('MetaMask - Cannot ignore collectible without tokenID');
+    }
+    if (!dontShowLoadingIndicator) {
+      dispatch(showLoadingIndication());
+    }
+    try {
+      await promisifiedBackground.removeAndIgnoreCollectible(address, tokenID);
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning(error.message));
+    } finally {
+      await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
+export function removeCollectible(address, tokenID, dontShowLoadingIndicator) {
+  return async (dispatch) => {
+    if (!address) {
+      throw new Error('MetaMask - Cannot remove collectible without address');
+    }
+    if (!tokenID) {
+      throw new Error('MetaMask - Cannot remove collectible without tokenID');
+    }
+    if (!dontShowLoadingIndicator) {
+      dispatch(showLoadingIndication());
+    }
+    try {
+      await promisifiedBackground.removeCollectible(address, tokenID);
+    } catch (error) {
+      log.error(error);
+      dispatch(displayWarning(error.message));
+    } finally {
+      await forceUpdateMetamaskState(dispatch);
+      dispatch(hideLoadingIndication());
+    }
+  };
+}
+
 export function removeToken(address) {
   return async (dispatch) => {
     dispatch(showLoadingIndication());
@@ -1356,12 +1455,6 @@ export function acceptWatchAsset(suggestedAssetID) {
   };
 }
 
-export function addKnownMethodData(fourBytePrefix, methodData) {
-  return () => {
-    background.addKnownMethodData(fourBytePrefix, methodData);
-  };
-}
-
 export function clearPendingTokens() {
   return {
     type: actionConstants.CLEAR_PENDING_TOKENS,
@@ -2042,15 +2135,15 @@ export function setUseBlockie(val) {
 }
 
 export function setUseNonceField(val) {
-  return (dispatch) => {
+  return async (dispatch) => {
     dispatch(showLoadingIndication());
     log.debug(`background.setUseNonceField`);
-    background.setUseNonceField(val, (err) => {
-      dispatch(hideLoadingIndication());
-      if (err) {
-        dispatch(displayWarning(err.message));
-      }
-    });
+    try {
+      await background.setUseNonceField(val);
+    } catch (error) {
+      dispatch(displayWarning(error.message));
+    }
+    dispatch(hideLoadingIndication());
     dispatch({
       type: actionConstants.SET_USE_NONCEFIELD,
       value: val,
@@ -2084,6 +2177,32 @@ export function setUseTokenDetection(val) {
   };
 }
 
+export function setUseCollectibleDetection(val) {
+  return (dispatch) => {
+    dispatch(showLoadingIndication());
+    log.debug(`background.setUseCollectibleDetection`);
+    background.setUseCollectibleDetection(val, (err) => {
+      dispatch(hideLoadingIndication());
+      if (err) {
+        dispatch(displayWarning(err.message));
+      }
+    });
+  };
+}
+
+export function setOpenSeaEnabled(val) {
+  return (dispatch) => {
+    dispatch(showLoadingIndication());
+    log.debug(`background.setOpenSeaEnabled`);
+    background.setOpenSeaEnabled(val, (err) => {
+      dispatch(hideLoadingIndication());
+      if (err) {
+        dispatch(displayWarning(err.message));
+      }
+    });
+  };
+}
+
 export function setAdvancedGasFee(val) {
   return (dispatch) => {
     dispatch(showLoadingIndication());
@@ -2403,19 +2522,6 @@ export function removePermissionsFor(domains) {
   };
 }
 
-/**
- * Clears all permissions for all domains.
- */
-export function clearPermissions() {
-  return (dispatch) => {
-    background.clearPermissions((err) => {
-      if (err) {
-        dispatch(displayWarning(err.message));
-      }
-    });
-  };
-}
-
 // Pending Approvals
 
 /**
@@ -2483,6 +2589,13 @@ export function setNewNetworkAdded(newNetworkAdded) {
   };
 }
 
+export function setNewCollectibleAddedMessage(newCollectibleAddedMessage) {
+  return {
+    type: actionConstants.SET_NEW_COLLECTIBLE_ADDED_MESSAGE,
+    value: newCollectibleAddedMessage,
+  };
+}
+
 export function setLastActiveTime() {
   return (dispatch) => {
     background.setLastActiveTime((err) => {
@@ -2734,19 +2847,17 @@ export function setNextNonce(nextNonce) {
 }
 
 export function getNextNonce() {
-  return (dispatch, getState) => {
+  return async (dispatch, getState) => {
     const address = getState().metamask.selectedAddress;
-    return new Promise((resolve, reject) => {
-      background.getNextNonce(address, (err, nextNonce) => {
-        if (err) {
-          dispatch(displayWarning(err.message));
-          reject(err);
-          return;
-        }
-        dispatch(setNextNonce(nextNonce));
-        resolve(nextNonce);
-      });
-    });
+    let nextNonce;
+    try {
+      nextNonce = await promisifiedBackground.getNextNonce(address);
+    } catch (error) {
+      dispatch(displayWarning(error.message));
+      throw error;
+    }
+    dispatch(setNextNonce(nextNonce));
+    return nextNonce;
   };
 }
 
@@ -2935,3 +3046,30 @@ export async function detectNewTokens() {
 export function hideTestNetMessage() {
   return promisifiedBackground.setShowTestnetMessageInDropdown(false);
 }
+
+// QR Hardware Wallets
+export async function submitQRHardwareCryptoHDKey(cbor) {
+  await promisifiedBackground.submitQRHardwareCryptoHDKey(cbor);
+}
+
+export async function submitQRHardwareCryptoAccount(cbor) {
+  await promisifiedBackground.submitQRHardwareCryptoAccount(cbor);
+}
+
+export function cancelSyncQRHardware() {
+  return async (dispatch) => {
+    dispatch(hideLoadingIndication());
+    await promisifiedBackground.cancelSyncQRHardware();
+  };
+}
+
+export async function submitQRHardwareSignature(requestId, cbor) {
+  await promisifiedBackground.submitQRHardwareSignature(requestId, cbor);
+}
+
+export function cancelQRHardwareSignRequest() {
+  return async (dispatch) => {
+    dispatch(hideLoadingIndication());
+    await promisifiedBackground.cancelQRHardwareSignRequest();
+  };
+}
diff --git a/ui/store/actions.test.js b/ui/store/actions.test.js
index 90f524895..6d8aa3a34 100644
--- a/ui/store/actions.test.js
+++ b/ui/store/actions.test.js
@@ -45,17 +45,13 @@ describe('Actions', () => {
       sinon.restore();
     });
 
-    it('calls submitPassword and verifySeedPhrase', async () => {
+    it('calls submitPassword', async () => {
       const store = mockStore();
 
       const submitPassword = background.submitPassword.callsFake((_, cb) =>
         cb(),
       );
 
-      const verifySeedPhrase = background.verifySeedPhrase.callsFake((cb) =>
-        cb(),
-      );
-
       actions._setBackgroundConnection(background);
 
       const expectedActions = [
@@ -72,7 +68,6 @@ describe('Actions', () => {
       await store.dispatch(actions.tryUnlockMetamask());
 
       expect(submitPassword.callCount).toStrictEqual(1);
-      expect(verifySeedPhrase.callCount).toStrictEqual(1);
 
       expect(store.getActions()).toStrictEqual(expectedActions);
     });
@@ -97,36 +92,6 @@ describe('Actions', () => {
 
       expect(store.getActions()).toStrictEqual(expectedActions);
     });
-
-    it('displays warning error and unlock failed when verifySeed fails', async () => {
-      const store = mockStore();
-
-      background.submitPassword.callsFake((_, cb) => cb());
-      background.verifySeedPhrase.callsFake((cb) => {
-        cb(new Error('error'));
-      });
-
-      actions._setBackgroundConnection(background);
-
-      const expectedActions = [
-        { type: 'SHOW_LOADING_INDICATION', value: undefined },
-        { type: 'UNLOCK_IN_PROGRESS' },
-        { type: 'UNLOCK_SUCCEEDED', value: undefined },
-        {
-          type: 'UPDATE_METAMASK_STATE',
-          value: baseMockState,
-        },
-        { type: 'DISPLAY_WARNING', value: 'error' },
-        { type: 'UNLOCK_FAILED', value: 'error' },
-        { type: 'HIDE_LOADING_INDICATION' },
-      ];
-
-      await expect(
-        store.dispatch(actions.tryUnlockMetamask('test')),
-      ).rejects.toThrow('error');
-
-      expect(store.getActions()).toStrictEqual(expectedActions);
-    });
   });
 
   describe('#createNewVaultAndRestore', () => {
diff --git a/yarn.lock b/yarn.lock
index efb65fe4c..1e93c4229 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -62,7 +62,12 @@
   resolved "https://registry.yarnpkg.com/@agoric/transform-module/-/transform-module-0.4.1.tgz#9fb152364faf372e1bda535cb4ef89717724f57c"
   integrity sha512-4TJJHXeXAWu1FCA7yXCAZmhBNoGTB/BEAe2pv+J2X8W/mJTr9b395OkDCSRMpzvmSshLfBx6wT0D7dqWIWEC1w==
 
-"@babel/code-frame@7.10.4", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.5.5":
+"@apocentre/alias-sampling@^0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@apocentre/alias-sampling/-/alias-sampling-0.5.3.tgz#897ff181b48ad7b2bcb4ecf29400214888244f08"
+  integrity sha512-7UDWIIF9hIeJqfKXkNIzkVandlwLf1FWTSdrb9iXvOP8oF544JRXQjCbiTmCv2c9n44n/FIWtehhBfNuAx2CZA==
+
+"@babel/code-frame@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
@@ -76,36 +81,19 @@
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.15.8", "@babel/code-frame@^7.5.5", "@babel/code-frame@^7.8.3":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.15.8.tgz#45990c47adadb00c03677baa89221f7cc23d2503"
   integrity sha512-2IAnmn8zbvC/jKYhq5Ki9I+DwjlrtMPUCH/CpHvqI4dNnlwHwsxoIhlc8WcYY5LSYknXQtAlFYuHfqAFCvQ4Wg==
   dependencies:
     "@babel/highlight" "^7.14.5"
 
-"@babel/compat-data@^7.12.5", "@babel/compat-data@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.12.7.tgz#9329b4782a7d6bbd7eef57e11addf91ee3ef1e41"
-  integrity sha512-YaxPMGs/XIWtYqrdEOZOCPsVWfEoriXopnsz3/i7apYPXQ3698UFhS6dVT1KN5qOsWmVgw/FOrmQgpRaZayGsw==
-
 "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.15.0":
   version "7.15.0"
   resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176"
   integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA==
 
-"@babel/compat-data@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
-  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
-
-"@babel/core@7.12.9", "@babel/core@>=7.9.0", "@babel/core@^7.12.1", "@babel/core@^7.7.5":
+"@babel/core@7.12.9":
   version "7.12.9"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.9.tgz#fd450c4ec10cdbb980e2928b7aa7a28484593fc8"
   integrity sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==
@@ -127,28 +115,7 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.1.0":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.14.tgz#8e46ebbaca460a63497c797e574038ab04ae6d06"
-  integrity sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
-    "@babel/helper-module-transforms" "^7.13.14"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
-
-"@babel/core@^7.12.10":
+"@babel/core@>=7.9.0", "@babel/core@^7.1.0", "@babel/core@^7.12.1", "@babel/core@^7.12.10", "@babel/core@^7.7.5":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.8.tgz#195b9f2bffe995d2c6c159e72fe525b4114e8c10"
   integrity sha512-3UG9dsxvYBMYwRv+gS41WKHno4K60/9GPy1CJaH6xy3Elq8CTtvtjT5R5jmNhXfCYLX2mTw+7/aq5ak/gOE0og==
@@ -185,7 +152,7 @@
   dependencies:
     eslint-rule-composer "^0.3.0"
 
-"@babel/generator@^7.12.11", "@babel/generator@^7.15.4", "@babel/generator@^7.15.8":
+"@babel/generator@^7.12.11", "@babel/generator@^7.12.5", "@babel/generator@^7.15.4", "@babel/generator@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.8.tgz#fa56be6b596952ceb231048cf84ee499a19c0cd1"
   integrity sha512-ECmAKstXbp1cvpTTZciZCgfOt6iN64lR0d+euv3UZisU5awfRawOvg07Utn/qBGuH4bRIEZKrA/4LzZyXhZr8g==
@@ -194,31 +161,6 @@
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.5.tgz#a2c50de5c8b6d708ab95be5e6053936c1884a4de"
-  integrity sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==
-  dependencies:
-    "@babel/types" "^7.12.5"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
-  dependencies:
-    "@babel/types" "^7.13.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz#5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"
-  integrity sha512-XQlqKQP4vXFB7BN8fEEerrmYvHp3fK/rBkRFz9jaJbzK0B1DSfej9Kc7ZzE8Z/OnId1jpJdNAZ3BFQjWG68rcA==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-annotate-as-pure@^7.14.5", "@babel/helper-annotate-as-pure@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz#3d0e43b00c5e49fdb6c57e421601a7a658d5f835"
@@ -226,14 +168,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz#bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"
-  integrity sha512-L0zGlFrGWZK4PbT8AszSfLTM5sDU1+Az/En9VrdT8/LmEiJt4zXt+Jve9DCAnQcbqDhCI+29y/L93mrDzddCcg==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz#21ad815f609b84ee0e3058676c33cf6d1670525f"
@@ -242,33 +176,6 @@
     "@babel/helper-explode-assignable-expression" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helper-builder-react-jsx-experimental@^7.12.4":
-  version "7.12.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz#55fc1ead5242caa0ca2875dcb8eed6d311e50f48"
-  integrity sha512-AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-builder-react-jsx@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz#8095cddbff858e6fa9c326daee54a2f2732c1d5d"
-  integrity sha512-5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-compilation-targets@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz#cb470c76198db6a24e9dbc8987275631e5d29831"
-  integrity sha512-+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw==
-  dependencies:
-    "@babel/compat-data" "^7.12.5"
-    "@babel/helper-validator-option" "^7.12.1"
-    browserslist "^4.14.5"
-    semver "^5.5.0"
-
 "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz#cf6d94f30fbefc139123e27dd6b02f65aeedb7b9"
@@ -279,27 +186,6 @@
     browserslist "^4.16.6"
     semver "^6.3.0"
 
-"@babel/helper-compilation-targets@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
-  dependencies:
-    "@babel/compat-data" "^7.13.12"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
-
-"@babel/helper-create-class-features-plugin@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.12.1.tgz#3c45998f431edd4a9214c5f1d3ad1448a6137f6e"
-  integrity sha512-hkL++rWeta/OVOBTRJc9a5Azh5mt5WgZUGAKMD8JM141YsE08K//bp1unBBieO6rUKkIPyUE0USQ30jAy3Sk1w==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-
 "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz#7f977c17bd12a5fba363cb19bea090394bf37d2e"
@@ -312,14 +198,6 @@
     "@babel/helper-replace-supers" "^7.15.4"
     "@babel/helper-split-export-declaration" "^7.15.4"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.1":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.7.tgz#2084172e95443fa0a09214ba1bb328f9aea1278f"
-  integrity sha512-idnutvQPdpbduutvi3JVfEgcVIHooQnhvhx0Nk9isOINOIGYkZea1Pk2JlJRiUnMefrlvr0vkByATBY/mB4vjQ==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    regexpu-core "^4.7.1"
-
 "@babel/helper-create-regexp-features-plugin@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
@@ -328,15 +206,6 @@
     "@babel/helper-annotate-as-pure" "^7.14.5"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-map@^7.10.4":
-  version "7.10.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz#b53c10db78a640800152692b13393147acb9bb30"
-  integrity sha512-fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/types" "^7.10.5"
-    lodash "^4.17.19"
-
 "@babel/helper-define-polyfill-provider@^0.1.5":
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e"
@@ -365,13 +234,6 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.10.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.1.tgz#8006a466695c4ad86a2a5f2fb15b5f2c31ad5633"
-  integrity sha512-dmUwH8XmlrUpVqgtZ737tK88v07l840z9j3OEhCLwKTkjlvKpfqXVIZ0wpK3aeOxspwGrf/5AP5qLx4rO3w5rA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
 "@babel/helper-explode-assignable-expression@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz#f9aec9d219f271eaf92b9f561598ca6b2682600c"
@@ -379,24 +241,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-function-name@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz#d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"
-  integrity sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
 "@babel/helper-function-name@^7.14.5", "@babel/helper-function-name@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz#845744dafc4381a4a5fb6afa6c3d36f98a787ebc"
@@ -406,20 +250,6 @@
     "@babel/template" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helper-get-function-arity@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz#98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"
-  integrity sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
 "@babel/helper-get-function-arity@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz#098818934a137fce78b536a3e015864be1e2879b"
@@ -427,13 +257,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-hoist-variables@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz#d49b001d1d5a68ca5e6604dda01a6297f7c9381e"
-  integrity sha512-wljroF5PgCk2juF69kanHVs6vrLwIPNp6DLD+Lrl3hoQ3PpPPikaDRNFA+0t81NOoMt2DL6WW/mdU8k4k6ZzuA==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-hoist-variables@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz#09993a3259c0e918f99d104261dfdfc033f178df"
@@ -441,20 +264,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-member-expression-to-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz#fba0f2fcff3fba00e6ecb664bb5e6e26e2d6165c"
-  integrity sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
 "@babel/helper-member-expression-to-functions@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz#bfd34dc9bba9824a4658b0317ec2fd571a51e6ef"
@@ -462,57 +271,14 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz#1bfc0229f794988f76ed0a4d4e90860850b54dfb"
-  integrity sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==
-  dependencies:
-    "@babel/types" "^7.12.5"
-
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz#e18007d230632dea19b47853b984476e7b4e103f"
   integrity sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-module-imports@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
-  integrity sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-simple-access" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.13.14":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz#e600652ba48ccb1641775413cb32cfa4e8b495ef"
-  integrity sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==
-  dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.14"
-
-"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.15.8":
+"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.4", "@babel/helper-module-transforms@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.8.tgz#d8c0e75a87a52e374a8f25f855174786a09498b2"
   integrity sha512-DfAfA6PfpG8t4S6npwzLvTUpp0sS7JrcuaMiy1Y5645laRJIp/LiLGIBbQKaXSInK8tiGNI7FL7L8UvB8gdUZg==
@@ -526,20 +292,6 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.6"
 
-"@babel/helper-optimise-call-expression@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz#50dc96413d594f995a77905905b05893cd779673"
-  integrity sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==
-  dependencies:
-    "@babel/types" "^7.10.4"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
 "@babel/helper-optimise-call-expression@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz#f310a5121a3b9cc52d9ab19122bd729822dee171"
@@ -547,30 +299,16 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-plugin-utils@7.10.4", "@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+"@babel/helper-plugin-utils@7.10.4":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
 
-"@babel/helper-plugin-utils@^7.12.13":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
   integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
 
-"@babel/helper-remap-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.12.1.tgz#8c4dbbf916314f6047dc05e6a2217074238347fd"
-  integrity sha512-9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-wrap-function" "^7.10.4"
-    "@babel/types" "^7.12.1"
-
 "@babel/helper-remap-async-to-generator@^7.14.5", "@babel/helper-remap-async-to-generator@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz#2637c0731e4c90fbf58ac58b50b2b5a192fc970f"
@@ -580,26 +318,6 @@
     "@babel/helper-wrap-function" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helper-replace-supers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz#f15c9cc897439281891e11d5ce12562ac0cf3fa9"
-  integrity sha512-zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.1"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/traverse" "^7.12.1"
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
 "@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz#52a8ab26ba918c7f6dee28628b07071ac7b7347a"
@@ -610,20 +328,6 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helper-simple-access@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz#32427e5aa61547d38eb1e6eaf5fd1426fdad9136"
-  integrity sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
 "@babel/helper-simple-access@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz#ac368905abf1de8e9781434b635d8f8674bcc13b"
@@ -631,13 +335,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
-  integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
-  dependencies:
-    "@babel/types" "^7.12.1"
-
 "@babel/helper-skip-transparent-expression-wrappers@^7.14.5", "@babel/helper-skip-transparent-expression-wrappers@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz#707dbdba1f4ad0fa34f9114fc8197aec7d5da2eb"
@@ -645,20 +342,6 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-split-export-declaration@^7.10.4", "@babel/helper-split-export-declaration@^7.11.0":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz#f8a491244acf6a676158ac42072911ba83ad099f"
-  integrity sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==
-  dependencies:
-    "@babel/types" "^7.11.0"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
 "@babel/helper-split-export-declaration@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz#aecab92dcdbef6a10aa3b62ab204b085f776e257"
@@ -666,51 +349,16 @@
   dependencies:
     "@babel/types" "^7.15.4"
 
-"@babel/helper-validator-identifier@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz#a78c7a7251e01f616512d31b10adcf52ada5e0d2"
-  integrity sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==
-
-"@babel/helper-validator-identifier@^7.12.11":
-  version "7.12.11"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed"
-  integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==
-
-"@babel/helper-validator-identifier@^7.14.5":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
-  integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
-
-"@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9", "@babel/helper-validator-identifier@^7.15.7":
   version "7.15.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz#220df993bfe904a4a6b02ab4f3385a5ebf6e2389"
   integrity sha512-K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w==
 
-"@babel/helper-validator-option@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.1.tgz#175567380c3e77d60ff98a54bb015fe78f2178d9"
-  integrity sha512-YpJabsXlJVWP0USHjnC/AQDTLlZERbON577YUVO/wLpqyj6HAtVYnWaQaN0iUN+1/tWn3c+uKKXjRut5115Y2A==
-
-"@babel/helper-validator-option@^7.12.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
 "@babel/helper-validator-option@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
   integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
 
-"@babel/helper-wrap-function@^7.10.4":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.12.3.tgz#3332339fc4d1fbbf1c27d7958c27d34708e990d9"
-  integrity sha512-Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.10.4"
-    "@babel/types" "^7.10.4"
-
 "@babel/helper-wrap-function@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz#6f754b2446cfaf3d612523e6ab8d79c27c3a3de7"
@@ -721,25 +369,7 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/helpers@^7.12.5":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.5.tgz#1a1ba4a768d9b58310eda516c449913fe647116e"
-  integrity sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==
-  dependencies:
-    "@babel/template" "^7.10.4"
-    "@babel/traverse" "^7.12.5"
-    "@babel/types" "^7.12.5"
-
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
-  dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helpers@^7.15.4":
+"@babel/helpers@^7.12.5", "@babel/helpers@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.4.tgz#5f40f02050a3027121a3cf48d497c05c555eaf43"
   integrity sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==
@@ -748,25 +378,7 @@
     "@babel/traverse" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.12.13":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
-  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    chalk "^2.0.0"
-    js-tokens "^4.0.0"
-
-"@babel/highlight@^7.14.5":
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
   integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
@@ -775,36 +387,11 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0":
-  version "7.15.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.6.tgz#043b9aa3c303c0722e5377fef9197f4cf1796549"
-  integrity sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==
-
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
-  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
-
-"@babel/parser@^7.10.1", "@babel/parser@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.7.tgz#fee7b39fe809d0e73e5b25eecaf5780ef3d73056"
-  integrity sha512-oWR02Ubp4xTLCAqPRiNIuMVgNO5Aif/xpXtabhzW2HWUD47XJsAB4Zd/Rg30+XeQA3juXigV7hlquOTmwqLiwg==
-
-"@babel/parser@^7.12.0", "@babel/parser@^7.12.5", "@babel/parser@^7.13.9":
-  version "7.14.7"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.7.tgz#6099720c8839ca865a2637e6c85852ead0bdb595"
-  integrity sha512-X67Z5y+VBJuHB/RjwECp8kSl5uYi0BvRbNeWqkaJCVh+LiTPl19WBUfG627psSgp9rSf6ojuXghQM3ha6qHHdA==
-
-"@babel/parser@^7.12.11", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.10.1", "@babel/parser@^7.12.0", "@babel/parser@^7.12.11", "@babel/parser@^7.12.5", "@babel/parser@^7.12.7", "@babel/parser@^7.13.9", "@babel/parser@^7.15.4", "@babel/parser@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.8.tgz#7bacdcbe71bdc3ff936d510c15dcea7cf0b99016"
   integrity sha512-BRYa3wcQnjS/nqI8Ac94pYYpJfojHVvVXJ97+IDCImX4Jc8W8Xv1+47enbruk+q1etOpsQNwnfFcNGw+gtPGxA==
 
-"@babel/parser@^7.7.5":
-  version "7.12.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.3.tgz#a305415ebe7a6c7023b40b5122a0662d928334cd"
-  integrity sha512-kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw==
-
 "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz#dbdeabb1e80f622d9f0b583efb2999605e0a567e"
@@ -814,15 +401,6 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
     "@babel/plugin-proposal-optional-chaining" "^7.14.5"
 
-"@babel/plugin-proposal-async-generator-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.12.1.tgz#dc6c1170e27d8aca99ff65f4925bd06b1c90550e"
-  integrity sha512-d+/o30tJxFxrA1lhzJqiUcEJdI6jKlNregCv5bASeGf2Q4MXmnwH7viDo7nhx1/ohf09oaH8j1GVYG/e3Yqk6A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-
 "@babel/plugin-proposal-async-generator-functions@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.8.tgz#a3100f785fab4357987c4223ab1b02b599048403"
@@ -832,15 +410,7 @@
     "@babel/helper-remap-async-to-generator" "^7.15.4"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.5.5":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.12.1.tgz#a082ff541f2a29a4821065b8add9346c0c16e5de"
-  integrity sha512-cKp3dlQsFsEs5CWKnN7BnSHOd0EOW8EKpEjkoz1pO2E5KzIDNV9Ros1b0CnmbVgAGXJubOYVBOGCT1OmJwOI7w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-class-properties@^7.14.5":
+"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.5.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
   integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
@@ -866,14 +436,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-decorators" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.12.1.tgz#43eb5c2a3487ecd98c5c8ea8b5fdb69a2749b2dc"
-  integrity sha512-a4rhUSZFuq5W8/OO8H7BL5zspjnc1FLd9hlOxIK/f7qG4a0qsqk8uvF/ywgBA8/OmjsapjpvaEOYItfGG1qIvQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-
 "@babel/plugin-proposal-dynamic-import@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
@@ -890,14 +452,6 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-export-default-from" "^7.12.1"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.1.tgz#8b9b8f376b2d88f5dd774e4d24a5cc2e3679b6d4"
-  integrity sha512-6CThGf0irEkzujYS5LQcjBx8j/4aQGiVv7J9+2f7pGfxqyKh3WnmVJYW3hdrQjyksErMGBPQrCnHfOtna+WLbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
 "@babel/plugin-proposal-export-namespace-from@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
@@ -906,14 +460,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.12.1.tgz#d45423b517714eedd5621a9dfdc03fa9f4eb241c"
-  integrity sha512-GoLDUi6U9ZLzlSda2Df++VSqDJg3CG+dR0+iWsv6XRw1rEq+zwt4DirM9yrxW6XWaTpmai1cWJLMfM8qQJf+yw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-
 "@babel/plugin-proposal-json-strings@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
@@ -922,14 +468,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.12.1.tgz#f2c490d36e1b3c9659241034a5d2cd50263a2751"
-  integrity sha512-k8ZmVv0JU+4gcUGeCDZOGd0lCIamU/sMtIiX3UWnUc5yzgq6YUGyEolNYD+MLYKfSzgECPcqetVcJP9Afe/aCA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
 "@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
@@ -938,15 +476,7 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.12.1.tgz#3ed4fff31c015e7f3f1467f190dbe545cd7b046c"
-  integrity sha512-nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.10.4", "@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
   integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
@@ -954,14 +484,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.7.tgz#8bf253de8139099fea193b297d23a9d406ef056b"
-  integrity sha512-8c+uy0qmnRTeukiGsjLGy6uVs/TFjJchGXUeBqlG4VWYOdJWkhhVPdQ3uHwbmalfJwv2JsV0qffXP4asRfL2SQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
 "@babel/plugin-proposal-numeric-separator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
@@ -970,7 +492,7 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
+"@babel/plugin-proposal-object-rest-spread@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.12.1.tgz#def9bd03cea0f9b72283dac0ec22d289c7691069"
   integrity sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==
@@ -979,7 +501,7 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
     "@babel/plugin-transform-parameters" "^7.12.1"
 
-"@babel/plugin-proposal-object-rest-spread@^7.15.6":
+"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.15.6", "@babel/plugin-proposal-object-rest-spread@^7.5.5":
   version "7.15.6"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz#ef68050c8703d07b25af402cb96cf7f34a68ed11"
   integrity sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==
@@ -990,14 +512,6 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-transform-parameters" "^7.15.4"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.12.1.tgz#ccc2421af64d3aae50b558a71cede929a5ab2942"
-  integrity sha512-hFvIjgprh9mMw5v42sJWLI1lzU5L2sznP805zeT6rySVRA0Y18StRhDqhSxlap0oVgItRsB6WSROp4YnJTJz0g==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-
 "@babel/plugin-proposal-optional-catch-binding@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
@@ -1006,16 +520,7 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.8.3":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.12.7.tgz#e02f0ea1b5dc59d401ec16fb824679f683d3303c"
-  integrity sha512-4ovylXZ0PWmwoOvhU2vhnzVNnm88/Sm9nx7V8BPgMvAzn5zDou3/Awy0EjglyubVHasJj+XCEkr/r1X3P5elCA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-
-"@babel/plugin-proposal-optional-chaining@^7.14.5":
+"@babel/plugin-proposal-optional-chaining@^7.12.7", "@babel/plugin-proposal-optional-chaining@^7.14.5", "@babel/plugin-proposal-optional-chaining@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
   integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
@@ -1024,15 +529,7 @@
     "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.12.1.tgz#86814f6e7a21374c980c10d38b4493e703f4a389"
-  integrity sha512-mwZ1phvH7/NHK6Kf8LP7MYDogGV+DKB1mryFOEwx5EBNQrosvIczzZFTUmWaeujd5xT6G1ELYWUz3CutMhjE1w==
-  dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-private-methods@^7.14.5":
+"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
   integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
@@ -1050,15 +547,7 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.1.tgz#2a183958d417765b9eae334f47758e5d6a82e072"
-  integrity sha512-MYq+l+PvHuw/rKUz1at/vb6nCnQ2gmJBNaM62z0OgH7B2W1D9pvkpYtlti9bGtizNIU1K3zm4bZF9F91efVY0w==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-proposal-unicode-property-regex@^7.14.5":
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
   integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
@@ -1066,7 +555,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4":
+"@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
@@ -1080,13 +569,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-class-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz#bcb297c5366e79bebadef509549cd93b04f19978"
-  integrity sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-syntax-class-properties@^7.12.13", "@babel/plugin-syntax-class-properties@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
@@ -1108,7 +590,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3":
+"@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
@@ -1143,14 +625,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-json-strings@^7.8.0", "@babel/plugin-syntax-json-strings@^7.8.3":
+"@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-jsx@7.12.1", "@babel/plugin-syntax-jsx@^7.12.1":
+"@babel/plugin-syntax-jsx@7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.1.tgz#9d9d357cc818aa7ae7935917c1257f67677a0926"
   integrity sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==
@@ -1171,7 +653,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
-"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.0", "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
+"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
@@ -1192,14 +674,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-catch-binding@^7.8.0", "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
+"@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-optional-chaining@^7.8.0", "@babel/plugin-syntax-optional-chaining@^7.8.3":
+"@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
@@ -1213,27 +695,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0"
-  integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-syntax-top-level-await@^7.14.5":
+"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-syntax-top-level-await@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
 "@babel/plugin-syntax-typescript@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716"
@@ -1241,29 +709,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.12.1.tgz#8083ffc86ac8e777fbe24b5967c4b2521f3cb2b3"
-  integrity sha512-5QB50qyN44fzzz4/qxDPQMBCTHgxg3n0xRBLJUmBlLoU/sFvxVWGZF/ZUfMVDQuJUKXaBhbupxIzIfZ6Fwk/0A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-arrow-functions@^7.14.5":
+"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
   integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-async-to-generator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.12.1.tgz#3849a49cc2a22e9743cbd6b52926d30337229af1"
-  integrity sha512-SDtqoEcarK1DFlRJ1hHRY5HvJUj5kX4qmtpMAm2QnhOlyuMC4TMdCRgW6WXpv93rZeYNeLP22y8Aq2dbcDRM1A==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-remap-async-to-generator" "^7.12.1"
-
 "@babel/plugin-transform-async-to-generator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
@@ -1273,13 +725,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-remap-async-to-generator" "^7.14.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.1.tgz#f2a1a365bde2b7112e0a6ded9067fdd7c07905d9"
-  integrity sha512-5OpxfuYnSgPalRpo8EWGPzIYf0lHBWORCkj5M0oLBwHdlux9Ri36QqGW3/LR13RSVOAoUUMzoPI/jpE4ABcHoA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-block-scoped-functions@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
@@ -1287,13 +732,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-block-scoping@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.1.tgz#f0ee727874b42a208a48a586b84c3d222c2bbef1"
-  integrity sha512-zJyAC9sZdE60r1nVQHblcfCj29Dh2Y0DOvlMkcqSo0ckqjiCwNiUezUKw+RjOCwGfpLRwnAeQ2XlLpsnGkvv9w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-block-scoping@^7.12.12", "@babel/plugin-transform-block-scoping@^7.15.3":
   version "7.15.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf"
@@ -1301,21 +739,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.12.1.tgz#65e650fcaddd3d88ddce67c0f834a3d436a32db6"
-  integrity sha512-/74xkA7bVdzQTBeSUhLLJgYIcxw/dpEpCdRDiHgPJ3Mv6uC11UhjpOhl72CgqbBCmt1qtssCyB2xnJm1+PFjog==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-define-map" "^7.10.4"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-optimise-call-expression" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-    "@babel/helper-split-export-declaration" "^7.10.4"
-    globals "^11.1.0"
-
-"@babel/plugin-transform-classes@^7.15.4":
+"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz#50aee17aaf7f332ae44e3bce4c2e10534d5d3bf1"
   integrity sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==
@@ -1328,13 +752,6 @@
     "@babel/helper-split-export-declaration" "^7.15.4"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.12.1.tgz#d68cf6c9b7f838a8a4144badbe97541ea0904852"
-  integrity sha512-vVUOYpPWB7BkgUWPo4C44mUQHpTZXakEqFjbv8rQMg7TC6S6ZhGZ3otQcRH6u7+adSlE5i0sp63eMC/XGffrzg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-computed-properties@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
@@ -1342,29 +759,14 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-destructuring@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.12.1.tgz#b9a570fe0d0a8d460116413cb4f97e8e08b2f847"
-  integrity sha512-fRMYFKuzi/rSiYb2uRLiUENJOKq4Gnl+6qOv5f8z0TZXg3llUwUhsNNwrwaT/6dUhJTzNpBr+CUvEWBtfNY1cw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-destructuring@^7.14.7":
+"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.14.7":
   version "7.14.7"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
   integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.1.tgz#a1d16c14862817b6409c0a678d6f9373ca9cd975"
-  integrity sha512-B2pXeRKoLszfEW7J4Hg9LoFaWEbr/kzo3teWHmtFCszjRNa/b40f9mfeqZsIDLLt/FjwQ6pz/Gdlwy85xNckBA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-dotall-regex@^7.14.5":
+"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
   integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
@@ -1372,13 +774,6 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.1.tgz#745661baba295ac06e686822797a69fbaa2ca228"
-  integrity sha512-iRght0T0HztAb/CazveUpUQrZY+aGKKaWXMJ4uf9YJtqxSUe09j3wteztCUDRHs+SRAL7yMuFqUsLoAKKzgXjw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-duplicate-keys@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
@@ -1386,14 +781,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.1.tgz#b0f2ed356ba1be1428ecaf128ff8a24f02830ae0"
-  integrity sha512-7tqwy2bv48q+c1EHbXK0Zx3KXd2RVQp6OC7PbwFNt/dPTAV3Lu5sWtWuAj8owr5wqtWnqHfl2/mJlUmqkChKug==
-  dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-exponentiation-operator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
@@ -1410,28 +797,13 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-syntax-flow" "^7.12.1"
 
-"@babel/plugin-transform-for-of@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.12.1.tgz#07640f28867ed16f9511c99c888291f560921cfa"
-  integrity sha512-Zaeq10naAsuHo7heQvyV0ptj4dlZJwZgNAtBYBnu5nNKJoW62m0zKcIEyVECrUKErkUkg6ajMy4ZfnVZciSBhg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-for-of@^7.15.4":
+"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz#25c62cce2718cfb29715f416e75d5263fb36a8c2"
   integrity sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-function-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.1.tgz#2ec76258c70fe08c6d7da154003a480620eba667"
-  integrity sha512-JF3UgJUILoFrFMEnOJLJkRHSk6LUSXLmEFsA23aR2O5CSLUxbeUX1IZ1YQ7Sn0aXb601Ncwjx73a+FVqgcljVw==
-  dependencies:
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-function-name@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
@@ -1440,13 +812,6 @@
     "@babel/helper-function-name" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.1.tgz#d73b803a26b37017ddf9d3bb8f4dc58bfb806f57"
-  integrity sha512-+PxVGA+2Ag6uGgL0A5f+9rklOnnMccwEBzwYFL3EUaKuiyVnUipyXncFcfjSkbimLrODoqki1U9XxZzTvfN7IQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
@@ -1454,13 +819,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.1.tgz#496038602daf1514a64d43d8e17cbb2755e0c3ad"
-  integrity sha512-1sxePl6z9ad0gFMB9KqmYofk34flq62aqMt9NqliS/7hPEpURUCMbyHXrMPlo282iY7nAvUB1aQd5mg79UD9Jg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-member-expression-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
@@ -1468,15 +826,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-modules-amd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.12.1.tgz#3154300b026185666eebb0c0ed7f8415fefcf6f9"
-  integrity sha512-tDW8hMkzad5oDtzsB70HIQQRBiTKrhfgwC/KkJeGsaNFTdWhKNt/BiE8c5yj19XiGyrxpbkOfH87qkNg1YGlOQ==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
 "@babel/plugin-transform-modules-amd@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
@@ -1486,16 +835,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.12.1.tgz#fa403124542636c786cf9b460a0ffbb48a86e648"
-  integrity sha512-dY789wq6l0uLY8py9c1B48V8mVL5gZh/+PQ5ZPrylPYsnAvnEMjqsUXkuoDVPeVK+0VyGar+D08107LzDQ6pag==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-simple-access" "^7.12.1"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
 "@babel/plugin-transform-modules-commonjs@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz#8201101240eabb5a76c08ef61b2954f767b6b4c1"
@@ -1506,17 +845,6 @@
     "@babel/helper-simple-access" "^7.15.4"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.12.1.tgz#663fea620d593c93f214a464cd399bf6dc683086"
-  integrity sha512-Hn7cVvOavVh8yvW6fLwveFqSnd7rbQN3zJvoPNyNaQSvgfKmDBO9U1YL9+PCXGRlZD9tNdWTy5ACKqMuzyn32Q==
-  dependencies:
-    "@babel/helper-hoist-variables" "^7.10.4"
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-identifier" "^7.10.4"
-    babel-plugin-dynamic-import-node "^2.3.3"
-
 "@babel/plugin-transform-modules-systemjs@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz#b42890c7349a78c827719f1d2d0cd38c7d268132"
@@ -1528,14 +856,6 @@
     "@babel/helper-validator-identifier" "^7.14.9"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.12.1.tgz#eb5a218d6b1c68f3d6217b8fa2cc82fec6547902"
-  integrity sha512-aEIubCS0KHKM0zUos5fIoQm+AZUMt1ZvMpqz0/H5qAQ7vWylr9+PLYurT+Ic7ID/bKLd4q8hDovaG3Zch2uz5Q==
-  dependencies:
-    "@babel/helper-module-transforms" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-modules-umd@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
@@ -1544,13 +864,6 @@
     "@babel/helper-module-transforms" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.1.tgz#b407f5c96be0d9f5f88467497fa82b30ac3e8753"
-  integrity sha512-tB43uQ62RHcoDp9v2Nsf+dSM8sbNodbEicbQNA53zHz8pWUhsgHSJCGpt7daXxRydjb0KnfmB+ChXOv3oADp1Q==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-
 "@babel/plugin-transform-named-capturing-groups-regex@^7.14.9":
   version "7.14.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2"
@@ -1558,13 +871,6 @@
   dependencies:
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
 
-"@babel/plugin-transform-new-target@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.1.tgz#80073f02ee1bb2d365c3416490e085c95759dec0"
-  integrity sha512-+eW/VLcUL5L9IvJH7rT1sT0CzkdUTvPrXC2PXTn/7z7tXLBuKvezYbGdxD5WMRoyvyaujOq2fWoKl869heKjhw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-new-target@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
@@ -1572,14 +878,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-object-super@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.1.tgz#4ea08696b8d2e65841d0c7706482b048bed1066e"
-  integrity sha512-AvypiGJH9hsquNUn+RXVcBdeE3KHPZexWRdimhuV59cSoOt5kFBmqlByorAeUlGG2CJWd0U+4ZtNKga/TB0cAw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-replace-supers" "^7.12.1"
-
 "@babel/plugin-transform-object-super@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
@@ -1588,27 +886,13 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-replace-supers" "^7.14.5"
 
-"@babel/plugin-transform-parameters@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.12.1.tgz#d2e963b038771650c922eff593799c96d853255d"
-  integrity sha512-xq9C5EQhdPK23ZeCdMxl8bbRnAgHFrw5EOC3KJUsSylZqdkCaFEXxGSBuTSObOpiiHHNyb82es8M1QYgfQGfNg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-parameters@^7.15.4":
+"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz#5f2285cc3160bf48c8502432716b48504d29ed62"
   integrity sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.1.tgz#41bc81200d730abb4456ab8b3fbd5537b59adecd"
-  integrity sha512-6MTCR/mZ1MQS+AwZLplX4cEySjCpnIF26ToWo942nqn8hXSm7McaHQNeGx/pt7suI1TWOWMfa/NgBhiqSnX0cQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-property-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
@@ -1616,13 +900,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-display-name@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.1.tgz#1cbcd0c3b1d6648c55374a22fc9b6b7e5341c00d"
-  integrity sha512-cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-react-display-name@^7.14.5":
   version "7.15.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.15.1.tgz#6aaac6099f1fcf6589d35ae6be1b6e10c8c602b9"
@@ -1630,15 +907,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-react-jsx-development@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.7.tgz#4c2a647de79c7e2b16bfe4540677ba3121e82a08"
-  integrity sha512-Rs3ETtMtR3VLXFeYRChle5SsP/P9Jp/6dsewBQfokDSzKJThlsuFcnzLTDRALiUmTC48ej19YD9uN1mupEeEDg==
-  dependencies:
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.12.1"
-
 "@babel/plugin-transform-react-jsx-development@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af"
@@ -1646,20 +914,6 @@
   dependencies:
     "@babel/plugin-transform-react-jsx" "^7.14.5"
 
-"@babel/plugin-transform-react-jsx-self@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.1.tgz#ef43cbca2a14f1bd17807dbe4376ff89d714cf28"
-  integrity sha512-FbpL0ieNWiiBB5tCldX17EtXgmzeEZjFrix72rQYeq9X6nUK38HCaxexzVQrZWXanxKJPKVVIU37gFjEQYkPkA==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-react-jsx-source@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.1.tgz#d07de6863f468da0809edcf79a1aa8ce2a82a26b"
-  integrity sha512-keQ5kBfjJNRc6zZN1/nVHCd6LLIHq4aUKcVnvE/2l+ZZROSbqoiGFRtT5t3Is89XJxBQaP7NLZX2jgGHdZvvFQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-react-jsx@^7.12.12", "@babel/plugin-transform-react-jsx@^7.14.5":
   version "7.14.9"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c"
@@ -1671,24 +925,6 @@
     "@babel/plugin-syntax-jsx" "^7.14.5"
     "@babel/types" "^7.14.9"
 
-"@babel/plugin-transform-react-jsx@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.7.tgz#8b14d45f6eccd41b7f924bcb65c021e9f0a06f7f"
-  integrity sha512-YFlTi6MEsclFAPIDNZYiCRbneg1MFGao9pPG9uD5htwE0vDbPaMUMeYd6itWjw7K4kro4UbdQf3ljmFl9y48dQ==
-  dependencies:
-    "@babel/helper-builder-react-jsx" "^7.10.4"
-    "@babel/helper-builder-react-jsx-experimental" "^7.12.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-syntax-jsx" "^7.12.1"
-
-"@babel/plugin-transform-react-pure-annotations@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42"
-  integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.10.4"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-react-pure-annotations@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc"
@@ -1697,13 +933,6 @@
     "@babel/helper-annotate-as-pure" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-regenerator@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.1.tgz#5f0a28d842f6462281f06a964e88ba8d7ab49753"
-  integrity sha512-gYrHqs5itw6i4PflFX3OdBPMQdPbF4bj2REIUxlMRUFk0/ZOAIpDFuViuxPjUL7YC8UPnf+XG7/utJvqXdPKng==
-  dependencies:
-    regenerator-transform "^0.14.2"
-
 "@babel/plugin-transform-regenerator@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
@@ -1711,13 +940,6 @@
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.1.tgz#6fdfc8cc7edcc42b36a7c12188c6787c873adcd8"
-  integrity sha512-pOnUfhyPKvZpVyBHhSBoX8vfA09b7r00Pmm1sH+29ae2hMTKVmSp4Ztsr8KBKjLjx17H0eJqaRC3bR2iThM54A==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-reserved-words@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
@@ -1735,29 +957,14 @@
     resolve "^1.8.1"
     semver "^5.5.1"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.1.tgz#0bf9cac5550fce0cfdf043420f661d645fdc75e3"
-  integrity sha512-GFZS3c/MhX1OusqB1MZ1ct2xRzX5ppQh2JU1h2Pnfk88HtFTM+TWQqJNfwkmxtPQtb/s1tk87oENfXJlx7rSDw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-shorthand-properties@^7.14.5":
+"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
   integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-spread@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.12.1.tgz#527f9f311be4ec7fdc2b79bb89f7bf884b3e1e1e"
-  integrity sha512-vuLp8CP0BE18zVYjsEBZ5xoCecMK6LBMMxYzJnh01rxQRvhNhH1csMMmBfNo5tGpGO+NhdSNW2mzIvBu3K1fng==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-spread@^7.15.8":
+"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.15.8":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.15.8.tgz#79d5aa27f68d700449b2da07691dfa32d2f6d468"
   integrity sha512-/daZ8s2tNaRekl9YJa9X4bzjpeRZLt122cpgFnQPLGUe61PH8zMEBmYqKkW5xF5JUEh5buEGXJoQpqBmIbpmEQ==
@@ -1765,13 +972,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/helper-skip-transparent-expression-wrappers" "^7.15.4"
 
-"@babel/plugin-transform-sticky-regex@^7.12.7":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.7.tgz#560224613ab23987453948ed21d0b0b193fa7fad"
-  integrity sha512-VEiqZL5N/QvDbdjfYQBhruN0HYjSPjC4XkeqW4ny/jNtH9gcbgaqBIXYEZCNnESMAGs0/K/R7oFGMhOyu/eIxg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-sticky-regex@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
@@ -1779,27 +979,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-template-literals@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.12.1.tgz#b43ece6ed9a79c0c71119f576d299ef09d942843"
-  integrity sha512-b4Zx3KHi+taXB1dVRBhVJtEPi9h1THCeKmae2qP0YdUHIFhVjtpqqNfxeVAa1xeHVhAy4SbHxEwx5cltAu5apw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
-"@babel/plugin-transform-template-literals@^7.14.5":
+"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
   integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-typeof-symbol@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.1.tgz#9ca6be343d42512fbc2e68236a82ae64bc7af78a"
-  integrity sha512-EPGgpGy+O5Kg5pJFNDKuxt9RdmTgj5sgrus2XVeMp/ZIbOESadgILUbm50SNpghOh3/6yrbsH+NB5+WJTmsA7Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-typeof-symbol@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
@@ -1816,13 +1002,6 @@
     "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-typescript" "^7.14.5"
 
-"@babel/plugin-transform-unicode-escapes@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.1.tgz#5232b9f81ccb07070b7c3c36c67a1b78f1845709"
-  integrity sha512-I8gNHJLIc7GdApm7wkVnStWssPNbSRMPtgHdmH3sRM1zopz09UWPS4x5V4n1yz/MIWTVnJ9sp6IkuXdWM4w+2Q==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-unicode-escapes@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
@@ -1830,14 +1009,6 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-unicode-regex@^7.12.1":
-  version "7.12.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.1.tgz#cc9661f61390db5c65e3febaccefd5c6ac3faecb"
-  integrity sha512-SqH4ClNngh/zGwHZOOQMTD+e8FGWexILV+ePMyiDJttAWRh5dhDL8rcl5lSgU3Huiq6Zn6pWTMvdPAb21Dwdyg==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.1"
-    "@babel/helper-plugin-utils" "^7.10.4"
-
 "@babel/plugin-transform-unicode-regex@^7.14.5":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
@@ -1846,7 +1017,7 @@
     "@babel/helper-create-regexp-features-plugin" "^7.14.5"
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/preset-env@^7.12.11":
+"@babel/preset-env@^7.12.11", "@babel/preset-env@^7.5.5":
   version "7.15.8"
   resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.8.tgz#f527ce5bcb121cd199f6b502bf23e420b3ff8dba"
   integrity sha512-rCC0wH8husJgY4FPbHsiYyiLxSY8oMDJH7Rl6RQMknbN9oDDHhM9RDFvnGM2MgkbUJzSQB4gtuwygY5mCqGSsA==
@@ -1925,78 +1096,6 @@
     core-js-compat "^3.16.0"
     semver "^6.3.0"
 
-"@babel/preset-env@^7.5.5":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.12.7.tgz#54ea21dbe92caf6f10cb1a0a576adc4ebf094b55"
-  integrity sha512-OnNdfAr1FUQg7ksb7bmbKoby4qFOHw6DKWWUNB9KqnnCldxhxJlP+21dpyaWFmf2h0rTbOkXJtAGevY3XW1eew==
-  dependencies:
-    "@babel/compat-data" "^7.12.7"
-    "@babel/helper-compilation-targets" "^7.12.5"
-    "@babel/helper-module-imports" "^7.12.5"
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/helper-validator-option" "^7.12.1"
-    "@babel/plugin-proposal-async-generator-functions" "^7.12.1"
-    "@babel/plugin-proposal-class-properties" "^7.12.1"
-    "@babel/plugin-proposal-dynamic-import" "^7.12.1"
-    "@babel/plugin-proposal-export-namespace-from" "^7.12.1"
-    "@babel/plugin-proposal-json-strings" "^7.12.1"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.12.1"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.12.1"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.12.1"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.12.7"
-    "@babel/plugin-proposal-private-methods" "^7.12.1"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.12.1"
-    "@babel/plugin-syntax-async-generators" "^7.8.0"
-    "@babel/plugin-syntax-class-properties" "^7.12.1"
-    "@babel/plugin-syntax-dynamic-import" "^7.8.0"
-    "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-    "@babel/plugin-syntax-json-strings" "^7.8.0"
-    "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-    "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0"
-    "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-    "@babel/plugin-syntax-object-rest-spread" "^7.8.0"
-    "@babel/plugin-syntax-optional-catch-binding" "^7.8.0"
-    "@babel/plugin-syntax-optional-chaining" "^7.8.0"
-    "@babel/plugin-syntax-top-level-await" "^7.12.1"
-    "@babel/plugin-transform-arrow-functions" "^7.12.1"
-    "@babel/plugin-transform-async-to-generator" "^7.12.1"
-    "@babel/plugin-transform-block-scoped-functions" "^7.12.1"
-    "@babel/plugin-transform-block-scoping" "^7.12.1"
-    "@babel/plugin-transform-classes" "^7.12.1"
-    "@babel/plugin-transform-computed-properties" "^7.12.1"
-    "@babel/plugin-transform-destructuring" "^7.12.1"
-    "@babel/plugin-transform-dotall-regex" "^7.12.1"
-    "@babel/plugin-transform-duplicate-keys" "^7.12.1"
-    "@babel/plugin-transform-exponentiation-operator" "^7.12.1"
-    "@babel/plugin-transform-for-of" "^7.12.1"
-    "@babel/plugin-transform-function-name" "^7.12.1"
-    "@babel/plugin-transform-literals" "^7.12.1"
-    "@babel/plugin-transform-member-expression-literals" "^7.12.1"
-    "@babel/plugin-transform-modules-amd" "^7.12.1"
-    "@babel/plugin-transform-modules-commonjs" "^7.12.1"
-    "@babel/plugin-transform-modules-systemjs" "^7.12.1"
-    "@babel/plugin-transform-modules-umd" "^7.12.1"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.1"
-    "@babel/plugin-transform-new-target" "^7.12.1"
-    "@babel/plugin-transform-object-super" "^7.12.1"
-    "@babel/plugin-transform-parameters" "^7.12.1"
-    "@babel/plugin-transform-property-literals" "^7.12.1"
-    "@babel/plugin-transform-regenerator" "^7.12.1"
-    "@babel/plugin-transform-reserved-words" "^7.12.1"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.1"
-    "@babel/plugin-transform-spread" "^7.12.1"
-    "@babel/plugin-transform-sticky-regex" "^7.12.7"
-    "@babel/plugin-transform-template-literals" "^7.12.1"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.1"
-    "@babel/plugin-transform-unicode-escapes" "^7.12.1"
-    "@babel/plugin-transform-unicode-regex" "^7.12.1"
-    "@babel/preset-modules" "^0.1.3"
-    "@babel/types" "^7.12.7"
-    core-js-compat "^3.7.0"
-    semver "^5.5.0"
-
 "@babel/preset-flow@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/preset-flow/-/preset-flow-7.12.1.tgz#1a81d376c5a9549e75352a3888f8c273455ae940"
@@ -2005,7 +1104,7 @@
     "@babel/helper-plugin-utils" "^7.10.4"
     "@babel/plugin-transform-flow-strip-types" "^7.12.1"
 
-"@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4":
+"@babel/preset-modules@^0.1.4":
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz#362f2b68c662842970fdb5e254ffc8fc1c2e415e"
   integrity sha512-J36NhwnfdzpmH41M1DrnkkgAqhZaqr/NBdPfQ677mLzlaXo+oDiv1deyCDtgAhz8p328otdob0Du7+xgHGZbKg==
@@ -2016,20 +1115,7 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/preset-react@^7.0.0":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.7.tgz#36d61d83223b07b6ac4ec55cf016abb0f70be83b"
-  integrity sha512-wKeTdnGUP5AEYCYQIMeXMMwU7j+2opxrG0WzuZfxuuW9nhKvvALBjl67653CWamZJVefuJGI219G591RSldrqQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.10.4"
-    "@babel/plugin-transform-react-display-name" "^7.12.1"
-    "@babel/plugin-transform-react-jsx" "^7.12.7"
-    "@babel/plugin-transform-react-jsx-development" "^7.12.7"
-    "@babel/plugin-transform-react-jsx-self" "^7.12.1"
-    "@babel/plugin-transform-react-jsx-source" "^7.12.1"
-    "@babel/plugin-transform-react-pure-annotations" "^7.12.1"
-
-"@babel/preset-react@^7.12.10":
+"@babel/preset-react@^7.0.0", "@babel/preset-react@^7.12.10":
   version "7.14.5"
   resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c"
   integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ==
@@ -2063,52 +1149,20 @@
 
 "@babel/runtime-corejs3@^7.10.2":
   version "7.11.2"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
-  integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==
-  dependencies:
-    core-js-pure "^3.0.0"
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.5", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
-  version "7.12.5"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.5.tgz#410e7e487441e1b360c29be715d870d9b985882e"
-  integrity sha512-plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/runtime@^7.14.0":
-  version "7.14.6"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
-  integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz#02c3029743150188edeb66541195f54600278419"
+  integrity sha512-qh5IR+8VgFz83VBa6OkaET6uN/mJOhHONuy3m1sgF0CV6mXdPSEBdA7e1eUbVvyNtANjMbg22JUv71BaDXLY6A==
   dependencies:
+    core-js-pure "^3.0.0"
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.14.8":
-  version "7.15.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.4.tgz#fd17d16bfdf878e6dd02d19753a39fa8a8d9c84a"
-  integrity sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.3", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.0", "@babel/runtime@^7.14.8", "@babel/runtime@^7.15.4", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0", "@babel/runtime@^7.4.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.0", "@babel/runtime@^7.5.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.7.6", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2":
+  version "7.16.3"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.3.tgz#b86f0db02a04187a3c17caa77de69840165d42d5"
+  integrity sha512-WBwekcqacdY2e9AF/Q7WLFUWmdJGJTkbjqTjoMDgXkVZ3ZRUvOPsLb5KdwISoQVsbP+DQzVZW4Zhci0DvpbNTQ==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.10.4", "@babel/template@^7.12.7", "@babel/template@^7.7.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.7.tgz#c817233696018e39fbb6c491d2fb684e05ed43bc"
-  integrity sha512-GkDzmHS6GV7ZeXfJZ0tLRBhZcMcY0/Lnb+eEbXDBfCAcZCjrZKe6p3J4we/D24O9Y8enxWAg1cWwof59yLh2ow==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
-
-"@babel/template@^7.12.13", "@babel/template@^7.3.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/template@^7.15.4":
+"@babel/template@^7.12.7", "@babel/template@^7.15.4", "@babel/template@^7.3.3":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.15.4.tgz#51898d35dcf3faa670c4ee6afcfd517ee139f194"
   integrity sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==
@@ -2117,51 +1171,7 @@
     "@babel/parser" "^7.15.4"
     "@babel/types" "^7.15.4"
 
-"@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
-  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.13"
-    "@babel/types" "^7.13.13"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/traverse@^7.10.1":
-  version "7.12.8"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.8.tgz#c1c2983bf9ba0f4f0eaa11dff7e77fa63307b2a4"
-  integrity sha512-EIRQXPTwFEGRZyu6gXbjfpNORN1oZvwuzJbxcXjAgWV0iqXYDszN1Hx3FVm6YgZfu1ZQbCVAk3l+nIw95Xll9Q==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.10.4", "@babel/traverse@^7.12.1", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.7.4":
-  version "7.12.9"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.9.tgz#fad26c972eabbc11350e0b695978de6cc8e8596f"
-  integrity sha512-iX9ajqnLdoU1s1nHt36JDI9KG4k+vmI8WgjK5d+aDTwQbL2fUnzedNedssA645Ede3PM2ma1n8Q4h2ohwXgMXw==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    "@babel/generator" "^7.12.5"
-    "@babel/helper-function-name" "^7.10.4"
-    "@babel/helper-split-export-declaration" "^7.11.0"
-    "@babel/parser" "^7.12.7"
-    "@babel/types" "^7.12.7"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.12.11", "@babel/traverse@^7.15.4":
+"@babel/traverse@^7.1.0", "@babel/traverse@^7.10.1", "@babel/traverse@^7.12.11", "@babel/traverse@^7.12.5", "@babel/traverse@^7.12.9", "@babel/traverse@^7.13.0", "@babel/traverse@^7.15.4":
   version "7.15.4"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.4.tgz#ff8510367a144bfbff552d9e18e28f3e2889c22d"
   integrity sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==
@@ -2176,33 +1186,7 @@
     debug "^4.1.0"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.13", "@babel/types@^7.13.14", "@babel/types@^7.3.0", "@babel/types@^7.3.3":
-  version "7.13.14"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.14.tgz#c35a4abb15c7cd45a2746d78ab328e362cbace0d"
-  integrity sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.10.4", "@babel/types@^7.10.5", "@babel/types@^7.11.0", "@babel/types@^7.11.5", "@babel/types@^7.12.1", "@babel/types@^7.12.5", "@babel/types@^7.12.7", "@babel/types@^7.4.4":
-  version "7.12.7"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.7.tgz#6039ff1e242640a29452c9ae572162ec9a8f5d13"
-  integrity sha512-MNyI92qZq6jrQkXvtIiykvl4WtoRrVV9MPn+ZfsoEENjiWcBQ3ZSHrkxnJWgWtLX3XXqX5hrSQ+X69wkmesXuQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.0":
-  version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
-  integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.14.5"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.12.11", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6":
+"@babel/types@^7.0.0", "@babel/types@^7.11.5", "@babel/types@^7.12.0", "@babel/types@^7.12.11", "@babel/types@^7.12.7", "@babel/types@^7.13.0", "@babel/types@^7.14.9", "@babel/types@^7.15.4", "@babel/types@^7.15.6", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.15.6"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.6.tgz#99abdc48218b2881c058dd0a7ab05b99c9be758f"
   integrity sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==
@@ -2423,7 +1407,7 @@
     ethers "^5.4.5"
     lodash "^4.17.21"
 
-"@ethereumjs/common@^2.3.1", "@ethereumjs/common@^2.4.0":
+"@ethereumjs/common@^2.0.0", "@ethereumjs/common@^2.3.1", "@ethereumjs/common@^2.4.0":
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/common/-/common-2.4.0.tgz#2d67f6e6ba22246c5c89104e6b9a119fb3039766"
   integrity sha512-UdkhFWzWcJCZVsj1O/H8/oqj/0RVYjLc1OhPjBrQdALAkQHpCp8xXI4WLnuGTADqTdJZww0NtgwG+TRPkXt27w==
@@ -2431,7 +1415,15 @@
     crc-32 "^1.2.0"
     ethereumjs-util "^7.1.0"
 
-"@ethereumjs/tx@^3.1.1", "@ethereumjs/tx@^3.1.4", "@ethereumjs/tx@^3.2.0", "@ethereumjs/tx@^3.2.1", "@ethereumjs/tx@^3.3.0":
+"@ethereumjs/tx@3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.0.0.tgz#8dfd91ed6e91e63996e37b3ddc340821ebd48c81"
+  integrity sha512-H9tfy6qgYxPXvt1TSObfVmVjlF43OoQqoPQ3PJsG2JiuqaMHj5ettV1pGFEC3FamENDBkl6vD6niQEvIlXv/VQ==
+  dependencies:
+    "@ethereumjs/common" "^2.0.0"
+    ethereumjs-util "^7.0.7"
+
+"@ethereumjs/tx@^3.1.1", "@ethereumjs/tx@^3.2.0", "@ethereumjs/tx@^3.2.1", "@ethereumjs/tx@^3.3.0":
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/@ethereumjs/tx/-/tx-3.3.0.tgz#14ed1b7fa0f28e1cd61e3ecbdab824205f6a4378"
   integrity sha512-yTwEj2lVzSMgE6Hjw9Oa1DZks/nKTWM8Wn4ykDNapBPua2f4nXO3qKnni86O6lgDj5fVNRqbDsD0yy7/XNGDEA==
@@ -2454,36 +1446,6 @@
     "@ethersproject/properties" ">=5.0.0-beta.131"
     "@ethersproject/strings" ">=5.0.0-beta.130"
 
-"@ethersproject/abi@5.4.0", "@ethersproject/abi@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.4.0.tgz#a6d63bdb3672f738398846d4279fa6b6c9818242"
-  integrity sha512-9gU2H+/yK1j2eVMdzm6xvHSnMxk8waIHQGYCZg5uvAyH0rsAzxkModzBSpbAkAuhKFEovC2S9hM4nPuLym8IZw==
-  dependencies:
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-
-"@ethersproject/abi@5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abi/-/abi-5.4.1.tgz#6ac28fafc9ef6f5a7a37e30356a2eb31fa05d39b"
-  integrity sha512-9mhbjUk76BiSluiiW4BaYyI58KSbDMMQpCLdsAR+RsT2GyATiNYxVv+pGWRrekmsIdY3I+hOqsYQSTkc8L/mcg==
-  dependencies:
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/strings" "^5.4.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"
@@ -2499,33 +1461,7 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/abstract-provider@5.4.0", "@ethersproject/abstract-provider@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.0.tgz#415331031b0f678388971e1987305244edc04e1d"
-  integrity sha512-vPBR7HKUBY0lpdllIn7tLIzNN7DrVnhCLKSzY0l8WAwxz686m/aL7ASDzrVxV93GJtIub6N2t4dfZ29CkPOxgA==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/networks" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/web" "^5.4.0"
-
-"@ethersproject/abstract-provider@5.4.1", "@ethersproject/abstract-provider@^5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.4.1.tgz#e404309a29f771bd4d28dbafadcaa184668c2a6e"
-  integrity sha512-3EedfKI3LVpjSKgAxoUaI+gB27frKsxzm+r21w9G60Ugk+3wVLQwhi1LsEJAKNV7WoZc8CIpNrATlL1QFABjtQ==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/networks" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/web" "^5.4.0"
-
-"@ethersproject/abstract-provider@5.5.1", "@ethersproject/abstract-provider@^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==
@@ -2538,42 +1474,7 @@
     "@ethersproject/transactions" "^5.5.0"
     "@ethersproject/web" "^5.5.0"
 
-"@ethersproject/abstract-provider@^5.0.4":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-provider/-/abstract-provider-5.0.5.tgz#797a32a8707830af1ad8f833e9c228994d5572b9"
-  integrity sha512-i/CjElAkzV7vQBAeoz+IpjGfcFYEP9eD7j3fzZ0fzTq03DO7PPnR+xkEZ1IoDXGwDS+55aLM1xvLDwB/Lx6IOQ==
-  dependencies:
-    "@ethersproject/bignumber" "^5.0.7"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/networks" "^5.0.3"
-    "@ethersproject/properties" "^5.0.3"
-    "@ethersproject/transactions" "^5.0.5"
-    "@ethersproject/web" "^5.0.6"
-
-"@ethersproject/abstract-signer@5.4.0", "@ethersproject/abstract-signer@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.0.tgz#cd5f50b93141ee9f9f49feb4075a0b3eafb57d65"
-  integrity sha512-AieQAzt05HJZS2bMofpuxMEp81AHufA5D6M4ScKwtolj041nrfIbIi8ciNW7+F59VYxXq+V4c3d568Q6l2m8ew==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-
-"@ethersproject/abstract-signer@5.4.1", "@ethersproject/abstract-signer@^5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.4.1.tgz#e4e9abcf4dd4f1ba0db7dff9746a5f78f355ea81"
-  integrity sha512-SkkFL5HVq1k4/25dM+NWP9MILgohJCgGv5xT5AcRruGz4ILpfHeBtO/y6j+Z3UN/PAjDeb4P7E51Yh8wcGNLGA==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-
-"@ethersproject/abstract-signer@5.5.0", "@ethersproject/abstract-signer@^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==
@@ -2584,29 +1485,7 @@
     "@ethersproject/logger" "^5.5.0"
     "@ethersproject/properties" "^5.5.0"
 
-"@ethersproject/abstract-signer@^5.0.6":
-  version "5.0.7"
-  resolved "https://registry.yarnpkg.com/@ethersproject/abstract-signer/-/abstract-signer-5.0.7.tgz#cdbd3bd479edf77c71b7f6a6156b0275b1176ded"
-  integrity sha512-8W8gy/QutEL60EoMEpvxZ8MFAEWs/JvH5nmZ6xeLXoZvmBCasGmxqHdYjo2cxg0nevkPkq9SeenSsBBZSCx+SQ==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.0.4"
-    "@ethersproject/bignumber" "^5.0.7"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/properties" "^5.0.3"
-
-"@ethersproject/address@5.4.0", "@ethersproject/address@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.4.0.tgz#ba2d00a0f8c4c0854933b963b9a3a9f6eb4a37a3"
-  integrity sha512-SD0VgOEkcACEG/C6xavlU1Hy3m5DGSXW3CUHkaaEHbAPPsgi0coP5oNPsxau8eTlZOk/bpa/hKeCNoK5IzVI2Q==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/rlp" "^5.4.0"
-
-"@ethersproject/address@5.5.0", "@ethersproject/address@^5.5.0":
+"@ethersproject/address@5.5.0", "@ethersproject/address@>=5.0.0-beta.128", "@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==
@@ -2617,25 +1496,6 @@
     "@ethersproject/logger" "^5.5.0"
     "@ethersproject/rlp" "^5.5.0"
 
-"@ethersproject/address@>=5.0.0-beta.128", "@ethersproject/address@^5.0.4", "@ethersproject/address@^5.0.5":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/address/-/address-5.0.5.tgz#2caa65f6b7125015395b1b54c985ee0b27059cc7"
-  integrity sha512-DpkQ6rwk9jTefrRsJzEm6nhRiJd9pvhn1xN0rw5N/jswXG5r7BLk/GVA0mMAVWAsYfvi2xSc5L41FMox43RYEA==
-  dependencies:
-    "@ethersproject/bignumber" "^5.0.7"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/keccak256" "^5.0.3"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/rlp" "^5.0.3"
-    bn.js "^4.4.0"
-
-"@ethersproject/base64@5.4.0", "@ethersproject/base64@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.4.0.tgz#7252bf65295954c9048c7ca5f43e5c86441b2a9a"
-  integrity sha512-CjQw6E17QDSSC5jiM9YpF7N1aSCHmYGMt9bWD8PWv6YPMxjsys2/Q8xLrROKI3IWJ7sFfZ8B3flKDTM5wlWuZQ==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.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"
@@ -2643,21 +1503,6 @@
   dependencies:
     "@ethersproject/bytes" "^5.5.0"
 
-"@ethersproject/base64@^5.0.3":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@ethersproject/base64/-/base64-5.0.4.tgz#b0d8fdbf3dda977cf546dcd35725a7b1d5256caa"
-  integrity sha512-4KRykQ7BQMeOXfvio1YITwHjxwBzh92UoXIdzxDE1p53CK28bbHPdsPNYo0wl0El7lJAMpT2SOdL0hhbWRnyIA==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.4"
-
-"@ethersproject/basex@5.4.0", "@ethersproject/basex@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/basex/-/basex-5.4.0.tgz#0a2da0f4e76c504a94f2b21d3161ed9438c7f8a6"
-  integrity sha512-J07+QCVJ7np2bcpxydFVf/CuYo9mZ7T73Pe7KQY4c1lRlrixMeblauMxHXD0MPwFmUHZIILDNViVkykFBZylbg==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/properties" "^5.4.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"
@@ -2666,25 +1511,7 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/properties" "^5.5.0"
 
-"@ethersproject/bignumber@5.4.1", "@ethersproject/bignumber@^5.4.0":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.4.1.tgz#64399d3b9ae80aa83d483e550ba57ea062c1042d"
-  integrity sha512-fJhdxqoQNuDOk6epfM7yD6J8Pol4NUCy1vkaGAkuujZm0+lNow//MKu1hLhRiYV4BsOHyBv5/lsTjF+7hWwhJg==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    bn.js "^4.11.9"
-
-"@ethersproject/bignumber@5.4.2":
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.4.2.tgz#44232e015ae4ce82ac034de549eb3583c71283d8"
-  integrity sha512-oIBDhsKy5bs7j36JlaTzFgNPaZjiNDOXsdSgSpXRucUl+UA6L/1YLlFeI3cPAoodcenzF4nxNPV13pcy7XbWjA==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    bn.js "^4.11.9"
-
-"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@^5.5.0":
+"@ethersproject/bignumber@5.5.0", "@ethersproject/bignumber@>=5.0.0-beta.130", "@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==
@@ -2693,97 +1520,21 @@
     "@ethersproject/logger" "^5.5.0"
     bn.js "^4.11.9"
 
-"@ethersproject/bignumber@>=5.0.0-beta.130", "@ethersproject/bignumber@^5.0.7", "@ethersproject/bignumber@^5.0.8":
-  version "5.0.8"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bignumber/-/bignumber-5.0.8.tgz#cee33bd8eb0266176def0d371b45274b1d2c4ec0"
-  integrity sha512-KXFVAFKS1jdTXYN8BE5Oj+ZfPMh28iRdFeNGBVT6cUFdtiPVqeXqc0ggvBqA3A1VoFFGgM7oAeaagA393aORHA==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-    bn.js "^4.4.0"
-
-"@ethersproject/bytes@5.4.0", "@ethersproject/bytes@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.4.0.tgz#56fa32ce3bf67153756dbaefda921d1d4774404e"
-  integrity sha512-H60ceqgTHbhzOj4uRc/83SCN9d+BSUnOkrr2intevqdtEMO1JFVZ1XL84OEZV+QjV36OaZYxtnt4lGmxcGsPfA==
-  dependencies:
-    "@ethersproject/logger" "^5.4.0"
-
-"@ethersproject/bytes@5.5.0", "@ethersproject/bytes@^5.5.0":
+"@ethersproject/bytes@5.5.0", "@ethersproject/bytes@>=5.0.0-beta.129", "@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.5.0"
 
-"@ethersproject/bytes@>=5.0.0-beta.129", "@ethersproject/bytes@^5.0.4":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.5.tgz#688b70000e550de0c97a151a21f15b87d7f97d7c"
-  integrity sha512-IEj9HpZB+ACS6cZ+QQMTqmu/cnUK2fYNE6ms/PVxjoBjoxc6HCraLpam1KuRvreMy0i523PLmjN8OYeikRdcUQ==
-  dependencies:
-    "@ethersproject/logger" "^5.0.5"
-
-"@ethersproject/bytes@^5.0.9":
-  version "5.0.11"
-  resolved "https://registry.yarnpkg.com/@ethersproject/bytes/-/bytes-5.0.11.tgz#21118e75b1d00db068984c15530e316021101276"
-  integrity sha512-D51plLYY5qF05AsoVQwIZVLqlBkaTPVHVP/1WmmBIWyHB0cRW0C9kh0kx5Exo51rB63Hk8PfHxc7SmpoaQFEyg==
-  dependencies:
-    "@ethersproject/logger" "^5.0.8"
-
-"@ethersproject/constants@5.4.0", "@ethersproject/constants@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.4.0.tgz#ee0bdcb30bf1b532d2353c977bf2ef1ee117958a"
-  integrity sha512-tzjn6S7sj9+DIIeKTJLjK9WGN2Tj0P++Z8ONEIlZjyoTkBuODN+0VfhAyYksKi43l1Sx9tX2VlFfzjfmr5Wl3Q==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-
-"@ethersproject/constants@5.5.0", "@ethersproject/constants@^5.5.0":
+"@ethersproject/constants@5.5.0", "@ethersproject/constants@>=5.0.0-beta.128", "@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.5.0"
 
-"@ethersproject/constants@>=5.0.0-beta.128", "@ethersproject/constants@^5.0.4":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/constants/-/constants-5.0.5.tgz#0ed19b002e8404bdf6d135234dc86a7d9bcf9b71"
-  integrity sha512-foaQVmxp2+ik9FrLUCtVrLZCj4M3Ibgkqvh+Xw/vFRSerkjVSYePApaVE5essxhoSlF1U9oXfWY09QI2AXtgKA==
-  dependencies:
-    "@ethersproject/bignumber" "^5.0.7"
-
-"@ethersproject/contracts@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.4.0.tgz#e05fe6bd33acc98741e27d553889ec5920078abb"
-  integrity sha512-hkO3L3IhS1Z3ZtHtaAG/T87nQ7KiPV+/qnvutag35I0IkiQ8G3ZpCQ9NNOpSCzn4pWSW4CfzmtE02FcqnLI+hw==
-  dependencies:
-    "@ethersproject/abi" "^5.4.0"
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-
-"@ethersproject/contracts@5.4.1", "@ethersproject/contracts@^5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/contracts/-/contracts-5.4.1.tgz#3eb4f35b7fe60a962a75804ada2746494df3e470"
-  integrity sha512-m+z2ZgPy4pyR15Je//dUaymRUZq5MtDajF6GwFbGAVmKz/RF+DNIPwF0k5qEcL3wPGVqUjFg2/krlCRVTU4T5w==
-  dependencies:
-    "@ethersproject/abi" "^5.4.0"
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-
-"@ethersproject/contracts@5.5.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==
@@ -2811,21 +1562,7 @@
   optionalDependencies:
     "@ledgerhq/hw-transport-node-hid" "5.26.0"
 
-"@ethersproject/hash@5.4.0", "@ethersproject/hash@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.4.0.tgz#d18a8e927e828e22860a011f39e429d388344ae0"
-  integrity sha512-xymAM9tmikKgbktOCjW60Z5sdouiIIurkZUr9oW5NOex5uwxrbsYG09kb5bMcNjlVeJD3yPivTNzViIs1GCbqA==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-
-"@ethersproject/hash@5.5.0", "@ethersproject/hash@^5.5.0":
+"@ethersproject/hash@5.5.0", "@ethersproject/hash@>=5.0.0-beta.128", "@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==
@@ -2839,38 +1576,6 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/hash@>=5.0.0-beta.128":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hash/-/hash-5.0.6.tgz#2a2e8a1470685421217e9e86e9971ca636e609ce"
-  integrity sha512-Gvh57v6BWhwnud6l7tMfQm32PRQ2DYx2WaAAQmAxAfYvmzUkpQCBstnGeNMXIL8/2wdkvcB2u+WZRWaZtsFuUQ==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.0.6"
-    "@ethersproject/address" "^5.0.5"
-    "@ethersproject/bignumber" "^5.0.8"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/keccak256" "^5.0.3"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/properties" "^5.0.4"
-    "@ethersproject/strings" "^5.0.4"
-
-"@ethersproject/hdnode@5.4.0", "@ethersproject/hdnode@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/hdnode/-/hdnode-5.4.0.tgz#4bc9999b9a12eb5ce80c5faa83114a57e4107cac"
-  integrity sha512-pKxdS0KAaeVGfZPp1KOiDLB0jba11tG6OP1u11QnYfb7pXn6IZx0xceqWRr6ygke8+Kw74IpOoSi7/DwANhy8Q==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/basex" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/pbkdf2" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/sha2" "^5.4.0"
-    "@ethersproject/signing-key" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/wordlists" "^5.4.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"
@@ -2889,25 +1594,6 @@
     "@ethersproject/transactions" "^5.5.0"
     "@ethersproject/wordlists" "^5.5.0"
 
-"@ethersproject/json-wallets@5.4.0", "@ethersproject/json-wallets@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/json-wallets/-/json-wallets-5.4.0.tgz#2583341cfe313fc9856642e8ace3080154145e95"
-  integrity sha512-igWcu3fx4aiczrzEHwG1xJZo9l1cFfQOWzTqwRw/xcvxTk58q4f9M7cjh51EKphMHvrJtcezJ1gf1q1AUOfEQQ==
-  dependencies:
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/hdnode" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/pbkdf2" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/random" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    aes-js "3.0.0"
-    scrypt-js "3.0.1"
-
 "@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"
@@ -2927,15 +1613,7 @@
     aes-js "3.0.0"
     scrypt-js "3.0.1"
 
-"@ethersproject/keccak256@5.4.0", "@ethersproject/keccak256@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.4.0.tgz#7143b8eea4976080241d2bd92e3b1f1bf7025318"
-  integrity sha512-FBI1plWet+dPUvAzPAeHzRKiPpETQzqSUWR1wXJGHVWi4i8bOSrpC3NwpkPjgeXG7MnugVc1B42VbfnQikyC/A==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    js-sha3 "0.5.7"
-
-"@ethersproject/keccak256@5.5.0", "@ethersproject/keccak256@^5.5.0":
+"@ethersproject/keccak256@5.5.0", "@ethersproject/keccak256@>=5.0.0-beta.127", "@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==
@@ -2943,53 +1621,11 @@
     "@ethersproject/bytes" "^5.5.0"
     js-sha3 "0.8.0"
 
-"@ethersproject/keccak256@>=5.0.0-beta.127", "@ethersproject/keccak256@^5.0.3":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@ethersproject/keccak256/-/keccak256-5.0.4.tgz#36ca0a7d1ae2a272da5654cb886776d0c680ef3a"
-  integrity sha512-GNpiOUm9PGUxFNqOxYKDQBM0u68bG9XC9iOulEQ8I0tOx/4qUpgVzvgXL6ugxr0RY554Gz/NQsVqknqPzUcxpQ==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.4"
-    js-sha3 "0.5.7"
-
-"@ethersproject/logger@5.4.0", "@ethersproject/logger@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.0.tgz#f39adadf62ad610c420bcd156fd41270e91b3ca9"
-  integrity sha512-xYdWGGQ9P2cxBayt64d8LC8aPFJk6yWCawQi/4eJ4+oJdMMjEBMrIcIMZ9AxhwpPVmnBPrsB10PcXGmGAqgUEQ==
-
-"@ethersproject/logger@5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.4.1.tgz#503bd33683538b923c578c07d1c2c0dd18672054"
-  integrity sha512-DZ+bRinnYLPw1yAC64oRl0QyVZj43QeHIhVKfD/+YwSz4wsv1pfwb5SOFjz+r710YEWzU6LrhuSjpSO+6PeE4A==
-
-"@ethersproject/logger@5.5.0", "@ethersproject/logger@^5.5.0":
+"@ethersproject/logger@5.5.0", "@ethersproject/logger@>=5.0.0-beta.129", "@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/logger@>=5.0.0-beta.129", "@ethersproject/logger@^5.0.5":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.6.tgz#faa484203e86e08be9e07fef826afeef7183fe88"
-  integrity sha512-FrX0Vnb3JZ1md/7GIZfmJ06XOAA8r3q9Uqt9O5orr4ZiksnbpXKlyDzQtlZ5Yv18RS8CAUbiKH9vwidJg1BPmQ==
-
-"@ethersproject/logger@^5.0.8":
-  version "5.0.10"
-  resolved "https://registry.yarnpkg.com/@ethersproject/logger/-/logger-5.0.10.tgz#fd884688b3143253e0356ef92d5f22d109d2e026"
-  integrity sha512-0y2T2NqykDrbPM3Zw9RSbPkDOxwChAL8detXaom76CfYoGxsOnRP/zTX8OUAV+x9LdwzgbWvWmeXrc0M7SuDZw==
-
-"@ethersproject/networks@5.4.1", "@ethersproject/networks@^5.4.0":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.1.tgz#2ce83b8e42aa85216e5d277a7952d97b6ce8d852"
-  integrity sha512-8SvowCKz9Uf4xC5DTKI8+il8lWqOr78kmiqAVLYT9lzB8aSmJHQMD1GSuJI0CW4hMAnzocpGpZLgiMdzsNSPig==
-  dependencies:
-    "@ethersproject/logger" "^5.4.0"
-
-"@ethersproject/networks@5.4.2":
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.4.2.tgz#2247d977626e97e2c3b8ee73cd2457babde0ce35"
-  integrity sha512-eekOhvJyBnuibfJnhtK46b8HimBc5+4gqpvd1/H9LEl7Q7/qhsIhM81dI9Fcnjpk3jB1aTy6bj0hz3cifhNeYw==
-  dependencies:
-    "@ethersproject/logger" "^5.4.0"
-
 "@ethersproject/networks@5.5.0", "@ethersproject/networks@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.5.0.tgz#babec47cab892c51f8dd652ce7f2e3e14283981a"
@@ -2997,21 +1633,6 @@
   dependencies:
     "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/networks@^5.0.3":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@ethersproject/networks/-/networks-5.0.4.tgz#6d320a5e15a0cda804f5da88be0ba846156f6eec"
-  integrity sha512-/wHDTRms5mpJ09BoDrbNdFWINzONe05wZRgohCXvEv39rrH/Gd/yAnct8wC0RsW3tmFOgjgQxuBvypIxuUynTw==
-  dependencies:
-    "@ethersproject/logger" "^5.0.5"
-
-"@ethersproject/pbkdf2@5.4.0", "@ethersproject/pbkdf2@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/pbkdf2/-/pbkdf2-5.4.0.tgz#ed88782a67fda1594c22d60d0ca911a9d669641c"
-  integrity sha512-x94aIv6tiA04g6BnazZSLoRXqyusawRyZWlUhKip2jvoLpzJuLb//KtMM6PEovE47pMbW+Qe1uw+68ameJjB7g==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/sha2" "^5.4.0"
-
 "@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"
@@ -3020,92 +1641,14 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/sha2" "^5.5.0"
 
-"@ethersproject/properties@5.4.0", "@ethersproject/properties@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.4.0.tgz#38ba20539b44dcc5d5f80c45ad902017dcdbefe7"
-  integrity sha512-7jczalGVRAJ+XSRvNA6D5sAwT4gavLq3OXPuV/74o3Rd2wuzSL035IMpIMgei4CYyBdialJMrTqkOnzccLHn4A==
-  dependencies:
-    "@ethersproject/logger" "^5.4.0"
-
-"@ethersproject/properties@5.4.1":
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.4.1.tgz#9f051f976ce790142c6261ccb7b826eaae1f2f36"
-  integrity sha512-cyCGlF8wWlIZyizsj2PpbJ9I7rIlUAfnHYwy/T90pdkSn/NFTa5YWZx2wTJBe9V7dD65dcrrEMisCRUJiq6n3w==
-  dependencies:
-    "@ethersproject/logger" "^5.4.0"
-
-"@ethersproject/properties@5.5.0", "@ethersproject/properties@^5.5.0":
+"@ethersproject/properties@5.5.0", "@ethersproject/properties@>=5.0.0-beta.131", "@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/properties@>=5.0.0-beta.131", "@ethersproject/properties@^5.0.3", "@ethersproject/properties@^5.0.4":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.4.tgz#a67a1f5a52c30850b5062c861631e73d131f666e"
-  integrity sha512-UdyX3GqBxFt15B0uSESdDNmhvEbK3ACdDXl2soshoPcneXuTswHDeA0LoPlnaZzhbgk4p6jqb4GMms5C26Qu6A==
-  dependencies:
-    "@ethersproject/logger" "^5.0.5"
-
-"@ethersproject/properties@^5.0.7":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@ethersproject/properties/-/properties-5.0.9.tgz#d7aae634680760136ea522e25c3ef043ec15b5c2"
-  integrity sha512-ZCjzbHYTw+rF1Pn8FDCEmx3gQttwIHcm/6Xee8g/M3Ga3SfW4tccNMbs5zqnBH0E4RoOPaeNgyg1O68TaF0tlg==
-  dependencies:
-    "@ethersproject/logger" "^5.0.8"
-
-"@ethersproject/providers@5.4.2":
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.2.tgz#73df9767869a31bd88d9e27e78cff96364b8fbed"
-  integrity sha512-Qr8Am8hlj2gL9HwNymhFlYd52MQVVEBLoDwPxhv4ASeyNpaoRiUAQnNEuE6SnEQtiwYkpLrQtSALNLUSeyuvjA==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/basex" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/networks" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/random" "^5.4.0"
-    "@ethersproject/rlp" "^5.4.0"
-    "@ethersproject/sha2" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/web" "^5.4.0"
-    bech32 "1.1.4"
-    ws "7.4.6"
-
-"@ethersproject/providers@5.4.5", "@ethersproject/providers@^5.4.5":
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.4.5.tgz#eb2ea2a743a8115f79604a8157233a3a2c832928"
-  integrity sha512-1GkrvkiAw3Fj28cwi1Sqm8ED1RtERtpdXmRfwIBGmqBSN5MoeRUHuwHPppMtbPayPgpFcvD7/Gdc9doO5fGYgw==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/basex" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/networks" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/random" "^5.4.0"
-    "@ethersproject/rlp" "^5.4.0"
-    "@ethersproject/sha2" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/web" "^5.4.0"
-    bech32 "1.1.4"
-    ws "7.4.6"
-
-"@ethersproject/providers@5.5.0":
+"@ethersproject/providers@5.5.0", "@ethersproject/providers@^5.4.5":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.5.0.tgz#bc2876a8fe5e0053ed9828b1f3767ae46e43758b"
   integrity sha512-xqMbDnS/FPy+J/9mBLKddzyLLAQFjrVff5g00efqxPzcAwXiR+SiCGVy6eJ5iAIirBOATjx7QLhDNPGV+AEQsw==
@@ -3130,14 +1673,6 @@
     bech32 "1.1.4"
     ws "7.4.6"
 
-"@ethersproject/random@5.4.0", "@ethersproject/random@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.4.0.tgz#9cdde60e160d024be39cc16f8de3b9ce39191e16"
-  integrity sha512-pnpWNQlf0VAZDEOVp1rsYQosmv2o0ITS/PecNw+mS2/btF8eYdspkN0vIXrCMtkX09EAh9bdk8GoXmFXM1eAKw==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-
 "@ethersproject/random@5.5.0", "@ethersproject/random@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/random/-/random-5.5.0.tgz#305ed9e033ca537735365ac12eed88580b0f81f9"
@@ -3146,14 +1681,6 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/rlp@5.4.0", "@ethersproject/rlp@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.4.0.tgz#de61afda5ff979454e76d3b3310a6c32ad060931"
-  integrity sha512-0I7MZKfi+T5+G8atId9QaQKHRvvasM/kqLyAH4XxBCBchAooH2EX5rL9kYZWwcm3awYV+XC7VF6nLhfeQFKVPg==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.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"
@@ -3162,23 +1689,6 @@
     "@ethersproject/bytes" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/rlp@^5.0.3":
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/@ethersproject/rlp/-/rlp-5.0.4.tgz#0090a0271e84ea803016a112a79f5cfd80271a77"
-  integrity sha512-5qrrZad7VTjofxSsm7Zg/7Dr4ZOln4S2CqiDdOuTv6MBKnXj0CiBojXyuDy52M8O3wxH0CyE924hXWTDV1PQWQ==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-
-"@ethersproject/sha2@5.4.0", "@ethersproject/sha2@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.4.0.tgz#c9a8db1037014cbc4e9482bd662f86c090440371"
-  integrity sha512-siheo36r1WD7Cy+bDdE1BJ8y0bDtqXCOxRMzPa4bV1TGt/eTUUt03BHoJNB6reWJD8A30E/pdJ8WFkq+/uz4Gg==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    hash.js "1.1.7"
-
 "@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"
@@ -3188,18 +1698,6 @@
     "@ethersproject/logger" "^5.5.0"
     hash.js "1.1.7"
 
-"@ethersproject/signing-key@5.4.0", "@ethersproject/signing-key@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.4.0.tgz#2f05120984e81cf89a3d5f6dec5c68ee0894fbec"
-  integrity sha512-q8POUeywx6AKg2/jX9qBYZIAmKSB4ubGXdQ88l40hmATj29JnG5pp331nAWwwxPn2Qao4JpWHNZsQN+bPiSW9A==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    bn.js "^4.11.9"
-    elliptic "6.5.4"
-    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"
@@ -3212,27 +1710,6 @@
     elliptic "6.5.4"
     hash.js "1.1.7"
 
-"@ethersproject/signing-key@^5.0.4":
-  version "5.0.11"
-  resolved "https://registry.yarnpkg.com/@ethersproject/signing-key/-/signing-key-5.0.11.tgz#19fc5c4597e18ad0a5efc6417ba5b74069fdd2af"
-  integrity sha512-Jfcru/BGwdkXhLxT+8WCZtFy7LL0TPFZw05FAb5asxB/MyVsEfNdNxGDtjVE9zXfmRSPe/EusXYY4K7wcygOyQ==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.9"
-    "@ethersproject/logger" "^5.0.8"
-    "@ethersproject/properties" "^5.0.7"
-    elliptic "6.5.4"
-
-"@ethersproject/solidity@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.4.0.tgz#1305e058ea02dc4891df18b33232b11a14ece9ec"
-  integrity sha512-XFQTZ7wFSHOhHcV1DpcWj7VXECEiSrBuv7JErJvB9Uo+KfCdc3QtUZV+Vjh/AAaYgezUEKbCtE6Khjm44seevQ==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/sha2" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-
 "@ethersproject/solidity@5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/solidity/-/solidity-5.5.0.tgz#2662eb3e5da471b85a20531e420054278362f93f"
@@ -3245,16 +1722,7 @@
     "@ethersproject/sha2" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/strings@5.4.0", "@ethersproject/strings@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.4.0.tgz#fb12270132dd84b02906a8d895ae7e7fa3d07d9a"
-  integrity sha512-k/9DkH5UGDhv7aReXLluFG5ExurwtIpUfnDNhQA29w896Dw3i4uDTz01Quaptbks1Uj9kI8wo9tmW73wcIEaWA==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-
-"@ethersproject/strings@5.5.0", "@ethersproject/strings@^5.5.0":
+"@ethersproject/strings@5.5.0", "@ethersproject/strings@>=5.0.0-beta.130", "@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==
@@ -3263,31 +1731,7 @@
     "@ethersproject/constants" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/strings@>=5.0.0-beta.130", "@ethersproject/strings@^5.0.4":
-  version "5.0.5"
-  resolved "https://registry.yarnpkg.com/@ethersproject/strings/-/strings-5.0.5.tgz#ed7e99a282a02f40757691b04a24cd83f3752195"
-  integrity sha512-JED6WaIV00xM/gvj8vSnd+0VWtDYdidTmavFRCTQakqfz+4tDo6Jz5LHgG+dd45h7ah7ykCHW0C7ZXWEDROCXQ==
-  dependencies:
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/constants" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-
-"@ethersproject/transactions@5.4.0", "@ethersproject/transactions@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.4.0.tgz#a159d035179334bd92f340ce0f77e83e9e1522e0"
-  integrity sha512-s3EjZZt7xa4BkLknJZ98QGoIza94rVjaEed0rzZ/jB9WrIuu/1+tjvYCWzVrystXtDswy7TPBeIepyXwSYa4WQ==
-  dependencies:
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/rlp" "^5.4.0"
-    "@ethersproject/signing-key" "^5.4.0"
-
-"@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.5.0":
+"@ethersproject/transactions@5.5.0", "@ethersproject/transactions@^5.0.0-beta.135", "@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==
@@ -3302,30 +1746,6 @@
     "@ethersproject/rlp" "^5.5.0"
     "@ethersproject/signing-key" "^5.5.0"
 
-"@ethersproject/transactions@^5.0.0-beta.135", "@ethersproject/transactions@^5.0.5":
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/@ethersproject/transactions/-/transactions-5.0.6.tgz#b8b27938be6e9ed671dbdd35fe98af8b14d0df7c"
-  integrity sha512-htsFhOD+NMBxx676A8ehSuwVV49iqpSB+CkjPZ02tpNew0K6p8g0CZ46Z1ZP946gIHAU80xQ0NACHYrjIUaCFA==
-  dependencies:
-    "@ethersproject/address" "^5.0.4"
-    "@ethersproject/bignumber" "^5.0.7"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/constants" "^5.0.4"
-    "@ethersproject/keccak256" "^5.0.3"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/properties" "^5.0.3"
-    "@ethersproject/rlp" "^5.0.3"
-    "@ethersproject/signing-key" "^5.0.4"
-
-"@ethersproject/units@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.4.0.tgz#d57477a4498b14b88b10396062c8cbbaf20c79fe"
-  integrity sha512-Z88krX40KCp+JqPCP5oPv5p750g+uU6gopDYRTBGcDvOASh6qhiEYCRatuM/suC4S2XW9Zz90QI35MfSrTIaFg==
-  dependencies:
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/constants" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-
 "@ethersproject/units@5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/units/-/units-5.5.0.tgz#104d02db5b5dc42cc672cc4587bafb87a95ee45e"
@@ -3335,27 +1755,6 @@
     "@ethersproject/constants" "^5.5.0"
     "@ethersproject/logger" "^5.5.0"
 
-"@ethersproject/wallet@5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.4.0.tgz#fa5b59830b42e9be56eadd45a16a2e0933ad9353"
-  integrity sha512-wU29majLjM6AjCjpat21mPPviG+EpK7wY1+jzKD0fg3ui5fgedf2zEu1RDgpfIMsfn8fJHJuzM4zXZ2+hSHaSQ==
-  dependencies:
-    "@ethersproject/abstract-provider" "^5.4.0"
-    "@ethersproject/abstract-signer" "^5.4.0"
-    "@ethersproject/address" "^5.4.0"
-    "@ethersproject/bignumber" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/hdnode" "^5.4.0"
-    "@ethersproject/json-wallets" "^5.4.0"
-    "@ethersproject/keccak256" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/random" "^5.4.0"
-    "@ethersproject/signing-key" "^5.4.0"
-    "@ethersproject/transactions" "^5.4.0"
-    "@ethersproject/wordlists" "^5.4.0"
-
 "@ethersproject/wallet@5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/wallet/-/wallet-5.5.0.tgz#322a10527a440ece593980dca6182f17d54eae75"
@@ -3377,17 +1776,6 @@
     "@ethersproject/transactions" "^5.5.0"
     "@ethersproject/wordlists" "^5.5.0"
 
-"@ethersproject/web@5.4.0", "@ethersproject/web@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.4.0.tgz#49fac173b96992334ed36a175538ba07a7413d1f"
-  integrity sha512-1bUusGmcoRLYgMn6c1BLk1tOKUIFuTg8j+6N8lYlbMpDesnle+i3pGSagGNvwjaiLo4Y5gBibwctpPRmjrh4Og==
-  dependencies:
-    "@ethersproject/base64" "^5.4.0"
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/strings" "^5.4.0"
-
 "@ethersproject/web@5.5.0", "@ethersproject/web@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.5.0.tgz#0e5bb21a2b58fb4960a705bfc6522a6acf461e28"
@@ -3399,28 +1787,6 @@
     "@ethersproject/properties" "^5.5.0"
     "@ethersproject/strings" "^5.5.0"
 
-"@ethersproject/web@^5.0.6":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@ethersproject/web/-/web-5.0.9.tgz#b08f8295f4bfd4777c8723fe9572f5453b9f03cb"
-  integrity sha512-//QNlv1MSkOII1hv3+HQwWoiVFS+BMVGI0KYeUww4cyrEktnx1QIez5bTSab9s9fWTFaWKNmQNBwMbxAqPuYDw==
-  dependencies:
-    "@ethersproject/base64" "^5.0.3"
-    "@ethersproject/bytes" "^5.0.4"
-    "@ethersproject/logger" "^5.0.5"
-    "@ethersproject/properties" "^5.0.3"
-    "@ethersproject/strings" "^5.0.4"
-
-"@ethersproject/wordlists@5.4.0", "@ethersproject/wordlists@^5.4.0":
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/@ethersproject/wordlists/-/wordlists-5.4.0.tgz#f34205ec3bbc9e2c49cadaee774cf0b07e7573d7"
-  integrity sha512-FemEkf6a+EBKEPxlzeVgUaVSodU7G0Na89jqKjmWMlDB0tomoU8RlEMgUvXyqtrg8N4cwpLh8nyRnm1Nay1isA==
-  dependencies:
-    "@ethersproject/bytes" "^5.4.0"
-    "@ethersproject/hash" "^5.4.0"
-    "@ethersproject/logger" "^5.4.0"
-    "@ethersproject/properties" "^5.4.0"
-    "@ethersproject/strings" "^5.4.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"
@@ -3943,6 +2309,58 @@
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
+"@keystonehq/base-eth-keyring@^0.3.1":
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/@keystonehq/base-eth-keyring/-/base-eth-keyring-0.3.1.tgz#c985803f7083f0a2e6ea55846905099c46573142"
+  integrity sha512-lbVLCMD3R4Ki8CThctZOjafKvJn0p2u19csuMrJHBlFllqu88vYoyfv3I/BPtOpnWqeC90Kta23w68FFUnV8Zg==
+  dependencies:
+    "@ethereumjs/tx" "3.0.0"
+    "@keystonehq/bc-ur-registry-eth" "^0.7.5"
+    ethereumjs-util "^7.0.8"
+    hdkey "^2.0.1"
+    uuid "^8.3.2"
+
+"@keystonehq/bc-ur-registry-eth@^0.6.8":
+  version "0.6.13"
+  resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-eth/-/bc-ur-registry-eth-0.6.13.tgz#c1680930b1d3fed14857336bd4fb47a484dfac32"
+  integrity sha512-sQQMMiKlacxMOIGeH8l/m/j3sL2VaM7Zid/xvf6cogZ5EZ5pa8Jow8cgY/t7krTOOBp81/GglCbwCGC8RIOLqA==
+  dependencies:
+    "@keystonehq/bc-ur-registry" "^0.4.4"
+    ethereumjs-util "^7.0.8"
+    hdkey "^2.0.1"
+    uuid "^8.3.2"
+
+"@keystonehq/bc-ur-registry-eth@^0.7.5":
+  version "0.7.5"
+  resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry-eth/-/bc-ur-registry-eth-0.7.5.tgz#30a146e2b6ba01f73380530bbb6bd6a62d540a8b"
+  integrity sha512-9WcIe4WcqJxf/HKxKhnOBgEfre8/BB5Zi68iHFdw/pyfdYBfzU/nAn2/NB/ggqIHNGWO4zsRnBk85vbJ3QwQsQ==
+  dependencies:
+    "@keystonehq/bc-ur-registry" "^0.4.4"
+    ethereumjs-util "^7.0.8"
+    hdkey "^2.0.1"
+    uuid "^8.3.2"
+
+"@keystonehq/bc-ur-registry@^0.4.4":
+  version "0.4.4"
+  resolved "https://registry.yarnpkg.com/@keystonehq/bc-ur-registry/-/bc-ur-registry-0.4.4.tgz#3073fdd4b33cdcbd04526a313a7685891a4b4583"
+  integrity sha512-SBdKdAZfp3y14GTGrKjfJJHf4iXObjcm4/qKUZ92lj8HVR8mxHHGmHksjE328bJPTAsJPloLix4rTnWg+qgS2w==
+  dependencies:
+    "@ngraveio/bc-ur" "^1.1.5"
+    base58check "^2.0.0"
+    tslib "^2.3.0"
+
+"@keystonehq/metamask-airgapped-keyring@0.2.1":
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/@keystonehq/metamask-airgapped-keyring/-/metamask-airgapped-keyring-0.2.1.tgz#d6a8dd75d97cf7911faa8c2a8b19a0168b74891e"
+  integrity sha512-LTBGLR8KaJycZLG9igOoIi1tdM2CDN07+dXVGHYnls6DWDN8v3DPzOeAuu1+7H+NDIZYUhGmaa1RcbBT3lY+Uw==
+  dependencies:
+    "@ethereumjs/tx" "^3.3.0"
+    "@keystonehq/base-eth-keyring" "^0.3.1"
+    "@keystonehq/bc-ur-registry-eth" "^0.7.5"
+    "@metamask/obs-store" "^7.0.0"
+    rlp "^2.2.6"
+    uuid "^8.3.2"
+
 "@lavamoat/allow-scripts@^1.0.6":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@lavamoat/allow-scripts/-/allow-scripts-1.0.6.tgz#fbdf7c35a5c2c2cff05ba002b7bc8f3355bda22c"
@@ -4183,19 +2601,19 @@
     semver "^7.3.5"
     yargs "^17.0.1"
 
-"@metamask/contract-metadata@^1.19.0", "@metamask/contract-metadata@^1.28.0", "@metamask/contract-metadata@^1.29.0":
+"@metamask/contract-metadata@^1.19.0", "@metamask/contract-metadata@^1.28.0", "@metamask/contract-metadata@^1.30.0":
   version "1.30.0"
   resolved "https://registry.yarnpkg.com/@metamask/contract-metadata/-/contract-metadata-1.30.0.tgz#fa8e1b0c3e7aaa963986088f691fb553ffbe3904"
   integrity sha512-b2usYW/ptQYnE6zhUmr4T+nvOAQJK5ABcpKudyQANpy4K099elpv4aN0WcrcOcwV99NHOdMzFP3ZuG0HoAyOBQ==
 
-"@metamask/controllers@^17.0.0":
-  version "17.0.0"
-  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-17.0.0.tgz#7ef00b4f7583d8075115e8a2f074d7b66646bbe8"
-  integrity sha512-myPlAk8SpNm5SwHHKGgm2XDLP4bxNR2UsKoQlYtV7bJq3l8FV1agSFwHBwDhg61/52Xvqdqy+1YDVdV3kOwPgg==
+"@metamask/controllers@^20.1.0":
+  version "20.1.0"
+  resolved "https://registry.yarnpkg.com/@metamask/controllers/-/controllers-20.1.0.tgz#1d8386dc22d14f9fd9feb8b3cc8314d663587550"
+  integrity sha512-Z/7uLGXZWbCBbtCybR3jo1bx3mcvZRUSm1i43od4dnJoQo2+Veq4ePrFVgPKS3WtLIM/hzZuI7UTAQ9HNX9aew==
   dependencies:
     "@ethereumjs/common" "^2.3.1"
     "@ethereumjs/tx" "^3.2.1"
-    "@metamask/contract-metadata" "^1.29.0"
+    "@metamask/contract-metadata" "^1.30.0"
     "@types/uuid" "^8.3.0"
     abort-controller "^3.0.0"
     async-mutex "^0.2.6"
@@ -4214,6 +2632,7 @@
     ethjs-unit "^0.1.6"
     ethjs-util "^0.1.6"
     human-standard-collectible-abi "^1.0.2"
+    human-standard-multi-collectible-abi "^1.0.2"
     human-standard-token-abi "^2.0.0"
     immer "^9.0.6"
     isomorphic-fetch "^3.0.0"
@@ -4340,6 +2759,14 @@
     readable-stream "^2.2.2"
     through2 "^2.0.3"
 
+"@metamask/obs-store@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@metamask/obs-store/-/obs-store-7.0.0.tgz#6cae5f28306bb3e83a381bc9ae22682316095bd3"
+  integrity sha512-Tr61Uu9CGXkCg5CZwOYRMQERd+y6fbtrtLd/PzDTPHO5UJpmSbU+7MPcQK7d1DwZCOCeCIvhmZSUCvYliC8uGw==
+  dependencies:
+    "@metamask/safe-event-emitter" "^2.0.0"
+    through2 "^2.0.3"
+
 "@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"
@@ -4388,6 +2815,19 @@
   resolved "https://registry.yarnpkg.com/@multiformats/base-x/-/base-x-4.0.1.tgz#95ff0fa58711789d53aefb2590a8b7a4e715d121"
   integrity sha512-eMk0b9ReBbV23xXU693TAIrLyeO5iTgBZGSJfpqriG8UkYvr/hC9u9pyMlAakDNHWmbhMZCDs6KQO0jzKD8OTw==
 
+"@ngraveio/bc-ur@^1.1.5", "@ngraveio/bc-ur@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@ngraveio/bc-ur/-/bc-ur-1.1.6.tgz#8f8c75fff22f6a5e4dfbc5a6b540d7fe8f42cd39"
+  integrity sha512-G+2XgjXde2IOcEQeCwR250aS43/Swi7gw0FuETgJy2c3HqF8f88SXDMsIGgJlZ8jXd0GeHR4aX0MfjXf523UZg==
+  dependencies:
+    "@apocentre/alias-sampling" "^0.5.3"
+    assert "^2.0.0"
+    bignumber.js "^9.0.1"
+    cbor-sync "^1.0.4"
+    crc "^3.8.0"
+    jsbi "^3.1.5"
+    sha.js "^2.4.11"
+
 "@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"
@@ -4457,16 +2897,59 @@
     schema-utils "^2.6.5"
     source-map "^0.7.3"
 
-"@popperjs/core@^2.4.0", "@popperjs/core@^2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.4.tgz#de25b5da9f727985a3757fd59b5d028aba75841a"
-  integrity sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ==
-
-"@popperjs/core@^2.6.0":
+"@popperjs/core@^2.4.0", "@popperjs/core@^2.5.4", "@popperjs/core@^2.6.0":
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.2.tgz#adea7b6953cbb34651766b0548468e743c6a2353"
   integrity sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==
 
+"@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/aspromise/-/aspromise-1.1.2.tgz#9b8b0cc663d669a7d8f6f5d0893a14d348f30fbf"
+  integrity sha1-m4sMxmPWaafY9vXQiToU00jzD78=
+
+"@protobufjs/base64@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/base64/-/base64-1.1.2.tgz#4c85730e59b9a1f1f349047dbf24296034bb2735"
+  integrity sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg==
+
+"@protobufjs/codegen@^2.0.4":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@protobufjs/codegen/-/codegen-2.0.4.tgz#7ef37f0d010fb028ad1ad59722e506d9262815cb"
+  integrity sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==
+
+"@protobufjs/eventemitter@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz#355cbc98bafad5978f9ed095f397621f1d066b70"
+  integrity sha1-NVy8mLr61ZePntCV85diHx0Ga3A=
+
+"@protobufjs/fetch@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/fetch/-/fetch-1.1.0.tgz#ba99fb598614af65700c1619ff06d454b0d84c45"
+  integrity sha1-upn7WYYUr2VwDBYZ/wbUVLDYTEU=
+  dependencies:
+    "@protobufjs/aspromise" "^1.1.1"
+    "@protobufjs/inquire" "^1.1.0"
+
+"@protobufjs/float@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/float/-/float-1.0.2.tgz#5e9e1abdcb73fc0a7cb8b291df78c8cbd97b87d1"
+  integrity sha1-Xp4avctz/Ap8uLKR33jIy9l7h9E=
+
+"@protobufjs/inquire@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/inquire/-/inquire-1.1.0.tgz#ff200e3e7cf2429e2dcafc1140828e8cc638f089"
+  integrity sha1-/yAOPnzyQp4tyvwRQIKOjMY48Ik=
+
+"@protobufjs/path@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@protobufjs/path/-/path-1.1.2.tgz#6cc2b20c5c9ad6ad0dccfd21ca7673d8d7fbf68d"
+  integrity sha1-bMKyDFya1q0NzP0hynZz2Nf79o0=
+
+"@protobufjs/pool@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@protobufjs/pool/-/pool-1.1.0.tgz#09fd15f2d6d3abfa9b65bc366506d6ad7846ff54"
+  integrity sha1-Cf0V8tbTq/qbZbw2ZQbWrXhG/1Q=
+
 "@protobufjs/utf8@^1.1.0":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
@@ -4590,14 +3073,7 @@
   dependencies:
     type-detect "4.0.8"
 
-"@sinonjs/fake-timers@^6.0.0":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.0.tgz#b64b0faadfdd01a6dcf0c4dcdb78438d86fa7dbf"
-  integrity sha512-atR1J/jRXvQAb47gfzSK8zavXy7BcpnYq21ALon0U99etu99vsir0trzIO3wpeLtW+LLVY6X7EkfVTbjGSH8Ww==
-  dependencies:
-    "@sinonjs/commons" "^1.7.0"
-
-"@sinonjs/fake-timers@^6.0.1":
+"@sinonjs/fake-timers@^6.0.0", "@sinonjs/fake-timers@^6.0.1":
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz#293674fccb3262ac782c7aadfdeca86b10c75c40"
   integrity sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==
@@ -5483,44 +3959,113 @@
     tiny-worker "^2.3.0"
     ws "^7.4.0"
 
-"@trezor/rollout@1.0.7":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@trezor/rollout/-/rollout-1.0.7.tgz#e4ee8281866ab6712ccc8873f3a383621b1a18ca"
-  integrity sha512-yFN2J/g3Epv1dM0dCsRnOagK7lrsfs7vDy1uc4T7DF9qtN0ZGO/tdCjSdgRGUZECRdXRcPrzRUsZDXGOkPcLoA==
+"@trezor/connect-common@^0.0.3":
+  version "0.0.3"
+  resolved "https://registry.yarnpkg.com/@trezor/connect-common/-/connect-common-0.0.3.tgz#d136453d259d24f9200daf72d0184594d56e92e2"
+  integrity sha512-oc4K/Ve2e1o3R1M0QAexLYN7aOepeSlcO5NVP/cfxBA+36cApZrRSy6kbs3OB2uc15tua5qkmYEDpJ3QSnZarg==
+
+"@trezor/rollout@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@trezor/rollout/-/rollout-1.2.0.tgz#827316debc5cf2e8af2210900eb49540ea2753d1"
+  integrity sha512-R8/M8PsGQUndHlyETZ5+mPOveaJSTlEgmAovY7Ifm3quvk8nV5ByWL1LUJ8IYUgir209EWDWSKWfa5RWoon8IA==
   dependencies:
     cross-fetch "^3.0.6"
     runtypes "^5.0.1"
 
-"@trezor/utxo-lib@0.1.2", "@trezor/utxo-lib@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@trezor/utxo-lib/-/utxo-lib-0.1.2.tgz#19319a424b0d0c648b0df456f1849eb08697fb44"
-  integrity sha512-ONAsg8LAyZY9g6X/qgqloUHwWsqtRmrx2Wt3wkz+7LO2VdE69HktAHWUjJLK9drskNwly3Fp0GKK6ZbbtX+Ghw==
+"@trezor/utxo-lib@1.0.0-beta.10":
+  version "1.0.0-beta.10"
+  resolved "https://registry.yarnpkg.com/@trezor/utxo-lib/-/utxo-lib-1.0.0-beta.10.tgz#93f16ce607d94e50f8338a75ca8a3710f106c20e"
+  integrity sha512-osQwFYe/xC9TeRzuUXqVjZPHwBziN0vioYTPq95xgAAZZ9fCWjgJdL98rLLBgFJd0sOz/JwUdLefNGS257YYUQ==
   dependencies:
-    bech32 "0.0.3"
-    bigi "^1.4.0"
-    bip66 "^1.1.0"
-    bitcoin-ops "^1.3.0"
-    blake2b "https://github.com/BitGo/blake2b#6268e6dd678661e0acc4359e9171b97eb1ebf8ac"
-    bs58check "^2.0.0"
-    create-hash "^1.1.0"
-    create-hmac "^1.1.3"
-    debug "~3.1.0"
-    ecurve "^1.0.0"
-    int64-buffer "0.99.1007"
-    merkle-lib "^2.0.10"
+    bchaddrjs "^0.5.2"
+    bech32 "^2.0.0"
+    bip66 "^1.1.5"
+    bitcoin-ops "^1.4.1"
+    blake-hash "^2.0.0"
+    bn.js "^4.0.0"
+    bs58 "^4.0.1"
+    bs58check "^2.1.2"
+    create-hash "^1.2.0"
+    create-hmac "^1.1.7"
+    int64-buffer "^1.0.1"
     pushdata-bitcoin "^1.0.1"
-    randombytes "^2.0.1"
-    safe-buffer "^5.0.1"
-    typeforce "^1.11.3"
-    varuint-bitcoin "^1.0.4"
-    wif "^2.0.1"
-  optionalDependencies:
-    secp256k1 "^3.5.2"
+    tiny-secp256k1 "^1.1.6"
+    typeforce "^1.18.0"
+    varuint-bitcoin "^1.1.2"
+    wif "^2.0.6"
 
-"@types/anymatch@*":
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
-  integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
+"@truffle/abi-utils@^0.2.4":
+  version "0.2.4"
+  resolved "https://registry.yarnpkg.com/@truffle/abi-utils/-/abi-utils-0.2.4.tgz#9fc8bfc95bbe29a33cca3ab9028865b078e2f051"
+  integrity sha512-ICr5Sger6r5uj2G5GN9Zp9OQDCaCqe2ZyAEyvavDoFB+jX0zZFUCfDnv5jllGRhgzdYJ3mec2390mjUyz9jSZA==
+  dependencies:
+    change-case "3.0.2"
+    faker "^5.3.1"
+    fast-check "^2.12.1"
+
+"@truffle/code-utils@^1.2.30":
+  version "1.2.30"
+  resolved "https://registry.yarnpkg.com/@truffle/code-utils/-/code-utils-1.2.30.tgz#aa0a2a11eea40e3c76824729467f27d6cb76819b"
+  integrity sha512-/GFtGkmSZlLpIbIjBTunvhQQ4K2xaHK63QCEKydt3xRMPhpaeVAIaBNH53Z1ulOMDi6BZcSgwQHkquHf/omvMQ==
+  dependencies:
+    cbor "^5.1.0"
+
+"@truffle/codec@^0.11.18", "@truffle/codec@^0.11.19":
+  version "0.11.19"
+  resolved "https://registry.yarnpkg.com/@truffle/codec/-/codec-0.11.19.tgz#c3da4b823d1f730a1114f94406fccfa5459b6bdd"
+  integrity sha512-ZxsfRWBE4wcQ01NCpMWH6VRJ/q3mGTl3ku8ln+WJ2P6McIMsS37imO3d8N9NWiQ49klc9kJfT3mKnOVMLTJhIg==
+  dependencies:
+    "@truffle/abi-utils" "^0.2.4"
+    "@truffle/compile-common" "^0.7.22"
+    big.js "^5.2.2"
+    bn.js "^5.1.3"
+    cbor "^5.1.0"
+    debug "^4.3.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.escaperegexp "^4.1.2"
+    lodash.partition "^4.6.0"
+    lodash.sum "^4.0.2"
+    semver "^7.3.4"
+    utf8 "^3.0.0"
+    web3-utils "1.5.3"
+
+"@truffle/compile-common@^0.7.22":
+  version "0.7.22"
+  resolved "https://registry.yarnpkg.com/@truffle/compile-common/-/compile-common-0.7.22.tgz#c376eea36f59dc770ece3bc8cbb7132f49352846"
+  integrity sha512-afFKh0Wphn8JrCSjOORKjO8/E1X0EtQv6GpFJpQCAWo3/i4VGcSVKR1rjkknnExtjEGe9PJH/Ym/opGH3pQyDw==
+  dependencies:
+    "@truffle/error" "^0.0.14"
+    colors "^1.4.0"
+
+"@truffle/decoder@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@truffle/decoder/-/decoder-5.1.0.tgz#79cb9f6131ed81f69ec67a241fd5bbfd079d1501"
+  integrity sha512-bfNIqSlJviZjpHSiQ76IQvrJewKAzqnpIlC6V73tnhmJn2v21OQ945dXeQdVn/1V9gTkqSUgcXfNjB0wBKaevg==
+  dependencies:
+    "@truffle/abi-utils" "^0.2.4"
+    "@truffle/codec" "^0.11.19"
+    "@truffle/compile-common" "^0.7.22"
+    "@truffle/source-map-utils" "^1.3.63"
+    bn.js "^5.1.3"
+    debug "^4.3.1"
+    web3-utils "1.5.3"
+
+"@truffle/error@^0.0.14":
+  version "0.0.14"
+  resolved "https://registry.yarnpkg.com/@truffle/error/-/error-0.0.14.tgz#59683b5407bede7bddf16d80dc5592f9c5e5fa05"
+  integrity sha512-utJx+SZYoMqk8wldQG4gCVKhV8GwMJbWY7sLXFT/D8wWZTnE2peX7URFJh/cxkjTRCO328z1s2qewkhyVsu2HA==
+
+"@truffle/source-map-utils@^1.3.63":
+  version "1.3.63"
+  resolved "https://registry.yarnpkg.com/@truffle/source-map-utils/-/source-map-utils-1.3.63.tgz#6fa26d6b7a0874e99d6d78a5cacc13903dbcffd4"
+  integrity sha512-JmRnhONsjAdB5sTDl2xy7DUoIxg2KUGpXsPcu1EggBcojY1fZoD3wsdWWLysRDW5Od+npn/BWSdjzGdQknyVPA==
+  dependencies:
+    "@truffle/code-utils" "^1.2.30"
+    "@truffle/codec" "^0.11.19"
+    debug "^4.3.1"
+    json-pointer "^0.6.0"
+    node-interval-tree "^1.3.3"
+    web3-utils "1.5.3"
 
 "@types/aria-query@^4.2.0":
   version "4.2.0"
@@ -5698,21 +4243,11 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/json-schema@^7.0.3":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
-
-"@types/json-schema@^7.0.4":
+"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
   version "7.0.9"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
   integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
 
-"@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0"
-  integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==
-
 "@types/json5@^0.0.29":
   version "0.0.29"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
@@ -5723,6 +4258,11 @@
   resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
   integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
 
+"@types/long@^4.0.1":
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
+  integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
+
 "@types/markdown-to-jsx@^6.11.3":
   version "6.11.3"
   resolved "https://registry.yarnpkg.com/@types/markdown-to-jsx/-/markdown-to-jsx-6.11.3.tgz#cdd1619308fecbc8be7e6a26f3751260249b020e"
@@ -5744,12 +4284,7 @@
   dependencies:
     "@types/braces" "*"
 
-"@types/minimatch@*":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimatch@^3.0.3":
+"@types/minimatch@*", "@types/minimatch@^3.0.3":
   version "3.0.5"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
@@ -5767,16 +4302,21 @@
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@^12.0.12", "@types/node@^12.12.6":
-  version "12.19.15"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182"
-  integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==
+"@types/node@*", "@types/node@>=13.7.0":
+  version "16.11.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.12.tgz#ac7fb693ac587ee182c3780c26eb65546a1a3c10"
+  integrity sha512-+2Iggwg7PxoO5Kyhvsq9VarmPbIelXP070HMImEpbtGCoyWNINQj4wzjbQCXzdHTRXnqufutJb5KAURZANNBAw==
 
 "@types/node@10.12.18":
   version "10.12.18"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.12.18.tgz#1d3ca764718915584fcd9f6344621b7672665c67"
   integrity sha512-fh+pAqt4xRzPfqA6eh3Z2y6fyZavRIumvjhaCL753+TVkGKGhpPeyrJG2JftD0T9q4GF00KjefsQ+PQNDdWQaQ==
 
+"@types/node@^12.0.12", "@types/node@^12.12.6":
+  version "12.19.15"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.19.15.tgz#0de7e978fb43db62da369db18ea088a63673c182"
+  integrity sha512-lowukE3GUI+VSYSu6VcBXl14d61Rp5hA1D+61r16qnwC0lYNSqdxcvRh0pswejorHfS+HgwBasM8jLXz0/aOsw==
+
 "@types/node@^14.0.10":
   version "14.17.27"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.17.27.tgz#5054610d37bb5f6e21342d0e6d24c494231f3b85"
@@ -5819,16 +4359,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/prettier@^2.0.0":
+"@types/prettier@^2.0.0", "@types/prettier@^2.1.0":
   version "2.2.3"
   resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
   integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
 
-"@types/prettier@^2.1.0":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.1.1.tgz#be148756d5480a84cde100324c03a86ae5739fb5"
-  integrity sha512-2zs+O+UkDsJ1Vcp667pd3f8xearMdopz/z54i99wtRDI5KLmngk7vlrYZD0ZjKHaROR03EznlBbVY9PfAEyJIQ==
-
 "@types/pretty-hrtime@^1.0.0":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/pretty-hrtime/-/pretty-hrtime-1.0.1.tgz#72a26101dc567b0d68fd956cf42314556e42d601"
@@ -5904,12 +4439,7 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
-"@types/tapable@*", "@types/tapable@^1.0.5":
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74"
-  integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA==
-
-"@types/tapable@^1":
+"@types/tapable@^1", "@types/tapable@^1.0.5":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
   integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
@@ -5936,12 +4466,7 @@
   dependencies:
     source-map "^0.6.1"
 
-"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
-  integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
-
-"@types/unist@^2.0.3":
+"@types/unist@*", "@types/unist@^2.0.0", "@types/unist@^2.0.2", "@types/unist@^2.0.3":
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.6.tgz#250a7b16c3b91f672a24552ec64678eeb1d3a08d"
   integrity sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==
@@ -5965,7 +4490,7 @@
     "@types/source-list-map" "*"
     source-map "^0.7.3"
 
-"@types/webpack@^4.41.26":
+"@types/webpack@^4.41.26", "@types/webpack@^4.41.8":
   version "4.41.31"
   resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.31.tgz#c35f252a3559ddf9c85c0d8b0b42019025e581aa"
   integrity sha512-/i0J7sepXFIp1ZT7FjUGi1eXMCg8HCCzLJEQkKsOtbJFontsJLolBcDC+3qxn5pPwiCt1G0ZdRmYRzNBtvpuGQ==
@@ -5977,18 +4502,6 @@
     anymatch "^3.0.0"
     source-map "^0.6.0"
 
-"@types/webpack@^4.41.8":
-  version "4.41.25"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.25.tgz#4d3b5aecc4e44117b376280fbfd2dc36697968c4"
-  integrity sha512-cr6kZ+4m9lp86ytQc1jPOJXgINQyz3kLLunZ57jznW+WIAL0JqZbGubQk4GlD42MuQL5JGOABrxdpqqWeovlVQ==
-  dependencies:
-    "@types/anymatch" "*"
-    "@types/node" "*"
-    "@types/tapable" "*"
-    "@types/uglify-js" "*"
-    "@types/webpack-sources" "*"
-    source-map "^0.6.0"
-
 "@types/ws@^7.2.0":
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.0.tgz#499690ea08736e05a8186113dac37769ab251a0e"
@@ -6302,7 +4815,14 @@
   resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-"@zxing/library@^0.8.0":
+"@zxing/browser@^0.0.10":
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/@zxing/browser/-/browser-0.0.10.tgz#63c0a762fc2fd4ee946a20953ef24fab225698a9"
+  integrity sha512-P2wQc5fs+cjSc39zFS4UDhejWqdikf4FjuWIlFrzXD8fOsZ4ASfmLDKGeg7mRgmJq11oMKcVXvFFI6kcIKtxuQ==
+  optionalDependencies:
+    "@zxing/text-encoding" "^0.9.0"
+
+"@zxing/library@0.8.0":
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/@zxing/library/-/library-0.8.0.tgz#accd9f3cd5c06fa40a95c2c1f61398c41548a9e3"
   integrity sha512-D7oopukr7cJ0Va01Er2zXiSPXvmvc6D1PpOq/THRvd/57yEsBs+setRsiDo7tSRnYHcw7FrRZSZ7rwyzNSLJeA==
@@ -6311,7 +4831,7 @@
   optionalDependencies:
     text-encoding "^0.6.4"
 
-"@zxing/text-encoding@0.9.0":
+"@zxing/text-encoding@0.9.0", "@zxing/text-encoding@^0.9.0":
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/@zxing/text-encoding/-/text-encoding-0.9.0.tgz#fb50ffabc6c7c66a0c96b4c03e3d9be74864b70b"
   integrity sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==
@@ -6414,11 +4934,6 @@ accounting@^0.4.1:
   resolved "https://registry.yarnpkg.com/accounting/-/accounting-0.4.1.tgz#87dd4103eff7f4460f1e186f5c677ed6cf566883"
   integrity sha1-h91BA+/39EYPHhhvXGd+1s9WaIM=
 
-acorn-dynamic-import@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
-  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
-
 acorn-globals@^4.0.0:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7"
@@ -6442,27 +4957,12 @@ acorn-jsx@^3.0.0:
   dependencies:
     acorn "^3.0.4"
 
-acorn-jsx@^5.0.0, acorn-jsx@^5.0.2, acorn-jsx@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe"
-  integrity sha512-HiUX/+K2YpkpJ+SzBffkM/AQ2YE03S0U1kjTLVpoJdhZMOWy8qvXVN9JdLqv2QsaQ6MPYQIuNmwD8zOiYUofLQ==
-
-acorn-jsx@^5.3.1:
+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:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.6.2.tgz#b7d7ceca6f22e6417af933a62cad4de01048d5d2"
-  integrity sha512-rIhNEZuNI8ibQcL7ANm/mGyPukIaZsRNX9psFNQURyJW0nu6k8wjSDld20z6v2mDBWqX13pIEnk9gGZJHIlEXg==
-  dependencies:
-    acorn "^6.0.2"
-    acorn-dynamic-import "^4.0.0"
-    acorn-walk "^6.1.0"
-    xtend "^4.0.1"
-
-acorn-node@^1.6.1:
+acorn-node@^1.2.0, acorn-node@^1.3.0, acorn-node@^1.5.2, acorn-node@^1.6.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8"
   integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==
@@ -6471,7 +4971,7 @@ acorn-node@^1.6.1:
     acorn-walk "^7.0.0"
     xtend "^4.0.2"
 
-acorn-walk@^6.0.1, acorn-walk@^6.1.0:
+acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
   integrity sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==
@@ -6491,7 +4991,7 @@ acorn@^5.1.2, acorn@^5.2.1:
   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.2, acorn@^6.0.7, 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==
@@ -6582,14 +5082,7 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@6:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.1.tgz#808007e4e5867decb0ab6ab2f928fbdb5a596db4"
-  integrity sha512-01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg==
-  dependencies:
-    debug "4"
-
-agent-base@^6.0.0, agent-base@^6.0.2:
+agent-base@6, agent-base@^6.0.0, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -6887,7 +5380,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.0, anymatch@^3.0.3, anymatch@^3.1.0, anymatch@~3.1.2:
+anymatch@^3.0.0, anymatch@^3.0.3, anymatch@^3.1.0, anymatch@~3.1.1, anymatch@~3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
   integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -6895,14 +5388,6 @@ anymatch@^3.0.0, anymatch@^3.0.3, anymatch@^3.1.0, anymatch@~3.1.2:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
-  dependencies:
-    normalize-path "^3.0.0"
-    picomatch "^2.0.4"
-
 app-module-path@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/app-module-path/-/app-module-path-2.2.0.tgz#641aa55dfb7d6a6f0a8141c4b9c0aa50b6c24dd5"
@@ -7059,16 +5544,7 @@ array-from@^2.1.1:
   resolved "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"
   integrity sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=
 
-array-includes@^3.0.3, array-includes@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348"
-  integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    is-string "^1.0.5"
-
-array-includes@^3.1.2, array-includes@^3.1.3:
+array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
   integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
@@ -7156,16 +5632,7 @@ array.prototype.flat@^1.2.1, array.prototype.flat@^1.2.3:
     define-properties "^1.1.3"
     es-abstract "^1.17.0-next.1"
 
-array.prototype.flatmap@^1.2.1:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz#1c13f84a178566042dd63de4414440db9222e443"
-  integrity sha512-OOEk+lkePcg+ODXIpvuU9PAryCikCJyo7GlDG1upleEpQRx6mzL9puEBkozQ5iAx20KV0l3DbyQwqciJtqe5Pg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-
-array.prototype.flatmap@^1.2.4:
+array.prototype.flatmap@^1.2.1, array.prototype.flatmap@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9"
   integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q==
@@ -7195,14 +5662,6 @@ asap@^2.0.0, asap@^2.0.6:
   resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
   integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
 
-ascli@~0.3:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ascli/-/ascli-0.3.0.tgz#5e66230e5219fe3e8952a4efb4f20fae596a813a"
-  integrity sha1-XmYjDlIZ/j6JUqTvtPIPrllqgTo=
-  dependencies:
-    colour latest
-    optjs latest
-
 asmcrypto.js@^2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/asmcrypto.js/-/asmcrypto.js-2.3.2.tgz#b9f84bd0a1fb82f21f8c29cc284a707ad17bba2e"
@@ -7267,12 +5726,17 @@ assert@^1.1.1, assert@^1.4.0, assert@^1.4.1:
     object-assign "^4.1.1"
     util "0.10.3"
 
-assertion-error@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.0.2.tgz#13ca515d86206da0bac66e834dd397d87581094c"
-  integrity sha1-E8pRXYYgbaC6xm6DTdOX2HWBCUw=
+assert@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+  dependencies:
+    es6-object-assign "^1.1.0"
+    is-nan "^1.2.1"
+    object-is "^1.0.1"
+    util "^0.12.0"
 
-assertion-error@^1.1.0:
+assertion-error@^1.0.1, assertion-error@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b"
   integrity sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==
@@ -7419,12 +5883,7 @@ at-least-node@^1.0.0:
   resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a"
-  integrity sha1-ri1acpR38onWDdf5amMUoi3Wwio=
-
-atob@^2.1.2:
+atob@^2.0.0, atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
@@ -7441,20 +5900,7 @@ autoprefixer@^8.0.0:
     postcss "^6.0.19"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^9.8.0:
-  version "9.8.5"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.5.tgz#2c225de229ddafe1d1424c02791d0c3e10ccccaa"
-  integrity sha512-C2p5KkumJlsTHoNv9w31NrBRgXhf6eCMteJuHZi2xhkgC+5Vm40MEtCKPhc0qdgAOhox0YPy1SQHTAky05UoKg==
-  dependencies:
-    browserslist "^4.12.0"
-    caniuse-lite "^1.0.30001097"
-    colorette "^1.2.0"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.32"
-    postcss-value-parser "^4.1.0"
-
-autoprefixer@^9.8.6:
+autoprefixer@^9.8.0, autoprefixer@^9.8.6:
   version "9.8.8"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.8.tgz#fd4bd4595385fa6f06599de749a4d5f7a474957a"
   integrity sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==
@@ -8264,12 +6710,12 @@ base-x@3.0.8, base-x@^3.0.2, base-x@^3.0.8:
   dependencies:
     safe-buffer "^5.0.1"
 
-base32-encode@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/base32-encode/-/base32-encode-1.1.1.tgz#d022d86aca0002a751bbe1bf20eb4a9b1cef4e95"
-  integrity sha512-eqa0BeGghj3guezlasdHJhr3+J5ZbbQvxeprkcDMbRQrjlqOT832IUDT4Al4ofAwekFYMqkkM9KMUHs9Cu0HKA==
+base-x@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/base-x/-/base-x-1.1.0.tgz#42d3d717474f9ea02207f6d1aa1f426913eeb7ac"
+  integrity sha1-QtPXF0dPnqAiB/bRqh9CaRPut6w=
 
-base32-encode@^1.2.0:
+base32-encode@^1.1.0, base32-encode@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/base32-encode/-/base32-encode-1.2.0.tgz#e150573a5e431af0a998e32bdfde7045725ca453"
   integrity sha512-cHFU8XeRyx0GgmoWi5qHMCVRiqU6J3MHWxVgun7jggCBUpVzm1Ir7M9dYr2whjSNc3tFeXfQ/oZjQu/4u55h9A==
@@ -8281,6 +6727,13 @@ base32.js@~0.1.0:
   resolved "https://registry.yarnpkg.com/base32.js/-/base32.js-0.1.0.tgz#b582dec693c2f11e893cf064ee6ac5b6131a2202"
   integrity sha1-tYLexpPC8R6JPPBk7mrFthMaIgI=
 
+base58check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base58check/-/base58check-2.0.0.tgz#8046652d14bc87f063bd16be94a39134d3b61173"
+  integrity sha1-gEZlLRS8h/BjvRa+lKORNNO2EXM=
+  dependencies:
+    bs58 "^3.0.0"
+
 base64-arraybuffer@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
@@ -8336,21 +6789,11 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-bech32@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/bech32/-/bech32-0.0.3.tgz#736747c4a6531c5d8937d0400498de30e93b2f9c"
-  integrity sha512-O+K1w8P/aAOLcYwwQ4sbiPYZ51ZIW95lnS4/6nE8Aib/z+OOddQIIPdu2qi94qGDp4HhYy/wJotttXKkak1lXg==
-
-bech32@1.1.4:
+bech32@1.1.4, bech32@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.4.tgz#e38c9f37bf179b8eb16ae3a772b40c356d4832e9"
   integrity sha512-s0IrSOzLlbvX7yp4WBfPITzpAU8sqQcpsmwXDiKwrG4r491vwCO/XpejasRNl0piBMe/DvP4Tz0mIS/X1DPJBQ==
 
-bech32@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/bech32/-/bech32-1.1.3.tgz#bd47a8986bbb3eec34a56a097a84b8d3e9a2dfcd"
-  integrity sha512-yuVFUvrNcoJi0sv5phmqc6P+Fl1HjRDRNOOkHY2X/3LBy2bIGNSFx4fZ95HMaXHupuS7cZR15AsvtmCIF4UEyg==
-
 bech32@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bech32/-/bech32-2.0.0.tgz#078d3686535075c8c79709f054b1b226a133b355"
@@ -8391,11 +6834,6 @@ big.js@^5.1.2, big.js@^5.2.2:
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
-bigi@^1.1.0, bigi@^1.4.0, bigi@^1.4.1:
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825"
-  integrity sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU=
-
 bignumber.js@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/bignumber.js/-/bignumber.js-4.1.0.tgz#db6f14067c140bd46624815a7916c92d9b6c24b1"
@@ -8483,7 +6921,7 @@ bip66@^1.1.0, bip66@^1.1.5:
   dependencies:
     safe-buffer "^5.0.1"
 
-bitcoin-ops@^1.3.0, bitcoin-ops@^1.4.0:
+bitcoin-ops@^1.3.0, bitcoin-ops@^1.4.0, bitcoin-ops@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/bitcoin-ops/-/bitcoin-ops-1.4.1.tgz#e45de620398e22fd4ca6023de43974ff42240278"
   integrity sha512-pef6gxZFztEhaE9RY9HmWVmiIHqCb2OyS4HPKkpc6CIiiOa3Qmuoylxc5P2EkU3w+5eTSifI9SEZC88idAIGow==
@@ -8539,18 +6977,14 @@ bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
-"blake2b-wasm@https://github.com/BitGo/blake2b-wasm#193cdb71656c1a6c7f89b05d0327bb9b758d071b":
+blake-hash@^2.0.0:
   version "2.0.0"
-  resolved "https://github.com/BitGo/blake2b-wasm#193cdb71656c1a6c7f89b05d0327bb9b758d071b"
-  dependencies:
-    nanoassert "^1.0.0"
-
-"blake2b@https://github.com/BitGo/blake2b#6268e6dd678661e0acc4359e9171b97eb1ebf8ac":
-  version "2.1.3"
-  resolved "https://github.com/BitGo/blake2b#6268e6dd678661e0acc4359e9171b97eb1ebf8ac"
+  resolved "https://registry.yarnpkg.com/blake-hash/-/blake-hash-2.0.0.tgz#af184dce641951126d05b7d1c3de3224f538d66e"
+  integrity sha512-Igj8YowDu1PRkRsxZA7NVkdFNxH5rKv5cpLxQ0CVXSIA77pVYwCPRQJ2sMew/oneUpfuYRyjG6r8SmmmnbZb1w==
   dependencies:
-    blake2b-wasm "https://github.com/BitGo/blake2b-wasm#193cdb71656c1a6c7f89b05d0327bb9b758d071b"
-    nanoassert "^1.0.0"
+    node-addon-api "^3.0.0"
+    node-gyp-build "^4.2.2"
+    readable-stream "^3.6.0"
 
 blakejs@^1.1.0:
   version "1.1.0"
@@ -8582,17 +7016,12 @@ bn.js@^1.0.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-1.3.0.tgz#0db4cbf96f8f23b742f5bcb9d1aa7a9994a05e83"
   integrity sha1-DbTL+W+PI7dC9by50ap6mZSgXoM=
 
-bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.0, bn.js@^4.11.1, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0:
+bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.11.0, bn.js@^4.11.6, bn.js@^4.11.7, bn.js@^4.11.8, bn.js@^4.11.9, bn.js@^4.4.0:
   version "4.11.9"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
   integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
 
-bn.js@^5.1.1, bn.js@^5.1.2:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
-  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
-
-bn.js@^5.2.0:
+bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.1.3, bn.js@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
   integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
@@ -8645,18 +7074,7 @@ boom@^7.2.0:
   dependencies:
     hoek "6.x.x"
 
-borc@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/borc/-/borc-2.1.1.tgz#df1a4ec063b9913f2fff5e07c9377eeeff47914a"
-  integrity sha512-vPLLC2/gS0QN4O3cnPh+8jLshkMMD4qIfs+B1TPGPh30WrtcfItaO6j4k9alsqu/hIgKi8dVdmMvTcbq4tIF7A==
-  dependencies:
-    bignumber.js "^9.0.0"
-    commander "^2.15.0"
-    ieee754 "^1.1.8"
-    iso-url "~0.4.4"
-    json-text-sequence "~0.1.0"
-
-borc@^2.1.2:
+borc@^2.1.0, borc@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/borc/-/borc-2.1.2.tgz#6ce75e7da5ce711b963755117dd1b187f6f8cf19"
   integrity sha512-Sy9eoUi4OiKzq7VovMn246iTo17kzuyHJKomCfpWMlI6RpfN1gk95w7d7gH264nApVLg0HZfcpz62/g4VH1Y4w==
@@ -8799,7 +7217,7 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-resolve@^1.11.0, browser-resolve@^1.7.0:
+browser-resolve@^1.11.0:
   version "1.11.3"
   resolved "https://registry.yarnpkg.com/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6"
   integrity sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==
@@ -8818,6 +7236,11 @@ browser-stdout@1.3.1:
   resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
   integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
 
+browser-util-inspect@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/browser-util-inspect/-/browser-util-inspect-0.2.0.tgz#cdda8ce1a4a07a4386035168a228c8777bff459c"
+  integrity sha1-zdqM4aSgekOGA1FooijId3v/RZw=
+
 browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.0.6, browserify-aes@^1.1.1, browserify-aes@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
@@ -9015,18 +7438,7 @@ browserslist@^3.1.1, browserslist@^3.2.6:
     caniuse-lite "^1.0.30000844"
     electron-to-chromium "^1.3.47"
 
-browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.14.7:
-  version "4.14.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.7.tgz#c071c1b3622c1c2e790799a37bb09473a4351cb6"
-  integrity sha512-BSVRLCeG3Xt/j/1cCGj1019Wbty0H+Yvu2AOuZSuoaUWn3RatbL33Cxk+Q4jRMRAbOm0p7SLravLjpnT6s0vzQ==
-  dependencies:
-    caniuse-lite "^1.0.30001157"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.591"
-    escalade "^3.1.1"
-    node-releases "^1.1.66"
-
-browserslist@^4.16.6, browserslist@^4.17.3:
+browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.17.3:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.17.4.tgz#72e2508af2a403aec0a49847ef31bd823c57ead4"
   integrity sha512-Zg7RpbZpIJRW3am9Lyckue7PLytvVxxhJj1CaJVlCWENsGEAOlnlt8X0ZxGRPp7Bt9o8tIRM5SEXy4BCPMJjLQ==
@@ -9054,6 +7466,13 @@ bs58@^2.0.1:
   resolved "https://registry.yarnpkg.com/bs58/-/bs58-2.0.1.tgz#55908d58f1982aba2008fa1bed8f91998a29bf8d"
   integrity sha1-VZCNWPGYKrogCPob7Y+RmYopv40=
 
+bs58@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bs58/-/bs58-3.1.0.tgz#d4c26388bf4804cac714141b1945aa47e5eb248e"
+  integrity sha1-1MJjiL9IBMrHFBQbGUWqR+XrJI4=
+  dependencies:
+    base-x "^1.1.0"
+
 bs58check@2.1.2, bs58check@<3.0.0, bs58check@^2.0.0, bs58check@^2.1.1, bs58check@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc"
@@ -9153,7 +7572,7 @@ buffer@^4.3.0:
     ieee754 "^1.1.4"
     isarray "^1.0.0"
 
-buffer@^5.0.5, buffer@^5.2.1, buffer@^5.4.2, buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.0.5, buffer@^5.1.0, buffer@^5.2.1, buffer@^5.4.2, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -9184,23 +7603,17 @@ bufferutil@^4.0.1:
   dependencies:
     node-gyp-build "~3.7.0"
 
-bufferview@~1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/bufferview/-/bufferview-1.0.1.tgz#7afd74a45f937fa422a1d338c08bbfdc76cd725d"
-  integrity sha1-ev10pF+Tf6QiodM4wIu/3HbNcl0=
-
 builtin-status-codes@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8"
   integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
 
-bytebuffer-old-fixed-webpack@3.5.6:
-  version "3.5.6"
-  resolved "https://registry.yarnpkg.com/bytebuffer-old-fixed-webpack/-/bytebuffer-old-fixed-webpack-3.5.6.tgz#5adc419c6a9b4692f217206703ec7431c759aa3f"
-  integrity sha1-WtxBnGqbRpLyFyBnA+x0McdZqj8=
+bytebuffer@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd"
+  integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0=
   dependencies:
-    bufferview "~1"
-    long "~2 >=2.2.3"
+    long "~3"
 
 byteman@^1.3.5:
   version "1.3.5"
@@ -9375,6 +7788,14 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
+camel-case@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
+  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.1"
+
 camel-case@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.1.tgz#1fc41c854f00e2f7d0139dfeba1542d6896fe547"
@@ -9417,17 +7838,12 @@ camelcase@^4.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.0.0.tgz#5259f7c30e35e278f1bdc2a4d91230b37cad981e"
-  integrity sha512-8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w==
-
-camelcase@^6.2.0:
+camelcase@^6.0.0, camelcase@^6.2.0:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.2.0.tgz#924af881c9d525ac9d87f40d964e5cea982a1809"
   integrity sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==
 
-caniuse-lite@1.0.30001265, caniuse-lite@^1.0.30000810, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001097, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001157, caniuse-lite@^1.0.30001265:
+caniuse-lite@1.0.30001265, caniuse-lite@^1.0.30000810, caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001265:
   version "1.0.30001265"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001265.tgz#0613c9e6c922e422792e6fcefdf9a3afeee4f8c3"
   integrity sha512-YzBnspggWV5hep1m9Z6sZVLOt7vrju8xWooFAgN6BA5qvy98qPAPb7vNUzypFaoh2pb3vlfzbDO8tB57UPGbtw==
@@ -9466,6 +7882,19 @@ cbor-sync@^1.0.4:
   resolved "https://registry.yarnpkg.com/cbor-sync/-/cbor-sync-1.0.4.tgz#5a11a1ab75c2a14d1af1b237fd84aa8c1593662f"
   integrity sha512-GWlXN4wiz0vdWWXBU71Dvc1q3aBo0HytqwAZnXF1wOwjqNnDWA1vZ1gDMFLlqohak31VQzmhiYfiCX5QSSfagA==
 
+cbor-web@^7.0.6:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cbor-web/-/cbor-web-7.0.6.tgz#6e23a0c58db4c38e485e395de511b9e2f628961c"
+  integrity sha512-A6ZH12jcDJG9PS7StugO78G+ok23SAjxMugGInPBy4IItiH6hYzybi6HQkGjWw9jBEGQpIBkleB2mizxYZIpLw==
+
+cbor@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/cbor/-/cbor-5.2.0.tgz#4cca67783ccd6de7b50ab4ed62636712f287a67c"
+  integrity sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==
+  dependencies:
+    bignumber.js "^9.0.1"
+    nofilter "^1.0.4"
+
 ccount@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/ccount/-/ccount-1.0.4.tgz#9cf2de494ca84060a2a8d2854edd6dfb0445f386"
@@ -9552,6 +7981,30 @@ chalk@~0.4.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"
+  integrity sha512-Mww+SLF6MZ0U6kdg11algyKd5BARbyM4TbFBepwowYSR5ClfQGCGtxNXgykpN0uF/bstWeaGDT4JWaDh8zWAHA==
+  dependencies:
+    camel-case "^3.0.0"
+    constant-case "^2.0.0"
+    dot-case "^2.1.0"
+    header-case "^1.0.0"
+    is-lower-case "^1.1.0"
+    is-upper-case "^1.1.0"
+    lower-case "^1.1.1"
+    lower-case-first "^1.0.0"
+    no-case "^2.3.2"
+    param-case "^2.1.0"
+    pascal-case "^2.0.0"
+    path-case "^2.1.0"
+    sentence-case "^2.1.0"
+    snake-case "^2.1.0"
+    swap-case "^1.1.0"
+    title-case "^2.1.0"
+    upper-case "^1.1.1"
+    upper-case-first "^1.1.0"
+
 char-regex@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf"
@@ -9626,22 +8079,7 @@ chokidar@3.3.0:
   optionalDependencies:
     fsevents "~2.1.1"
 
-"chokidar@>=2.0.0 <4.0.0", chokidar@^3.4.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
-  integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
-  dependencies:
-    anymatch "~3.1.1"
-    braces "~3.0.2"
-    glob-parent "~5.1.0"
-    is-binary-path "~2.1.0"
-    is-glob "~4.0.1"
-    normalize-path "~3.0.0"
-    readdirp "~3.5.0"
-  optionalDependencies:
-    fsevents "~2.3.1"
-
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.4.2:
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.2:
   version "3.5.2"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
   integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
@@ -9692,10 +8130,10 @@ chrome-trace-event@^1.0.2:
   dependencies:
     tslib "^1.9.0"
 
-chromedriver@^95.0.0:
-  version "95.0.0"
-  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-95.0.0.tgz#ecf854cac6df5137a651dcc132edf55612d3db7f"
-  integrity sha512-HwSg7S0ZZYsHTjULwxFHrrUqEpz1+ljDudJM3eOquvqD5QKnR5pSe/GlBTY9UU2tVFRYz8bEHYC4Y8qxciQiLQ==
+chromedriver@^96.0.0:
+  version "96.0.0"
+  resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-96.0.0.tgz#c8473498e4c94950fa168187b112019cce9e5c6c"
+  integrity sha512-4g6Hn5RHGsbaBmOrJbDlz/hdVPOc22eRsbvoAAMqkZxR2NJCcddHzCw2FAQeW8lX/C7xWVz3nyDsKX3fE9lIIw==
   dependencies:
     "@testim/chrome-version" "^1.0.7"
     axios "^0.21.2"
@@ -10059,11 +8497,6 @@ color@^0.11.3:
     color-convert "^1.3.0"
     color-string "^0.3.0"
 
-colorette@^1.2.0, colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
-
 colorette@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
@@ -10074,16 +8507,11 @@ colors@0.5.x:
   resolved "https://registry.yarnpkg.com/colors/-/colors-0.5.1.tgz#7d0023eaeb154e8ee9fce75dcb923d0ed1667774"
   integrity sha1-fQAj6usVTo7p/Oddy5I9DtFmd3Q=
 
-colors@^1.1.2:
+colors@^1.1.2, colors@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-colour@latest:
-  version "0.7.1"
-  resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778"
-  integrity sha1-nLFpkX7F0SwHNtPoaFdG3xyt93g=
-
 columnify@1.5.4:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/columnify/-/columnify-1.5.4.tgz#4737ddf1c7b69a8a7c340570782e947eec8e78bb"
@@ -10284,6 +8712,14 @@ consolidate@^0.16.0:
   dependencies:
     bluebird "^3.7.2"
 
+constant-case@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-2.0.0.tgz#4175764d389d3fa9c8ecd29186ed6005243b6a46"
+  integrity sha1-QXV2TTidP6nI7NKRhu1gBSQ7akY=
+  dependencies:
+    snake-case "^2.1.0"
+    upper-case "^1.1.1"
+
 constants-browserify@^1.0.0, constants-browserify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
@@ -10330,7 +8766,7 @@ continuable-cache@^0.3.1:
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
   integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
-convert-source-map@1.7.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -10342,7 +8778,7 @@ convert-source-map@^0.3.3:
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
   integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
 
-convert-source-map@^1.0.0, convert-source-map@^1.8.0:
+convert-source-map@^1.0.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0, convert-source-map@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
   integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
@@ -10407,14 +8843,7 @@ copy-props@^2.0.1:
     each-props "^1.3.0"
     is-plain-object "^2.0.1"
 
-copy-to-clipboard@^3.0.8:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.0.8.tgz#f4e82f4a8830dce4666b7eb8ded0c9bcc313aba9"
-  integrity sha512-c3GdeY8qxCHGezVb1EFQfHYK/8NZRemgcTIzPq7PuxjHAf/raKibn2QdhHPb/y6q74PMgH6yizaDZlRmw6QyKw==
-  dependencies:
-    toggle-selection "^1.0.3"
-
-copy-to-clipboard@^3.3.1:
+copy-to-clipboard@^3.0.8, copy-to-clipboard@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
   integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
@@ -10446,20 +8875,7 @@ core-js-compat@^3.16.0, core-js-compat@^3.16.2, core-js-compat@^3.8.1:
     browserslist "^4.17.3"
     semver "7.0.0"
 
-core-js-compat@^3.7.0:
-  version "3.8.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.8.0.tgz#3248c6826f4006793bd637db608bca6e4cd688b1"
-  integrity sha512-o9QKelQSxQMYWHXc/Gc4L8bx/4F7TTraE5rhuN8I7mKBt5dBIUpXpIR3omv70ebr8ST5R3PqbDQr+ZI3+Tt1FQ==
-  dependencies:
-    browserslist "^4.14.7"
-    semver "7.0.0"
-
-core-js-pure@^3.0.0, core-js-pure@^3.0.1:
-  version "3.6.5"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813"
-  integrity sha512-lacdXOimsiD0QyNf9BC/mxivNJ/ybBGJXQFKzRekp1WTHoVUWsUHEn+2T8GJAzzIhyOuXA+gOxCVN3l+5PLPUA==
-
-core-js-pure@^3.8.2:
+core-js-pure@^3.0.0, core-js-pure@^3.0.1, core-js-pure@^3.8.2:
   version "3.18.3"
   resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.18.3.tgz#7eed77dcce1445ab68fd68715856633e2fb3b90c"
   integrity sha512-qfskyO/KjtbYn09bn1IPkuhHl5PlJ6IzJ9s9sraJ1EqcuGyLGKzhSM1cY0zgyL9hx42eulQLZ6WaeK5ycJCkqw==
@@ -10469,12 +8885,7 @@ core-js@^2.4.0, core-js@^2.5.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
   integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
 
-core-js@^3.0.4, core-js@^3.6.5:
-  version "3.8.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.8.3.tgz#c21906e1f14f3689f93abcc6e26883550dd92dd0"
-  integrity sha512-KPYXeVZYemC2TkNEkX/01I+7yd+nX3KddKwZ1Ww7SKWdI2wQprSgLmrTddT8nw92AjEklTsPBoSdQBhbI1bQ6Q==
-
-core-js@^3.8.2:
+core-js@^3.0.4, core-js@^3.6.5, core-js@^3.8.2:
   version "3.15.2"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61"
   integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q==
@@ -10547,6 +8958,13 @@ crc-32@^1.2.0:
     exit-on-epipe "~1.0.1"
     printj "~1.1.0"
 
+crc@^3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/crc/-/crc-3.8.0.tgz#ad60269c2c856f8c299e2c4cc0de4556914056c6"
+  integrity sha512-iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ==
+  dependencies:
+    buffer "^5.1.0"
+
 crdts@~0.1.2:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/crdts/-/crdts-0.1.5.tgz#89413e8adfc3ab943300a890ee6392db5ba60c06"
@@ -10778,21 +9196,16 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.2.tgz#b8036170c79f07a90ff2f16e22284027a243848b"
-  integrity sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=
+cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0", cssom@~0.3.6:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssom@^0.4.4:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
   integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
 
-cssom@~0.3.6:
-  version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
-  integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
-
 "cssstyle@>= 0.2.37 < 0.3.0":
   version "0.2.37"
   resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-0.2.37.tgz#541097234cb2513c83ceed3acddc27ff27987d54"
@@ -10974,10 +9387,10 @@ debug@3.2.6, debug@3.X, debug@^3.0.0, debug@^3.1.0, debug@^3.2.6:
   dependencies:
     ms "^2.1.1"
 
-debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"
-  integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==
+debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
@@ -10988,13 +9401,6 @@ debug@4.1.0:
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.0, debug@^4.2.0, debug@^4.3.1, debug@^4.3.2:
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
-  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
-  dependencies:
-    ms "2.1.2"
-
 debug@~3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
@@ -11077,7 +9483,7 @@ deep-eql@^3.0.1:
   dependencies:
     type-detect "^4.0.0"
 
-deep-equal@^1.0.0, deep-equal@^1.0.1, deep-equal@^1.1.0:
+deep-equal@^1.0.0, deep-equal@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
   integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
@@ -11114,12 +9520,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.0.0, deepmerge@^4.0.0:
+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.2.2:
+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==
@@ -11336,17 +9742,7 @@ deps-regex@^0.1.4:
   resolved "https://registry.yarnpkg.com/deps-regex/-/deps-regex-0.1.4.tgz#518667b7691460a5e7e0a341be76eb7ce8090184"
   integrity sha1-UYZnt2kUYKXn4KNBvnbrfOgJAYQ=
 
-deps-sort@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.0.tgz#091724902e84658260eb910748cccd1af6e21fb5"
-  integrity sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=
-  dependencies:
-    JSONStream "^1.0.3"
-    shasum "^1.0.0"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-
-deps-sort@^2.0.1:
+deps-sort@^2.0.0, deps-sort@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/deps-sort/-/deps-sort-2.0.1.tgz#9dfdc876d2bcec3386b6829ac52162cda9fa208d"
   integrity sha512-1orqXQr5po+3KI6kQb9A4jnXT1PBwggGl2d7Sq2xsnOeI9GPcE/tGcF9UiSZtZBM7MukY4cAh7MemS6tZYipfw==
@@ -11506,15 +9902,6 @@ detective-typescript@^7.0.0:
     node-source-walk "^4.2.0"
     typescript "^3.9.7"
 
-detective@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb"
-  integrity sha512-TFHMqfOvxlgrfVzTEkNBSh9SvSNX/HfF4OFI2QFGCyPm02EsyILqnUeb5P6q7JZ3SFNTBL5t2sePRgrN4epUWQ==
-  dependencies:
-    acorn-node "^1.3.0"
-    defined "^1.0.0"
-    minimist "^1.1.1"
-
 detective@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b"
@@ -11789,6 +10176,13 @@ domutils@^1.5.1:
     dom-serializer "0"
     domelementtype "1"
 
+dot-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-2.1.1.tgz#34dcf37f50a8e93c2b3bca8bb7fb9155c7da3bee"
+  integrity sha1-NNzzf1Co6TwrO8qLt/uRVcfaO+4=
+  dependencies:
+    no-case "^2.2.0"
+
 dot-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
@@ -11906,14 +10300,6 @@ ecc-jsbn@~0.1.1:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
-ecurve@^1.0.0, ecurve@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/ecurve/-/ecurve-1.0.6.tgz#dfdabbb7149f8d8b78816be5a7d5b83fcf6de797"
-  integrity sha512-/BzEjNfiSuB7jIWKcS/z8FK9jNjmEWvUV2YZ4RLSmcDtP7Lq0m6FvDuSnJpBlDpGRpfRQeTLGLBI8H+kEv0r+w==
-  dependencies:
-    bigi "^1.1.0"
-    safe-buffer "^5.0.1"
-
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
@@ -11926,12 +10312,7 @@ ejs@^3.0.2:
   dependencies:
     jake "^10.6.1"
 
-electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.591:
-  version "1.3.610"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.610.tgz#1254eb394acd220a836ea1f203f8cded4e487052"
-  integrity sha512-eFDC+yVQpEhtlapk4CYDPfV9ajF9cEof5TBcO49L1ETO+aYogrKWDmYpZyxBScMNe8Bo/gJamH4amQ4yyvXg4g==
-
-electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.867:
+electron-to-chromium@^1.3.47, electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.867:
   version "1.3.871"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.871.tgz#6e87365fd72037a6c898fb46050ad4be3ac9ef62"
   integrity sha512-qcLvDUPf8DSIMWarHT2ptgcqrYg62n3vPA7vhrOF24d8UNzbUBaHu2CySiENR3nEDzYgaN60071t0F6KLYMQ7Q==
@@ -12088,15 +10469,6 @@ engine.io@~3.5.0:
     engine.io-parser "~2.2.0"
     ws "~7.4.2"
 
-enhanced-resolve@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz#3b806f3bfafc1ec7de69551ef93cca46c1704126"
-  integrity sha512-3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
 enhanced-resolve@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
@@ -12239,42 +10611,7 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
-es-abstract@^1.13.0, es-abstract@^1.17.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.17.5, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.9.0:
-  version "1.17.7"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz#a4de61b2f66989fc7421676c1cb9787573ace54c"
-  integrity sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.0:
-  version "1.18.0-next.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz#6e3a0a4bda717e5023ab3b8e90bec36108d22c68"
-  integrity sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-negative-zero "^2.0.0"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
+es-abstract@^1.13.0, es-abstract@^1.17.0-next.1, es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.4.3, es-abstract@^1.5.0, es-abstract@^1.9.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
   integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
@@ -12345,6 +10682,11 @@ es6-map@^0.1.3, es6-map@^0.1.5:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
+es6-object-assign@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
+
 es6-promise@^4.2.8:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -12767,16 +11109,7 @@ espree@^5.0.1:
     acorn-jsx "^5.0.0"
     eslint-visitor-keys "^1.0.0"
 
-espree@^7.3.0:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.0.tgz#dc30437cf67947cf576121ebd780f15eeac72348"
-  integrity sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==
-  dependencies:
-    acorn "^7.4.0"
-    acorn-jsx "^5.2.0"
-    eslint-visitor-keys "^1.3.0"
-
-espree@^7.3.1:
+espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
   resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
   integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
@@ -12790,14 +11123,7 @@ esprima@4.0.1, esprima@^4.0.0, esprima@^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:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57"
-  integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==
-  dependencies:
-    estraverse "^5.1.0"
-
-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==
@@ -13070,14 +11396,7 @@ eth-rpc-errors@^3.0.0:
   dependencies:
     fast-safe-stringify "^2.0.6"
 
-eth-rpc-errors@^4.0.0, eth-rpc-errors@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.2.tgz#11bc164e25237a679061ac05b7da7537b673d3b7"
-  integrity sha512-n+Re6Gu8XGyfFy1it0AwbD1x0MUzspQs0D5UiPs1fFPCr6WAwZM+vbIhXheBFrpgosqN9bs5PqlB4Q61U/QytQ==
-  dependencies:
-    fast-safe-stringify "^2.0.6"
-
-eth-rpc-errors@^4.0.3:
+eth-rpc-errors@^4.0.0, eth-rpc-errors@^4.0.2, eth-rpc-errors@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/eth-rpc-errors/-/eth-rpc-errors-4.0.3.tgz#6ddb6190a4bf360afda82790bb7d9d5e724f423a"
   integrity sha512-Z3ymjopaoft7JDoxZcEb3pwdGh7yiYMhOwm2doUt6ASXlMavpNlK6Cre0+IMl2VSGyEU9rkiperQhp5iRxn5Pg==
@@ -13122,17 +11441,15 @@ eth-simple-keyring@^4.2.0:
     ethereumjs-wallet "^1.0.1"
     events "^1.1.1"
 
-eth-trezor-keyring@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/eth-trezor-keyring/-/eth-trezor-keyring-0.7.0.tgz#99ebaae6783ae40347352b36f7cf19e3b818c12d"
-  integrity sha512-WSJ/n68qsMzrMyTgfKiF2/Ytn37hWrIwQrkjBt6Tmt/btQnrQkwG/7Fv/diOUJNCG0HNGWyxQpkvtBOnckboLQ==
+eth-trezor-keyring@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/eth-trezor-keyring/-/eth-trezor-keyring-0.9.1.tgz#10d78308c71966eadf94acc8acf7f7136311f31f"
+  integrity sha512-27k4pjHFG6z5F1dhpTfORONgtAPrF0BR+Qr+ygjYrjchmERJKkrgyqnJqkSGtHF6+XrgI8pKYiDTjo6CBPHVKw==
   dependencies:
-    "@ethereumjs/tx" "^3.1.4"
-    eth-sig-util "^1.4.2"
-    ethereumjs-tx "^1.3.4"
+    "@ethereumjs/tx" "^3.2.1"
     ethereumjs-util "^7.0.9"
     hdkey "0.8.0"
-    trezor-connect "8.1.23-extended"
+    trezor-connect "8.2.3-extended"
 
 eth-tx-summary@^3.1.2:
   version "3.2.4"
@@ -13292,7 +11609,7 @@ ethereumjs-tx@2.1.2, ethereumjs-tx@^2.1.1, ethereumjs-tx@^2.1.2:
     ethereumjs-common "^1.5.0"
     ethereumjs-util "^6.0.0"
 
-ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.3, ethereumjs-tx@^1.3.4:
+ethereumjs-tx@^1.1.1, ethereumjs-tx@^1.2.0, ethereumjs-tx@^1.2.2, ethereumjs-tx@^1.3.3:
   version "1.3.7"
   resolved "https://registry.yarnpkg.com/ethereumjs-tx/-/ethereumjs-tx-1.3.7.tgz#88323a2d875b10549b8347e09f4862b546f3d89a"
   integrity sha512-wvLMxzt1RPhAQ9Yi3/HKZTn0FZYpnsmQdbKYfUUpi4j1SEIcbkd9tndVjcPrufY3V7j2IebOpC00Zp2P/Ay2kA==
@@ -13326,7 +11643,7 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
-ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.9, ethereumjs-util@^7.1.0:
+ethereumjs-util@^7.0.10, ethereumjs-util@^7.0.2, ethereumjs-util@^7.0.7, ethereumjs-util@^7.0.8, ethereumjs-util@^7.0.9, ethereumjs-util@^7.1.0:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-7.1.0.tgz#e2b43a30bfcdbcb432a4eb42bd5f2393209b3fd5"
   integrity sha512-kR+vhu++mUDARrsMMhsjjzPduRVAeundLGXucGRHF3B4oEltOUspfgCVco4kckucj3FMlLaZHUl9n7/kdmr6Tw==
@@ -13438,79 +11755,7 @@ ethers@^4.0.20, ethers@^4.0.28:
     uuid "2.0.1"
     xmlhttprequest "1.8.0"
 
-ethers@^5.0.8, ethers@^5.4.1:
-  version "5.4.2"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.4.2.tgz#91368e4d9c39f1111157de1c2aa1d8c1616c0f7b"
-  integrity sha512-JcFcNWjULzhm4tMp5cZKnU45zqN/c7rqabIITiUiQzZuP7LcYSD4WAbADo4Ja6G2orU4d/PbhAWGHGtAKYrB4Q==
-  dependencies:
-    "@ethersproject/abi" "5.4.0"
-    "@ethersproject/abstract-provider" "5.4.0"
-    "@ethersproject/abstract-signer" "5.4.0"
-    "@ethersproject/address" "5.4.0"
-    "@ethersproject/base64" "5.4.0"
-    "@ethersproject/basex" "5.4.0"
-    "@ethersproject/bignumber" "5.4.1"
-    "@ethersproject/bytes" "5.4.0"
-    "@ethersproject/constants" "5.4.0"
-    "@ethersproject/contracts" "5.4.0"
-    "@ethersproject/hash" "5.4.0"
-    "@ethersproject/hdnode" "5.4.0"
-    "@ethersproject/json-wallets" "5.4.0"
-    "@ethersproject/keccak256" "5.4.0"
-    "@ethersproject/logger" "5.4.0"
-    "@ethersproject/networks" "5.4.1"
-    "@ethersproject/pbkdf2" "5.4.0"
-    "@ethersproject/properties" "5.4.0"
-    "@ethersproject/providers" "5.4.2"
-    "@ethersproject/random" "5.4.0"
-    "@ethersproject/rlp" "5.4.0"
-    "@ethersproject/sha2" "5.4.0"
-    "@ethersproject/signing-key" "5.4.0"
-    "@ethersproject/solidity" "5.4.0"
-    "@ethersproject/strings" "5.4.0"
-    "@ethersproject/transactions" "5.4.0"
-    "@ethersproject/units" "5.4.0"
-    "@ethersproject/wallet" "5.4.0"
-    "@ethersproject/web" "5.4.0"
-    "@ethersproject/wordlists" "5.4.0"
-
-ethers@^5.4.0, ethers@^5.4.5:
-  version "5.4.7"
-  resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.4.7.tgz#0fd491a5da7c9793de2d6058d76b41b1e7efba8f"
-  integrity sha512-iZc5p2nqfWK1sj8RabwsPM28cr37Bpq7ehTQ5rWExBr2Y09Sn1lDKZOED26n+TsZMye7Y6mIgQ/1cwpSD8XZew==
-  dependencies:
-    "@ethersproject/abi" "5.4.1"
-    "@ethersproject/abstract-provider" "5.4.1"
-    "@ethersproject/abstract-signer" "5.4.1"
-    "@ethersproject/address" "5.4.0"
-    "@ethersproject/base64" "5.4.0"
-    "@ethersproject/basex" "5.4.0"
-    "@ethersproject/bignumber" "5.4.2"
-    "@ethersproject/bytes" "5.4.0"
-    "@ethersproject/constants" "5.4.0"
-    "@ethersproject/contracts" "5.4.1"
-    "@ethersproject/hash" "5.4.0"
-    "@ethersproject/hdnode" "5.4.0"
-    "@ethersproject/json-wallets" "5.4.0"
-    "@ethersproject/keccak256" "5.4.0"
-    "@ethersproject/logger" "5.4.1"
-    "@ethersproject/networks" "5.4.2"
-    "@ethersproject/pbkdf2" "5.4.0"
-    "@ethersproject/properties" "5.4.1"
-    "@ethersproject/providers" "5.4.5"
-    "@ethersproject/random" "5.4.0"
-    "@ethersproject/rlp" "5.4.0"
-    "@ethersproject/sha2" "5.4.0"
-    "@ethersproject/signing-key" "5.4.0"
-    "@ethersproject/solidity" "5.4.0"
-    "@ethersproject/strings" "5.4.0"
-    "@ethersproject/transactions" "5.4.0"
-    "@ethersproject/units" "5.4.0"
-    "@ethersproject/wallet" "5.4.0"
-    "@ethersproject/web" "5.4.0"
-    "@ethersproject/wordlists" "5.4.0"
-
-ethers@^5.4.2:
+ethers@^5.0.8, ethers@^5.4.0, ethers@^5.4.1, ethers@^5.4.2, ethers@^5.4.5:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.5.1.tgz#d3259a95a42557844aa543906c537106c0406fbf"
   integrity sha512-RodEvUFZI+EmFcE6bwkuJqpCYHazdzeR1nMzg+YWQSmQEsNtfl1KHGfp/FWZYl48bI/g7cgBeP2IlPthjiVngw==
@@ -13797,12 +12042,7 @@ events@^2.0.0:
   resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5"
   integrity sha512-3Zmiobend8P9DjmKAty0Era4jV8oJ0yGYe2nJJAxgymF9+N8F2m0hhZiMoWtcfepExzNKZumFU3ksdQbInGWCg==
 
-events@^3.0.0, events@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
-
-events@^3.3.0:
+events@^3.0.0, events@^3.2.0, events@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -14017,12 +12257,7 @@ extend@3.0.2, extend@^3.0.0, extend@~3.0.2:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
-extension-port-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/extension-port-stream/-/extension-port-stream-2.0.0.tgz#c52da241eef4643171b7c6d696baa4a3453c5a9a"
-  integrity sha512-7ju8jisPXY8w8UiUczF61hRN6bpx/YTZYU9J901GnEqu7vQnweMAwS30k+SgXCcY9S38Zno+fhuu1iaxd+0swg==
-
-extension-port-stream@^2.0.1:
+extension-port-stream@^2.0.0, extension-port-stream@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extension-port-stream/-/extension-port-stream-2.0.1.tgz#d374820c581418c2275d3c4439ade0b82c4cfac6"
   integrity sha512-ltrv4Dh/979I04+D4Te6TFygfRSOc5EBzzlHRldWMS8v73V80qWluxH88hqF0qyUsBXTb8NmzlmSipcre6a+rg==
@@ -14102,6 +12337,11 @@ fake-merkle-patricia-tree@^1.0.1:
   dependencies:
     checkpoint-store "^1.1.0"
 
+faker@^5.3.1:
+  version "5.5.3"
+  resolved "https://registry.yarnpkg.com/faker/-/faker-5.5.3.tgz#c57974ee484431b25205c2c8dc09fda861e51e0e"
+  integrity sha512-wLTv2a28wjUyWkbnX7u/ABZBkUkIF2fCd73V6P2oFqEGEktDfzWx4UxrSqtPRw0xPRAcjeAOIiJWqZm3pP4u3g==
+
 fancy-log@1.3.2:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
@@ -14121,6 +12361,13 @@ fancy-log@^1.3.2, fancy-log@^1.3.3:
     parse-node-version "^1.0.0"
     time-stamp "^1.0.0"
 
+fast-check@^2.12.1:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/fast-check/-/fast-check-2.19.0.tgz#e87666450e417cd163a564bd546ee763d27c0f19"
+  integrity sha512-qY4Rc0Nljl2aJx2qgbK3o6wPBjL9QvhKdD/VqJgaKd5ewn8l4ViqgDpUHJq/JkHTBnFKomYYvkFkOYGDVTT8bw==
+  dependencies:
+    pure-rand "^5.0.0"
+
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -14170,14 +12417,7 @@ fast-json-parse@^1.0.3:
   resolved "https://registry.yarnpkg.com/fast-json-parse/-/fast-json-parse-1.0.3.tgz#43e5c61ee4efa9265633046b770fb682a7577c4d"
   integrity sha512-FRWsaZRWEJ1ESVNbDWmsAlqDk96gPQezzLghafp5J4GUKjbCz3OkAHuZs5TuPEtkbVQERysLp9xv6c24fBm8Aw==
 
-fast-json-patch@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.0.6.tgz#86fff8f8662391aa819722864d632e603e6ee605"
-  integrity sha1-hv/4+GYjkaqBlyKGTWMuYD5u5gU=
-  dependencies:
-    deep-equal "^1.0.1"
-
-fast-json-patch@^2.2.1:
+fast-json-patch@^2.0.6, fast-json-patch@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-2.2.1.tgz#18150d36c9ab65c7209e7d4eb113f4f8eaabe6d9"
   integrity sha512-4j5uBaTnsYAV5ebkidvxiLUYOwjQ+JSFljeqfTxCrH9bDmlCQaOJFS84oDJ2rAXZq2yskmk3ORfoP9DCwqFNig==
@@ -14683,7 +12923,7 @@ for-own@^1.0.0:
   dependencies:
     for-in "^1.0.1"
 
-foreach@^2.0.5:
+foreach@^2.0.4, foreach@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
   integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
@@ -14839,17 +13079,7 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-extra@^9.0.0:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
-  integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
-  dependencies:
-    at-least-node "^1.0.0"
-    graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^1.0.0"
-
-fs-extra@^9.0.1:
+fs-extra@^9.0.0, fs-extra@^9.0.1:
   version "9.1.0"
   resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -14924,11 +13154,6 @@ fsevents@~2.1.1:
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz#fb738703ae8d2f9fe900c33836ddebee8b97f23e"
   integrity sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==
 
-fsevents@~2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
-  integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
-
 fsm-event@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fsm-event/-/fsm-event-2.1.0.tgz#d385716ed38f9c92feab2ba601e2aac6c0ba5a92"
@@ -15086,12 +13311,7 @@ generic-names@^2.0.1:
   dependencies:
     loader-utils "^1.1.0"
 
-gensync@^1.0.0-beta.1:
-  version "1.0.0-beta.1"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
-  integrity sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==
-
-gensync@^1.0.0-beta.2:
+gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
@@ -15279,14 +13499,7 @@ glob-parent@^3.0.1, glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
-  dependencies:
-    is-glob "^4.0.1"
-
-glob-parent@~5.1.2:
+glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0, glob-parent@~5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -15482,7 +13695,7 @@ globalthis@^1.0.0, globalthis@^1.0.1:
   dependencies:
     define-properties "^1.1.3"
 
-globby@11.0.1, globby@^11.0.1:
+globby@11.0.1:
   version "11.0.1"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357"
   integrity sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==
@@ -15494,7 +13707,7 @@ globby@11.0.1, globby@^11.0.1:
     merge2 "^1.3.0"
     slash "^3.0.0"
 
-globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
+globby@^11.0.1, globby@^11.0.2, globby@^11.0.3, globby@^11.0.4:
   version "11.0.4"
   resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
   integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
@@ -15645,12 +13858,7 @@ got@^7.1.0:
     url-parse-lax "^1.0.0"
     url-to-options "^1.0.1"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
-  integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
-
-graceful-fs@^4.2.4:
+graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -15950,12 +14158,7 @@ has-symbol-support-x@^1.4.1:
   resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
   integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
-has-symbols@^1.0.0, has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
-
-has-symbols@^1.0.2:
+has-symbols@^1.0.0, has-symbols@^1.0.1, has-symbols@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
   integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
@@ -16125,17 +14328,6 @@ hastscript@^6.0.0:
     property-information "^5.0.0"
     space-separated-tokens "^1.0.0"
 
-hd-wallet@9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/hd-wallet/-/hd-wallet-9.1.1.tgz#4a6e49ff09e8cb4bbe0127133cfaf80e24142096"
-  integrity sha512-Z1UhEcFv6aGrPL2fDDkEzO3MwPuiAKbLAs8MSNQ1BxeW9c2HxXjTWMEfx8xhQ0gv10Blf1bmXLm+itOe1+nh6Q==
-  dependencies:
-    "@trezor/utxo-lib" "0.1.2"
-    bchaddrjs "^0.5.2"
-    bignumber.js "^9.0.1"
-    queue "^6.0.1"
-    socket.io-client "^2.2.0"
-
 hdkey@0.8.0:
   version "0.8.0"
   resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-0.8.0.tgz#08c9a9fcb6a42d9724d669f81c53a3c507f87bf1"
@@ -16145,11 +14337,28 @@ hdkey@0.8.0:
     safe-buffer "^5.1.1"
     secp256k1 "^3.0.1"
 
+hdkey@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hdkey/-/hdkey-2.0.1.tgz#0a211d0c510bfc44fa3ec9d44b13b634641cad74"
+  integrity sha512-c+tl9PHG9/XkGgG0tD7CJpRVaE0jfZizDNmnErUAKQ4EjQSOcOUcV3EN9ZEZS8pZ4usaeiiK0H7stzuzna8feA==
+  dependencies:
+    bs58check "^2.1.2"
+    safe-buffer "^5.1.1"
+    secp256k1 "^4.0.0"
+
 he@1.2.0, he@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
+header-case@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/header-case/-/header-case-1.0.1.tgz#9535973197c144b09613cd65d317ef19963bd02d"
+  integrity sha1-lTWXMZfBRLCWE81l0xfvGZY70C0=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.1.3"
+
 heap@0.2.6, heap@~0.2.6:
   version "0.2.6"
   resolved "https://registry.yarnpkg.com/heap/-/heap-0.2.6.tgz#087e1f10b046932fc8594dd9e6d378afc9d1e5ac"
@@ -16415,6 +14624,11 @@ human-standard-collectible-abi@^1.0.2:
   resolved "https://registry.yarnpkg.com/human-standard-collectible-abi/-/human-standard-collectible-abi-1.0.2.tgz#077bae9ed1b0b0b82bc46932104b4b499c941aa0"
   integrity sha512-nD3ITUuSAIBgkaCm9J2BGwlHL8iEzFjJfTleDAC5Wi8RBJEXXhxV0JeJjd95o+rTwf98uTE5MW+VoBKOIYQh0g==
 
+human-standard-multi-collectible-abi@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/human-standard-multi-collectible-abi/-/human-standard-multi-collectible-abi-1.0.3.tgz#be5896b13f8622289cff70040e478366931bf3d7"
+  integrity sha512-1VXqats7JQqDZozLKhpmFG0S33hVePrkLNRJNKfJTxewR0heYKjSoz72kqs+6O/Tywi0zW4fWe7dfTaPX4j7gQ==
+
 human-standard-token-abi@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/human-standard-token-abi/-/human-standard-token-abi-1.0.2.tgz#207d7846796ee5bb85fdd336e769cb38045b2ae0"
@@ -16452,11 +14666,6 @@ 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.19:
-  version "0.4.19"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
-  integrity sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==
-
 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"
@@ -16502,7 +14711,7 @@ idna-uts46@^1.0.1:
   dependencies:
     punycode "^2.1.0"
 
-ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.1.8, ieee754@^1.2.1:
+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"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
@@ -16688,23 +14897,7 @@ inquirer@^6.2.2:
     strip-ansi "^5.1.0"
     through "^2.3.6"
 
-insert-module-globals@^7.0.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.2.0.tgz#ec87e5b42728479e327bd5c5c71611ddfb4752ba"
-  integrity sha512-VE6NlW+WGn2/AeOMd496AHFYmE7eLKkUY6Ty31k4og5vmA3Fjuwe9v6ifH6Xx/Hz27QvdoMoviw1/pqWRB09Sw==
-  dependencies:
-    JSONStream "^1.0.3"
-    acorn-node "^1.5.2"
-    combine-source-map "^0.8.0"
-    concat-stream "^1.6.1"
-    is-buffer "^1.1.0"
-    path-is-absolute "^1.0.1"
-    process "~0.11.0"
-    through2 "^2.0.0"
-    undeclared-identifiers "^1.1.2"
-    xtend "^4.0.0"
-
-insert-module-globals@^7.2.1:
+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"
   integrity sha512-ufS5Qq9RZN+Bu899eA9QCAYThY+gGW7oRkmb0vC93Vlyu/CFGcH0OYPEjVkDXA5FEbTt1+VWzdoOD3Ny9N+8tg==
@@ -16720,10 +14913,10 @@ insert-module-globals@^7.2.1:
     undeclared-identifiers "^1.1.2"
     xtend "^4.0.0"
 
-int64-buffer@0.99.1007:
-  version "0.99.1007"
-  resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-0.99.1007.tgz#211ea089a2fdb960070a2e77cd6d17dc456a5220"
-  integrity sha512-XDBEu44oSTqlvCSiOZ/0FoUkpWu/vwjJLGSKDabNISPQNZ5wub1FodGHBljRsrR0IXRPq7SslshZYMuA55CgTQ==
+int64-buffer@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/int64-buffer/-/int64-buffer-1.0.1.tgz#c78d841b444cadf036cd04f8683696c740f15dca"
+  integrity sha512-+3azY4pXrjAupJHU1V9uGERWlhoqNswJNji6aD/02xac7oxol508AsMC5lxKhEqyZeDFy3enq5OGWXF4u75hiw==
 
 interface-connection@~0.3.2, interface-connection@~0.3.3:
   version "0.3.3"
@@ -16744,15 +14937,6 @@ interface-datastore@~0.6.0:
     pull-stream "^3.6.9"
     uuid "^3.2.2"
 
-internal-slot@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3"
-  integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g==
-  dependencies:
-    es-abstract "^1.17.0-next.1"
-    has "^1.0.3"
-    side-channel "^1.0.2"
-
 internal-slot@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
@@ -17377,16 +15561,11 @@ is-accessor-descriptor@^1.0.0:
   dependencies:
     kind-of "^6.0.0"
 
-is-alphabetical@1.0.4:
+is-alphabetical@1.0.4, is-alphabetical@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
   integrity sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==
 
-is-alphabetical@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.1.tgz#c77079cc91d4efac775be1034bf2d243f95e6f08"
-  integrity sha1-x3B5zJHU76x3W+EDS/LSQ/lebwg=
-
 is-alphanumeric@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-alphanumeric/-/is-alphanumeric-1.0.0.tgz#4a9cef71daf4c001c1d81d63d140cf53fd6889f4"
@@ -17429,12 +15608,7 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
-is-boolean-object@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.0.0.tgz#98f8b28030684219a95f375cfbd88ce3405dff93"
-  integrity sha1-mPiygDBoQhmpXzdc+9iM40Bd/5M=
-
-is-boolean-object@^1.1.0:
+is-boolean-object@^1.0.0, is-boolean-object@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
   integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
@@ -17451,12 +15625,7 @@ is-buffer@^2.0.0, is-buffer@^2.0.3, is-buffer@~2.0.3:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.4.tgz#3e572f23c8411a5cfd9557c849e3665e0b290623"
   integrity sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==
 
-is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9"
-  integrity sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==
-
-is-callable@^1.2.3:
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e"
   integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ==
@@ -17480,28 +15649,7 @@ is-circular@^1.0.2:
   resolved "https://registry.yarnpkg.com/is-circular/-/is-circular-1.0.2.tgz#2e0ab4e9835f4c6b0ea2b9855a84acd501b8366c"
   integrity sha512-YttjnrswnUYRVJvxCvu8z+PGMUSzC2JttP0OEXezlAEdp3EXzhf7IZ3j0gRAybJBQupedIZFhY61Tga6E0qASA==
 
-is-core-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.0.0.tgz#58531b70aed1db7c0e8d4eb1a0a2d1ddd64bd12d"
-  integrity sha512-jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946"
-  integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
-  dependencies:
-    has "^1.0.3"
-
-is-core-module@^2.4.0:
+is-core-module@^2.2.0, is-core-module@^2.4.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
   integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
@@ -17719,6 +15867,13 @@ is-ipfs@~0.6.1:
     multibase "~0.6.0"
     multihashes "~0.4.13"
 
+is-lower-case@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-lower-case/-/is-lower-case-1.1.3.tgz#7e147be4768dc466db3bfb21cc60b31e6ad69393"
+  integrity sha1-fhR75HaNxGbbO/shzGCzHmrWk5M=
+  dependencies:
+    lower-case "^1.1.0"
+
 is-mergeable-object@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/is-mergeable-object/-/is-mergeable-object-1.1.1.tgz#faaa3ed1cfce87d6f7d2f5885e92cc30af3e2ebf"
@@ -17740,16 +15895,19 @@ is-my-json-valid@^2.10.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"
+  integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+
 is-negated-glob@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
   integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
 
-is-negative-zero@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz#9553b121b0fac28869da9ed459e20c7543788461"
-  integrity sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=
-
 is-negative-zero@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24"
@@ -17765,12 +15923,7 @@ is-npm@^3.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-3.0.0.tgz#ec9147bfb629c43f494cf67936a961edec7e8053"
   integrity sha512-wsigDr1Kkschp2opC4G3yA6r9EgVA6NjRpWzIi9axXqeIaAATPRJc4uLujXe3Nd9uO8KoDyA4MD6aZSeXTADhA==
 
-is-number-object@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.3.tgz#f265ab89a9f445034ef6aff15a8f00b00f551799"
-  integrity sha1-8mWrian0RQNO9q/xWo8AsA9VF5k=
-
-is-number-object@^1.0.4:
+is-number-object@^1.0.3, is-number-object@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
   integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
@@ -17912,14 +16065,7 @@ is-redirect@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
   integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
 
-is-regex@^1.0.4, is-regex@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz#c6f98aacc546f6cec5468a07b7b153ab564a57b9"
-  integrity sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==
-  dependencies:
-    has-symbols "^1.0.1"
-
-is-regex@^1.1.2:
+is-regex@^1.0.4, is-regex@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
   integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
@@ -18021,6 +16167,13 @@ is-unc-path@^1.0.0:
   dependencies:
     unc-path-regex "^0.1.2"
 
+is-upper-case@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-upper-case/-/is-upper-case-1.1.2.tgz#8d0b1fa7e7933a1e58483600ec7d9661cbaf756f"
+  integrity sha1-jQsfp+eTOh5YSDYA7H2WYcuvdW8=
+  dependencies:
+    upper-case "^1.1.0"
+
 is-url@^1.2.2, is-url@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
@@ -18097,11 +16250,6 @@ isarray@2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
   integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
 
-isarray@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.4.tgz#38e7bcbb0f3ba1b7933c86ba1894ddfc3781bbb7"
-  integrity sha512-GMxXOiUirWg1xTKRipM0Ek07rX+ubx4nNVElTJdNLYmNO/2YrDkgJGw9CljXn+r4EWiDQg/8lsRdHyg2PJuUaA==
-
 isexe@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
@@ -18121,12 +16269,7 @@ iso-stream-http@~0.1.2:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
-iso-url@~0.4.4, iso-url@~0.4.6:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-0.4.6.tgz#45005c4af4984cad4f8753da411b41b74cf0a8a6"
-  integrity sha512-YQO7+aIe6l1aSJUKOx+Vrv08DlhZeLFIVfehG2L29KLSEb9RszqPXilxJRVpp57px36BddKR5ZsebacO5qG0tg==
-
-iso-url@~0.4.7:
+iso-url@~0.4.6, iso-url@~0.4.7:
   version "0.4.7"
   resolved "https://registry.yarnpkg.com/iso-url/-/iso-url-0.4.7.tgz#de7e48120dae46921079fe78f325ac9e9217a385"
   integrity sha512-27fFRDnPAMnHGLq36bWTpKET+eiXct3ENlCcdcMdk+mjXrb2kw3mhBUg1B7ewAC0kVzlOPhADzQgz1SE6Tglog==
@@ -18173,20 +16316,7 @@ istanbul-lib-hook@^3.0.0:
   dependencies:
     append-transform "^2.0.0"
 
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
-  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-instrument@^4.0.3:
+istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
   integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
@@ -18227,15 +16357,7 @@ istanbul-lib-source-maps@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     source-map "^0.6.1"
 
-istanbul-reports@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.0.tgz#d4d16d035db99581b6194e119bbf36c963c5eb70"
-  integrity sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==
-  dependencies:
-    html-escaper "^2.0.0"
-    istanbul-lib-report "^3.0.0"
-
-istanbul-reports@^3.0.2:
+istanbul-reports@^3.0.0, istanbul-reports@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b"
   integrity sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==
@@ -18704,7 +16826,7 @@ js-tokens@^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, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.1:
+js-yaml@3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -18712,7 +16834,7 @@ js-yaml@3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.5.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-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==
@@ -18725,6 +16847,11 @@ jsan@^3.1.13:
   resolved "https://registry.yarnpkg.com/jsan/-/jsan-3.1.13.tgz#4de8c7bf8d1cfcd020c313d438f930cec4b91d86"
   integrity sha512-9kGpCsGHifmw6oJet+y8HaCl14y7qgAsxVdV3pCHDySNR3BfDC30zgkssd7x5LRVAT22dnpbe9JdzzmXZnq9/g==
 
+jsbi@^3.1.5:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/jsbi/-/jsbi-3.2.0.tgz#3500a08fb3e8e56cf0439964fc774a8762b151ed"
+  integrity sha512-nL7F2gCfPTXLRoS1ZABhzyYCib6L4bAjX9F6qutL4L2o0r+gDndWVlQ7A6bMa80RTN53R82hXTm6FRsdRxbLgQ==
+
 jsbn@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040"
@@ -18835,6 +16962,13 @@ json-parse-even-better-errors@^2.3.0:
   resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-pointer@^0.6.0:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/json-pointer/-/json-pointer-0.6.1.tgz#3c6caa6ac139e2599f5a1659d39852154015054d"
+  integrity sha512-3OvjqKdCBvH41DLpV4iSt6v2XhZXV1bPB4OROuknvUXI7ZQNofieCPkmE26stEJ9zdQuvIxDHCuYhfgxFAAs+Q==
+  dependencies:
+    foreach "^2.0.4"
+
 json-rpc-engine@^3.4.0, json-rpc-engine@^3.6.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/json-rpc-engine/-/json-rpc-engine-3.8.0.tgz#9d4ff447241792e1d0a232f6ef927302bb0c62a9"
@@ -18954,14 +17088,7 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2:
-  version "2.1.3"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"
-  integrity sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==
-  dependencies:
-    minimist "^1.2.5"
-
-json5@^2.1.3:
+json5@^2.1.2, json5@^2.1.3:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
   integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
@@ -19161,7 +17288,7 @@ k-bucket@^5.0.0:
   dependencies:
     randombytes "^2.0.3"
 
-keccak@3.0.1, keccak@^3.0.0, keccak@^3.0.1:
+keccak@3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/keccak/-/keccak-3.0.1.tgz#ae30a0e94dbe43414f741375cff6d64c8bea0bff"
   integrity sha512-epq90L9jlFWCW7+pQa6JOnKn2Xgl2mtI664seYR6MHskvI9agt7AnDqmAlp9TqU4/caMYbA08Hi5DMZAl5zdkA==
@@ -19179,6 +17306,15 @@ keccak@^1.0.2:
     nan "^2.2.1"
     safe-buffer "^5.1.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==
+  dependencies:
+    node-addon-api "^2.0.0"
+    node-gyp-build "^4.2.0"
+    readable-stream "^3.6.0"
+
 keccakjs@^0.2.1:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/keccakjs/-/keccakjs-0.2.3.tgz#5e4e969ce39689a3861f445d7752ee3477f9fe72"
@@ -19321,16 +17457,7 @@ koa@^2.7.0:
     type-is "^1.6.16"
     vary "^1.1.2"
 
-labeled-stream-splicer@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz#9cffa32fd99e1612fd1d86a8db962416d5292926"
-  integrity sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==
-  dependencies:
-    inherits "^2.0.1"
-    isarray "^2.0.4"
-    stream-splicer "^2.0.0"
-
-labeled-stream-splicer@^2.0.2:
+labeled-stream-splicer@^2.0.0, labeled-stream-splicer@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/labeled-stream-splicer/-/labeled-stream-splicer-2.0.2.tgz#42a41a16abcd46fd046306cf4f2c3576fffb1c21"
   integrity sha512-Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==
@@ -19439,10 +17566,10 @@ lavamoat-viz@^6.0.9:
     serve-handler "^6.1.3"
     yargs "^16.0.0"
 
-lavamoat@^5.3.4:
-  version "5.3.4"
-  resolved "https://registry.yarnpkg.com/lavamoat/-/lavamoat-5.3.4.tgz#cf0778a5fc8b2bc14bce79d46dc730df3d8c21ad"
-  integrity sha512-0p7B8+6Hs/WGlkBaVQl6RGdAlYd0pL6eFTh6/Oc3kdyi4wVc2Fz5vFOJqrZi8XkvjMuCLln7udYbiCapr74yZQ==
+lavamoat@^5.3.5:
+  version "5.3.5"
+  resolved "https://registry.yarnpkg.com/lavamoat/-/lavamoat-5.3.5.tgz#e4faaf0749195ebd55bee4b7deb7241ff7718be7"
+  integrity sha512-7ds094PVQXfBoGWkjnjAAXR+s9VLYNDvS1UbH/GrXNGeSTTVJb/KAE604j/t26AOW0sn0PMGY5OhCKPpuqOBqQ==
   dependencies:
     "@babel/code-frame" "^7.10.4"
     "@babel/highlight" "^7.10.4"
@@ -20227,7 +18354,7 @@ loader-runner@^2.4.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
   integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
 
-loader-utils@1.2.3, loader-utils@^1.1.0, loader-utils@^1.2.3:
+loader-utils@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
   integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
@@ -20245,7 +18372,7 @@ loader-utils@2.0.0, loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-loader-utils@^1.4.0:
+loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
   integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
@@ -20259,20 +18386,13 @@ locale-currency@0.0.1:
   resolved "https://registry.yarnpkg.com/locale-currency/-/locale-currency-0.0.1.tgz#c9e15a22ff575b4b4bb947a4bf92ac236bd1fe9b"
   integrity sha1-yeFaIv9XW0tLuUekv5KsI2vR/ps=
 
-localforage@^1.8.1:
+localforage@^1.8.1, localforage@^1.9.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
   integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
   dependencies:
     lie "3.1.1"
 
-localforage@^1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.9.0.tgz#f3e4d32a8300b362b4634cc4e066d9d00d2f09d1"
-  integrity sha512-rR1oyNrKulpe+VM9cYmcFn6tsHuokyVHFaCM3+osEmxaHTbEk8oQu6eGDfS6DQLWi/N67XRmB8ECG37OES368g==
-  dependencies:
-    lie "3.1.1"
-
 localstorage-down@^0.6.7:
   version "0.6.7"
   resolved "https://registry.yarnpkg.com/localstorage-down/-/localstorage-down-0.6.7.tgz#d0799a93b31e6c5fa5188ec06242eb1cce9d6d15"
@@ -20364,6 +18484,11 @@ lodash.escape@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
   integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg=
 
+lodash.escaperegexp@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz#64762c48618082518ac3df4ccf5d5886dae20347"
+  integrity sha1-ZHYsSGGAglGKw99Mz11YhtriA0c=
+
 lodash.filter@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
@@ -20429,11 +18554,21 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
+lodash.partition@^4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.partition/-/lodash.partition-4.6.0.tgz#a38e46b73469e0420b0da1212e66d414be364ba4"
+  integrity sha1-o45GtzRp4EILDaEhLmbUFL42S6Q=
+
 lodash.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"
   integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=
 
+lodash.sum@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/lodash.sum/-/lodash.sum-4.0.2.tgz#ad90e397965d803d4f1ff7aa5b2d0197f3b4637b"
+  integrity sha1-rZDjl5ZdgD1PH/eqWy0Bl/O0Y3s=
+
 lodash.throttle@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
@@ -20495,10 +18630,10 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-"long@~2 >=2.2.3":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-2.4.0.tgz#9fa180bb1d9500cdc29c4156766a1995e1f4524f"
-  integrity sha1-n6GAux2VAM3CnEFWdmoZleH0Uk8=
+long@~3:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
+  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
 
 longest-streak@^2.0.1:
   version "2.0.3"
@@ -20527,6 +18662,18 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
+lower-case-first@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/lower-case-first/-/lower-case-first-1.0.2.tgz#e5da7c26f29a7073be02d52bac9980e5922adfa1"
+  integrity sha1-5dp8JvKacHO+AtUrrJmA5ZIq36E=
+  dependencies:
+    lower-case "^1.1.2"
+
+lower-case@^1.1.0, lower-case@^1.1.1, lower-case@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
+  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+
 lower-case@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
@@ -21089,12 +19236,12 @@ miller-rabin@^4.0.0:
     bn.js "^4.0.0"
     brorand "^1.0.1"
 
-mime-db@1.45.0, mime-db@1.x.x:
+mime-db@1.45.0:
   version "1.45.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz#cceeda21ccd7c3a745eba2decd55d4b73e7879ea"
   integrity sha512-CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w==
 
-"mime-db@>= 1.43.0 < 2":
+mime-db@1.x.x, "mime-db@>= 1.43.0 < 2":
   version "1.50.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f"
   integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A==
@@ -21350,28 +19497,7 @@ module-definition@^3.3.1:
     ast-module-types "^2.7.1"
     node-source-walk "^4.0.0"
 
-module-deps@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.0.tgz#d41a2e790245ce319171e4e7c4d8c73993ba3cd5"
-  integrity sha512-hKPmO06so6bL/ZvqVNVqdTVO8UAYsi3tQWlCa+z9KuWhoN4KDQtb5hcqQQv58qYiDE21wIvnttZEPiDgEbpwbA==
-  dependencies:
-    JSONStream "^1.0.3"
-    browser-resolve "^1.7.0"
-    cached-path-relative "^1.0.0"
-    concat-stream "~1.6.0"
-    defined "^1.0.0"
-    detective "^5.0.2"
-    duplexer2 "^0.1.2"
-    inherits "^2.0.1"
-    parents "^1.0.0"
-    readable-stream "^2.0.2"
-    resolve "^1.4.0"
-    stream-combiner2 "^1.1.1"
-    subarg "^1.0.0"
-    through2 "^2.0.0"
-    xtend "^4.0.0"
-
-module-deps@^6.2.3:
+module-deps@^6.0.0, module-deps@^6.2.3:
   version "6.2.3"
   resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.2.3.tgz#15490bc02af4b56cf62299c7c17cba32d71a96ee"
   integrity sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==
@@ -21727,11 +19853,6 @@ nano-json-stream-parser@^0.1.2:
   resolved "https://registry.yarnpkg.com/nano-json-stream-parser/-/nano-json-stream-parser-0.1.2.tgz#0cc8f6d0e2b622b479c40d499c46d64b755c6f5f"
   integrity sha1-DMj20OK2IrR5xA1JnEbWS3Vcb18=
 
-nanoassert@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/nanoassert/-/nanoassert-1.1.0.tgz#4f3152e09540fde28c76f44b19bbcd1d5a42478d"
-  integrity sha1-TzFS4JVA/eKMdvRLGbvNHVpCR40=
-
 nanoid@^2.0.0, nanoid@^2.1.6:
   version "2.1.11"
   resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-2.1.11.tgz#ec24b8a758d591561531b4176a01e3ab4f0f0280"
@@ -21863,6 +19984,13 @@ nise@^4.0.1:
     just-extend "^4.0.2"
     path-to-regexp "^1.7.0"
 
+no-case@^2.2.0, no-case@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac"
+  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
+  dependencies:
+    lower-case "^1.1.1"
+
 no-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.3.tgz#c21b434c1ffe48b39087e86cfb4d2582e9df18f8"
@@ -21898,7 +20026,7 @@ node-addon-api@^2.0.0:
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-2.0.2.tgz#432cfa82962ce494b132e9d72a15b29f71ff5d32"
   integrity sha512-Ntyt4AIXyaLIuMHF6IOoTakB3K+RWxwtsHNRxllEoA6vPwP9o4866g6YWDLUdnucilZhmkxiHwHr11gAENw+QA==
 
-node-addon-api@^3.0.2:
+node-addon-api@^3.0.0, node-addon-api@^3.0.2:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
@@ -21946,12 +20074,7 @@ node-forge@^0.10.0, node-forge@^0.7.1, node-forge@^0.7.5, node-forge@~0.7.6:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-node-gyp-build@^4.2.0, node-gyp-build@^4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
-  integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
-
-node-gyp-build@^4.3.0:
+node-gyp-build@^4.2.0, node-gyp-build@^4.2.2, node-gyp-build@^4.2.3, node-gyp-build@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
   integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
@@ -22011,6 +20134,13 @@ node-int64@^0.4.0:
   resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
   integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
 
+node-interval-tree@^1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/node-interval-tree/-/node-interval-tree-1.3.3.tgz#15ffb904cde08270214acace8dc7653e89ae32b7"
+  integrity sha512-K9vk96HdTK5fEipJwxSvIIqwTqr4e3HRJeJrNxBSeVMNSC/JWARRaX7etOLOuTmrRMeOI/K5TCJu3aWIwZiNTw==
+  dependencies:
+    shallowequal "^1.0.2"
+
 node-libs-browser@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
@@ -22101,11 +20231,6 @@ node-releases@^1.1.61:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.77.tgz#50b0cfede855dd374e7585bf228ff34e57c1c32e"
   integrity sha512-rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ==
 
-node-releases@^1.1.66:
-  version "1.1.67"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.67.tgz#28ebfcccd0baa6aad8e8d4d8fe4cbc49ae239c12"
-  integrity sha512-V5QF9noGFl3EymEwUYzO+3NTDpGfQB4ve6Qfnzf3UNydMhjQRVPR1DZTuvWiLzaFJYw2fmDwAfnRNEVb64hSIg==
-
 node-releases@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.0.tgz#67dc74903100a7deb044037b8a2e5f453bb05400"
@@ -22131,6 +20256,11 @@ nodeify@^1.0.1:
     is-promise "~1.0.0"
     promise "~1.3.0"
 
+nofilter@^1.0.4:
+  version "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"
@@ -22387,12 +20517,7 @@ object-hash@^2.0.1:
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.0.3.tgz#d12db044e03cd2ca3d77c0570d87225b02e1e6ea"
   integrity sha512-JPKn0GMu+Fa3zt3Bmr66JhokJU5BaNBIh4ZeTlaCBzrBsOeXzwcKKAK1tbLiPKgvwmPXsDvvLHoWh5Bm7ofIYg==
 
-object-inspect@^1.6.0, object-inspect@^1.7.0, object-inspect@^1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz#df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"
-  integrity sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==
-
-object-inspect@^1.9.0:
+object-inspect@^1.6.0, object-inspect@^1.9.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a"
   integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw==
@@ -22434,17 +20559,7 @@ object.assign@4.1.0:
     has-symbols "^1.0.0"
     object-keys "^1.0.11"
 
-object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz#303867a666cdd41936ecdedfb1f8f3e32a478cdd"
-  integrity sha512-VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.0"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.assign@^4.1.2:
+object.assign@^4.0.4, object.assign@^4.1.0, object.assign@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
   integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
@@ -22464,16 +20579,7 @@ object.defaults@^1.0.0, object.defaults@^1.1.0:
     for-own "^1.0.0"
     isobject "^3.0.0"
 
-object.entries@^1.0.4, object.entries@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz#bc73f00acb6b6bb16c203434b10f9a7e797d3add"
-  integrity sha512-BQdB9qKmb/HyNdMNWVr7O3+z5MUIx3aiegEIJqjMBbBf0YT9RRxTJSim4mzFqtyr7PDAHigq0N9dO0m0tRakQA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-    has "^1.0.3"
-
-object.entries@^1.1.3:
+object.entries@^1.0.4, object.entries@^1.1.0, object.entries@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6"
   integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg==
@@ -22483,17 +20589,7 @@ object.entries@^1.1.3:
     es-abstract "^1.18.0-next.1"
     has "^1.0.3"
 
-"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1, object.fromentries@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9"
-  integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-object.fromentries@^2.0.4:
+"object.fromentries@^2.0.0 || ^1.0.0", object.fromentries@^2.0.1, object.fromentries@^2.0.2, object.fromentries@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8"
   integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ==
@@ -22542,17 +20638,7 @@ object.reduce@^1.0.0:
     for-own "^1.0.0"
     make-iterator "^1.0.0"
 
-object.values@^1.0.4, object.values@^1.1.0, object.values@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e"
-  integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
-object.values@^1.1.2, object.values@^1.1.3:
+object.values@^1.0.4, object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee"
   integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==
@@ -22627,14 +20713,7 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-onetime@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
-  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
-  dependencies:
-    mimic-fn "^2.1.0"
-
-onetime@^5.1.2:
+onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
@@ -22646,15 +20725,7 @@ only@~0.0.2:
   resolved "https://registry.yarnpkg.com/only/-/only-0.0.2.tgz#2afde84d03e50b9a8edc444e30610a70295edfb4"
   integrity sha1-Kv3oTQPlC5qO3EROMGEKcCle37Q=
 
-open@^7.0.2, open@^7.0.3:
-  version "7.3.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz#45461fdee46444f3645b6e14eb3ca94b82e1be69"
-  integrity sha512-mgLwQIx2F/ye9SmbrUkurZCnkoXyXyu9EbHtJZrICjVAJfyMArdHp3KkixGdZx1ZHFPNIwl0DDM1dFFqXbTLZw==
-  dependencies:
-    is-docker "^2.0.0"
-    is-wsl "^2.1.1"
-
-open@^7.4.2:
+open@^7.0.2, open@^7.0.3, open@^7.4.2:
   version "7.4.2"
   resolved "https://registry.yarnpkg.com/open/-/open-7.4.2.tgz#b8147e26dcf3e426316c730089fd71edd29c2321"
   integrity sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==
@@ -22703,11 +20774,6 @@ optionator@^0.9.1:
     type-check "^0.4.0"
     word-wrap "^1.2.3"
 
-optjs@latest:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/optjs/-/optjs-3.2.2.tgz#69a6ce89c442a44403141ad2f9b370bd5bb6f4ee"
-  integrity sha1-aabOicRCpEQDFBrS+bNwvVu29O4=
-
 orbit-db-access-controllers@^0.2.0, orbit-db-access-controllers@~0.2.0:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/orbit-db-access-controllers/-/orbit-db-access-controllers-0.2.2.tgz#4412b01a198208712d2a0a4065709eeea86b39d6"
@@ -23184,6 +21250,13 @@ parallel-transform@^1.1.0:
     inherits "^2.0.3"
     readable-stream "^2.1.5"
 
+param-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247"
+  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
+  dependencies:
+    no-case "^2.2.0"
+
 param-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
@@ -23346,6 +21419,14 @@ parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
+pascal-case@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-2.0.1.tgz#2d578d3455f660da65eca18ef95b4e0de912761e"
+  integrity sha1-LVeNNFX2YNpl7KGO+VtODekSdh4=
+  dependencies:
+    camel-case "^3.0.0"
+    upper-case-first "^1.1.0"
+
 pascal-case@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
@@ -23406,6 +21487,13 @@ path-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
   integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
 
+path-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/path-case/-/path-case-2.1.1.tgz#94b8037c372d3fe2906e465bb45e25d226e8eea5"
+  integrity sha1-lLgDfDctP+KQbkZbtF4l0ibo7qU=
+  dependencies:
+    no-case "^2.2.0"
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -23995,16 +22083,7 @@ postcss-scss@^2.1.1:
   dependencies:
     postcss "^7.0.6"
 
-postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
-  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
-  dependencies:
-    cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
-postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.6"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
   integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
@@ -24059,20 +22138,11 @@ postcss@^6.0.1, postcss@^6.0.19, postcss@^6.0.23:
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
   integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
-    chalk "^2.4.1"
-    source-map "^0.6.1"
-    supports-color "^5.4.0"
-
-postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
-  dependencies:
-    chalk "^2.4.2"
+    chalk "^2.4.1"
     source-map "^0.6.1"
-    supports-color "^6.1.0"
+    supports-color "^5.4.0"
 
-postcss@^7.0.36:
+postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2, postcss@^7.0.21, postcss@^7.0.26, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6, postcss@^7.0.7:
   version "7.0.39"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
   integrity sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==
@@ -24080,16 +22150,7 @@ postcss@^7.0.36:
     picocolors "^0.2.1"
     source-map "^0.6.1"
 
-postcss@^8.1.10:
-  version "8.3.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709"
-  integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.23"
-    source-map-js "^0.6.2"
-
-postcss@^8.1.7:
+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==
@@ -24215,12 +22276,7 @@ prettier-plugin-sort-json@^0.0.1:
     "@types/prettier" "^2.1.0"
     prettier "^2.1.1"
 
-prettier@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6"
-  integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==
-
-prettier@^2.2.1, prettier@~2.2.1:
+prettier@^2.1.1, prettier@^2.2.1, prettier@~2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
   integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
@@ -24407,15 +22463,7 @@ prompts@2.4.0:
     kleur "^3.0.3"
     sisteransi "^1.0.5"
 
-prompts@^2.0.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61"
-  integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ==
-  dependencies:
-    kleur "^3.0.3"
-    sisteransi "^1.0.5"
-
-prompts@^2.4.0:
+prompts@^2.0.1, prompts@^2.4.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
   integrity sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==
@@ -24455,14 +22503,7 @@ proper-lockfile@^4.0.0:
     retry "^0.12.0"
     signal-exit "^3.0.2"
 
-property-information@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.1.0.tgz#e4755eee5319f03f7f6f5a9bc1a6a7fea6609e2c"
-  integrity sha512-tODH6R3+SwTkAQckSp2S9xyYX8dEKYkeXw+4TmJzTxnNzd6mQPu1OD4f9zPrvw/Rm4wpPgI+Zp63mNSGNzUgHg==
-  dependencies:
-    xtend "^4.0.1"
-
-property-information@^5.3.0:
+property-information@^5.0.0, property-information@^5.3.0:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/property-information/-/property-information-5.6.0.tgz#61675545fb23002f245c6540ec46077d4da3ed69"
   integrity sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==
@@ -24474,13 +22515,24 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-protobufjs-old-fixed-webpack@3.8.5:
-  version "3.8.5"
-  resolved "https://registry.yarnpkg.com/protobufjs-old-fixed-webpack/-/protobufjs-old-fixed-webpack-3.8.5.tgz#5813c1af9f1d136bbf39f4f9f2e6f3e43c389d06"
-  integrity sha1-WBPBr58dE2u/OfT58ubz5Dw4nQY=
-  dependencies:
-    ascli "~0.3"
-    bytebuffer-old-fixed-webpack "3.5.6"
+protobufjs@^6.11.2:
+  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"
+    "@protobufjs/codegen" "^2.0.4"
+    "@protobufjs/eventemitter" "^1.1.0"
+    "@protobufjs/fetch" "^1.1.0"
+    "@protobufjs/float" "^1.0.2"
+    "@protobufjs/inquire" "^1.1.0"
+    "@protobufjs/path" "^1.1.2"
+    "@protobufjs/pool" "^1.1.0"
+    "@protobufjs/utf8" "^1.1.0"
+    "@types/long" "^4.0.1"
+    "@types/node" ">=13.7.0"
+    long "^4.0.0"
 
 protocol-buffers-schema@^3.3.1:
   version "3.3.2"
@@ -24838,6 +22890,11 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
+pure-rand@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-5.0.0.tgz#87f5bdabeadbd8904e316913a5c0b8caac517b37"
+  integrity sha512-lD2/y78q+7HqBx2SaT6OT4UcwtvXNRfEpzYEzl0EQ+9gZq2Qi3fa0HDnYPeqQwhlHJFBUhT7AO3mLU3+8bynHA==
+
 pushdata-bitcoin@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/pushdata-bitcoin/-/pushdata-bitcoin-1.0.1.tgz#15931d3cd967ade52206f523aa7331aef7d43af7"
@@ -24845,17 +22902,31 @@ pushdata-bitcoin@^1.0.1:
   dependencies:
     bitcoin-ops "^1.3.0"
 
+qr.js@0.0.0:
+  version "0.0.0"
+  resolved "https://registry.yarnpkg.com/qr.js/-/qr.js-0.0.0.tgz#cace86386f59a0db8050fa90d9b6b0e88a1e364f"
+  integrity sha1-ys6GOG9ZoNuAUPqQ2baw6IoeNk8=
+
 qrcode-generator@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/qrcode-generator/-/qrcode-generator-1.4.1.tgz#bfb6760e05d12c39df8acd60a0d459bdb2fa0756"
   integrity sha512-KOdSAyFBPf0/5Z3mra4JfSbjrDlUn2J3YH8Rm33tRGbptxP4vhogLWysvkQp8mp5ix9u80Wfr4vxHXTeR9o0Ug==
 
-qs@6.7.0, qs@^6.4.0, qs@^6.5.1, qs@^6.5.2:
+qrcode.react@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/qrcode.react/-/qrcode.react-1.0.1.tgz#2834bb50e5e275ffe5af6906eff15391fe9e38a5"
+  integrity sha512-8d3Tackk8IRLXTo67Y+c1rpaiXjoz/Dd2HpcMdW//62/x8J1Nbho14Kh8x974t9prsLHN6XqVgcnRiBGFptQmg==
+  dependencies:
+    loose-envify "^1.4.0"
+    prop-types "^15.6.0"
+    qr.js "0.0.0"
+
+qs@6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
   integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
-qs@^6.10.0:
+qs@^6.10.0, qs@^6.4.0, qs@^6.5.1, qs@^6.5.2:
   version "6.10.1"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a"
   integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg==
@@ -24893,13 +22964,6 @@ querystring@0.2.0, querystring@^0.2.0:
   resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
   integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
 
-queue@^6.0.1:
-  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"
@@ -25168,12 +23232,7 @@ react-error-overlay@^6.0.9:
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
   integrity sha512-nQTTcUu+ATDbrSD1BZHr5kgSD4oF8OFjxun8uAaL8RwPBacGBNPf/yAuVVdx17N8XNzRDMrZ9XcKZHCjPW+9ew==
 
-react-fast-compare@^3.0.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.1.1.tgz#0becf31e3812fa70dc231e259f40d892d4767900"
-  integrity sha512-SCsAORWK59BvauR2L1BTdjQbJcSGJJz03U0awektk2hshLKrITDDFTlgGCqIZpTDlPC/NFlZee6xTMzXPVLiHw==
-
-react-fast-compare@^3.2.0:
+react-fast-compare@^3.0.1, react-fast-compare@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/react-fast-compare/-/react-fast-compare-3.2.0.tgz#641a9da81b6a6320f270e89724fb45a0b39e43bb"
   integrity sha512-rtGImPZ0YyLrscKI9xTpV8psd6I8VAtjKCzQDlzyDvqJA8XOW78TXYQwNRNd8g8JZnDu8q9Fu/1v4HPAVwVdHA==
@@ -25400,7 +23459,7 @@ react-transition-group@^1.2.1:
     prop-types "^15.5.6"
     warning "^3.0.0"
 
-react-transition-group@^4.3.0:
+react-transition-group@^4.3.0, react-transition-group@^4.4.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
   integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
@@ -25410,16 +23469,6 @@ react-transition-group@^4.3.0:
     loose-envify "^1.4.0"
     prop-types "^15.6.2"
 
-react-transition-group@^4.4.0:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9"
-  integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw==
-  dependencies:
-    "@babel/runtime" "^7.5.5"
-    dom-helpers "^5.0.1"
-    loose-envify "^1.4.0"
-    prop-types "^15.6.2"
-
 react@^16.12.0:
   version "16.14.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
@@ -25628,13 +23677,6 @@ readdirp@~3.2.0:
   dependencies:
     picomatch "^2.0.4"
 
-readdirp@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
-  integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
-  dependencies:
-    picomatch "^2.2.1"
-
 readline2@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/readline2/-/readline2-1.0.1.tgz#41059608ffc154757b715d9989d199ffbf372e35"
@@ -25704,15 +23746,7 @@ redux-thunk@^2.3.0:
   resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"
   integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==
 
-redux@*, redux@^4.0.0, redux@^4.0.1, redux@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f"
-  integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w==
-  dependencies:
-    loose-envify "^1.4.0"
-    symbol-observable "^1.2.0"
-
-redux@^4.1.0:
+redux@*, redux@^4.0.0, redux@^4.0.1, redux@^4.0.5, redux@^4.1.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.1.tgz#76f1c439bb42043f985fbd9bf21990e60bd67f47"
   integrity sha512-hZQZdDEM25UY2P493kPYuKqviVwZ58lEmGQNeQ+gXa+U0gYPUBf7NKYazbe3m+bs/DzM/ahN12DbF+NG8i0CWw==
@@ -25786,15 +23820,7 @@ regex-parser@^2.2.11:
   resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75"
-  integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0-next.1"
-
-regexp.prototype.flags@^1.3.1:
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26"
   integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA==
@@ -25942,7 +23968,7 @@ remark-mdx@1.6.22:
     remark-parse "8.0.3"
     unified "9.2.0"
 
-remark-parse@8.0.3:
+remark-parse@8.0.3, remark-parse@^8.0.0:
   version "8.0.3"
   resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.3.tgz#9c62aa3b35b79a486454c690472906075f40c7e1"
   integrity sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==
@@ -25964,28 +23990,6 @@ remark-parse@8.0.3:
     vfile-location "^3.0.0"
     xtend "^4.0.1"
 
-remark-parse@^8.0.0:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/remark-parse/-/remark-parse-8.0.2.tgz#5999bc0b9c2e3edc038800a64ff103d0890b318b"
-  integrity sha512-eMI6kMRjsAGpMXXBAywJwiwAse+KNpmt+BK55Oofy4KvBZEqUDj6mWbGLJZrujoPIPPxDXzn3T9baRlpsm2jnQ==
-  dependencies:
-    ccount "^1.0.0"
-    collapse-white-space "^1.0.2"
-    is-alphabetical "^1.0.0"
-    is-decimal "^1.0.0"
-    is-whitespace-character "^1.0.0"
-    is-word-character "^1.0.0"
-    markdown-escapes "^1.0.0"
-    parse-entities "^2.0.0"
-    repeat-string "^1.5.4"
-    state-toggle "^1.0.0"
-    trim "0.0.1"
-    trim-trailing-lines "^1.0.0"
-    unherit "^1.0.4"
-    unist-util-remove-position "^2.0.0"
-    vfile-location "^3.0.0"
-    xtend "^4.0.1"
-
 remark-slug@^6.0.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/remark-slug/-/remark-slug-6.1.0.tgz#0503268d5f0c4ecb1f33315c00465ccdd97923ce"
@@ -26303,15 +24307,7 @@ resolve@1.1.7:
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
   integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
 
-resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130"
-  integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA==
-  dependencies:
-    is-core-module "^2.0.0"
-    path-parse "^1.0.6"
-
-resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0:
+resolve@^1.1.4, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.8.1:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -26319,14 +24315,6 @@ resolve@^1.14.2, resolve@^1.18.1, resolve@^1.19.0, resolve@^1.20.0:
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
-resolve@^1.15.1:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
-  integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
-  dependencies:
-    is-core-module "^2.1.0"
-    path-parse "^1.0.6"
-
 resolve@^2.0.0-next.3:
   version "2.0.0-next.3"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46"
@@ -26499,14 +24487,7 @@ rlp-browser@^1.0.1:
   dependencies:
     buffer "^5.4.2"
 
-rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.6.tgz#c80ba6266ac7a483ef1e69e8e2f056656de2fb2c"
-  integrity sha512-HAfAmL6SDYNWPUOJNrM500x4Thn4PZsEy5pijPh40U9WfNk0z15hUYzO9xVIMAdIHdFtD8CBDHd75Td1g36Mjg==
-  dependencies:
-    bn.js "^4.11.1"
-
-rlp@^2.2.6:
+rlp@^2.0.0, rlp@^2.2.1, rlp@^2.2.2, rlp@^2.2.3, rlp@^2.2.4, rlp@^2.2.6:
   version "2.2.7"
   resolved "https://registry.yarnpkg.com/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf"
   integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ==
@@ -26621,20 +24602,13 @@ rx-lite@^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, 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==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0, rxjs@^6.5.2:
-  version "6.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c"
-  integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==
-  dependencies:
-    tslib "^1.9.0"
-
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -26714,27 +24688,13 @@ sass-lookup@^3.0.0:
   dependencies:
     commander "^2.16.0"
 
-sass@^1.26.3:
-  version "1.32.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
-  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
-  dependencies:
-    chokidar ">=2.0.0 <4.0.0"
-
-sass@^1.29.0:
+sass@^1.26.3, sass@^1.29.0, sass@^1.32.4:
   version "1.35.2"
   resolved "https://registry.yarnpkg.com/sass/-/sass-1.35.2.tgz#b732314fcdaf7ef8d0f1698698adc378043cb821"
   integrity sha512-jhO5KAR+AMxCEwIH3v+4zbB2WB0z67V1X0jbapfVwQQdjHZUGUyukpnoM6+iCMfsIUC016w9OPKQ5jrNOS9uXw==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
 
-sass@^1.32.4:
-  version "1.32.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.4.tgz#308bf29dd7f53d44ae4f06580e9a910ad9aa411e"
-  integrity sha512-N0BT0PI/t3+gD8jKa83zJJUb7ssfQnRRfqN+GIErokW6U4guBpfYl8qYB+OFLEho+QvnV5ZH1R9qhUC/Z2Ch9w==
-  dependencies:
-    chokidar ">=2.0.0 <4.0.0"
-
 sax@^1.2.1, sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -26853,7 +24813,7 @@ scss-parser@^1.0.4:
   dependencies:
     invariant "2.2.4"
 
-secp256k1@4.0.2, secp256k1@^4.0.1:
+secp256k1@4.0.2, secp256k1@^4.0.0, secp256k1@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.2.tgz#15dd57d0f0b9fdb54ac1fa1694f40e5e9a54f4a1"
   integrity sha512-UDar4sKvWAksIlfX3xIaQReADn+WFnHvbVujpcbr+9Sf/69odMwy2MUsz5CKLQgX9nsIyrjuxL2imVyoNHa3fg==
@@ -26862,7 +24822,7 @@ secp256k1@4.0.2, secp256k1@^4.0.1:
     node-addon-api "^2.0.0"
     node-gyp-build "^4.2.0"
 
-secp256k1@^3.0.1, secp256k1@^3.5.2, secp256k1@^3.6.1, secp256k1@^3.6.2:
+secp256k1@^3.0.1, secp256k1@^3.6.1, secp256k1@^3.6.2:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-3.8.0.tgz#28f59f4b01dbee9575f56a47034b7d2e3b3b352d"
   integrity sha512-k5ke5avRZbtl9Tqx/SA7CbY3NF6Ro+Sj9cZxezFzuBlLDmyqPiL8hJJ+EmzD8Ig4LUDByHJ3/iPOVoRixs/hmw==
@@ -26965,6 +24925,14 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
+sentence-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/sentence-case/-/sentence-case-2.1.1.tgz#1f6e2dda39c168bf92d13f86d4a918933f667ed4"
+  integrity sha1-H24t2jnBaL+S0T+G1KkYkz9mftQ=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case-first "^1.1.2"
+
 serialize-error@^7.0.1:
   version "7.0.1"
   resolved "https://registry.yarnpkg.com/serialize-error/-/serialize-error-7.0.1.tgz#f1360b0447f61ffb483ec4157c737fab7d778e18"
@@ -26997,21 +24965,7 @@ serve-favicon@^2.5.0:
     parseurl "~1.3.2"
     safe-buffer "5.1.1"
 
-serve-handler@^6.1.2:
-  version "6.1.2"
-  resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.2.tgz#f05b0421a313fff2d257838cba00cbcc512cd2b6"
-  integrity sha512-RFh49wX7zJmmOVDcIjiDSJnMH+ItQEvyuYLYuDBVoA/xmQSCuj+uRmk1cmBB5QQlI3qOiWKp6p4DUGY+Z5AB2A==
-  dependencies:
-    bytes "3.0.0"
-    content-disposition "0.5.2"
-    fast-url-parser "1.1.3"
-    mime-types "2.1.18"
-    minimatch "3.0.4"
-    path-is-inside "1.0.2"
-    path-to-regexp "2.2.1"
-    range-parser "1.2.0"
-
-serve-handler@^6.1.3:
+serve-handler@^6.1.2, serve-handler@^6.1.3:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/serve-handler/-/serve-handler-6.1.3.tgz#1bf8c5ae138712af55c758477533b9117f6435e8"
   integrity sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==
@@ -27090,7 +25044,7 @@ setprototypeof@1.1.1:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
   integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
-sha.js@^2.4.0, 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==
@@ -27208,14 +25162,6 @@ shortid@^2.2.8:
   dependencies:
     nanoid "^2.0.0"
 
-side-channel@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947"
-  integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA==
-  dependencies:
-    es-abstract "^1.17.0-next.1"
-    object-inspect "^1.7.0"
-
 side-channel@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
@@ -27225,12 +25171,7 @@ side-channel@^1.0.4:
     get-intrinsic "^1.0.2"
     object-inspect "^1.9.0"
 
-signal-exit@^3.0.0, signal-exit@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
-  integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=
-
-signal-exit@^3.0.3:
+signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
@@ -27342,16 +25283,18 @@ slide@~1.1.3:
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
 
-smart-buffer@^4.0.2:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
-  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
-
-smart-buffer@^4.1.0:
+smart-buffer@^4.0.2, smart-buffer@^4.1.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
+snake-case@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/snake-case/-/snake-case-2.1.0.tgz#41bdb1b73f30ec66a04d4e2cad1b76387d4d6d9f"
+  integrity sha1-Qb2xtz8w7GagTU4srRt2OH1NbZ8=
+  dependencies:
+    no-case "^2.2.0"
+
 snapdragon-node@^2.0.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
@@ -27387,7 +25330,7 @@ socket.io-adapter@~1.1.0:
   resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
   integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
 
-socket.io-client@2.4.0, socket.io-client@^2.1.1, socket.io-client@^2.2.0:
+socket.io-client@2.4.0, socket.io-client@^2.1.1:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
   integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
@@ -27561,15 +25504,7 @@ source-map-support@^0.4.15:
   dependencies:
     source-map "^0.5.6"
 
-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.19, source-map-support@~0.5.4:
-  version "0.5.19"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
-source-map-support@~0.5.20:
+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==
@@ -27989,19 +25924,7 @@ string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0:
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-"string.prototype.matchall@^4.0.0 || ^3.0.1", string.prototype.matchall@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e"
-  integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.0"
-    has-symbols "^1.0.1"
-    internal-slot "^1.0.2"
-    regexp.prototype.flags "^1.3.0"
-    side-channel "^1.0.2"
-
-string.prototype.matchall@^4.0.4:
+"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"
   resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29"
   integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ==
@@ -28050,14 +25973,6 @@ string.prototype.trim@~1.1.2:
     es-abstract "^1.5.0"
     function-bind "^1.0.2"
 
-string.prototype.trimend@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz#85812a6b847ac002270f5808146064c995fb6913"
-  integrity sha512-LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimend@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
@@ -28066,14 +25981,6 @@ string.prototype.trimend@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string.prototype.trimstart@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz#14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"
-  integrity sha512-XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.5"
-
 string.prototype.trimstart@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
@@ -28449,6 +26356,14 @@ svg-tags@^1.0.0:
   resolved "https://registry.yarnpkg.com/svg-tags/-/svg-tags-1.0.0.tgz#58f71cee3bd519b59d4b2a843b6c7de64ac04764"
   integrity sha1-WPcc7jvVGbWdSyqEO2x95krAR2Q=
 
+swap-case@^1.1.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/swap-case/-/swap-case-1.1.2.tgz#c39203a4587385fad3c850a0bd1bcafa081974e3"
+  integrity sha1-w5IDpFhzhfrTyFCgvRvK+ggZdOM=
+  dependencies:
+    lower-case "^1.1.1"
+    upper-case "^1.1.1"
+
 swappable-obj-proxy@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/swappable-obj-proxy/-/swappable-obj-proxy-1.1.0.tgz#fe23c60a0df22499e85d94b71297d9c39ff05fa4"
@@ -28476,12 +26391,7 @@ symbol-observable@^1.2.0, symbol-observable@^2.0.3:
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-2.0.3.tgz#5b521d3d07a43c351055fa43b8355b62d33fd16a"
   integrity sha512-sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==
 
-symbol-tree@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
-  integrity sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
-
-symbol-tree@^3.2.4:
+symbol-tree@^3.2.1, symbol-tree@^3.2.4:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
@@ -28576,18 +26486,7 @@ tar-fs@^2.0.0:
     pump "^3.0.0"
     tar-stream "^2.1.4"
 
-tar-stream@^2.0.0, tar-stream@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
-  integrity sha512-+DAn4Nb4+gz6WZigRzKEZl1QuJVOLtAwwF+WUxy1fJ6X63CaGaUAxJRD2KEn1OMfcbCjySTYpNC6WmfQoIEOdw==
-  dependencies:
-    bl "^3.0.0"
-    end-of-stream "^1.4.1"
-    fs-constants "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
-tar-stream@^2.1.4:
+tar-stream@^2.0.0, tar-stream@^2.0.1, tar-stream@^2.1.4:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -28730,7 +26629,7 @@ terser@^4.1.2, terser@^4.6.3:
     source-map "~0.6.1"
     source-map-support "~0.5.12"
 
-terser@^5.3.4:
+terser@^5.3.4, terser@^5.7.0:
   version "5.9.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-5.9.0.tgz#47d6e629a522963240f2b55fcaa3c99083d2c351"
   integrity sha512-h5hxa23sCdpzcye/7b8YqbE5OwKca/ni0RQz1uRX3tGh8haaGHqcuSqbGRybuAKNdntZ0mDgFNXPJ48xQ2RXKQ==
@@ -28739,15 +26638,6 @@ terser@^5.3.4:
     source-map "~0.7.2"
     source-map-support "~0.5.20"
 
-terser@^5.7.0:
-  version "5.7.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
-  integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
 test-exclude@^6.0.0:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -28903,10 +26793,10 @@ tiny-queue@0.2.0:
   resolved "https://registry.yarnpkg.com/tiny-queue/-/tiny-queue-0.2.0.tgz#c49fcb5c87555be1b4a5df7eb87101d5b78bc9dc"
   integrity sha1-xJ/LXIdVW+G0pd9+uHEB1beLydw=
 
-tiny-secp256k1@^1.1.0, tiny-secp256k1@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tiny-secp256k1/-/tiny-secp256k1-1.1.3.tgz#e93b1e1bf62e9bd1ad3ab24af27ff6127ce0e077"
-  integrity sha512-ZpobrhOtHP98VYEN51IYQH1YcrbFpnxFhI6ceWa3OEbJn7eHvSd8YFjGPxbedGCy7PNYU1v/+BRsdvyr5uRd4g==
+tiny-secp256k1@^1.1.0, tiny-secp256k1@^1.1.1, tiny-secp256k1@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/tiny-secp256k1/-/tiny-secp256k1-1.1.6.tgz#7e224d2bee8ab8283f284e40e6b4acb74ffe047c"
+  integrity sha512-FmqJZGduTyvsr2cF3375fqGHUovSwDi/QytexX1Se4BPuPZpTE5Ftp5fg+EFSuEf3lhZqgCRjEG3ydUQ/aNiwA==
   dependencies:
     bindings "^1.3.0"
     bn.js "^4.11.8"
@@ -28926,6 +26816,14 @@ tiny-worker@^2.3.0:
   dependencies:
     esm "^3.2.25"
 
+title-case@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/title-case/-/title-case-2.1.1.tgz#3e127216da58d2bc5becf137ab91dae3a7cd8faa"
+  integrity sha1-PhJyFtpY0rxb7PE3q5Ha46fNj6o=
+  dependencies:
+    no-case "^2.2.0"
+    upper-case "^1.0.3"
+
 tmp@0.0.30:
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
@@ -29029,7 +26927,7 @@ to-through@^2.0.0:
   dependencies:
     through2 "^2.0.3"
 
-toggle-selection@^1.0.3, toggle-selection@^1.0.6:
+toggle-selection@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
   integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
@@ -29044,15 +26942,7 @@ tosource@1.0.0:
   resolved "https://registry.yarnpkg.com/tosource/-/tosource-1.0.0.tgz#42d88dd116618bcf00d6106dd5446f3427902ff1"
   integrity sha1-QtiN0RZhi88A1hBt1URvNCeQL/E=
 
-tough-cookie@>=2.3.3, tough-cookie@^2.3.3, tough-cookie@~2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
-  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
-  dependencies:
-    psl "^1.1.28"
-    punycode "^2.1.1"
-
-tough-cookie@^4.0.0:
+tough-cookie@>=2.3.3, tough-cookie@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
   integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
@@ -29061,6 +26951,14 @@ tough-cookie@^4.0.0:
     punycode "^2.1.1"
     universalify "^0.1.2"
 
+tough-cookie@^2.3.3, tough-cookie@~2.5.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+  dependencies:
+    psl "^1.1.28"
+    punycode "^2.1.1"
+
 tr46@^1.0.0, tr46@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09"
@@ -29080,40 +26978,36 @@ tree-kill@^1.2.2:
   resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-trezor-connect@8.1.23-extended:
-  version "8.1.23-extended"
-  resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.1.23-extended.tgz#353369a9f136216630b9673a239dcdb140abe49e"
-  integrity sha512-Otlim+/tPiywWcuK7uIVP9UDUPvIhkvdBOPHzV6UKVylbqecTKb1LcUNq3tSfHq78CIsWvTa6g5AQrHq1wSPAw==
+trezor-connect@8.2.3-extended:
+  version "8.2.3-extended"
+  resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-8.2.3-extended.tgz#597e985bacd9ebc0ab61b031fffc21c96515546e"
+  integrity sha512-nGgkvE25rKW7SQaz5hOo5hgsx8US0L1piTWu5WFzC5PIz6R+yCyN+SeSeKlYRJ7t9VdzTC77cYu3fklxJHJzCA==
   dependencies:
-    "@babel/runtime" "^7.12.5"
+    "@babel/runtime" "^7.15.4"
     "@trezor/blockchain-link" "^1.0.17"
-    "@trezor/rollout" "1.0.7"
-    "@trezor/utxo-lib" "^0.1.2"
-    bchaddrjs "^0.5.2"
+    "@trezor/connect-common" "^0.0.3"
+    "@trezor/rollout" "^1.2.0"
+    "@trezor/utxo-lib" "1.0.0-beta.10"
     bignumber.js "^9.0.1"
     bowser "^2.11.0"
-    events "^3.2.0"
-    hd-wallet "9.1.1"
-    keccak "^3.0.1"
+    cbor-web "^7.0.6"
+    events "^3.3.0"
+    keccak "^3.0.2"
     node-fetch "^2.6.1"
     parse-uri "^1.0.3"
     tiny-worker "^2.3.0"
-    trezor-link "1.7.3"
-    whatwg-fetch "^3.5.0"
+    trezor-link "2.0.0-beta.6"
+    whatwg-fetch "^3.6.2"
 
-trezor-link@1.7.3:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/trezor-link/-/trezor-link-1.7.3.tgz#33c4b558913a3da395243018c04ee1804affcdc3"
-  integrity sha512-KaVYcK96BLD+cBuYmJmsxr6G9Z0ZeO6VYPhcYQyFxJ7jvc6/UvTmdACZdHjlUD7U5VuJEGMI4G8L3IGxFTFv4Q==
+trezor-link@2.0.0-beta.6:
+  version "2.0.0-beta.6"
+  resolved "https://registry.yarnpkg.com/trezor-link/-/trezor-link-2.0.0-beta.6.tgz#e727890a539ee1b6ff109a0227c38328d42d95c7"
+  integrity sha512-DwmbKV434Vx7RmuPxcZzABTLFK5n5mZ+5+UjQ8tA0lLx41NstRJ+/OKO0b8qMJOv1ZnoQ87dfu5LtI7o9EXKuw==
   dependencies:
-    bigi "^1.4.1"
-    ecurve "^1.0.3"
+    bytebuffer "^5.0.1"
     json-stable-stringify "^1.0.1"
-    node-fetch "^2.6.1"
-    object.values "^1.1.2"
-    protobufjs-old-fixed-webpack "3.8.5"
-    semver-compare "^1.0.0"
-    whatwg-fetch "^3.5.0"
+    long "^4.0.0"
+    protobufjs "^6.11.2"
 
 trim-newlines@^3.0.0:
   version "3.0.1"
@@ -29155,16 +27049,11 @@ truncate-utf8-bytes@^1.0.0:
     utf8-byte-length "^1.0.1"
 
 ts-custom-error@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/ts-custom-error/-/ts-custom-error-2.2.1.tgz#47086fbc34df5c7c2d4fba8c92d8767662066951"
-  integrity sha512-lHKZtU+PXkVuap6nlFZybIAFLUO8B3jbCs1VynBL8AUSAHfeG6HpztcBTDRp5I+fN5820N9kGg+eTIvr+le2yg==
-
-ts-dedent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.0.0.tgz#47c5eb23d9096f3237cc413bc82d387d36dbe690"
-  integrity sha512-DfxKjSFQfw9+uf7N9Cy8Ebx9fv5fquK4hZ6SD3Rzr+1jKP6AVA6H8+B5457ZpUs0JKsGpGqIevbpZ9DMQJDp1A==
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/ts-custom-error/-/ts-custom-error-2.2.2.tgz#ee769cd6a9cf35dc2e9fedefbb3842f3a2fbceae"
+  integrity sha512-I0FEdfdatDjeigRqh1JFj67bcIKyRNm12UVGheBjs2pXgyELg2xeiQLVaWu1pVmNGXZVnz/fvycSU41moBIpOg==
 
-ts-dedent@^2.1.1:
+ts-dedent@^2.0.0, ts-dedent@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ts-dedent/-/ts-dedent-2.2.0.tgz#39e4bd297cd036292ae2394eb3412be63f563bb5"
   integrity sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==
@@ -29194,12 +27083,7 @@ 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:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
-
-tslib@^2.3.0:
+tslib@^2.0.0, tslib@^2.0.1, 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==
@@ -29335,7 +27219,7 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typeforce@^1.11.3, typeforce@^1.11.5:
+typeforce@^1.11.3, typeforce@^1.11.5, typeforce@^1.18.0:
   version "1.18.0"
   resolved "https://registry.yarnpkg.com/typeforce/-/typeforce-1.18.0.tgz#d7416a2c5845e085034d70fcc5b6cc4a90edbfdc"
   integrity sha512-7uc1O8h1M1g0rArakJdf0uLRSSgFcYexrVoKo+bzJd32gd4gDy2L/Z+8/FjPnU9ydY3pEnVPtr9FyscYY60K1g==
@@ -29493,7 +27377,7 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz#a9cc6cc7ce63a0a3023fc99e341b94431d405a57"
   integrity sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==
 
-unified@9.2.0:
+unified@9.2.0, unified@^9.0.0:
   version "9.2.0"
   resolved "https://registry.yarnpkg.com/unified/-/unified-9.2.0.tgz#67a62c627c40589edebbf60f53edfd4d822027f8"
   integrity sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==
@@ -29505,18 +27389,6 @@ unified@9.2.0:
     trough "^1.0.0"
     vfile "^4.0.0"
 
-unified@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/unified/-/unified-9.0.0.tgz#12b099f97ee8b36792dbad13d278ee2f696eed1d"
-  integrity sha512-ssFo33gljU3PdlWLjNp15Inqb77d6JnJSfyplGJPT/a+fNRNyCBeveBAYJdO5khKdF6WVHa/yYCC7Xl6BDwZUQ==
-  dependencies:
-    bail "^1.0.0"
-    extend "^3.0.0"
-    is-buffer "^2.0.0"
-    is-plain-obj "^2.0.0"
-    trough "^1.0.0"
-    vfile "^4.0.0"
-
 union-value@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
@@ -29636,11 +27508,6 @@ universalify@^0.1.0, universalify@^0.1.2:
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
-universalify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-1.0.0.tgz#b61a1da173e8435b2fe3c67d29b9adf8594bd16d"
-  integrity sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==
-
 universalify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
@@ -29725,6 +27592,18 @@ uport-base64url@3.0.2-alpha.0:
   dependencies:
     buffer "^5.2.1"
 
+upper-case-first@^1.1.0, upper-case-first@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/upper-case-first/-/upper-case-first-1.1.2.tgz#5d79bedcff14419518fd2edb0a0507c9b6859115"
+  integrity sha1-XXm+3P8UQZUY/S7bCgUHybaFkRU=
+  dependencies:
+    upper-case "^1.1.1"
+
+upper-case@^1.0.3, upper-case@^1.1.0, upper-case@^1.1.1, upper-case@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
+  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+
 uri-js@^4.2.2:
   version "4.2.2"
   resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0"
@@ -29899,7 +27778,7 @@ util@^0.11.0:
   dependencies:
     inherits "2.0.3"
 
-util@^0.12.3, util@~0.12.0:
+util@^0.12.0, util@^0.12.3, util@~0.12.0:
   version "0.12.4"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.4.tgz#66121a31420df8f01ca0c464be15dfa1d1850253"
   integrity sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==
@@ -30002,12 +27881,7 @@ varint-decoder@~0.1.1:
   dependencies:
     varint "^5.0.0"
 
-varint@^5.0.0, varint@~5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.0.tgz#d826b89f7490732fabc0c0ed693ed475dcb29ebf"
-  integrity sha1-2Ca4n3SQcy+rwMDtaT7Uddyynr8=
-
-varint@^5.0.2:
+varint@^5.0.0, varint@^5.0.2, varint@~5.0.0:
   version "5.0.2"
   resolved "https://registry.yarnpkg.com/varint/-/varint-5.0.2.tgz#5b47f8a947eb668b848e034dcfa87d0ff8a7f7a4"
   integrity sha512-lKxKYG6H03yCZUpAGOPOsMcGxd1RHCu1iKvEHYDPmTyq2HueGhD73ssNBqqQWfvYs04G9iUFRvmAVLW20Jw6ow==
@@ -30017,10 +27891,10 @@ varint@^6.0.0:
   resolved "https://registry.yarnpkg.com/varint/-/varint-6.0.0.tgz#9881eb0ce8feaea6512439d19ddf84bf551661d0"
   integrity sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==
 
-varuint-bitcoin@^1.0.4:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/varuint-bitcoin/-/varuint-bitcoin-1.1.0.tgz#7a343f50537607af6a3059312b9782a170894540"
-  integrity sha512-jCEPG+COU/1Rp84neKTyDJQr478/hAfVp5xxYn09QEH0yBjbmPeMfuuQIrp+BUD83hybtYZKhr5elV3bvdV1bA==
+varuint-bitcoin@^1.0.4, varuint-bitcoin@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/varuint-bitcoin/-/varuint-bitcoin-1.1.2.tgz#e76c138249d06138b480d4c5b40ef53693e24e92"
+  integrity sha512-4EVb+w4rx+YfVM32HQX42AbbT7/1f5zwAYhIujKXKk8NQK+JfRVl3pqT3hjNn/L+RstigmGGKVwHA/P0wgITZw==
   dependencies:
     safe-buffer "^5.1.1"
 
@@ -30038,12 +27912,7 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vfile-location@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.0.1.tgz#d78677c3546de0f7cd977544c367266764d31bb3"
-  integrity sha512-yYBO06eeN/Ki6Kh1QAkgzYpWT1d3Qln+ZCtSbJqFExPl1S3y2qqotJQXoh6qEvl/jDlgpUJolBn3PItVnnZRqQ==
-
-vfile-location@^3.2.0:
+vfile-location@^3.0.0, vfile-location@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-3.2.0.tgz#d8e41fbcbd406063669ebf6c33d56ae8721d0f3c"
   integrity sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==
@@ -30147,19 +28016,7 @@ vinyl@^1.1.0:
     clone-stats "^0.0.1"
     replace-ext "0.0.1"
 
-vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86"
-  integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg==
-  dependencies:
-    clone "^2.1.1"
-    clone-buffer "^1.0.0"
-    clone-stats "^1.0.0"
-    cloneable-readable "^1.0.0"
-    remove-trailing-separator "^1.0.1"
-    replace-ext "^1.0.0"
-
-vinyl@^2.2.1:
+vinyl@^2.0.0, vinyl@^2.1.0, vinyl@^2.2.0, vinyl@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
   integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
@@ -30556,6 +28413,19 @@ web3-utils@1.2.11:
     underscore "1.9.1"
     utf8 "3.0.0"
 
+web3-utils@1.5.3:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/web3-utils/-/web3-utils-1.5.3.tgz#e914c9320cd663b2a09a5cb920ede574043eb437"
+  integrity sha512-56nRgA+Ad9SEyCv39g36rTcr5fpsd4L9LgV3FK0aB66nAMazLAA6Qz4lH5XrUKPDyBIPGJIR+kJsyRtwcu2q1Q==
+  dependencies:
+    bn.js "^4.11.9"
+    eth-lib "0.2.8"
+    ethereum-bloom-filters "^1.0.6"
+    ethjs-unit "0.1.6"
+    number-to-bn "1.7.0"
+    randombytes "^2.1.0"
+    utf8 "3.0.0"
+
 web3@1.2.11:
   version "1.2.11"
   resolved "https://registry.yarnpkg.com/web3/-/web3-1.2.11.tgz#50f458b2e8b11aa37302071c170ed61cff332975"
@@ -30667,7 +28537,7 @@ webpack-virtual-modules@^0.2.2:
   dependencies:
     debug "^3.0.0"
 
-webpack@4:
+webpack@4, webpack@^4.41.6:
   version "4.46.0"
   resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
   integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
@@ -30696,35 +28566,6 @@ webpack@4:
     watchpack "^1.7.4"
     webpack-sources "^1.4.1"
 
-webpack@^4.41.6:
-  version "4.44.2"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.44.2.tgz#6bfe2b0af055c8b2d1e90ed2cd9363f841266b72"
-  integrity sha512-6KJVGlCxYdISyurpQ0IPTklv+DULv05rs2hseIXer6D7KrUicRDLFb4IUM1S6LUAKypPM/nSiVSuv8jHu1m3/Q==
-  dependencies:
-    "@webassemblyjs/ast" "1.9.0"
-    "@webassemblyjs/helper-module-context" "1.9.0"
-    "@webassemblyjs/wasm-edit" "1.9.0"
-    "@webassemblyjs/wasm-parser" "1.9.0"
-    acorn "^6.4.1"
-    ajv "^6.10.2"
-    ajv-keywords "^3.4.1"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^4.3.0"
-    eslint-scope "^4.0.3"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^2.4.0"
-    loader-utils "^1.2.3"
-    memory-fs "^0.4.1"
-    micromatch "^3.1.10"
-    mkdirp "^0.5.3"
-    neo-async "^2.6.1"
-    node-libs-browser "^2.2.1"
-    schema-utils "^1.0.0"
-    tapable "^1.1.3"
-    terser-webpack-plugin "^1.4.3"
-    watchpack "^1.7.4"
-    webpack-sources "^1.4.1"
-
 "webrtcsupport@github:ipfs/webrtcsupport":
   version "2.2.0"
   resolved "https://codeload.github.com/ipfs/webrtcsupport/tar.gz/0669f576582c53a3a42aa5ac014fcc5966809615"
@@ -30754,14 +28595,7 @@ websocket@1.0.32, websocket@^1.0.31:
     utf-8-validate "^5.0.2"
     yaeti "^0.0.6"
 
-whatwg-encoding@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz#57c235bc8657e914d24e1a397d3c82daee0a6ba3"
-  integrity sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==
-  dependencies:
-    iconv-lite "0.4.19"
-
-whatwg-encoding@^1.0.5:
+whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
   integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
@@ -30773,10 +28607,10 @@ whatwg-fetch@2.0.4:
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
   integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
 
-whatwg-fetch@^3.4.1, whatwg-fetch@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
-  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
+whatwg-fetch@^3.4.1, whatwg-fetch@^3.6.2:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
+  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
@@ -31137,18 +28971,11 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0:
+yaml@^1.10.0, yaml@^1.7.2:
   version "1.10.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yaml@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2"
-  integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw==
-  dependencies:
-    "@babel/runtime" "^7.6.3"
-
 yargs-parser@13.1.2, yargs-parser@^13.1.0, 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"